diff --git a/.gitignore b/.gitignore index fcfc4a1b5c..2a799286d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ result* +*.ignore.* +*.ignore \ No newline at end of file diff --git a/distros/foxy/ackermann-msgs/default.nix b/distros/foxy/ackermann-msgs/default.nix index bc39cd7424..5e9e54f928 100644 --- a/distros/foxy/ackermann-msgs/default.nix +++ b/distros/foxy/ackermann-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ackermann-msgs"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/ackermann_msgs-release/archive/release/foxy/ackermann_msgs/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "8e8d92f2ef625abec378de4425b4da8421a28287feb6727610104e1e8902501f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "ackermann_msgs-release"; + rev = "release/foxy/ackermann_msgs/2.0.2-1"; + sha256 = "sha256-zn0jbHQ6PrAlpzAwpr3Tu01dOE8TVcs0XYlTXL0x8wg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/action-msgs/default.nix b/distros/foxy/action-msgs/default.nix index c64cf4870a..e9422fdabb 100644 --- a/distros/foxy/action-msgs/default.nix +++ b/distros/foxy/action-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-action-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/foxy/action_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "98f6d6a6cdce04e07d239dc50233ec4d6ab460c6caa4eb297d1138416cef1d97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/foxy/action_msgs/1.0.0-1"; + sha256 = "sha256-y7F7Ih+C6Duj1u2LIiV7R4jvmCaJGg8JAOugw38YX4I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/action-tutorials-cpp/default.nix b/distros/foxy/action-tutorials-cpp/default.nix index 530b0c8dc5..c15ecbb577 100644 --- a/distros/foxy/action-tutorials-cpp/default.nix +++ b/distros/foxy/action-tutorials-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-action-tutorials-cpp"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/action_tutorials_cpp/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "ece75ba361659c1f67b03a5066848efbc3e512aa17bc368bd1698b0b0d6c463f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/action_tutorials_cpp/0.9.4-1"; + sha256 = "sha256-D3Qk0Db/q+4v9SDYQjbzfgTHfFTa5BHLLWaEFYeFVuw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/action-tutorials-interfaces/default.nix b/distros/foxy/action-tutorials-interfaces/default.nix index 79c1a34383..e49f4e3990 100644 --- a/distros/foxy/action-tutorials-interfaces/default.nix +++ b/distros/foxy/action-tutorials-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-action-tutorials-interfaces"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/action_tutorials_interfaces/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "2b1f8ba25a5b36b97825e1f701d2018bafb59e1d5377a550498fc8afb6696e41"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/action_tutorials_interfaces/0.9.4-1"; + sha256 = "sha256-xONDl4Gr6frXde8EwPhfWtRBIrVU52ZNUc5vwZQafJs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/action-tutorials-py/default.nix b/distros/foxy/action-tutorials-py/default.nix index bc9e043cb8..674d3dc542 100644 --- a/distros/foxy/action-tutorials-py/default.nix +++ b/distros/foxy/action-tutorials-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-action-tutorials-py"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/action_tutorials_py/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "b093ae3e3e88cfc08ad4d25476c9a29f37923bc6e4cceaabb43ccf46d3a7eba1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/action_tutorials_py/0.9.4-1"; + sha256 = "sha256-6WQTSKJ40RJOs+Gh+dpZeJhEJcnFjK4aFZrp1JaFP/4="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/actionlib-msgs/default.nix b/distros/foxy/actionlib-msgs/default.nix index 21c57b2490..d158e5be7b 100644 --- a/distros/foxy/actionlib-msgs/default.nix +++ b/distros/foxy/actionlib-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-actionlib-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/actionlib_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "33fb6df04e2ca0b411c62a1fb6d51a9b1983a93fad02234ccd2368267341f148"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/actionlib_msgs/2.0.5-1"; + sha256 = "sha256-rZVlG7U3YAyT+It4PGrm/X+2/lS844XOJvdxaJY++54="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/ament-clang-format/default.nix b/distros/foxy/ament-clang-format/default.nix index 3d1308cfd4..01efdcb7c3 100644 --- a/distros/foxy/ament-clang-format/default.nix +++ b/distros/foxy/ament-clang-format/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-clang-format"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_clang_format/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "308eb252a60b39bcaadfe46035492c1ba8a06d86b58763625c30d4c3654040d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_clang_format/0.9.7-1"; + sha256 = "sha256-tJnFt40uq5pKOJwrLKsfl+X+yA8NA3dqfn19pp1ffdo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-clang-tidy/default.nix b/distros/foxy/ament-clang-tidy/default.nix index e3767a2785..f4d5d4d5d3 100644 --- a/distros/foxy/ament-clang-tidy/default.nix +++ b/distros/foxy/ament-clang-tidy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-clang-tidy"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_clang_tidy/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "8752cd7f34f1a8a9984f96669ff1382f85603e54d99415a271c3bd6202fa40eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_clang_tidy/0.9.7-1"; + sha256 = "sha256-2LUEoZGhFFitbP3DDKfANE7nfeOVH8m4whXCDGUQeWc="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-cmake-auto/default.nix b/distros/foxy/ament-cmake-auto/default.nix index 18c1dfdf0c..e266949d2f 100644 --- a/distros/foxy/ament-cmake-auto/default.nix +++ b/distros/foxy/ament-cmake-auto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-auto"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_auto/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "5c24986ae6c12ca27b06f5b079df2000209279041b1fba8c3ad0eada23c38806"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_auto/0.9.11-1"; + sha256 = "sha256-8Twu6yIs6Jl8yKT/r+x9nIoWEIRG9y2ApDKLYo0gBhE="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ament-cmake-catch2/default.nix b/distros/foxy/ament-cmake-catch2/default.nix index ff1049602c..a9835afca7 100644 --- a/distros/foxy/ament-cmake-catch2/default.nix +++ b/distros/foxy/ament-cmake-catch2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-catch2"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_catch2-release/archive/release/foxy/ament_cmake_catch2/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "4c435817be2c972b6f062c6dc0cb0bbaeca09abb8c6cd37b185d9153df544e74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_catch2-release"; + rev = "release/foxy/ament_cmake_catch2/1.2.0-1"; + sha256 = "sha256-tO+yhq78V4z0Tiq3cso46p8Nv2iIiy1GtgvMFrerMPI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-clang-format/default.nix b/distros/foxy/ament-cmake-clang-format/default.nix index 532943d045..1c6b466862 100644 --- a/distros/foxy/ament-cmake-clang-format/default.nix +++ b/distros/foxy/ament-cmake-clang-format/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-clang-format"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_clang_format/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "258cb55a65b3bb6dd38695836e32a126a6d3c4556f4cd2ea1bacd94e9a493c64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_clang_format/0.9.7-1"; + sha256 = "sha256-0Gus/RG4eeU1BUMXfjC29NxpoCawl3bGKBAHYPCFkRE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-clang-tidy/default.nix b/distros/foxy/ament-cmake-clang-tidy/default.nix index c5055cd2c7..aeda91a924 100644 --- a/distros/foxy/ament-cmake-clang-tidy/default.nix +++ b/distros/foxy/ament-cmake-clang-tidy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-clang-tidy"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_clang_tidy/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "54a27d55f677cc1e618510d2565eb6879670ad6369b409262be4b594f02ecbc5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_clang_tidy/0.9.7-1"; + sha256 = "sha256-bMm8lnSsRsoiWnYO/IhZDQaF2CYNJpN4UEcFDrOYkek="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-copyright/default.nix b/distros/foxy/ament-cmake-copyright/default.nix index c359289e53..29e8743dc3 100644 --- a/distros/foxy/ament-cmake-copyright/default.nix +++ b/distros/foxy/ament-cmake-copyright/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-copyright"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_copyright/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "be736f76073e12b9f5c9b958db28874a78fb3c7afc982d495c6918640236aa2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_copyright/0.9.7-1"; + sha256 = "sha256-ob8y+X4guv9TYd8dNKfzPfcjjDWtWDzvHL0uoqtWE64="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-core/default.nix b/distros/foxy/ament-cmake-core/default.nix index 3e391e9839..71c45251aa 100644 --- a/distros/foxy/ament-cmake-core/default.nix +++ b/distros/foxy/ament-cmake-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-core"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_core/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "1c72f1240fb41ca6b6a801d2c8408b6b5aa20f529375d7c5acee8d424fa68850"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_core/0.9.11-1"; + sha256 = "sha256-EWJCwOffufno7DafGyMdbzCXa2rlJ1JxAN/SesDDI0M="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-package cmake python3Packages.catkin-pkg ]; diff --git a/distros/foxy/ament-cmake-cppcheck/default.nix b/distros/foxy/ament-cmake-cppcheck/default.nix index 70153e6292..99c4dbd0f0 100644 --- a/distros/foxy/ament-cmake-cppcheck/default.nix +++ b/distros/foxy/ament-cmake-cppcheck/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-cppcheck"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_cppcheck/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "c374f88631647cb7f38f98296bd7f69554c17310132934204a87454997b96ec3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_cppcheck/0.9.7-1"; + sha256 = "sha256-4c+9zYccuJN0b6CjBqzjn3b1nFLb4OIatcA8C+k8/2A="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-copyright ament-cmake-lint-cmake ]; diff --git a/distros/foxy/ament-cmake-cpplint/default.nix b/distros/foxy/ament-cmake-cpplint/default.nix index ca520ba0b1..51313f0895 100644 --- a/distros/foxy/ament-cmake-cpplint/default.nix +++ b/distros/foxy/ament-cmake-cpplint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-cpplint"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_cpplint/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "a1e0378d2ddf4b6e8ba885161d071a79788f6b8c897bf6f1ac4b52c4a4cff045"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_cpplint/0.9.7-1"; + sha256 = "sha256-mVjppVuxi2AVvQK2H5Q7OKMzFI+jObn/AIsNMDvhYkc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-export-definitions/default.nix b/distros/foxy/ament-cmake-export-definitions/default.nix index 48f80e34c9..04566b2d9a 100644 --- a/distros/foxy/ament-cmake-export-definitions/default.nix +++ b/distros/foxy/ament-cmake-export-definitions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-export-definitions"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_export_definitions/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "54d5495db85f1f73fda6ef57ca20c6588834d203c2eae1c583ca725a118b6186"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_export_definitions/0.9.11-1"; + sha256 = "sha256-uljsvfEhLCkNctbAl/K21+rp5sOjdaXwUzB4vAMl5y8="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-export-dependencies/default.nix b/distros/foxy/ament-cmake-export-dependencies/default.nix index 0eb443cf88..347f597ca8 100644 --- a/distros/foxy/ament-cmake-export-dependencies/default.nix +++ b/distros/foxy/ament-cmake-export-dependencies/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-export-dependencies"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_export_dependencies/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "ef301d14628c07235f3f415d2386d4f4d214d027080f2943cab4bacd3a525652"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_export_dependencies/0.9.11-1"; + sha256 = "sha256-1IP0Zn8Uvl8PDOxAPkKaUz40KyVmABDDYAfmdxFtzzM="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-libraries ]; diff --git a/distros/foxy/ament-cmake-export-include-directories/default.nix b/distros/foxy/ament-cmake-export-include-directories/default.nix index c20baff3e5..c0a0254ae9 100644 --- a/distros/foxy/ament-cmake-export-include-directories/default.nix +++ b/distros/foxy/ament-cmake-export-include-directories/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-export-include-directories"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_export_include_directories/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "5cc524a02af824b24731beed3d11a27b1126dcb3a7a463db3eeba0f4c689aa9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_export_include_directories/0.9.11-1"; + sha256 = "sha256-uYV6Uv90kUNu6lp2NRN5L9VlWR6r/KNgv42e9I2QYf4="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-export-interfaces/default.nix b/distros/foxy/ament-cmake-export-interfaces/default.nix index 763d09d110..1ce716796d 100644 --- a/distros/foxy/ament-cmake-export-interfaces/default.nix +++ b/distros/foxy/ament-cmake-export-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-export-interfaces"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_export_interfaces/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "17986042922de0e7cbce35f2e46435b9cb2d7cfa463bb6925d33aa97fed4333f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_export_interfaces/0.9.11-1"; + sha256 = "sha256-37VfiOpD9nqo+0SRtF7KwHUlxL9X3pFzyXnltk2NA3w="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-libraries ]; diff --git a/distros/foxy/ament-cmake-export-libraries/default.nix b/distros/foxy/ament-cmake-export-libraries/default.nix index 8702ee9f45..05d17af8de 100644 --- a/distros/foxy/ament-cmake-export-libraries/default.nix +++ b/distros/foxy/ament-cmake-export-libraries/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-export-libraries"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_export_libraries/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "acd310b648e1b2cce13a09b49385c26eda5430700f40f806433a56ff10e9e69b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_export_libraries/0.9.11-1"; + sha256 = "sha256-fuZm/jjOdwvLgDhDOD5ZnRtmJbZTBrnEkU/jpJYWubI="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-export-link-flags/default.nix b/distros/foxy/ament-cmake-export-link-flags/default.nix index 9bdfe7f9f0..31666c4eec 100644 --- a/distros/foxy/ament-cmake-export-link-flags/default.nix +++ b/distros/foxy/ament-cmake-export-link-flags/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-export-link-flags"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_export_link_flags/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "6d58244c42d7e96c7472b591d0dc80ab8502aacee7bb927c0f9483d6bfb92300"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_export_link_flags/0.9.11-1"; + sha256 = "sha256-g+9PylAAfXKPsN7zIcIC0JxTmvqINrRj4T9N0/jGFp0="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-export-targets/default.nix b/distros/foxy/ament-cmake-export-targets/default.nix index 5dcd0a0951..ee58cdea43 100644 --- a/distros/foxy/ament-cmake-export-targets/default.nix +++ b/distros/foxy/ament-cmake-export-targets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-export-targets"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_export_targets/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "2c3510e819b39a50154444be600f9dc3d4c6e58f899eaa0496dc0a850b912873"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_export_targets/0.9.11-1"; + sha256 = "sha256-krTsXW7dj8tU+89T5/RiOV4GIMIHyVHu9RoNLHcFqlU="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-libraries ]; diff --git a/distros/foxy/ament-cmake-flake8/default.nix b/distros/foxy/ament-cmake-flake8/default.nix index a8ccf5c940..d85abc3a27 100644 --- a/distros/foxy/ament-cmake-flake8/default.nix +++ b/distros/foxy/ament-cmake-flake8/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-flake8"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_flake8/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "812850e933a4ac40b9f75dd3443f4ab56b68b002a7278f4606ce0a5fbd25648e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_flake8/0.9.7-1"; + sha256 = "sha256-tTQ2meSfNdxI5BCDhbeysBcFx+bATPudWd6pMkwVvqc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-gmock/default.nix b/distros/foxy/ament-cmake-gmock/default.nix index d8dcd8ef5e..8bcd037669 100644 --- a/distros/foxy/ament-cmake-gmock/default.nix +++ b/distros/foxy/ament-cmake-gmock/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-gmock"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_gmock/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "ff94ac0f177bfb0855e91bb6f99dab25883de40e03f117efd9441642d4b4dc6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_gmock/0.9.11-1"; + sha256 = "sha256-85Rm2KwWF3td1rXL3spiAf0iy3ZPbUQAZStqENpIUg8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-google-benchmark/default.nix b/distros/foxy/ament-cmake-google-benchmark/default.nix index 04d7318d3d..a5fc0b7ad7 100644 --- a/distros/foxy/ament-cmake-google-benchmark/default.nix +++ b/distros/foxy/ament-cmake-google-benchmark/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-google-benchmark"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_google_benchmark/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "455344a6166cc5dce39c9bad4731a4beb28c0734e6d628839ff3b846ac0f2c59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_google_benchmark/0.9.11-1"; + sha256 = "sha256-LzWe3YuuUPwNsSvn6iJZvl3rbjcXqLMo9HABxUdGcdg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ament-cmake-python ]; diff --git a/distros/foxy/ament-cmake-gtest/default.nix b/distros/foxy/ament-cmake-gtest/default.nix index 030c95ae36..df2d0e1963 100644 --- a/distros/foxy/ament-cmake-gtest/default.nix +++ b/distros/foxy/ament-cmake-gtest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-gtest"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_gtest/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "8e6613bf8f1cf57a5a8892e54e1551ef25e75009c63863a7971530af7672af1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_gtest/0.9.11-1"; + sha256 = "sha256-mPAICta8ue6McXEofNBawKW9KUkaZjrhMaE9PZZ3aYY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-include-directories/default.nix b/distros/foxy/ament-cmake-include-directories/default.nix index 0f8660ad56..22f50ed91a 100644 --- a/distros/foxy/ament-cmake-include-directories/default.nix +++ b/distros/foxy/ament-cmake-include-directories/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-include-directories"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_include_directories/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "e93ca6207074043af76ee59520d58a67da986eda8101245c9567d0ea02927651"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_include_directories/0.9.11-1"; + sha256 = "sha256-QSeuv7QQnkgym0WtI3uzTgSCdeLtS6UkLQ/GnuTwIiM="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-libraries/default.nix b/distros/foxy/ament-cmake-libraries/default.nix index 1aedc8c780..dbde625d0e 100644 --- a/distros/foxy/ament-cmake-libraries/default.nix +++ b/distros/foxy/ament-cmake-libraries/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-libraries"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_libraries/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "f2686670476d658677a27714888a25e19066f4e7dd8e0a75829f1259ec00dd45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_libraries/0.9.11-1"; + sha256 = "sha256-qW0oPzN9ptqx4I8OzIasn2UAv1YrAYQU/sqE/qQyWIk="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-lint-cmake/default.nix b/distros/foxy/ament-cmake-lint-cmake/default.nix index 52c52662f0..b22b174ccc 100644 --- a/distros/foxy/ament-cmake-lint-cmake/default.nix +++ b/distros/foxy/ament-cmake-lint-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-lint-cmake"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_lint_cmake/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "178f3389b715cdb5c4df353df3351d642e0ada38548592e17a3f572a98ae586c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_lint_cmake/0.9.7-1"; + sha256 = "sha256-Z4oC+1VXkSeOCZNA+Q7BtcybdJb4kNqrB3eOe0dCuBY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-mypy/default.nix b/distros/foxy/ament-cmake-mypy/default.nix index 0958607a7e..a123677196 100644 --- a/distros/foxy/ament-cmake-mypy/default.nix +++ b/distros/foxy/ament-cmake-mypy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-mypy"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_mypy/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "047b53e267cd1d27f0fb32076fe57c5f59aa390c53a3e1aa37dc93905310de43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_mypy/0.9.7-1"; + sha256 = "sha256-d44BCL0oqG0oWtNQ/DI0uL2x3e5ThL2gk4ltHAgGpOg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-nose/default.nix b/distros/foxy/ament-cmake-nose/default.nix index 90823de3f9..ff56ef678c 100644 --- a/distros/foxy/ament-cmake-nose/default.nix +++ b/distros/foxy/ament-cmake-nose/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-nose"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_nose/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "6a416f118b1c82afc76cdb90bb2e5e96996af2763f16da4f2ffa7f104a8e7a0f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_nose/0.9.11-1"; + sha256 = "sha256-xy2PLLhpZMS/SiqFHCSNbTkrI3dJDRGD34wQwODXGGA="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test python3Packages.nose ]; diff --git a/distros/foxy/ament-cmake-pclint/default.nix b/distros/foxy/ament-cmake-pclint/default.nix index e2b87545b7..14eddaecd2 100644 --- a/distros/foxy/ament-cmake-pclint/default.nix +++ b/distros/foxy/ament-cmake-pclint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-pclint"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_pclint/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "150e254986adf3f691cc17d244d501d43723afab0128353b15bd4c0e2e0919fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_pclint/0.9.7-1"; + sha256 = "sha256-g5xLOh8nkYPaqkykd8lxDP/tl26dv8TSsyTK3tfP4KQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-pep257/default.nix b/distros/foxy/ament-cmake-pep257/default.nix index 541c1b996e..65a1e3f988 100644 --- a/distros/foxy/ament-cmake-pep257/default.nix +++ b/distros/foxy/ament-cmake-pep257/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-pep257"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_pep257/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "718800dfdc2ad8b3dfccd06c56bab33842caeaa65bdc50f347dc1ae355fd4bd1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_pep257/0.9.7-1"; + sha256 = "sha256-Qy+zk8OGwtVvAdNtYAcEKjCLbMeimjeOWbnq8VCicGQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-pycodestyle/default.nix b/distros/foxy/ament-cmake-pycodestyle/default.nix index 3e7055ae16..ec865c5192 100644 --- a/distros/foxy/ament-cmake-pycodestyle/default.nix +++ b/distros/foxy/ament-cmake-pycodestyle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-pycodestyle"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_pycodestyle/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "3b912b09480c98f23a0ae4ea0834154213bfa5cc95e36f8df30a34c2488bb8a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_pycodestyle/0.9.7-1"; + sha256 = "sha256-WdJ4CP8/DaUSJueJntYDRml/rqvPrNamBMAlruE0X0g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-pyflakes/default.nix b/distros/foxy/ament-cmake-pyflakes/default.nix index 9141185cba..ca336f546d 100644 --- a/distros/foxy/ament-cmake-pyflakes/default.nix +++ b/distros/foxy/ament-cmake-pyflakes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-pyflakes"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_pyflakes/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "7422496ad319346a347756b1e3696c510a30ee48349096be15854d44922c7900"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_pyflakes/0.9.7-1"; + sha256 = "sha256-RPSI/3Ae/lRk+tCVxqA/KTbaGUFZqHnekVZhrTyfWiY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-pytest/default.nix b/distros/foxy/ament-cmake-pytest/default.nix index 9f767d0f90..9674914173 100644 --- a/distros/foxy/ament-cmake-pytest/default.nix +++ b/distros/foxy/ament-cmake-pytest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-pytest"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_pytest/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "fb22a6b48e7892c538852cbbffffbc1b2bcfa62106128498db1d9732b9defbe5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_pytest/0.9.11-1"; + sha256 = "sha256-mOIwn2WtZTtAe6ZyL9xKfs14nnT7KQ1N0NyfaSHfBJY="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test pythonPackages.pytest ]; diff --git a/distros/foxy/ament-cmake-python/default.nix b/distros/foxy/ament-cmake-python/default.nix index 2f40e8fe49..c41221631d 100644 --- a/distros/foxy/ament-cmake-python/default.nix +++ b/distros/foxy/ament-cmake-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-python"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_python/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "83d3d582ca1cf9a76368bcef6fc332e9d59c5a395db31647a18bf80caa18632b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_python/0.9.11-1"; + sha256 = "sha256-bP49CztVjAG75uv4McBAruU3W3YG3ofnynMl+aOR2Zg="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-ros/default.nix b/distros/foxy/ament-cmake-ros/default.nix index 2a4a39fb86..d377f09ef6 100644 --- a/distros/foxy/ament-cmake-ros/default.nix +++ b/distros/foxy/ament-cmake-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-ros"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_ros-release/archive/release/foxy/ament_cmake_ros/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "c3799ed35c6541e8f0143c483206c770b037fd4c30fe9e46f10c6179ee8a164d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_ros-release"; + rev = "release/foxy/ament_cmake_ros/0.9.2-1"; + sha256 = "sha256-f+KJHSEL268Vd5MD1StKVHMW9Bc/yQyZBA21YCO7ll4="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/ament-cmake-target-dependencies/default.nix b/distros/foxy/ament-cmake-target-dependencies/default.nix index b9d2a77969..fcb52e3d61 100644 --- a/distros/foxy/ament-cmake-target-dependencies/default.nix +++ b/distros/foxy/ament-cmake-target-dependencies/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-target-dependencies"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_target_dependencies/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "6acb41d7c77d9eea4497a44a5b2df165451f05401f731f83a29719cf062570f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_target_dependencies/0.9.11-1"; + sha256 = "sha256-zGLYKLSzTrXIKD4xhNSOxq7tlJQQtUf/5rNdMoiuSyI="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-include-directories ament-cmake-libraries ]; diff --git a/distros/foxy/ament-cmake-test/default.nix b/distros/foxy/ament-cmake-test/default.nix index f576f93fc3..f7cec892b9 100644 --- a/distros/foxy/ament-cmake-test/default.nix +++ b/distros/foxy/ament-cmake-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-test"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_test/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "c1be7c5f4514bc126ada7c44d9be62e0694de6975d8c711fb30c323c1e3da7d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_test/0.9.11-1"; + sha256 = "sha256-ZzgXhRa+XD4e2vYhgzMB6F0fdyhC+oKDd58n/ZDqCxc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/foxy/ament-cmake-uncrustify/default.nix b/distros/foxy/ament-cmake-uncrustify/default.nix index 7c6b304edc..7dbc5101a8 100644 --- a/distros/foxy/ament-cmake-uncrustify/default.nix +++ b/distros/foxy/ament-cmake-uncrustify/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-uncrustify"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_uncrustify/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "f8e063e4d39c515259ecc2eb258f433143ab029c01c69290ee56f75f52ed3dd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_uncrustify/0.9.7-1"; + sha256 = "sha256-14ahdZIxpVlrTyhUpBA88RXrHl25pX9hAVUAGEjNN2E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-version/default.nix b/distros/foxy/ament-cmake-version/default.nix index 6e8169921d..a10b59b5ea 100644 --- a/distros/foxy/ament-cmake-version/default.nix +++ b/distros/foxy/ament-cmake-version/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-version"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake_version/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "337382371ec4e5f56379e5ce73eb44e4e148690eda85df9d139487b3c25941a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake_version/0.9.11-1"; + sha256 = "sha256-RpwvanIeD47QrZsNoh0q7lYLguPuWBDnNlaJA8SMQGc="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake-xmllint/default.nix b/distros/foxy/ament-cmake-xmllint/default.nix index 7ebcdfefaf..e2b385fecf 100644 --- a/distros/foxy/ament-cmake-xmllint/default.nix +++ b/distros/foxy/ament-cmake-xmllint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake-xmllint"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cmake_xmllint/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "d034066dd4b8db8129626257c817aed220e55fc93f67d206f112f48e4f9b1740"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cmake_xmllint/0.9.7-1"; + sha256 = "sha256-fjTsTc1BWs5EO3r6V4j409kveiRQRtAKdWPafvRaxNE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ament-cmake/default.nix b/distros/foxy/ament-cmake/default.nix index e37d9e67b0..4d2e49db57 100644 --- a/distros/foxy/ament-cmake/default.nix +++ b/distros/foxy/ament-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cmake"; version = "0.9.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/foxy/ament_cmake/0.9.11-1.tar.gz"; - name = "0.9.11-1.tar.gz"; - sha256 = "971ce41bb7b2380f12e3a8212d68129ed802760e2054ca629bc7721ea59dddc0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/foxy/ament_cmake/0.9.11-1"; + sha256 = "sha256-RIp9l+7X2EKNQ4uMZKJHHsEveMsvAA2unKkKrtUCecM="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-definitions ament-cmake-export-dependencies ament-cmake-export-include-directories ament-cmake-export-interfaces ament-cmake-export-libraries ament-cmake-export-link-flags ament-cmake-export-targets ament-cmake-libraries ament-cmake-python ament-cmake-target-dependencies ament-cmake-test ament-cmake-version cmake ]; diff --git a/distros/foxy/ament-copyright/default.nix b/distros/foxy/ament-copyright/default.nix index cc87fcffef..f15d0266eb 100644 --- a/distros/foxy/ament-copyright/default.nix +++ b/distros/foxy/ament-copyright/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-copyright"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_copyright/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "ef6f59b55470967d4cd72bbbfb74aa807f9414ecab08aa9c6ea81c96fcb99988"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_copyright/0.9.7-1"; + sha256 = "sha256-cF+MgDyUyClifvf8oReieRpwCCyYsYGf7s9DYoZpA9w="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-cppcheck/default.nix b/distros/foxy/ament-cppcheck/default.nix index 41aee0e328..435719f78b 100644 --- a/distros/foxy/ament-cppcheck/default.nix +++ b/distros/foxy/ament-cppcheck/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cppcheck"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cppcheck/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "6b1d0ba00aa5a8d1992ba3c9b4a80aaa9b1073d69510bd6d9cb7d18fafff5f57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cppcheck/0.9.7-1"; + sha256 = "sha256-xzaLH4iNK5PFI+8AK1B7xFehMPCC8rpGSgseIhze1Kk="; + }; buildType = "ament_python"; propagatedBuildInputs = [ cppcheck ]; diff --git a/distros/foxy/ament-cpplint/default.nix b/distros/foxy/ament-cpplint/default.nix index 511d4888ca..303f65407d 100644 --- a/distros/foxy/ament-cpplint/default.nix +++ b/distros/foxy/ament-cpplint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-cpplint"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_cpplint/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "aba0bf64ed047084b1bac202d6816724171fd0406caa79c29a043375fe18d90f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_cpplint/0.9.7-1"; + sha256 = "sha256-1lu9LNoSJp59Gq6w0sgemkEuOcQQ1QZ0oDOynJQn7KA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-download/default.nix b/distros/foxy/ament-download/default.nix index 8ce1bc09c0..70d8c2d789 100644 --- a/distros/foxy/ament-download/default.nix +++ b/distros/foxy/ament-download/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-download"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/samsung-ros/ament_download-release/archive/release/foxy/ament_download/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "b85972b56f2b369c2007a178b7e1c8e4896c5873dc0c9ae8b029d68cf2ce8cb9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "samsung-ros"; + repo = "ament_download-release"; + rev = "release/foxy/ament_download/0.0.5-1"; + sha256 = "sha256-6V9DhJraMIbNz3xeSeczpOFyaWgBqKsz2vQV4jFl6qk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ament-flake8/default.nix b/distros/foxy/ament-flake8/default.nix index db875d50d3..90f106c143 100644 --- a/distros/foxy/ament-flake8/default.nix +++ b/distros/foxy/ament-flake8/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-flake8"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_flake8/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "42aa8919b7e8740f0c9108769042e47b0a2c84f377d86b64f27f2eeeb0204725"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_flake8/0.9.7-1"; + sha256 = "sha256-+RpqOZDDEpAi90t4jaB959W1Pfw8kInvogkbkFsFPSg="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-lint python3Packages.flake8 ]; diff --git a/distros/foxy/ament-index-cpp/default.nix b/distros/foxy/ament-index-cpp/default.nix index d768cae41c..4bf9380eea 100644 --- a/distros/foxy/ament-index-cpp/default.nix +++ b/distros/foxy/ament-index-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-index-cpp"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_index-release/archive/release/foxy/ament_index_cpp/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "be3cb84b6d21b9ef200735ad2837c86968f409d27c463c2534922794eafe2ef1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_index-release"; + rev = "release/foxy/ament_index_cpp/1.1.0-1"; + sha256 = "sha256-V8bs/3iwCyIIllYP9UNb1x70EKW2cynFNJKiwcBe6YE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ament-index-python/default.nix b/distros/foxy/ament-index-python/default.nix index 0054885202..238cf9a5fb 100644 --- a/distros/foxy/ament-index-python/default.nix +++ b/distros/foxy/ament-index-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-index-python"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_index-release/archive/release/foxy/ament_index_python/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "0836dc79b482dfb39e8683d61e8f1027a1765e06874fcd16781fb20198deddef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_index-release"; + rev = "release/foxy/ament_index_python/1.1.0-1"; + sha256 = "sha256-u+F49HnjA+cuX8FFygDFMeFiAUKuQkAlSVPWd2jQYK4="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-lint-auto/default.nix b/distros/foxy/ament-lint-auto/default.nix index 08d1da4574..54f240cfaa 100644 --- a/distros/foxy/ament-lint-auto/default.nix +++ b/distros/foxy/ament-lint-auto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-lint-auto"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_lint_auto/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "0690f0cc33d831b61202e7e90818f382da20f47fc4cf75985659f2cfab85021c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_lint_auto/0.9.7-1"; + sha256 = "sha256-lEjHnP7JMP+sCI6PSq5jWeT1O+Eii0c+cOdFq0M6FJg="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test ]; diff --git a/distros/foxy/ament-lint-cmake/default.nix b/distros/foxy/ament-lint-cmake/default.nix index 11e76bd042..4561cec3dc 100644 --- a/distros/foxy/ament-lint-cmake/default.nix +++ b/distros/foxy/ament-lint-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-lint-cmake"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_lint_cmake/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "e18a2b08e3a26970b95b2cbc207ee2f394d76f51f43240f1f9f58baf71919804"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_lint_cmake/0.9.7-1"; + sha256 = "sha256-A1mn/s1fuNnTinjOfnmKUasjHmNc0iHY2m5a1R07PwM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-lint-common/default.nix b/distros/foxy/ament-lint-common/default.nix index c1e4adc12f..d045e78623 100644 --- a/distros/foxy/ament-lint-common/default.nix +++ b/distros/foxy/ament-lint-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-lint-common"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_lint_common/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "f3dc9f7eb651724f145365af45500c820fc3a5009f2105edd58bc96c87d6c973"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_lint_common/0.9.7-1"; + sha256 = "sha256-wvhL7H2IOU6c3oBCSgRvucvHTOJ+aoqnW9D4MHykHDU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-export-dependencies ]; diff --git a/distros/foxy/ament-lint/default.nix b/distros/foxy/ament-lint/default.nix index d7bbcadaf5..2a2c38ee85 100644 --- a/distros/foxy/ament-lint/default.nix +++ b/distros/foxy/ament-lint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-lint"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_lint/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "9aee5e2700aae351fed70c81df96070afaa1fe5eb3509b018e1b58f5064ae884"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_lint/0.9.7-1"; + sha256 = "sha256-Ey07LwnCExohq/3rf4ot25wWbFKQ3MkhLecFz2mpgFE="; + }; buildType = "ament_python"; diff --git a/distros/foxy/ament-mypy/default.nix b/distros/foxy/ament-mypy/default.nix index 9d7778e3e9..83fe2d633f 100644 --- a/distros/foxy/ament-mypy/default.nix +++ b/distros/foxy/ament-mypy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-mypy"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_mypy/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "5cb77b532a22bef923c5b6ff2e12313970669837fe803be54dc517eb2711a59c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_mypy/0.9.7-1"; + sha256 = "sha256-9vmmtayO9vYX6fRNoT93LR0HxvdJy1JcuCzsDyJXixc="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/foxy/ament-nodl/default.nix b/distros/foxy/ament-nodl/default.nix index 289a3039d9..275a8166c9 100644 --- a/distros/foxy/ament-nodl/default.nix +++ b/distros/foxy/ament-nodl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-nodl"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_nodl-release/archive/release/foxy/ament_nodl/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "9e05e775640cf8b78f1b83a2f08ffa7ee451b1cb41d44b0a7e9ef84fdbe7a80e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_nodl-release"; + rev = "release/foxy/ament_nodl/0.1.0-1"; + sha256 = "sha256-9azhFZrnSaHJiIRFdPiDTiDO3j2v3eKxQBNdAEFwd5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ament-package/default.nix b/distros/foxy/ament-package/default.nix index d58f16a1ad..c51b5f19ac 100644 --- a/distros/foxy/ament-package/default.nix +++ b/distros/foxy/ament-package/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-package"; version = "0.9.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_package-release/archive/release/foxy/ament_package/0.9.5-1.tar.gz"; - name = "0.9.5-1.tar.gz"; - sha256 = "7bee9d1107c1e922899d7883be41672051bf34383daca36bb53628bf26f73830"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_package-release"; + rev = "release/foxy/ament_package/0.9.5-1"; + sha256 = "sha256-KAJJNkGQokz71IHjSFzTazEOO63GxY6+W5KVeAeJH1w="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.flake8 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-pclint/default.nix b/distros/foxy/ament-pclint/default.nix index 9c16e22008..b3765aa695 100644 --- a/distros/foxy/ament-pclint/default.nix +++ b/distros/foxy/ament-pclint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-pclint"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_pclint/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "2a1e0a247f7967924b513ee9fa60a42e7ddabecd34d8b9cb2b71c7db9d10ab46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_pclint/0.9.7-1"; + sha256 = "sha256-VFU7ALdflGgW+TmNozMUYuF6sEP/ezALR43HB+J5Gfw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-pep257/default.nix b/distros/foxy/ament-pep257/default.nix index ed5231789d..57eb440b34 100644 --- a/distros/foxy/ament-pep257/default.nix +++ b/distros/foxy/ament-pep257/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-pep257"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_pep257/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "eed3c2e08af94e7f6ec7c48b79849463c21b684116686901d49dc152a72804e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_pep257/0.9.7-1"; + sha256 = "sha256-wOnrc5xJnqyUX2f1VVgtJmDioDasr4vAJ7MrtDD0tgI="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 pythonPackages.pytest ]; diff --git a/distros/foxy/ament-pycodestyle/default.nix b/distros/foxy/ament-pycodestyle/default.nix index b0e94652b2..d16da679af 100644 --- a/distros/foxy/ament-pycodestyle/default.nix +++ b/distros/foxy/ament-pycodestyle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-pycodestyle"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_pycodestyle/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "8a2865bbc9e4eae39bc94672f5dba534235c67d705dec948ea1d544098cf4a2e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_pycodestyle/0.9.7-1"; + sha256 = "sha256-Wj7mCJr7ruQqWfQdJ/QWx1ZYj2G0cm5+365LgZC+xNw="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.pycodestyle ]; diff --git a/distros/foxy/ament-pyflakes/default.nix b/distros/foxy/ament-pyflakes/default.nix index ccab62ab9b..d65d7b8241 100644 --- a/distros/foxy/ament-pyflakes/default.nix +++ b/distros/foxy/ament-pyflakes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-pyflakes"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_pyflakes/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "cb8f9f88408d8677f76b4d27d8b74972b385fe407d299a69086ddb52818b7475"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_pyflakes/0.9.7-1"; + sha256 = "sha256-+5LLwYZ/x9BaV1Dc8f22xuen5I5pCYi1NfLYwyCXGkM="; + }; buildType = "ament_python"; checkInputs = [ ament-pycodestyle pythonPackages.pytest ]; diff --git a/distros/foxy/ament-uncrustify/default.nix b/distros/foxy/ament-uncrustify/default.nix index 9603ff0d55..75a2aae6cc 100644 --- a/distros/foxy/ament-uncrustify/default.nix +++ b/distros/foxy/ament-uncrustify/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-uncrustify"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_uncrustify/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "d04a19bba75e222b756b90f8ec97332ff5765ce97d881a9b8ec38a1dbaa0c7bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_uncrustify/0.9.7-1"; + sha256 = "sha256-E+XvukiQdxZSU9HivnmUHc+dPNUrjregDWVIqu+iELA="; + }; buildType = "ament_python"; propagatedBuildInputs = [ uncrustify-vendor ]; diff --git a/distros/foxy/ament-xmllint/default.nix b/distros/foxy/ament-xmllint/default.nix index 3013a38dd8..6973e87825 100644 --- a/distros/foxy/ament-xmllint/default.nix +++ b/distros/foxy/ament-xmllint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ament-xmllint"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/foxy/ament_xmllint/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "4a0e356141c75852cdf0471d87afda115074b544b1245cd51fe3dfde544833ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/foxy/ament_xmllint/0.9.7-1"; + sha256 = "sha256-1F1TANfolR8m46ZRVPVJfRKa+43LsKNQXCpmmCV+mow="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/angles/default.nix b/distros/foxy/angles/default.nix index c6e11f8e73..a7e1ab56ba 100644 --- a/distros/foxy/angles/default.nix +++ b/distros/foxy/angles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-angles"; version = "1.12.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/angles-release/archive/release/foxy/angles/1.12.6-1.tar.gz"; - name = "1.12.6-1.tar.gz"; - sha256 = "a4f16d3854d340b4008e2cd556fe411cdf39c00764902264d2d6fa5dabe28e69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "angles-release"; + rev = "release/foxy/angles/1.12.6-1"; + sha256 = "sha256-b4i8WE+oNbh7/yIYtyBYit4oIcDPTsJ8+um+3ful2NY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python python3Packages.setuptools ]; diff --git a/distros/foxy/apriltag/default.nix b/distros/foxy/apriltag/default.nix index e2f1e52026..1f750c0fe6 100644 --- a/distros/foxy/apriltag/default.nix +++ b/distros/foxy/apriltag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-apriltag"; version = "3.2.0-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AprilRobotics"; + repo = "apriltag-release"; + rev = "release/foxy/apriltag/3.2.0-1"; + sha256 = "sha256-6kUYVWACrNDZBeDwDanrR3mgspXi5sPGKoy4chT7IrM="; + }; buildType = "cmake"; buildInputs = [ cmake python3Packages.numpy ]; diff --git a/distros/foxy/aruco-opencv-msgs/default.nix b/distros/foxy/aruco-opencv-msgs/default.nix index 7901605656..ebf700038b 100644 --- a/distros/foxy/aruco-opencv-msgs/default.nix +++ b/distros/foxy/aruco-opencv-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-aruco-opencv-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/aruco_opencv-release/archive/release/foxy/aruco_opencv_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "a2fff398ce13fb4cda9164896779dc49981baa1b2226ac1d60d80170667e1433"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "aruco_opencv-release"; + rev = "release/foxy/aruco_opencv_msgs/1.0.1-1"; + sha256 = "sha256-2Nxmq4K3Q0wikPLbsJYcIL+v6kk1pAPlRdLaM5XH/+c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/aruco-opencv/default.nix b/distros/foxy/aruco-opencv/default.nix index a86564b023..50252f39f1 100644 --- a/distros/foxy/aruco-opencv/default.nix +++ b/distros/foxy/aruco-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-aruco-opencv"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/aruco_opencv-release/archive/release/foxy/aruco_opencv/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "45cddb72580326049122896e65ebd9e16c82ee351413acc80a76cb6bf5a0f9cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "aruco_opencv-release"; + rev = "release/foxy/aruco_opencv/1.0.1-1"; + sha256 = "sha256-fhsub+GQyZR3LNpD0ofVO5Df+MeSASUE8nTjk8rcyNI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/asio-cmake-module/default.nix b/distros/foxy/asio-cmake-module/default.nix index 1565b28a63..0fdba1ddd0 100644 --- a/distros/foxy/asio-cmake-module/default.nix +++ b/distros/foxy/asio-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-asio-cmake-module"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/transport_drivers-release/archive/release/foxy/asio_cmake_module/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "22d371d6006055b3c7d56dacc1c33be3760ab1cee55d6c8b932d3a28d7094020"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "transport_drivers-release"; + rev = "release/foxy/asio_cmake_module/1.0.0-1"; + sha256 = "sha256-L1UfSBsJEKevgELwvF5P8B3qHHLd+EG004UZSpNNtJ4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/astuff-sensor-msgs/default.nix b/distros/foxy/astuff-sensor-msgs/default.nix index 004ac07128..e689630e2e 100644 --- a/distros/foxy/astuff-sensor-msgs/default.nix +++ b/distros/foxy/astuff-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-astuff-sensor-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/astuff_sensor_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "258c5f14af862f6c85ca8573cfcbcd9edfa67b502f94ce97f84cd6fa28d4ab3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/astuff_sensor_msgs/3.1.0-1"; + sha256 = "sha256-odqJYeCkqQvLsWn92R03kIJM+SKcyztwqWmuvWi10YY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/foxy/async-web-server-cpp/default.nix b/distros/foxy/async-web-server-cpp/default.nix index 460c13596f..399bbda20e 100644 --- a/distros/foxy/async-web-server-cpp/default.nix +++ b/distros/foxy/async-web-server-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-async-web-server-cpp"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/fkie-release/async_web_server_cpp-release/archive/release/foxy/async_web_server_cpp/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "7ca550df59d0277041dee7475aeb724829374083e9abeaf0f2ba834e6393dc21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "async_web_server_cpp-release"; + rev = "release/foxy/async_web_server_cpp/2.0.0-1"; + sha256 = "sha256-bz0je03yD60CjR08T++F1rGD5GhfXZJWAbL6L5rINbo="; + }; buildType = "catkin"; buildInputs = [ ament-cmake-ros openssl ]; diff --git a/distros/foxy/automotive-autonomy-msgs/default.nix b/distros/foxy/automotive-autonomy-msgs/default.nix index 5530ac9507..1ab9033bc0 100644 --- a/distros/foxy/automotive-autonomy-msgs/default.nix +++ b/distros/foxy/automotive-autonomy-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-automotive-autonomy-msgs"; version = "3.0.3-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/foxy/automotive_autonomy_msgs/3.0.3-1.tar.gz"; - name = "3.0.3-1.tar.gz"; - sha256 = "85ccd955cbadc897374c94ea50e08eecb1aa5562d37fb8a90fa18001ab832a3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/foxy/automotive_autonomy_msgs/3.0.3-1"; + sha256 = "sha256-qXvAJdULO76wleGyDDXw+AMY/ulq1gDOEhLMwutCu6E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/foxy/automotive-navigation-msgs/default.nix b/distros/foxy/automotive-navigation-msgs/default.nix index f0318fe00b..4122b33c18 100644 --- a/distros/foxy/automotive-navigation-msgs/default.nix +++ b/distros/foxy/automotive-navigation-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-automotive-navigation-msgs"; version = "3.0.3-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/foxy/automotive_navigation_msgs/3.0.3-1.tar.gz"; - name = "3.0.3-1.tar.gz"; - sha256 = "612eebd72c82191bf2cdcab245485cc65b728806be9cc7f13cdfafb273ad90ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/foxy/automotive_navigation_msgs/3.0.3-1"; + sha256 = "sha256-NiveZGurEReMwER7gcFh3jQ/YVp/tUarOzH7bpm0ewU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/automotive-platform-msgs/default.nix b/distros/foxy/automotive-platform-msgs/default.nix index 8163572044..2aa32a48b8 100644 --- a/distros/foxy/automotive-platform-msgs/default.nix +++ b/distros/foxy/automotive-platform-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-automotive-platform-msgs"; version = "3.0.3-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/foxy/automotive_platform_msgs/3.0.3-1.tar.gz"; - name = "3.0.3-1.tar.gz"; - sha256 = "4bc6a91b23bc8eca2931cd43c975b4a3b1b5cc672e99b8e51754d244ba1b5e7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/foxy/automotive_platform_msgs/3.0.3-1"; + sha256 = "sha256-0uMZukCV2o924YBlQFGPhJZaMpELXATke8zP5LeaJjY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/avt-vimba-camera/default.nix b/distros/foxy/avt-vimba-camera/default.nix index 63dca8f7d7..8804317c07 100644 --- a/distros/foxy/avt-vimba-camera/default.nix +++ b/distros/foxy/avt-vimba-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-avt-vimba-camera"; version = "2001.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/avt_vimba_camera-release/archive/release/foxy/avt_vimba_camera/2001.1.0-1.tar.gz"; - name = "2001.1.0-1.tar.gz"; - sha256 = "78af7ea4ae8548664db0e401394f4f9a090bbf04b9c556f3be808fcb5fd96e30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "avt_vimba_camera-release"; + rev = "release/foxy/avt_vimba_camera/2001.1.0-1"; + sha256 = "sha256-b1YFGg6j0b9K0ewtxAKbcnT1um/8yTIj7XIIbEChDbY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/aws-robomaker-small-warehouse-world/default.nix b/distros/foxy/aws-robomaker-small-warehouse-world/default.nix index 2bfcef150c..c570474890 100644 --- a/distros/foxy/aws-robomaker-small-warehouse-world/default.nix +++ b/distros/foxy/aws-robomaker-small-warehouse-world/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-aws-robomaker-small-warehouse-world"; version = "1.0.5-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/aws_robomaker_small_warehouse_world-release/archive/release/foxy/aws_robomaker_small_warehouse_world/1.0.5-1.tar.gz"; - name = "1.0.5-1.tar.gz"; - sha256 = "2ced24d4335b91ca12fbc470b240e21971d86d18fcd6886ac334a43d7cee7642"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "aws_robomaker_small_warehouse_world-release"; + rev = "release/foxy/aws_robomaker_small_warehouse_world/1.0.5-1"; + sha256 = "sha256-bMYgLcTRb5UvNDZS4HmtCbd1SRpRfQypQmT4SJPbONY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/backward-ros/default.nix b/distros/foxy/backward-ros/default.nix index 15456f5e55..86757e5191 100644 --- a/distros/foxy/backward-ros/default.nix +++ b/distros/foxy/backward-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-backward-ros"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/backward_ros-release/archive/release/foxy/backward_ros/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "1482d82dcdf6e056b40c87c27d0f0f29830c5410815ab4e2791178e1c78dd94d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "backward_ros-release"; + rev = "release/foxy/backward_ros/1.0.1-1"; + sha256 = "sha256-9ZYtzzb6VGZ16+gvRK9sQ03A9wQG7LznEVdeUTg+t4w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/bag-recorder-nodes/default.nix b/distros/foxy/bag-recorder-nodes/default.nix index fa67b7fe33..24a9d16fa5 100644 --- a/distros/foxy/bag-recorder-nodes/default.nix +++ b/distros/foxy/bag-recorder-nodes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-bag-recorder-nodes"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/bag_recorder_nodes/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "f0632d4811553c36a304c5da7202b47c3f0c3c9caa69fc66b13a82ef873c4097"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/bag_recorder_nodes/0.3.9-1"; + sha256 = "sha256-FrotGNLnAQUjwTZWoonuaqjOdXXJzQBVizC0pLrbg2o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/behaviortree-cpp-v3/default.nix b/distros/foxy/behaviortree-cpp-v3/default.nix index ffccfb3a44..7e3ecf3e49 100644 --- a/distros/foxy/behaviortree-cpp-v3/default.nix +++ b/distros/foxy/behaviortree-cpp-v3/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-cpp, boost, cppzmq, ncurses, rclcpp, ros-environment }: buildRosPackage { pname = "ros-foxy-behaviortree-cpp-v3"; - version = "3.8.0-r1"; + version = "3.8.2-r1"; - src = fetchurl { - url = "https://github.com/BehaviorTree/behaviortree_cpp-release/archive/release/foxy/behaviortree_cpp_v3/3.8.0-1.tar.gz"; - name = "3.8.0-1.tar.gz"; - sha256 = "cc9f077d023e9bc01723c53ba0f50fe797e0af985e3f37620ac648ff8b9b891d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BehaviorTree"; + repo = "behaviortree_cpp_v3-release"; + rev = "release/foxy/behaviortree_cpp_v3/3.8.2-1"; + sha256 = "sha256-KuS/C9quRgq4cnqiu7BeZt1GD2vayxHHdnFZtvQBnck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/foxy/bno055/default.nix b/distros/foxy/bno055/default.nix index 692a1564e6..7489b33d23 100644 --- a/distros/foxy/bno055/default.nix +++ b/distros/foxy/bno055/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, example-interfaces, python3Packages, pythonPackages, rclpy, std-msgs }: buildRosPackage { pname = "ros-foxy-bno055"; - version = "0.3.0-r1"; + version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/flynneva/bno055-release/archive/release/foxy/bno055/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "2fa11534723964ea51cb8f3ecff54480fc62241b367feb845d4630926cd6226c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "bno055-release"; + rev = "release/foxy/bno055/0.4.1-1"; + sha256 = "sha256-4B7R/H6YgcMTqW90WunSaQCp7y/KJZpHFGHdpAQH+nY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/bond-core/default.nix b/distros/foxy/bond-core/default.nix index 29bcb8ae06..ee033694f5 100644 --- a/distros/foxy/bond-core/default.nix +++ b/distros/foxy/bond-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-bond-core"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/foxy/bond_core/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "74f015ff8d79f37706f0a06d7522bf3b64a7e48f77a6ba13a9ec810112805b1b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/foxy/bond_core/2.1.0-1"; + sha256 = "sha256-4GHuXRuGmL+Tx/y6Z/vUS+JUYkZv8XijCypWvcUSy5w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/bond/default.nix b/distros/foxy/bond/default.nix index a53de8a54d..ce4c6783df 100644 --- a/distros/foxy/bond/default.nix +++ b/distros/foxy/bond/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-bond"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/foxy/bond/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "697372b7c264f10a6383c91922e628418fbc8fd9678638796051bc573f1e3877"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/foxy/bond/2.1.0-1"; + sha256 = "sha256-S94l1Vd0Pj6OOGmPjS4p9nlQ3nERZiMLWmIDXVFZ8wM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/bondcpp/default.nix b/distros/foxy/bondcpp/default.nix index c47027ac1a..bbec211bbe 100644 --- a/distros/foxy/bondcpp/default.nix +++ b/distros/foxy/bondcpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-bondcpp"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/foxy/bondcpp/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "ffe014cb55631c22b936c62fb71f3448273abdabc16f9c5c9bcb01076d678d31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/foxy/bondcpp/2.1.0-1"; + sha256 = "sha256-jjSUkfSYbPzRlWhdLbrhqLrTxy69wVI6WwHYHLmodjE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/boost-geometry-util/default.nix b/distros/foxy/boost-geometry-util/default.nix index 5fae924d3c..51367fc0df 100644 --- a/distros/foxy/boost-geometry-util/default.nix +++ b/distros/foxy/boost-geometry-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-boost-geometry-util"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/boost_geometry_util-release/archive/release/foxy/boost_geometry_util/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "d7ad6dcb6393aec4180fde2d45138d4f7d73798d1eccdb57973e116311b2e8a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "boost_geometry_util-release"; + rev = "release/foxy/boost_geometry_util/0.0.1-1"; + sha256 = "sha256-5P2YMX4buwUYt7NAF7FiWJguryH/I8GC2y+vIK5KI0w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/foxy/bosch-locator-bridge/default.nix b/distros/foxy/bosch-locator-bridge/default.nix index 6d32aaa9e5..2d8f525838 100644 --- a/distros/foxy/bosch-locator-bridge/default.nix +++ b/distros/foxy/bosch-locator-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-bosch-locator-bridge"; version = "2.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/locator_ros_bridge-release/archive/release/foxy/bosch_locator_bridge/2.0.8-1.tar.gz"; - name = "2.0.8-1.tar.gz"; - sha256 = "e9b764b39a65a966c837ab3809903e957b3f4884a4be76fb5b675c11120a6b29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "locator_ros_bridge-release"; + rev = "release/foxy/bosch_locator_bridge/2.0.8-1"; + sha256 = "sha256-DtDmYR2o3sRCCUBsXLz9hgbTUxgO1EUKQCrVcuBUiIk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/builtin-interfaces/default.nix b/distros/foxy/builtin-interfaces/default.nix index f25ef177e6..b637089fe7 100644 --- a/distros/foxy/builtin-interfaces/default.nix +++ b/distros/foxy/builtin-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-builtin-interfaces"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/foxy/builtin_interfaces/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "cfca8040d1beb9a6cb122334cde383ff5f513d0e44ee0c8d21ce4c6a2614c0c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/foxy/builtin_interfaces/1.0.0-1"; + sha256 = "sha256-oaDcfn5UDVSYLwlbBsylEmWLQCa1zSgymqzgUO80Mhs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/camera-calibration-parsers/default.nix b/distros/foxy/camera-calibration-parsers/default.nix index 9ad0656150..0952e1ef4f 100644 --- a/distros/foxy/camera-calibration-parsers/default.nix +++ b/distros/foxy/camera-calibration-parsers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-camera-calibration-parsers"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/foxy/camera_calibration_parsers/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "bd0f502363620e2bddef611dcde02e001208564be1c949f1a7feb0ddf622c2d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/foxy/camera_calibration_parsers/2.4.0-1"; + sha256 = "sha256-F658YC8KP5lhokUcXMArPhob7GGLzqIWcCdQGFB32UU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/camera-calibration/default.nix b/distros/foxy/camera-calibration/default.nix index 702cb764a9..cb239e4939 100644 --- a/distros/foxy/camera-calibration/default.nix +++ b/distros/foxy/camera-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-camera-calibration"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/camera_calibration/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "dc9427c42d9c4253b324cbf824cefa7d447927aad2ed83ef7bebe19d883690cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/camera_calibration/2.3.0-1"; + sha256 = "sha256-5GXTmrMFkNWNSZSoy6EJTXPKpJg6TkGsIzeq7FI0J+4="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 python3Packages.requests pythonPackages.pytest ]; diff --git a/distros/foxy/camera-info-manager/default.nix b/distros/foxy/camera-info-manager/default.nix index 2fbd251780..397f6f4c01 100644 --- a/distros/foxy/camera-info-manager/default.nix +++ b/distros/foxy/camera-info-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-camera-info-manager"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/foxy/camera_info_manager/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "f6ece97f5bf6e68f691cab308da708e380c8852dd452cdb5ce2fd2a22738567b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/foxy/camera_info_manager/2.4.0-1"; + sha256 = "sha256-k7IJN4Ny8E60mXD9b7gJn5GFcNT76ZNPkNsWTlgc4Hs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/can-dbc-parser/default.nix b/distros/foxy/can-dbc-parser/default.nix index 9d4458bee8..edbb1f88b9 100644 --- a/distros/foxy/can-dbc-parser/default.nix +++ b/distros/foxy/can-dbc-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-can-dbc-parser"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/NewEagleRaptor/raptor-dbw-ros2-release/archive/release/foxy/can_dbc_parser/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "28b18fdf2fe15fb5c33f761f610ae929157099672439fd3c4de70e00efc9671e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "NewEagleRaptor"; + repo = "raptor-dbw-ros2-release"; + rev = "release/foxy/can_dbc_parser/1.2.0-1"; + sha256 = "sha256-wqIFNXyAvNCo/CkxRLtmbRyH20ouy5KIAPR46KyfRRQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/can-msgs/default.nix b/distros/foxy/can-msgs/default.nix index 8ec3340856..8775782565 100644 --- a/distros/foxy/can-msgs/default.nix +++ b/distros/foxy/can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-can-msgs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/foxy/can_msgs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "3064635a1df5204f1fab03d977b1f39b71522a64bdca969534410159f5ddfb55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/foxy/can_msgs/2.0.0-1"; + sha256 = "sha256-9K7mCEEppzWP9ITzFZlJje6JHNIFoBxJ/FXPs+NoX4M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/carla-msgs/default.nix b/distros/foxy/carla-msgs/default.nix index b8538338e2..e4ac504ee8 100644 --- a/distros/foxy/carla-msgs/default.nix +++ b/distros/foxy/carla-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-carla-msgs"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/carla-simulator/ros-carla-msgs-release/archive/release/foxy/carla_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "7ac2b7863a08277506c55af3df35054cb441623002173e5b619155e44d05d97c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carla-simulator"; + repo = "ros-carla-msgs-release"; + rev = "release/foxy/carla_msgs/1.3.0-1"; + sha256 = "sha256-NTgm6pRu+Vv0vfOcZJd3y+UUP4VS3rzyU+ZdNre+prE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/cartographer-ros-msgs/default.nix b/distros/foxy/cartographer-ros-msgs/default.nix index 6a7071c9c2..e9655a7d55 100644 --- a/distros/foxy/cartographer-ros-msgs/default.nix +++ b/distros/foxy/cartographer-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-cartographer-ros-msgs"; version = "1.0.9003-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer_ros-release/archive/release/foxy/cartographer_ros_msgs/1.0.9003-1.tar.gz"; - name = "1.0.9003-1.tar.gz"; - sha256 = "69a4899d3415f634ba49083b94ae568bac2b87daea5613e2ae8a3aece5dd9761"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer_ros-release"; + rev = "release/foxy/cartographer_ros_msgs/1.0.9003-1"; + sha256 = "sha256-4gZX+pmdIbD8wBcA9hOz7iplDDCwaAGkkfedX15lDTQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/cartographer-ros/default.nix b/distros/foxy/cartographer-ros/default.nix index b407325e6d..c68ddfbbcf 100644 --- a/distros/foxy/cartographer-ros/default.nix +++ b/distros/foxy/cartographer-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-cartographer-ros"; version = "1.0.9003-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer_ros-release/archive/release/foxy/cartographer_ros/1.0.9003-1.tar.gz"; - name = "1.0.9003-1.tar.gz"; - sha256 = "5df4a0442de6bba62724fd2b1bcf9e0d11fd98c448240af3b9b52c1dffce932a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer_ros-release"; + rev = "release/foxy/cartographer_ros/1.0.9003-1"; + sha256 = "sha256-bmWPvRd3or0c6ZlgCfBfJgHxF3/VmHMgFHt2Fx+Wa3M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen pcl-conversions tf2-eigen urdfdom-headers ]; diff --git a/distros/foxy/cartographer/default.nix b/distros/foxy/cartographer/default.nix index 7844350d0f..0dabc45965 100644 --- a/distros/foxy/cartographer/default.nix +++ b/distros/foxy/cartographer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-cartographer"; version = "1.0.9001-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer-release/archive/release/foxy/cartographer/1.0.9001-1.tar.gz"; - name = "1.0.9001-1.tar.gz"; - sha256 = "4bc1c5c13c3f150d839764d3ed7a1db6563f82316e8c32ebad686a512e7209c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer-release"; + rev = "release/foxy/cartographer/1.0.9001-1"; + sha256 = "sha256-rxyicosQIdt8xA6pfNTFge/sZ210UDpfJDONaluNWjA="; + }; buildType = "cmake"; buildInputs = [ cmake gtest python3Packages.sphinx ]; diff --git a/distros/foxy/cascade-lifecycle-msgs/default.nix b/distros/foxy/cascade-lifecycle-msgs/default.nix index f5f600825d..b1555c608f 100644 --- a/distros/foxy/cascade-lifecycle-msgs/default.nix +++ b/distros/foxy/cascade-lifecycle-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-cascade-lifecycle-msgs"; version = "0.0.8-r1"; - src = fetchurl { - url = "https://github.com/fmrico/cascade_lifecycle-release/archive/release/foxy/cascade_lifecycle_msgs/0.0.8-1.tar.gz"; - name = "0.0.8-1.tar.gz"; - sha256 = "f0e734ab6805379d32d941c7358bcbdc82d1774c192a0201be5c7f8fb0168081"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fmrico"; + repo = "cascade_lifecycle-release"; + rev = "release/foxy/cascade_lifecycle_msgs/0.0.8-1"; + sha256 = "sha256-fvZjg2KWhJNs9BZJ6KrY9zSlYiPrRGXW/GPrftC0z60="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/chomp-motion-planner/default.nix b/distros/foxy/chomp-motion-planner/default.nix index aa550b39f0..1a550385cb 100644 --- a/distros/foxy/chomp-motion-planner/default.nix +++ b/distros/foxy/chomp-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-chomp-motion-planner"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/chomp_motion_planner/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "73ab0c013bfcb4300a55942bad0b03b4bb493c81727742252734830683b2ed7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/chomp_motion_planner/2.2.3-1"; + sha256 = "sha256-LwbfAvW+hwO2O09r2SrxGd9KZ2pcZm1K9HDpYuKA/TI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/class-loader/default.nix b/distros/foxy/class-loader/default.nix index ed229ae889..8efd4b2091 100644 --- a/distros/foxy/class-loader/default.nix +++ b/distros/foxy/class-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-class-loader"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/class_loader-release/archive/release/foxy/class_loader/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "4f79f4f883be95b2580b184def1ef5779a2d60135849b139e3ee678e3f0ef60e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "class_loader-release"; + rev = "release/foxy/class_loader/2.0.3-1"; + sha256 = "sha256-djXnkPsFs85l+KhbZKfbwIneJCKw2N9h3ilkajYT23Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/clober-bringup/default.nix b/distros/foxy/clober-bringup/default.nix index 4ad32d5638..ce8862c024 100644 --- a/distros/foxy/clober-bringup/default.nix +++ b/distros/foxy/clober-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-clober-bringup"; version = "0.2.0-r5"; - src = fetchurl { - url = "https://github.com/CLOBOT-Co-Ltd-release/clober_ros2-release/archive/release/foxy/clober_bringup/0.2.0-5.tar.gz"; - name = "0.2.0-5.tar.gz"; - sha256 = "4a81d8bbfaa193268b2cfda800c52fa48cf0b1870404e2c9ca20a7d6449e01dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CLOBOT-Co-Ltd-release"; + repo = "clober_ros2-release"; + rev = "release/foxy/clober_bringup/0.2.0-5"; + sha256 = "sha256-3UM9hAGGSYtCy0V0K+0Gxf/9hHo/XrwB/KTh0lzc9q8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/clober-description/default.nix b/distros/foxy/clober-description/default.nix index cf19baf363..624ca843ae 100644 --- a/distros/foxy/clober-description/default.nix +++ b/distros/foxy/clober-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-clober-description"; version = "0.2.0-r5"; - src = fetchurl { - url = "https://github.com/CLOBOT-Co-Ltd-release/clober_ros2-release/archive/release/foxy/clober_description/0.2.0-5.tar.gz"; - name = "0.2.0-5.tar.gz"; - sha256 = "fb3d188d7210abdfb7eda4863e5fb24d70963786f6a420699f34df85f0de09f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CLOBOT-Co-Ltd-release"; + repo = "clober_ros2-release"; + rev = "release/foxy/clober_description/0.2.0-5"; + sha256 = "sha256-xuI088CF6wQndpG2+5LW2t9rWSNwlNr7E88v4vWp0Ks="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/clober-msgs/default.nix b/distros/foxy/clober-msgs/default.nix index 5e857cf096..9e2998210e 100644 --- a/distros/foxy/clober-msgs/default.nix +++ b/distros/foxy/clober-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-clober-msgs"; version = "0.1.0-r3"; - src = fetchurl { - url = "https://github.com/CLOBOT-Co-Ltd-release/clober_msgs_ros2-release/archive/release/foxy/clober_msgs/0.1.0-3.tar.gz"; - name = "0.1.0-3.tar.gz"; - sha256 = "aea55a757c4d37708d7322917dc47c52733b841d045dee262be60f713181b99a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CLOBOT-Co-Ltd-release"; + repo = "clober_msgs_ros2-release"; + rev = "release/foxy/clober_msgs/0.1.0-3"; + sha256 = "sha256-OxFW6Zlr+lUFj9TJAhmVbbs4H5Ka3X0A/7ohbv679N4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/clober-navigation/default.nix b/distros/foxy/clober-navigation/default.nix index e92494d9b0..a6dec470d8 100644 --- a/distros/foxy/clober-navigation/default.nix +++ b/distros/foxy/clober-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-clober-navigation"; version = "0.2.0-r5"; - src = fetchurl { - url = "https://github.com/CLOBOT-Co-Ltd-release/clober_ros2-release/archive/release/foxy/clober_navigation/0.2.0-5.tar.gz"; - name = "0.2.0-5.tar.gz"; - sha256 = "cc6453394d63624710d0e36cdde25e11896d8816ed5f153058605ac2dff49d8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CLOBOT-Co-Ltd-release"; + repo = "clober_ros2-release"; + rev = "release/foxy/clober_navigation/0.2.0-5"; + sha256 = "sha256-ZdLuXqdD45Ry+f4bk7WWvfkf+z2LAyT0jZrvQpmRojk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/clober-serial/default.nix b/distros/foxy/clober-serial/default.nix index 5fcf30a0b7..be019bb16b 100644 --- a/distros/foxy/clober-serial/default.nix +++ b/distros/foxy/clober-serial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-clober-serial"; version = "0.2.0-r5"; - src = fetchurl { - url = "https://github.com/CLOBOT-Co-Ltd-release/clober_ros2-release/archive/release/foxy/clober_serial/0.2.0-5.tar.gz"; - name = "0.2.0-5.tar.gz"; - sha256 = "dce5dc67b73f212f8e4f16f4caa9241a2e92d57af73a755ef82826767d5618a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CLOBOT-Co-Ltd-release"; + repo = "clober_ros2-release"; + rev = "release/foxy/clober_serial/0.2.0-5"; + sha256 = "sha256-aZQg/x3tNzrgTa62nQPdW2nTX8ZkNj360/EZ6hg6ykQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/clober-simulation/default.nix b/distros/foxy/clober-simulation/default.nix index 7b218ee2a8..f2ef2901c5 100644 --- a/distros/foxy/clober-simulation/default.nix +++ b/distros/foxy/clober-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-clober-simulation"; version = "0.2.0-r5"; - src = fetchurl { - url = "https://github.com/CLOBOT-Co-Ltd-release/clober_ros2-release/archive/release/foxy/clober_simulation/0.2.0-5.tar.gz"; - name = "0.2.0-5.tar.gz"; - sha256 = "8bc93cb20f5763be35cf716538b3ea66dd3beda7309f1f6a0f3fcf7cdf8603cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CLOBOT-Co-Ltd-release"; + repo = "clober_ros2-release"; + rev = "release/foxy/clober_simulation/0.2.0-5"; + sha256 = "sha256-+734VfFPesnsCMelr1j7HTU0bAsqpnYhc1KNDTjiFEg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/clober-slam/default.nix b/distros/foxy/clober-slam/default.nix index 5169662f95..2b4b52b323 100644 --- a/distros/foxy/clober-slam/default.nix +++ b/distros/foxy/clober-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-clober-slam"; version = "0.2.0-r5"; - src = fetchurl { - url = "https://github.com/CLOBOT-Co-Ltd-release/clober_ros2-release/archive/release/foxy/clober_slam/0.2.0-5.tar.gz"; - name = "0.2.0-5.tar.gz"; - sha256 = "454b7fc14ff9029a21a4cefb0ad546989d5c5198c32c83188fcc953786a0991e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CLOBOT-Co-Ltd-release"; + repo = "clober_ros2-release"; + rev = "release/foxy/clober_slam/0.2.0-5"; + sha256 = "sha256-YnGHKfxCYSVY+bNZoWJrWuYPdGz0luecTSnFCAHLiuk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/color-names/default.nix b/distros/foxy/color-names/default.nix index d0d6fa0f2a..7f61f27d30 100644 --- a/distros/foxy/color-names/default.nix +++ b/distros/foxy/color-names/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-color-names"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/color_names-release/archive/release/foxy/color_names/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "067bb1a95abef4aa130544fed636425614ff5a8f5897c8e6f4f3b61ea5a0ff3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "color_names-release"; + rev = "release/foxy/color_names/0.0.3-1"; + sha256 = "sha256-956LQvQPv4QtQBKeDL62YimdLDh1yLGsi9AYgWiBh/k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/common-interfaces/default.nix b/distros/foxy/common-interfaces/default.nix index 5675f7e7cc..8159bf68db 100644 --- a/distros/foxy/common-interfaces/default.nix +++ b/distros/foxy/common-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-common-interfaces"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/common_interfaces/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "7bebb396f4035e5f714f58a51f7a3ffda7a100502fbc037fbf03b1065d793113"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/common_interfaces/2.0.5-1"; + sha256 = "sha256-O+/bhTL/4OITwciMqF79+98uaCs1C0ENCMp6itSehQE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/composition-interfaces/default.nix b/distros/foxy/composition-interfaces/default.nix index f59d962ea2..4153f394c5 100644 --- a/distros/foxy/composition-interfaces/default.nix +++ b/distros/foxy/composition-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-composition-interfaces"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/foxy/composition_interfaces/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "22653ac9eaa92432abe00d7e6c67b29fdde39e9ab7d84d76bdea7c7c29b82fa7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/foxy/composition_interfaces/1.0.0-1"; + sha256 = "sha256-MFFzXzkH0WKNryRRgX/wbObpIS6iHEv/4oxaIxALVNM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/composition/default.nix b/distros/foxy/composition/default.nix index 48cc9c04e2..f5ac9cb990 100644 --- a/distros/foxy/composition/default.nix +++ b/distros/foxy/composition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-composition"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/composition/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "df5d41e3c4b82aa0f9b6d18566cbed1664bfc0cee2972aa9778885f8b94c674a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/composition/0.9.4-1"; + sha256 = "sha256-UN9fWRABOhDDI5krMKIx0sdsqB3JwxNLLpvyHGguSy4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/compressed-depth-image-transport/default.nix b/distros/foxy/compressed-depth-image-transport/default.nix index 1f00fe890c..79ddb5333f 100644 --- a/distros/foxy/compressed-depth-image-transport/default.nix +++ b/distros/foxy/compressed-depth-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-compressed-depth-image-transport"; version = "2.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/foxy/compressed_depth_image_transport/2.3.3-1.tar.gz"; - name = "2.3.3-1.tar.gz"; - sha256 = "e1bf6334b75ef1ecbfdd8e386ac7b2b9e48ba135ce101c8fc4a0c66d09e4acb1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/foxy/compressed_depth_image_transport/2.3.3-1"; + sha256 = "sha256-IjWycEeMBouVfgW71CViiilTyNexLK0Ob313AzUCICM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/compressed-image-transport/default.nix b/distros/foxy/compressed-image-transport/default.nix index e43f002a12..74ccaa8372 100644 --- a/distros/foxy/compressed-image-transport/default.nix +++ b/distros/foxy/compressed-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-compressed-image-transport"; version = "2.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/foxy/compressed_image_transport/2.3.3-1.tar.gz"; - name = "2.3.3-1.tar.gz"; - sha256 = "844a5cd20dbb449b9f00468a1af049091b0ab7c7c13d3171bb9e0427cfe9a537"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/foxy/compressed_image_transport/2.3.3-1"; + sha256 = "sha256-6ryHWZSzl8915dbOeIZSo/6nUKUi2e2krKoUtIgCNRk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/connext-cmake-module/default.nix b/distros/foxy/connext-cmake-module/default.nix index c0c92d8b87..fc8eac76fe 100644 --- a/distros/foxy/connext-cmake-module/default.nix +++ b/distros/foxy/connext-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-connext-cmake-module"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/foxy/connext_cmake_module/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "4c8566c74019f306622852c0938afe3158f286f324e3d53da9b56ee06617fe91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_connext-release"; + rev = "release/foxy/connext_cmake_module/1.0.3-1"; + sha256 = "sha256-5VhZyN/PJgW22Uz3ioc04h2hTPsTwVjXK5cerSmkKaU="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/console-bridge-vendor/default.nix b/distros/foxy/console-bridge-vendor/default.nix index 90faa73901..e7e6eacbf3 100644 --- a/distros/foxy/console-bridge-vendor/default.nix +++ b/distros/foxy/console-bridge-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-console-bridge-vendor"; version = "1.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/console_bridge_vendor-release/archive/release/foxy/console_bridge_vendor/1.2.4-1.tar.gz"; - name = "1.2.4-1.tar.gz"; - sha256 = "5a391dd9a9b92bb9777ae5d6ce9533e0ed9d637ff18f80ce205d677427f9ee8e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "console_bridge_vendor-release"; + rev = "release/foxy/console_bridge_vendor/1.2.4-1"; + sha256 = "sha256-14TJooLHg4e4u0/AfumJHVIsgHPvntyiLMAG+Nu8/V8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/contracts-lite-vendor/default.nix b/distros/foxy/contracts-lite-vendor/default.nix index 99b81996d4..cb4ae91ec7 100644 --- a/distros/foxy/contracts-lite-vendor/default.nix +++ b/distros/foxy/contracts-lite-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-contracts-lite-vendor"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-safety/contracts_lite_vendor-release/archive/release/foxy/contracts_lite_vendor/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "14ea41bbb384648b7195fb8adc8c2bc7e4883bc6ea9622f462790632c1e87e22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-safety"; + repo = "contracts_lite_vendor-release"; + rev = "release/foxy/contracts_lite_vendor/0.5.0-1"; + sha256 = "sha256-b59pq5UJ6e3vtngK1InKk+9bvvfO1GJ8KG1DVg4ucHU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/control-msgs/default.nix b/distros/foxy/control-msgs/default.nix index 94738f4b87..e3006bdfcf 100644 --- a/distros/foxy/control-msgs/default.nix +++ b/distros/foxy/control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-control-msgs"; version = "2.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/control_msgs-release/archive/release/foxy/control_msgs/2.5.1-1.tar.gz"; - name = "2.5.1-1.tar.gz"; - sha256 = "f9f6c29baacb967fb269637f6254dc0e5bbfedb69ffa325dd80f07203b4e0621"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "control_msgs-release"; + rev = "release/foxy/control_msgs/2.5.1-1"; + sha256 = "sha256-bbKgnz7+bvAMNGNeVlmKuwsWuPKfZG3qHXNxxFFEhxU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/control-toolbox/default.nix b/distros/foxy/control-toolbox/default.nix index 0c089528f5..89a9f034b1 100644 --- a/distros/foxy/control-toolbox/default.nix +++ b/distros/foxy/control-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-control-toolbox"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/control_toolbox-release/archive/release/foxy/control_toolbox/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "9f7fd7b393831fa8a327e24aeada983f926b38f93264fc5d16d45b34d77791b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "control_toolbox-release"; + rev = "release/foxy/control_toolbox/2.1.2-1"; + sha256 = "sha256-e4FTDWkjuTT971m6bkwPhXRtUGbRETznWjX+DtmLPw8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/controller-interface/default.nix b/distros/foxy/controller-interface/default.nix index 6548388bdd..95356c637f 100644 --- a/distros/foxy/controller-interface/default.nix +++ b/distros/foxy/controller-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-controller-interface"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/foxy/controller_interface/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "03dc7edc25cb6a65dbe5d612813c527bbe40be83e41ff3eba422762b4ab2f177"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/foxy/controller_interface/0.11.0-1"; + sha256 = "sha256-V10fnHzsLQV7lFUQEz4fG/0IhMxm+rFnJtMaXhhx0vQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/controller-manager-msgs/default.nix b/distros/foxy/controller-manager-msgs/default.nix index baa6b3e6c3..324de379e0 100644 --- a/distros/foxy/controller-manager-msgs/default.nix +++ b/distros/foxy/controller-manager-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-controller-manager-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/foxy/controller_manager_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "352bc1691a1bee337ebd71a29b937780a7790ca111e28f1006cb79d14410d881"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/foxy/controller_manager_msgs/0.11.0-1"; + sha256 = "sha256-gLx1G/ygyNjFr/1LMezwXCQKZxvZHHSBEApPk4NVQdw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/controller-manager/default.nix b/distros/foxy/controller-manager/default.nix index 231fc67d63..7360dfbeeb 100644 --- a/distros/foxy/controller-manager/default.nix +++ b/distros/foxy/controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-controller-manager"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/foxy/controller_manager/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "0add7e3275e2a73878493d6ec1cf2c85aa92669018ddfdee29b03665d3509ebd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/foxy/controller_manager/0.11.0-1"; + sha256 = "sha256-l/P2+pK4qGhac/TWdfqtlrCfrrZh2+3DBNKmMk/+wZE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/costmap-queue/default.nix b/distros/foxy/costmap-queue/default.nix index ce9cc7e9c0..31fe36034a 100644 --- a/distros/foxy/costmap-queue/default.nix +++ b/distros/foxy/costmap-queue/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-costmap-queue"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/costmap_queue/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "d82e0f1922caa20a0c0a370dd60b39066f06d2baac57a4c5e70e952e30bb7cef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/costmap_queue/0.4.7-1"; + sha256 = "sha256-rhHA/NB+synfAuRgkIf6LUn/IOCIMTnEF4tu+cxiyX0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/crane-plus-control/default.nix b/distros/foxy/crane-plus-control/default.nix index b4bf69f4ac..ba01724efa 100644 --- a/distros/foxy/crane-plus-control/default.nix +++ b/distros/foxy/crane-plus-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-crane-plus-control"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/crane_plus-release/archive/release/foxy/crane_plus_control/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "317a6c7aa29ba9529c777ad3eba9c0790adbc4caf93d8d2b43d6c576ef74c1c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "crane_plus-release"; + rev = "release/foxy/crane_plus_control/1.1.0-1"; + sha256 = "sha256-yBTNlB9rhw8pLj+q0wGeiX8vcwdC8HBBBnE44kCYFJw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/crane-plus-description/default.nix b/distros/foxy/crane-plus-description/default.nix index 5ec3b5ad07..b1b269f8e3 100644 --- a/distros/foxy/crane-plus-description/default.nix +++ b/distros/foxy/crane-plus-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-crane-plus-description"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/crane_plus-release/archive/release/foxy/crane_plus_description/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "7a17ffb77043cdd9e7468c6b215b35c43d29e434e4fe1768be9ac481b1d136a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "crane_plus-release"; + rev = "release/foxy/crane_plus_description/1.1.0-1"; + sha256 = "sha256-VJNjb6UaRvMh4k2/l4GfvniaugUN7sJv8j9lQzmGang="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/foxy/crane-plus-examples/default.nix b/distros/foxy/crane-plus-examples/default.nix index cf7b98b3eb..a9580bec64 100644 --- a/distros/foxy/crane-plus-examples/default.nix +++ b/distros/foxy/crane-plus-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-crane-plus-examples"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/crane_plus-release/archive/release/foxy/crane_plus_examples/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "448b17d5228079c24888da7785432dd4e348f3437d43db30e74c22c472d1e57b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "crane_plus-release"; + rev = "release/foxy/crane_plus_examples/1.1.0-1"; + sha256 = "sha256-GR+YOvPWYcwf2AiEJuTC5dxxlcUTFRIKoST75rs28a0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/crane-plus-gazebo/default.nix b/distros/foxy/crane-plus-gazebo/default.nix index 52037530a5..81cd78ab01 100644 --- a/distros/foxy/crane-plus-gazebo/default.nix +++ b/distros/foxy/crane-plus-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-crane-plus-gazebo"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/crane_plus-release/archive/release/foxy/crane_plus_gazebo/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "133cbb139c0c36997ad77064355c8775b65600f60f1ad01698a422345413eb68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "crane_plus-release"; + rev = "release/foxy/crane_plus_gazebo/1.1.0-1"; + sha256 = "sha256-6M8mT62aU283gI+45sI0aVnEcagPSn5v2KHU1wfHtsY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/crane-plus-ignition/default.nix b/distros/foxy/crane-plus-ignition/default.nix index 5207bc3929..f6ff0f836e 100644 --- a/distros/foxy/crane-plus-ignition/default.nix +++ b/distros/foxy/crane-plus-ignition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-crane-plus-ignition"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/crane_plus-release/archive/release/foxy/crane_plus_ignition/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "40023f28799b14eaf9388e724716835372bf74b9e46cf08feeb6df4236c348fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "crane_plus-release"; + rev = "release/foxy/crane_plus_ignition/1.1.0-1"; + sha256 = "sha256-NsQBCY0994Whr7niYzIzJ8y2CazM+ahuFq7VOEoPzY4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/crane-plus-moveit-config/default.nix b/distros/foxy/crane-plus-moveit-config/default.nix index 67f9ce90c7..d603433d19 100644 --- a/distros/foxy/crane-plus-moveit-config/default.nix +++ b/distros/foxy/crane-plus-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-crane-plus-moveit-config"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/crane_plus-release/archive/release/foxy/crane_plus_moveit_config/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "e3a741f509a404ac89bd80d208b8ad609c2808a8d3f3c3cb8ea101117765324f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "crane_plus-release"; + rev = "release/foxy/crane_plus_moveit_config/1.1.0-1"; + sha256 = "sha256-Tbh0zyhLZgj+HMxgzFFqBRmXOrlwMpwilCJ1jyPyiQ0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/crane-plus/default.nix b/distros/foxy/crane-plus/default.nix index c3cc16a9e8..490eb3533d 100644 --- a/distros/foxy/crane-plus/default.nix +++ b/distros/foxy/crane-plus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-crane-plus"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/crane_plus-release/archive/release/foxy/crane_plus/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "1f6c58c66155cc87879794b0bb41f355f7564b692fea8c6b9b6da06ffdee8346"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "crane_plus-release"; + rev = "release/foxy/crane_plus/1.1.0-1"; + sha256 = "sha256-VdyaVwQdCQaFTEbjjgYTbq/gdHZc7jaPf4+/C9kJlEM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/cv-bridge/default.nix b/distros/foxy/cv-bridge/default.nix index 3c3016f24b..4999612df0 100644 --- a/distros/foxy/cv-bridge/default.nix +++ b/distros/foxy/cv-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-cv-bridge"; version = "3.0.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/foxy/cv_bridge/3.0.7-1.tar.gz"; - name = "3.0.7-1.tar.gz"; - sha256 = "d4f0782dd74d6346dfeaab6067ba71aeb1754c5016b7f4d68a5ccbf100781dde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/foxy/cv_bridge/3.0.7-1"; + sha256 = "sha256-nIIfGz5CgxR4T7uYHJV/j53Beh08c2vJ53gRz7nPXk0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python-cmake-module ]; diff --git a/distros/foxy/cyclonedds/default.nix b/distros/foxy/cyclonedds/default.nix index 9870baacc7..ef5e5fb1a0 100644 --- a/distros/foxy/cyclonedds/default.nix +++ b/distros/foxy/cyclonedds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-cyclonedds"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cyclonedds-release/archive/release/foxy/cyclonedds/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "36b41936eec3ba0d2dd36650da408d4ab9728d377b099d34b113a0a608b675e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cyclonedds-release"; + rev = "release/foxy/cyclonedds/0.7.0-1"; + sha256 = "sha256-MBYwEwzsAkh0K3NQcVWimEY8BpBsduqqT4x5jnNZLyg="; + }; buildType = "cmake"; buildInputs = [ cmake maven openjdk ]; diff --git a/distros/foxy/dataspeed-can-msg-filters/default.nix b/distros/foxy/dataspeed-can-msg-filters/default.nix index bc65511162..2396a21d8f 100644 --- a/distros/foxy/dataspeed-can-msg-filters/default.nix +++ b/distros/foxy/dataspeed-can-msg-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dataspeed-can-msg-filters"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/foxy/dataspeed_can_msg_filters/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "82eea65813f5f8033f7d1a42c88e43610e05f080622300a1427987fbd9ae5a61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/foxy/dataspeed_can_msg_filters/2.0.1-1"; + sha256 = "sha256-dC1Ryzzvx7M9aQYxxBfXB4xFCa9nQHy8dO/Us9z+94c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dataspeed-can-usb/default.nix b/distros/foxy/dataspeed-can-usb/default.nix index 966bcf169e..1d689aafea 100644 --- a/distros/foxy/dataspeed-can-usb/default.nix +++ b/distros/foxy/dataspeed-can-usb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dataspeed-can-usb"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/foxy/dataspeed_can_usb/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "251aea36db8f3e5714fdca9e73cf90500bf65feef530bef8612278cc9d8ae70c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/foxy/dataspeed_can_usb/2.0.1-1"; + sha256 = "sha256-ydTwDeP2cNM8nLY8vHK6lkU+AoPQElN7C3xc7yaOoqc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dataspeed-can/default.nix b/distros/foxy/dataspeed-can/default.nix index 2aa25de1ae..21c05b699d 100644 --- a/distros/foxy/dataspeed-can/default.nix +++ b/distros/foxy/dataspeed-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dataspeed-can"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/foxy/dataspeed_can/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "4b8d8aa8a6d9fe9be2390e844e49b3f136581d14eaf566a91286d1a115b5cdca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/foxy/dataspeed_can/2.0.1-1"; + sha256 = "sha256-POBzwny/VrYoGfDkoXI7QH6BcAWKmKJgbN5omfz6JJI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dataspeed-dbw-common/default.nix b/distros/foxy/dataspeed-dbw-common/default.nix index 5b1ddb9207..b0370cf14c 100644 --- a/distros/foxy/dataspeed-dbw-common/default.nix +++ b/distros/foxy/dataspeed-dbw-common/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, rclcpp, ros2-socketcan }: buildRosPackage { pname = "ros-foxy-dataspeed-dbw-common"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dataspeed_dbw_common/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "6c9bf51043dcc3cae505c8a52ffae9222ccefcd4988966b07f70e27b3021498b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dataspeed_dbw_common/2.1.1-1"; + sha256 = "sha256-Z4/KJ3bNlIn2nsZ9lgY14Mmv7rjApkIBwytt83JDNUM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/dataspeed-dbw-gateway/default.nix b/distros/foxy/dataspeed-dbw-gateway/default.nix index 376c655007..4940c46a33 100644 --- a/distros/foxy/dataspeed-dbw-gateway/default.nix +++ b/distros/foxy/dataspeed-dbw-gateway/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, dataspeed-dbw-common, dataspeed-dbw-msgs, dbw-fca-msgs, dbw-ford-msgs, dbw-polaris-msgs, diagnostic-msgs, rclcpp, rclcpp-components, rosidl-default-generators, rosidl-default-runtime, sensor-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, dataspeed-dbw-common, dataspeed-dbw-msgs, dbw-fca-msgs, dbw-ford-msgs, dbw-polaris-msgs, diagnostic-msgs, rclcpp, rclcpp-components, ros-environment, rosidl-default-generators, rosidl-default-runtime, sensor-msgs }: buildRosPackage { pname = "ros-foxy-dataspeed-dbw-gateway"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dataspeed_dbw_gateway/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "45169d46cd7151d990e6b6553be338538ddb57b92f4196d605ce5892bab14fc2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dataspeed_dbw_gateway/2.1.1-1"; + sha256 = "sha256-Cud1x56Ln+i8WxrBiH7iiQcCBuLKqqolPlYBwNTIRAI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-default-generators ]; checkInputs = [ ament-cmake-gtest ]; - propagatedBuildInputs = [ dataspeed-dbw-common dataspeed-dbw-msgs dbw-fca-msgs dbw-ford-msgs dbw-polaris-msgs diagnostic-msgs rclcpp rclcpp-components rosidl-default-runtime sensor-msgs ]; + propagatedBuildInputs = [ dataspeed-dbw-common dataspeed-dbw-msgs dbw-fca-msgs dbw-ford-msgs dbw-polaris-msgs diagnostic-msgs rclcpp rclcpp-components ros-environment rosidl-default-runtime sensor-msgs ]; nativeBuildInputs = [ ament-cmake-ros ]; meta = { diff --git a/distros/foxy/dataspeed-dbw-msgs/default.nix b/distros/foxy/dataspeed-dbw-msgs/default.nix index 631add2f17..c93c282bca 100644 --- a/distros/foxy/dataspeed-dbw-msgs/default.nix +++ b/distros/foxy/dataspeed-dbw-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-dataspeed-dbw-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dataspeed_dbw_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "b2df61a8a99619432486052b4932e4e87f9dba6faded76ba47c0bdd6df52ba68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dataspeed_dbw_msgs/2.1.1-1"; + sha256 = "sha256-EmrJrkr8c3fvh48e8lWeMKtp5VpKdSAed+Y6bJtD2Lo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/dataspeed-ulc-can/default.nix b/distros/foxy/dataspeed-ulc-can/default.nix index 7fca475f56..6187305711 100644 --- a/distros/foxy/dataspeed-ulc-can/default.nix +++ b/distros/foxy/dataspeed-ulc-can/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, can-msgs, dataspeed-dbw-common, dataspeed-ulc-msgs, geometry-msgs, rclcpp, rclpy, ros-testing, std-msgs }: buildRosPackage { pname = "ros-foxy-dataspeed-ulc-can"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dataspeed_ulc_can/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "8bb97a2052dc6be64f705f1f3f16d295ac9690f80baa20c417ed2632a8e4a3f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dataspeed_ulc_can/2.1.1-1"; + sha256 = "sha256-YKbXPFHFAlOT2shKvtsTqSUNVW4KkioMLDy78iU6h4c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dataspeed-ulc-msgs/default.nix b/distros/foxy/dataspeed-ulc-msgs/default.nix index ea1e213c38..4c64d0fbaa 100644 --- a/distros/foxy/dataspeed-ulc-msgs/default.nix +++ b/distros/foxy/dataspeed-ulc-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-dataspeed-ulc-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dataspeed_ulc_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "fdf38e2382f6d307f8250600ca5165e9cb0c28d0f14ad9a763b077c026b3c900"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dataspeed_ulc_msgs/2.1.1-1"; + sha256 = "sha256-q1q8GPl857keZPH/HmJIV3JgP0GqnbP956AmhXkzsMw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/dataspeed-ulc/default.nix b/distros/foxy/dataspeed-ulc/default.nix index 2fd970514a..b14c3ca5eb 100644 --- a/distros/foxy/dataspeed-ulc/default.nix +++ b/distros/foxy/dataspeed-ulc/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dataspeed-ulc-can, dataspeed-ulc-msgs }: buildRosPackage { pname = "ros-foxy-dataspeed-ulc"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dataspeed_ulc/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "86c742b5eaa252fe72708e33c4552758a7241d68bb5ffef3a505a58800d19a19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dataspeed_ulc/2.1.1-1"; + sha256 = "sha256-zn/9uw/BROfUvJNNAUMcqLYakU/S18/gRpHVXEHOobM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-fca-can/default.nix b/distros/foxy/dbw-fca-can/default.nix index 2c79551425..712403dd62 100644 --- a/distros/foxy/dbw-fca-can/default.nix +++ b/distros/foxy/dbw-fca-can/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, can-msgs, dataspeed-can-msg-filters, dataspeed-can-usb, dataspeed-dbw-common, dataspeed-dbw-gateway, dataspeed-ulc-can, dbw-fca-description, dbw-fca-msgs, geometry-msgs, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-fca-can"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_fca_can/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "5abedd0bbb0f1123c56029b6d7c05f5669546b9052ceb284921977b00f7eaf58"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_fca_can/2.1.1-1"; + sha256 = "sha256-sUgSSDGe7pAH2iCiYc3ox1WlKqVo3HRPTnef8bGkAdI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake dataspeed-can-msg-filters ]; diff --git a/distros/foxy/dbw-fca-description/default.nix b/distros/foxy/dbw-fca-description/default.nix index 99e98b5475..6c245868a9 100644 --- a/distros/foxy/dbw-fca-description/default.nix +++ b/distros/foxy/dbw-fca-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, robot-state-publisher, rviz2, urdf, xacro }: buildRosPackage { pname = "ros-foxy-dbw-fca-description"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_fca_description/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "cf0aeb9809073c130458c6f3084681cc1d59927de42a20672a223469a427b9d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_fca_description/2.1.1-1"; + sha256 = "sha256-pVkTzedTAdG5BxGqPOCSw5NRZDW4R2X9jR3IbYoz9Z4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-fca-joystick-demo/default.nix b/distros/foxy/dbw-fca-joystick-demo/default.nix index 3f654a1862..a3fa2d4fc2 100644 --- a/distros/foxy/dbw-fca-joystick-demo/default.nix +++ b/distros/foxy/dbw-fca-joystick-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dataspeed-dbw-common, dbw-fca-can, dbw-fca-msgs, joy, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-fca-joystick-demo"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_fca_joystick_demo/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "85ec226b5265ed54b946369aa7c4651ebc81701c2155728834d99e92eb9ea940"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_fca_joystick_demo/2.1.1-1"; + sha256 = "sha256-Tgtir6KCKTmvHf7pVZKPXJE2/j3SLojsYXkSaBNF3Io="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-fca-msgs/default.nix b/distros/foxy/dbw-fca-msgs/default.nix index 0ad8462387..b0c270c265 100644 --- a/distros/foxy/dbw-fca-msgs/default.nix +++ b/distros/foxy/dbw-fca-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-fca-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_fca_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "41c70dd22e499ce6dc6d06db53801eedc30a78dc990ea3eded436492d9caf3f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_fca_msgs/2.1.1-1"; + sha256 = "sha256-tUpI9V7cQsggGXxV8+lSD+bY7k/Frt2X6x8dakJGRwE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/dbw-fca/default.nix b/distros/foxy/dbw-fca/default.nix index 0ae0910c18..aac0a08eab 100644 --- a/distros/foxy/dbw-fca/default.nix +++ b/distros/foxy/dbw-fca/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dbw-fca-can, dbw-fca-description, dbw-fca-joystick-demo, dbw-fca-msgs }: buildRosPackage { pname = "ros-foxy-dbw-fca"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_fca/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "8debc770d13e7d942b8e3227067a2325335739ea3c6a279c234ef2f840151c2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_fca/2.1.1-1"; + sha256 = "sha256-3Pb93xVeCR2zGquZRGHh7LBQdUOHlOX35cFAWCS5i98="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-ford-can/default.nix b/distros/foxy/dbw-ford-can/default.nix index bd14e0bbef..1fdf08d028 100644 --- a/distros/foxy/dbw-ford-can/default.nix +++ b/distros/foxy/dbw-ford-can/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, can-msgs, dataspeed-can-msg-filters, dataspeed-can-usb, dataspeed-dbw-common, dataspeed-dbw-gateway, dataspeed-ulc-can, dbw-ford-description, dbw-ford-msgs, geometry-msgs, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-ford-can"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_ford_can/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "01a9a59f03fd11aa8029a3a3533bf4795f6ef530b38ac9d843cd4d993c44e7c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_ford_can/2.1.1-1"; + sha256 = "sha256-C5IbpL7xHhCMtAtLBcbL61uTMwjPyHmBBvXJyt2350c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake dataspeed-can-msg-filters ]; diff --git a/distros/foxy/dbw-ford-description/default.nix b/distros/foxy/dbw-ford-description/default.nix index 15de5db9aa..9cd4d72977 100644 --- a/distros/foxy/dbw-ford-description/default.nix +++ b/distros/foxy/dbw-ford-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, robot-state-publisher, rviz2, urdf, xacro }: buildRosPackage { pname = "ros-foxy-dbw-ford-description"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_ford_description/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "1bec7434eb484a4a2cde6997d6d88328949e1a99cda199ca45fc590788c0abe3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_ford_description/2.1.1-1"; + sha256 = "sha256-XmjzkZgn0HEcp0Qi+sQM1qcvEPfbJCpGQj+LiSGQjF8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-ford-joystick-demo/default.nix b/distros/foxy/dbw-ford-joystick-demo/default.nix index 54b89b9b62..00618b86d9 100644 --- a/distros/foxy/dbw-ford-joystick-demo/default.nix +++ b/distros/foxy/dbw-ford-joystick-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dataspeed-dbw-common, dbw-ford-can, dbw-ford-msgs, joy, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-ford-joystick-demo"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_ford_joystick_demo/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "4a5dd7d9cbc1261007f34a45e02cacd048b9a2f9faf3b365244041d84b5f5593"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_ford_joystick_demo/2.1.1-1"; + sha256 = "sha256-cubNLJrZZrXY24D4Azl1joF0i/EMnM/0PV6wkzX3CiI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-ford-msgs/default.nix b/distros/foxy/dbw-ford-msgs/default.nix index dacab39102..b463cc40e5 100644 --- a/distros/foxy/dbw-ford-msgs/default.nix +++ b/distros/foxy/dbw-ford-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-ford-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_ford_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "55e6a7dd38ace924d897e2dea3684a06ff6244d4ba41faaf61c53a2c857c9fe4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_ford_msgs/2.1.1-1"; + sha256 = "sha256-6gCcMRdGIz/Zv/+ifl5IMwmEnvwPd8jJDykv/A0TeaA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/dbw-ford/default.nix b/distros/foxy/dbw-ford/default.nix index 24ed0fedb8..2c76d6c6d8 100644 --- a/distros/foxy/dbw-ford/default.nix +++ b/distros/foxy/dbw-ford/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dbw-ford-can, dbw-ford-description, dbw-ford-joystick-demo, dbw-ford-msgs }: buildRosPackage { pname = "ros-foxy-dbw-ford"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_ford/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "435616e2cffbd08840b125d35a0433a5f2d167bf7d707553a43a20ff89d55de1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_ford/2.1.1-1"; + sha256 = "sha256-h6M5hUkAe/dqiRZNYW7X7BCGI6tuDPjZxwGNprFUoyU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-polaris-can/default.nix b/distros/foxy/dbw-polaris-can/default.nix index 7aa8f978f1..11092ae261 100644 --- a/distros/foxy/dbw-polaris-can/default.nix +++ b/distros/foxy/dbw-polaris-can/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, can-msgs, dataspeed-can-msg-filters, dataspeed-can-usb, dataspeed-dbw-common, dataspeed-dbw-gateway, dataspeed-ulc-can, dbw-polaris-description, dbw-polaris-msgs, geometry-msgs, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-polaris-can"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_polaris_can/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "68e9ed24b4fb6a01b432221162cef3399ba02c6c1019d337ceba12ead76d423b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_polaris_can/2.1.1-1"; + sha256 = "sha256-EAfOUK7UQGYh4S63KnA3DiF5sHXjDdjB9hEbXNocR+g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake dataspeed-can-msg-filters ]; diff --git a/distros/foxy/dbw-polaris-description/default.nix b/distros/foxy/dbw-polaris-description/default.nix index 20680069dd..2f7e6e3a89 100644 --- a/distros/foxy/dbw-polaris-description/default.nix +++ b/distros/foxy/dbw-polaris-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, robot-state-publisher, rviz2, urdf, xacro }: buildRosPackage { pname = "ros-foxy-dbw-polaris-description"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_polaris_description/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "89832f1c94b32c6c3616915ee98ccf3f9b2fae1638cd5725af8f6de364767b57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_polaris_description/2.1.1-1"; + sha256 = "sha256-idklZI8YJ6EM6ZTyaU0tJCR7PUVfpV/ngHpM8OMu2sA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-polaris-joystick-demo/default.nix b/distros/foxy/dbw-polaris-joystick-demo/default.nix index 3eaaa720b8..078e9da391 100644 --- a/distros/foxy/dbw-polaris-joystick-demo/default.nix +++ b/distros/foxy/dbw-polaris-joystick-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dataspeed-dbw-common, dbw-polaris-can, dbw-polaris-msgs, joy, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-polaris-joystick-demo"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_polaris_joystick_demo/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "6ca901e83678ad41e3be8f963452b5abb93e728f4a046abb12c8b58aee7304e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_polaris_joystick_demo/2.1.1-1"; + sha256 = "sha256-MXOVGT7yWAGFYPDBEDkXFzxb9/4PY7DjfqGrBoVhxzE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dbw-polaris-msgs/default.nix b/distros/foxy/dbw-polaris-msgs/default.nix index 243fd95c85..1fb0c06645 100644 --- a/distros/foxy/dbw-polaris-msgs/default.nix +++ b/distros/foxy/dbw-polaris-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-dbw-polaris-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_polaris_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "e00773281b340d80ba9b4b5c164329be96d978f3df85d3c5d6e151f6364afe83"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_polaris_msgs/2.1.1-1"; + sha256 = "sha256-EAu0sreGxEQ1EZ0WxiXn4KuLY8gpUtO0NqO5byLFmCs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/dbw-polaris/default.nix b/distros/foxy/dbw-polaris/default.nix index a4a9ee2e90..f45ee1bdff 100644 --- a/distros/foxy/dbw-polaris/default.nix +++ b/distros/foxy/dbw-polaris/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dbw-polaris-can, dbw-polaris-description, dbw-polaris-joystick-demo, dbw-polaris-msgs }: buildRosPackage { pname = "ros-foxy-dbw-polaris"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/foxy/dbw_polaris/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "c65e7867cba78d80c5a6a43cb6c6e4bf26f8b5dcea550e09fdf3d5cfed5c6f88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/foxy/dbw_polaris/2.1.1-1"; + sha256 = "sha256-EgU+0KhZwDHjDIppxSsMKDPTqKqDdCK9CM2LSfCjitY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/delphi-esr-msgs/default.nix b/distros/foxy/delphi-esr-msgs/default.nix index 9da82a2573..d842311b55 100644 --- a/distros/foxy/delphi-esr-msgs/default.nix +++ b/distros/foxy/delphi-esr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-delphi-esr-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/delphi_esr_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "e0f142f60047d2773945b43c1abf273da68618d0aa36b9e7fd445e3a2b99ed4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/delphi_esr_msgs/3.1.0-1"; + sha256 = "sha256-KLdCVgXT5REK8goDtB7ho8Vu8qkxceNeHsWihuIYsW8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/delphi-mrr-msgs/default.nix b/distros/foxy/delphi-mrr-msgs/default.nix index 01621a6077..fc29c55cb4 100644 --- a/distros/foxy/delphi-mrr-msgs/default.nix +++ b/distros/foxy/delphi-mrr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-delphi-mrr-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/delphi_mrr_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "b5394667d1ff96e8a0736138e9f59c10c887473bb8c9d769ad8b7d076f4a3bd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/delphi_mrr_msgs/3.1.0-1"; + sha256 = "sha256-aRYPbU7PTBJ9h5RzAotHLRZunDO3Hm6wc86HeHGpMek="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/delphi-srr-msgs/default.nix b/distros/foxy/delphi-srr-msgs/default.nix index 75d06dbf84..4857830a47 100644 --- a/distros/foxy/delphi-srr-msgs/default.nix +++ b/distros/foxy/delphi-srr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-delphi-srr-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/delphi_srr_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "b150a619194892976766f98d02eb1cb91ffd7fecb6405337cf5d78f838a373da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/delphi_srr_msgs/3.1.0-1"; + sha256 = "sha256-7c3Zu973+d/j+c9+yu2oXnFEEiollrve9gUCH7BICi0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/demo-nodes-cpp-native/default.nix b/distros/foxy/demo-nodes-cpp-native/default.nix index 769dbe476b..2b133602e4 100644 --- a/distros/foxy/demo-nodes-cpp-native/default.nix +++ b/distros/foxy/demo-nodes-cpp-native/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-demo-nodes-cpp-native"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/demo_nodes_cpp_native/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "4311884b4f0a75a4045e26a64e4a95c49f3937eb199aba59a50d9124670bcff7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/demo_nodes_cpp_native/0.9.4-1"; + sha256 = "sha256-VZ8rO1OYmccDBxlBT3ObgoNk4yKLmJp9ouVB86Fg0zY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/demo-nodes-cpp/default.nix b/distros/foxy/demo-nodes-cpp/default.nix index 4bbe30c0e6..fcfea41361 100644 --- a/distros/foxy/demo-nodes-cpp/default.nix +++ b/distros/foxy/demo-nodes-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-demo-nodes-cpp"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/demo_nodes_cpp/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "2e58144a7f22097a27776c01c378c0406aa47a924850819ed9081e9ed2ff232b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/demo_nodes_cpp/0.9.4-1"; + sha256 = "sha256-X5psSNzAPywqutJi+uau2P05aFoh8jyph1wf2Ic7aKs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw-implementation-cmake ]; diff --git a/distros/foxy/demo-nodes-py/default.nix b/distros/foxy/demo-nodes-py/default.nix index 5e228769d6..14f41e0bd6 100644 --- a/distros/foxy/demo-nodes-py/default.nix +++ b/distros/foxy/demo-nodes-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-demo-nodes-py"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/demo_nodes_py/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "1fa2326b06f4efb8548b6476d2cefa65902e78000e1ab13e21c50867a1c58fc6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/demo_nodes_py/0.9.4-1"; + sha256 = "sha256-6dUCaJ+rOd7E/VpK7tLR2Do6A0JWK/y0Jf9ccotMuOA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/depth-image-proc/default.nix b/distros/foxy/depth-image-proc/default.nix index 24ec0c5851..4c68e8de6e 100644 --- a/distros/foxy/depth-image-proc/default.nix +++ b/distros/foxy/depth-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-depth-image-proc"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/depth_image_proc/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "6632a63208dc1a9644c67e3ec7bfbb2521547187e66a5f0c64a8bf7e1deb99e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/depth_image_proc/2.3.0-1"; + sha256 = "sha256-Lp2Kn9Xlodod8//Nel+FytgvTgcyPyNb1eFyFHw7hzs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto class-loader message-filters ]; diff --git a/distros/foxy/depthai-bridge/default.nix b/distros/foxy/depthai-bridge/default.nix index f4205bf03d..62c6a9bb46 100644 --- a/distros/foxy/depthai-bridge/default.nix +++ b/distros/foxy/depthai-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-depthai-bridge"; version = "2.5.3-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/foxy/depthai_bridge/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "6d064df6b638fcf2f0c0aa97221f2fd778656c5d50ad55695f4963ea2376bb0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/foxy/depthai_bridge/2.5.3-1"; + sha256 = "sha256-XrIGeRQUvCJEfBsQxcRwfkbocEEesqLGwDZ8LBkH0WY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/depthai-examples/default.nix b/distros/foxy/depthai-examples/default.nix index 04c849a036..dec3c43924 100644 --- a/distros/foxy/depthai-examples/default.nix +++ b/distros/foxy/depthai-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-depthai-examples"; version = "2.5.3-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/foxy/depthai_examples/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "6a7a51d633437c1a9e92be7df6fb882f17de769187069ad855faba50ed90ae59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/foxy/depthai_examples/2.5.3-1"; + sha256 = "sha256-nrdJU+IoRbmULiAVGjcHhvtd1kxBQVtsyOBMU3mDf54="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/depthai-ros-msgs/default.nix b/distros/foxy/depthai-ros-msgs/default.nix index ad82d9aa44..6fd12e74d4 100644 --- a/distros/foxy/depthai-ros-msgs/default.nix +++ b/distros/foxy/depthai-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-depthai-ros-msgs"; version = "2.5.3-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/foxy/depthai_ros_msgs/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "3065ad1a95530c35f2be8b5fb471b06c4f3fbad88fa8c8faf51440880036f62e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/foxy/depthai_ros_msgs/2.5.3-1"; + sha256 = "sha256-l8V7kaXNFQtgazo6zWSHDa62NrxTB1aKfKpR21pIgrU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/depthai-ros/default.nix b/distros/foxy/depthai-ros/default.nix index 291d61a8c8..324e2c2f1a 100644 --- a/distros/foxy/depthai-ros/default.nix +++ b/distros/foxy/depthai-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-depthai-ros"; version = "2.5.3-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/foxy/depthai-ros/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "2f94db0a1598e46d6b88b60e9bcb58bf528e677b5ef898abd3434c01201b8319"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/foxy/depthai-ros/2.5.3-1"; + sha256 = "sha256-Qmzfjn+hrhEjSkq14ihEZ0G7eryux541cOw9wl+dKRE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/depthai/default.nix b/distros/foxy/depthai/default.nix index 92142b88cd..b7380706bd 100644 --- a/distros/foxy/depthai/default.nix +++ b/distros/foxy/depthai/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, libusb1, nlohmann_json, opencv, ros-environment }: buildRosPackage { pname = "ros-foxy-depthai"; - version = "2.19.1-r1"; + version = "2.20.1-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-core-release/archive/release/foxy/depthai/2.19.1-1.tar.gz"; - name = "2.19.1-1.tar.gz"; - sha256 = "eb803428dab9d961ae454a3ef4721da6488260c79eb5b83dbd21cefd5da243c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-core-release"; + rev = "release/foxy/depthai/2.20.1-1"; + sha256 = "sha256-D6DnHY97UeGjzvx/NpYhNdvl92DNmrtjBeDmttX099E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/foxy/depthimage-to-laserscan/default.nix b/distros/foxy/depthimage-to-laserscan/default.nix index a87bb9a71f..1ba513987b 100644 --- a/distros/foxy/depthimage-to-laserscan/default.nix +++ b/distros/foxy/depthimage-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-depthimage-to-laserscan"; version = "2.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/depthimage_to_laserscan-release/archive/release/foxy/depthimage_to_laserscan/2.3.1-1.tar.gz"; - name = "2.3.1-1.tar.gz"; - sha256 = "6f9a4fac2cd4999f0317b6d4fdc57c9400ace3e7ad4ecf9ae6fc3e831b4306ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "depthimage_to_laserscan-release"; + rev = "release/foxy/depthimage_to_laserscan/2.3.1-1"; + sha256 = "sha256-MEwcfPJWOQKOdasLQvBqRKJxQwC6F4fwlQMLoxKdNr8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/derived-object-msgs/default.nix b/distros/foxy/derived-object-msgs/default.nix index 1a55aef7ab..7ba9b73663 100644 --- a/distros/foxy/derived-object-msgs/default.nix +++ b/distros/foxy/derived-object-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-derived-object-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/derived_object_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "1c8368fd5e5eca6a7dafa651489bb8569bc66a68cd0e8105a7885eb7f88a18bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/derived_object_msgs/3.1.0-1"; + sha256 = "sha256-jrkXLLg5mJhtIJtVTSC8z5MofI8S68uaDOiU+5+J7vw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/desktop/default.nix b/distros/foxy/desktop/default.nix index ae115c9b9a..5cc860c29c 100644 --- a/distros/foxy/desktop/default.nix +++ b/distros/foxy/desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-desktop"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/foxy/desktop/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "d9a3e5eb1b3e87409a9850e420ec7667a539120808c5696292a6540ac2788b9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/foxy/desktop/0.9.2-1"; + sha256 = "sha256-tyUBJ2HcdrjmTScLvlFjsOD1Vw8Il3I/1s4lAXRJ89Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/diagnostic-aggregator/default.nix b/distros/foxy/diagnostic-aggregator/default.nix index 230d1a71e1..86a912b982 100644 --- a/distros/foxy/diagnostic-aggregator/default.nix +++ b/distros/foxy/diagnostic-aggregator/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-python, ament-lint-auto, ament-lint-common, diagnostic-msgs, launch-testing-ament-cmake, launch-testing-ros, pluginlib, rclcpp, rclpy, std-msgs }: buildRosPackage { pname = "ros-foxy-diagnostic-aggregator"; - version = "2.0.8-r2"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/foxy/diagnostic_aggregator/2.0.8-2.tar.gz"; - name = "2.0.8-2.tar.gz"; - sha256 = "7d666fe6d9592908b132b560e02fbc213f9808c628cd0e06cc101a1f1d48e47b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/foxy/diagnostic_aggregator/3.1.0-1"; + sha256 = "sha256-tgB1ass3ILBeOD30sqn6bLM4TdNi0YPM6njMaIEnPyc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python diagnostic-msgs pluginlib rclcpp std-msgs ]; @@ -21,6 +25,6 @@ buildRosPackage { meta = { description = ''diagnostic_aggregator''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/foxy/diagnostic-common-diagnostics/default.nix b/distros/foxy/diagnostic-common-diagnostics/default.nix new file mode 100644 index 0000000000..5940afe5d3 --- /dev/null +++ b/distros/foxy/diagnostic-common-diagnostics/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-lint-cmake, ament-cmake-python, ament-cmake-xmllint, ament-lint-auto, diagnostic-updater, ntp, rclpy }: +buildRosPackage { + pname = "ros-foxy-diagnostic-common-diagnostics"; + version = "3.1.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/foxy/diagnostic_common_diagnostics/3.1.0-1"; + sha256 = "sha256-nLWY/TpbC4B8BP+/rMnVgvekuvf+rwzC8S972BHNIz0="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ament-cmake-python ]; + checkInputs = [ ament-cmake-lint-cmake ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ diagnostic-updater ntp rclpy ]; + nativeBuildInputs = [ ament-cmake ament-cmake-python ]; + + meta = { + description = ''diagnostic_common_diagnostics''; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/distros/foxy/diagnostic-msgs/default.nix b/distros/foxy/diagnostic-msgs/default.nix index a1776ba0ad..8520b4db3d 100644 --- a/distros/foxy/diagnostic-msgs/default.nix +++ b/distros/foxy/diagnostic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-diagnostic-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/diagnostic_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "0157e7866b3367dc441c1456f31c56cec2f169e2b461c77fc1578d2ae6420170"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/diagnostic_msgs/2.0.5-1"; + sha256 = "sha256-0ZyDKpYDQEQSc6A5zy5oybKSNHHTp8MqzwNoWVX+F8g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/diagnostic-updater/default.nix b/distros/foxy/diagnostic-updater/default.nix index b411844abc..293cec356a 100644 --- a/distros/foxy/diagnostic-updater/default.nix +++ b/distros/foxy/diagnostic-updater/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-python, ament-lint-auto, ament-lint-common, diagnostic-msgs, rclcpp, rclcpp-lifecycle, rclpy, std-msgs }: buildRosPackage { pname = "ros-foxy-diagnostic-updater"; - version = "2.0.8-r2"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/foxy/diagnostic_updater/2.0.8-2.tar.gz"; - name = "2.0.8-2.tar.gz"; - sha256 = "08abc22cf49ec9740af6ee857e2491213aeb78ffac9f589e14ab1faaa9b0c3ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/foxy/diagnostic_updater/3.1.0-1"; + sha256 = "sha256-xTskr5WjExtIqTza+z/AAQgPoX14wp+BL75tTPnSGqI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; @@ -21,6 +25,6 @@ buildRosPackage { meta = { description = ''diagnostic_updater contains tools for easily updating diagnostics. it is commonly used in device drivers to keep track of the status of output topics, device status, etc.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/foxy/diagnostics/default.nix b/distros/foxy/diagnostics/default.nix new file mode 100644 index 0000000000..aa929ed7ba --- /dev/null +++ b/distros/foxy/diagnostics/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, diagnostic-aggregator, diagnostic-common-diagnostics, diagnostic-updater, self-test }: +buildRosPackage { + pname = "ros-foxy-diagnostics"; + version = "3.1.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/foxy/diagnostics/3.1.0-1"; + sha256 = "sha256-4EQM94db9bRFnZIWM8lsMXaAp1H8Jmn75Lnh1JnDpSA="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ diagnostic-aggregator diagnostic-common-diagnostics diagnostic-updater self-test ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''diagnostics''; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/distros/foxy/diff-drive-controller/default.nix b/distros/foxy/diff-drive-controller/default.nix index 71f037cb72..1f617a51c2 100644 --- a/distros/foxy/diff-drive-controller/default.nix +++ b/distros/foxy/diff-drive-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-diff-drive-controller"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/diff_drive_controller/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "e2735ad70de9937792a5209da80cee1182c0ed01e31937c2ab9da341a1212b5d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/diff_drive_controller/0.8.2-1"; + sha256 = "sha256-NXzhg7qClnSBPqlQwycBMISZxd81pHreKpUWwMJ1k/Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; diff --git a/distros/foxy/dolly-follow/default.nix b/distros/foxy/dolly-follow/default.nix index 3014846d3f..032266fdbf 100644 --- a/distros/foxy/dolly-follow/default.nix +++ b/distros/foxy/dolly-follow/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dolly-follow"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/chapulina/dolly-release/archive/release/foxy/dolly_follow/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "190836a56e7f2f29028311a94eec3e926ae4bb9334a921e10ed6e12a7dd6b7fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "chapulina"; + repo = "dolly-release"; + rev = "release/foxy/dolly_follow/0.3.0-1"; + sha256 = "sha256-BNzluvgNWZDMxx/Faj/iKoOMCZ/RJqllKFlqRwGzk/o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dolly-gazebo/default.nix b/distros/foxy/dolly-gazebo/default.nix index 7768d6e2d6..34ddb77318 100644 --- a/distros/foxy/dolly-gazebo/default.nix +++ b/distros/foxy/dolly-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dolly-gazebo"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/chapulina/dolly-release/archive/release/foxy/dolly_gazebo/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "e08093c308744c9721f6f86dce0fb818c91ae2780cd599fcf0965103c863d698"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "chapulina"; + repo = "dolly-release"; + rev = "release/foxy/dolly_gazebo/0.3.0-1"; + sha256 = "sha256-mdIsQEjc10tQ9EVOj+9qNk3rF/g1p9oCBYzokTqYq4k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dolly-ignition/default.nix b/distros/foxy/dolly-ignition/default.nix index 36f939db57..df49e92df5 100644 --- a/distros/foxy/dolly-ignition/default.nix +++ b/distros/foxy/dolly-ignition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dolly-ignition"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/chapulina/dolly-release/archive/release/foxy/dolly_ignition/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "73060f3527bdf2b339720edae21e65c8462d2f62f45f5e85280bfdf9b707935d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "chapulina"; + repo = "dolly-release"; + rev = "release/foxy/dolly_ignition/0.3.0-1"; + sha256 = "sha256-byFER7fLZrWQwlO4ub0cMakVst1N8jDGxxXGiSd6KBE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dolly/default.nix b/distros/foxy/dolly/default.nix index 9856406654..4d4203dba1 100644 --- a/distros/foxy/dolly/default.nix +++ b/distros/foxy/dolly/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dolly"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/chapulina/dolly-release/archive/release/foxy/dolly/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "460c1f610ae8be2da3408e1b190a39ebf586b6cafb125ddc038b0153f538f3f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "chapulina"; + repo = "dolly-release"; + rev = "release/foxy/dolly/0.3.0-1"; + sha256 = "sha256-TjREEKwOUH9HZEqUMXWk4ZLviDWY1KgtUBFXbRPM4qc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/domain-coordinator/default.nix b/distros/foxy/domain-coordinator/default.nix index 33a74d49d0..1d07e45ee3 100644 --- a/distros/foxy/domain-coordinator/default.nix +++ b/distros/foxy/domain-coordinator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-domain-coordinator"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_ros-release/archive/release/foxy/domain_coordinator/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "515283f770b058bacaad143ba983c1e560ab22a601779b6e97c84facca818d5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_ros-release"; + rev = "release/foxy/domain_coordinator/0.9.2-1"; + sha256 = "sha256-KsoDZfHbqVDIEtXAmeR3Zb+vvEtYVCPpTwFkq6weOEo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/dsr-control2/default.nix b/distros/foxy/dsr-control2/default.nix index fa83b33ae7..85141ad78c 100644 --- a/distros/foxy/dsr-control2/default.nix +++ b/distros/foxy/dsr-control2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dsr-control2"; version = "0.1.1-r4"; - src = fetchurl { - url = "https://github.com/doosan-robotics/doosan-robot2-release/archive/release/foxy/dsr_control2/0.1.1-4.tar.gz"; - name = "0.1.1-4.tar.gz"; - sha256 = "daf2efcfd327b721e97256f937af60b29a736603eba98f321357fcc28f278081"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "doosan-robotics"; + repo = "doosan-robot2-release"; + rev = "release/foxy/dsr_control2/0.1.1-4"; + sha256 = "sha256-hNRTTW+rav+6+tS8petYQLRy7qI+oa/SA77HC9sgjNY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dsr-description2/default.nix b/distros/foxy/dsr-description2/default.nix index a7475d3f00..78621cea25 100644 --- a/distros/foxy/dsr-description2/default.nix +++ b/distros/foxy/dsr-description2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dsr-description2"; version = "0.1.1-r4"; - src = fetchurl { - url = "https://github.com/doosan-robotics/doosan-robot2-release/archive/release/foxy/dsr_description2/0.1.1-4.tar.gz"; - name = "0.1.1-4.tar.gz"; - sha256 = "7776c814f0cfabf18ca111f5ca111216c0d69ab7a74e73f1ce14d785d1659037"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "doosan-robotics"; + repo = "doosan-robot2-release"; + rev = "release/foxy/dsr_description2/0.1.1-4"; + sha256 = "sha256-Uzofn4VletQuTxBOe1h3uwsJDvc2uq7Gj5CzmancL8Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dsr-msgs2/default.nix b/distros/foxy/dsr-msgs2/default.nix index 3d66292596..cdfd0a47f3 100644 --- a/distros/foxy/dsr-msgs2/default.nix +++ b/distros/foxy/dsr-msgs2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dsr-msgs2"; version = "0.1.1-r4"; - src = fetchurl { - url = "https://github.com/doosan-robotics/doosan-robot2-release/archive/release/foxy/dsr_msgs2/0.1.1-4.tar.gz"; - name = "0.1.1-4.tar.gz"; - sha256 = "e3abf123677415e8a45929d79d9b1df9bfe90b41aabbc798af452316433b4909"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "doosan-robotics"; + repo = "doosan-robot2-release"; + rev = "release/foxy/dsr_msgs2/0.1.1-4"; + sha256 = "sha256-tznDmnN1WfmAcqJYbPvmE/2RyR3kZfgv/xiXs0AqdDw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/dummy-map-server/default.nix b/distros/foxy/dummy-map-server/default.nix index 00b3e66ff8..771d34e8d4 100644 --- a/distros/foxy/dummy-map-server/default.nix +++ b/distros/foxy/dummy-map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dummy-map-server"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/dummy_map_server/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "4f3fddbf708f424f978c584430f0707a8243bbc4cc3226201ed6b4e8946ef32e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/dummy_map_server/0.9.4-1"; + sha256 = "sha256-bdY27PpKnHxWRxeLpEIM/O7Xmh2qAsuLnZSPaJSOvpQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dummy-robot-bringup/default.nix b/distros/foxy/dummy-robot-bringup/default.nix index 5f051d3a87..b79c9837ac 100644 --- a/distros/foxy/dummy-robot-bringup/default.nix +++ b/distros/foxy/dummy-robot-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dummy-robot-bringup"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/dummy_robot_bringup/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "20f2b4cb814f001a2be132d668c6e8bea8dbdb518b8eb829b31386c68c19b18c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/dummy_robot_bringup/0.9.4-1"; + sha256 = "sha256-UzJtg18FBdFnZ1Qd+KvrT3FQpvG3CIKU/M5X/OP3KSA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dummy-sensors/default.nix b/distros/foxy/dummy-sensors/default.nix index bdd4e7b9b3..674134e1f6 100644 --- a/distros/foxy/dummy-sensors/default.nix +++ b/distros/foxy/dummy-sensors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dummy-sensors"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/dummy_sensors/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "e56dde37970e438fab53919b8862b8ce528ea5deb3fbda60a1a41738aa95816f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/dummy_sensors/0.9.4-1"; + sha256 = "sha256-bv6Ljx8CjZsjjFBH1XJjgrRID6Y0ipLLBtzvmslMET4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dwb-core/default.nix b/distros/foxy/dwb-core/default.nix index 7b0cc15747..af3e4b1106 100644 --- a/distros/foxy/dwb-core/default.nix +++ b/distros/foxy/dwb-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dwb-core"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/dwb_core/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "447ed10918519f8c802ba479fb2530dff87e147b608a2e406d5af96adfa6d4c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/dwb_core/0.4.7-1"; + sha256 = "sha256-i73z1htZVKnEzYrzSPi7dNv3ghCrgJBD20ByNTvoLQ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav-2d-msgs nav2-common sensor-msgs visualization-msgs ]; diff --git a/distros/foxy/dwb-critics/default.nix b/distros/foxy/dwb-critics/default.nix index 053d7b1d46..4140aa813a 100644 --- a/distros/foxy/dwb-critics/default.nix +++ b/distros/foxy/dwb-critics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dwb-critics"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/dwb_critics/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "d72f0a735b80663b18fcf0b56d9e7177aca18b61756e814a42fae454010eca30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/dwb_critics/0.4.7-1"; + sha256 = "sha256-6swl0wwMmqhOeJIEA1bRKu+nfAGSxauLxPcYfnHwIvg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/dwb-msgs/default.nix b/distros/foxy/dwb-msgs/default.nix index b5a20c773a..acde5b2c63 100644 --- a/distros/foxy/dwb-msgs/default.nix +++ b/distros/foxy/dwb-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dwb-msgs"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/dwb_msgs/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "62798348a28caeb902838342df12421cb00d0258a470878f11913faf78caf1d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/dwb_msgs/0.4.7-1"; + sha256 = "sha256-rN9HBcoJa9t9plI+fDRKYYUsODqA4hJNgzRjw+262kI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dwb-plugins/default.nix b/distros/foxy/dwb-plugins/default.nix index bd7a4a7936..15b004f5e7 100644 --- a/distros/foxy/dwb-plugins/default.nix +++ b/distros/foxy/dwb-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dwb-plugins"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/dwb_plugins/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "32f9562f8fe90501680c27d6c764f9cee9491d309fe225d9521fedc07e8d1318"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/dwb_plugins/0.4.7-1"; + sha256 = "sha256-lVUFX4+rgAAdVDeaqRtVPItIi4/37d0pTX/wGsxKc1M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/dynamic-edt-3d/default.nix b/distros/foxy/dynamic-edt-3d/default.nix index 88f582cbfa..adae678855 100644 --- a/distros/foxy/dynamic-edt-3d/default.nix +++ b/distros/foxy/dynamic-edt-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamic-edt-3d"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/foxy/dynamic_edt_3d/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "836454d9a8fae684a72f309cafcc841ff7d5c4615c9d732d9030c4070fbd1864"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/foxy/dynamic_edt_3d/1.9.8-1"; + sha256 = "sha256-p28ass6agSiGQV14tRJGr41aVOpOe1vDp5HCLwOyx7A="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/dynamic-graph/default.nix b/distros/foxy/dynamic-graph/default.nix index 526299920d..715a9ccc14 100644 --- a/distros/foxy/dynamic-graph/default.nix +++ b/distros/foxy/dynamic-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamic-graph"; version = "4.4.3-r2"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/dynamic-graph-ros-release/archive/release/foxy/dynamic-graph/4.4.3-2.tar.gz"; - name = "4.4.3-2.tar.gz"; - sha256 = "062cdbb24d7111dac5a149ce85438967a5019f9c478cdda33da9e862de89670c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "dynamic-graph-ros-release"; + rev = "release/foxy/dynamic-graph/4.4.3-2"; + sha256 = "sha256-ZjYVYmbMDjUMw0P7+KODSEEm94FSWSkq9bG/x6JNFYY="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/foxy/dynamixel-hardware-interface/default.nix b/distros/foxy/dynamixel-hardware-interface/default.nix index a494708b04..2a098b5e09 100644 --- a/distros/foxy/dynamixel-hardware-interface/default.nix +++ b/distros/foxy/dynamixel-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamixel-hardware-interface"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/dynamixel_hardware_interface-release/archive/release/foxy/dynamixel_hardware_interface/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "a835274fbe7593d11dcafda4d68104ee0c7d290fb6d911f35df0196b7ee6bb49"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "dynamixel_hardware_interface-release"; + rev = "release/foxy/dynamixel_hardware_interface/0.0.3-1"; + sha256 = "sha256-TZaD24csWqVynyvlonxW6ke5n5VIn4uXo+YQDcbal4A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dynamixel-sdk-custom-interfaces/default.nix b/distros/foxy/dynamixel-sdk-custom-interfaces/default.nix index e1eb251619..d86205537a 100644 --- a/distros/foxy/dynamixel-sdk-custom-interfaces/default.nix +++ b/distros/foxy/dynamixel-sdk-custom-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamixel-sdk-custom-interfaces"; version = "3.7.40-r4"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/dynamixel_sdk-release/archive/release/foxy/dynamixel_sdk_custom_interfaces/3.7.40-4.tar.gz"; - name = "3.7.40-4.tar.gz"; - sha256 = "7cedf9b2f2312b3a061299c2e9686cbf9e0b351f937c7dce9f812e88c9992aa4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "dynamixel_sdk-release"; + rev = "release/foxy/dynamixel_sdk_custom_interfaces/3.7.40-4"; + sha256 = "sha256-pWGzlnONW1lXGAui57EHtKsqI3VguxYMeL+ytq6dgec="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/dynamixel-sdk-examples/default.nix b/distros/foxy/dynamixel-sdk-examples/default.nix index 93dbeb495b..b8305da959 100644 --- a/distros/foxy/dynamixel-sdk-examples/default.nix +++ b/distros/foxy/dynamixel-sdk-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamixel-sdk-examples"; version = "3.7.40-r4"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/dynamixel_sdk-release/archive/release/foxy/dynamixel_sdk_examples/3.7.40-4.tar.gz"; - name = "3.7.40-4.tar.gz"; - sha256 = "056dbb39bef40eab9d8708e9d528e4a2448925c9d01fdd4b6c6c7007a61baa36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "dynamixel_sdk-release"; + rev = "release/foxy/dynamixel_sdk_examples/3.7.40-4"; + sha256 = "sha256-TRPWVWEEJtx/attfpSr6SATpy7YhzqP9x8ef/IVsULA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dynamixel-sdk/default.nix b/distros/foxy/dynamixel-sdk/default.nix index 3cf5d49f61..e0000bda60 100644 --- a/distros/foxy/dynamixel-sdk/default.nix +++ b/distros/foxy/dynamixel-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamixel-sdk"; version = "3.7.40-r4"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/dynamixel_sdk-release/archive/release/foxy/dynamixel_sdk/3.7.40-4.tar.gz"; - name = "3.7.40-4.tar.gz"; - sha256 = "c78aafa4e33d923a2e727bd06e9cddc775b73cc68db9da4d11e3ca3635b2c8cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "dynamixel_sdk-release"; + rev = "release/foxy/dynamixel_sdk/3.7.40-4"; + sha256 = "sha256-oqGB9nx57Y1CMx1pbn81xSZbN9xXdKhJmj0SvIXyaNY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dynamixel-workbench-msgs/default.nix b/distros/foxy/dynamixel-workbench-msgs/default.nix index 44b3d4b4f3..577c51e60b 100644 --- a/distros/foxy/dynamixel-workbench-msgs/default.nix +++ b/distros/foxy/dynamixel-workbench-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamixel-workbench-msgs"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench_msgs-release/archive/release/foxy/dynamixel_workbench_msgs/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "0314fe20cd9e7853e2d474fe49bfdf63091daba360ab04151df98e1a70b91349"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench_msgs-release"; + rev = "release/foxy/dynamixel_workbench_msgs/2.0.3-1"; + sha256 = "sha256-NMrVMFxbUmSDCdSRTO6gRJtKsmEeqY4Q5FqkBQCeY3I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/dynamixel-workbench-toolbox/default.nix b/distros/foxy/dynamixel-workbench-toolbox/default.nix index f1a6838f2c..981d1443e5 100644 --- a/distros/foxy/dynamixel-workbench-toolbox/default.nix +++ b/distros/foxy/dynamixel-workbench-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamixel-workbench-toolbox"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench-release/archive/release/foxy/dynamixel_workbench_toolbox/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "43b1f7a97f952e8477f7f8ae50156dfae9f0757c59eb84eded465e7740db85bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench-release"; + rev = "release/foxy/dynamixel_workbench_toolbox/2.2.3-1"; + sha256 = "sha256-nOIZ6YHjctUbm0SxTewtbsAXlfG10kknrKhpsVPGR5k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/dynamixel-workbench/default.nix b/distros/foxy/dynamixel-workbench/default.nix index 1943c24465..70d821d4d2 100644 --- a/distros/foxy/dynamixel-workbench/default.nix +++ b/distros/foxy/dynamixel-workbench/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-dynamixel-workbench"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench-release/archive/release/foxy/dynamixel_workbench/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "6a1a975f3636db3227405fdbd35040b01dad3fc4d6ee2f631aaee3f20a5efeb6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench-release"; + rev = "release/foxy/dynamixel_workbench/2.2.3-1"; + sha256 = "sha256-iA1/c6eRcHNi0wnJhwog1K7jH1fKwsqIvSfgCZivKrc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ecl-build/default.nix b/distros/foxy/ecl-build/default.nix index c1d6e7a79e..44cc78c910 100644 --- a/distros/foxy/ecl-build/default.nix +++ b/distros/foxy/ecl-build/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-build"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/foxy/ecl_build/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "214ae9d32b18abc87968e4d75e9dc444bfffd139b4524ea3ed072544ddcfe5e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/foxy/ecl_build/1.0.2-2"; + sha256 = "sha256-GrX5mhJ3gjlfBIMijfMIjJ00RQtndKXMUAr+lgfosHM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ecl-command-line/default.nix b/distros/foxy/ecl-command-line/default.nix index abd0a64f40..11ad4974e1 100644 --- a/distros/foxy/ecl-command-line/default.nix +++ b/distros/foxy/ecl-command-line/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-command-line"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_command_line/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "604b5c066bb33505bf009cf2bb4ceb39af86e86a1a1fd9185661e4fd0d94c6bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_command_line/1.2.0-1"; + sha256 = "sha256-OJqjljzcxcgIc4ddIIPO4LkpmLtja1iz8TgUAW00g/w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-concepts/default.nix b/distros/foxy/ecl-concepts/default.nix index fa1c9eba48..359e809b27 100644 --- a/distros/foxy/ecl-concepts/default.nix +++ b/distros/foxy/ecl-concepts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-concepts"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_concepts/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "b23edb39040867a533991f17463db8095f0861a83bf9b9fe1203f18fdf3947b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_concepts/1.2.0-1"; + sha256 = "sha256-DfYT5npWvWcaxyVeawEI8hgE9zN6p3lftYU/1LCooWU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-config/default.nix b/distros/foxy/ecl-config/default.nix index 823bc2d705..46960ed74c 100644 --- a/distros/foxy/ecl-config/default.nix +++ b/distros/foxy/ecl-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-config"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/foxy/ecl_config/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "54560f5ee96d75ddde9415ccc9f740ac8fa7ef5b6ca7287525aebd3f7adbfeea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/foxy/ecl_config/1.1.0-1"; + sha256 = "sha256-33yFy5eo6P8hSYgB4Tn9OC7v/NeKL0xHC5vZTC1w/w8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-console/default.nix b/distros/foxy/ecl-console/default.nix index eee798b40f..5d99ab9be6 100644 --- a/distros/foxy/ecl-console/default.nix +++ b/distros/foxy/ecl-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-console"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/foxy/ecl_console/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "43db25e0d2276b630c4cefbdfc0add8716d495faac1a913c4ebbdb84816ecfad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/foxy/ecl_console/1.1.0-1"; + sha256 = "sha256-Vj+pkN7UmvToP9JD4kwKrauUIBKrzRDF6A68i/4OR5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-containers/default.nix b/distros/foxy/ecl-containers/default.nix index 284bcd1c58..fe45145865 100644 --- a/distros/foxy/ecl-containers/default.nix +++ b/distros/foxy/ecl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-containers"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_containers/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "2acf495e2cacda75d8aae4ffea08e9d7ae47c4b940f9da6392b3ccb1188967cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_containers/1.2.0-1"; + sha256 = "sha256-FwFDtFQZYZqwcK1HCuugKHWNcYawmQiz1gxjnddV3ss="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-converters-lite/default.nix b/distros/foxy/ecl-converters-lite/default.nix index be369df81d..04bc36440a 100644 --- a/distros/foxy/ecl-converters-lite/default.nix +++ b/distros/foxy/ecl-converters-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-converters-lite"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/foxy/ecl_converters_lite/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "8b15f002cb74ac11083660ef294160b0419875d0bbdc3d96ef5460b942fcaa19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/foxy/ecl_converters_lite/1.1.0-1"; + sha256 = "sha256-8nK40G6+Y6FTPf+3k8HW16oSG3+jxN+cWCA6h0bs17c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-converters/default.nix b/distros/foxy/ecl-converters/default.nix index c093b7eb42..24686b909d 100644 --- a/distros/foxy/ecl-converters/default.nix +++ b/distros/foxy/ecl-converters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-converters"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_converters/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "c1112af470e84eb60e7b3bfc19090fe5ae6560bab092f6bbb4696c8b2a73ada7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_converters/1.2.0-1"; + sha256 = "sha256-5OdsVVoGGIIauGFjkmJKsxhh9POv+hRePGfVNmfFK5Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-core-apps/default.nix b/distros/foxy/ecl-core-apps/default.nix index 365edecee8..1e684a21d4 100644 --- a/distros/foxy/ecl-core-apps/default.nix +++ b/distros/foxy/ecl-core-apps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-core-apps"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_core_apps/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "a6c5e5e1cf33b6ac875437185e4011e390599c840efea8294fda66f94cd817ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_core_apps/1.2.0-1"; + sha256 = "sha256-kTgC3tvezZl3Q31zcD5MS7rJRFi5IwNhnWNIkiaxaqw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-core/default.nix b/distros/foxy/ecl-core/default.nix index dc5f2ce8d4..5fa4449fde 100644 --- a/distros/foxy/ecl-core/default.nix +++ b/distros/foxy/ecl-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-core"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_core/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "af6e7579f01e287fae7ab749df53d32d8fd45e60d23af6f0de1c3067d0d488e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_core/1.2.0-1"; + sha256 = "sha256-tw4lkKlMbUr4diV4zqc3LV3VJQfJsiQULzWpp/d1FYQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-devices/default.nix b/distros/foxy/ecl-devices/default.nix index 8ec97407ac..3294fce59b 100644 --- a/distros/foxy/ecl-devices/default.nix +++ b/distros/foxy/ecl-devices/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-devices"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_devices/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "e24b8a969849fe0f024dbf2a00f0d11cd546077eee2e9642a6088dcc2ca6573d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_devices/1.2.0-1"; + sha256 = "sha256-bJeBdJFsXRQqgweG/Cmq3KE0RV7hrpJBxQiCUO/AcWc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-eigen/default.nix b/distros/foxy/ecl-eigen/default.nix index 6a14fb77a0..60cda3b087 100644 --- a/distros/foxy/ecl-eigen/default.nix +++ b/distros/foxy/ecl-eigen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-eigen"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_eigen/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "960edf2adc81126db762501aaf7f1f8441901d89f66cefe45deeb745caa6c5f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_eigen/1.2.0-1"; + sha256 = "sha256-kuJruxsGovMGeaoy6ZFRO40A7H7GQJl0+rrT+mdMCGE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-errors/default.nix b/distros/foxy/ecl-errors/default.nix index 221bed13d7..bde6345101 100644 --- a/distros/foxy/ecl-errors/default.nix +++ b/distros/foxy/ecl-errors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-errors"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/foxy/ecl_errors/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "92f939390679eb59a1e2a3d5829742847d03487081a7cc53b1e6c5399d8413c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/foxy/ecl_errors/1.1.0-1"; + sha256 = "sha256-09ZFCQzj4nYs83txDT37v2Tv9ikzj+XQJCtpIz6nmy8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-exceptions/default.nix b/distros/foxy/ecl-exceptions/default.nix index 2afe7ffae2..adc37ec6d2 100644 --- a/distros/foxy/ecl-exceptions/default.nix +++ b/distros/foxy/ecl-exceptions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-exceptions"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_exceptions/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "e7eb483073cf86cff916206e50071e201d0c044acaca0860150d39a68e5ea884"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_exceptions/1.2.0-1"; + sha256 = "sha256-PgIwDamNdHeRes26KpP+0Uvh/u8K+QTzsGg7qakI4hk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-filesystem/default.nix b/distros/foxy/ecl-filesystem/default.nix index fa3c915967..f5bcbce61f 100644 --- a/distros/foxy/ecl-filesystem/default.nix +++ b/distros/foxy/ecl-filesystem/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-filesystem"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_filesystem/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "932b162df0e7698ff4f22b312f5a16b8cd964cb69ce84c57205007fd4eb20a36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_filesystem/1.2.0-1"; + sha256 = "sha256-10FuQInikulUqmuaGmmTpgb1m7LyKO0fp7vVVG+SrZ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-formatters/default.nix b/distros/foxy/ecl-formatters/default.nix index ca0dbe579f..0331ee9174 100644 --- a/distros/foxy/ecl-formatters/default.nix +++ b/distros/foxy/ecl-formatters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-formatters"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_formatters/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "46f4b0b99c36757e076193031e5f23ea95fd5298e71a450a9e7695636c1c8ee4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_formatters/1.2.0-1"; + sha256 = "sha256-csnK/KT7emSpanWIXw3QXNb2qWq3S4io17fniIvDyLk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-geometry/default.nix b/distros/foxy/ecl-geometry/default.nix index ef8f48aece..28feac1dd5 100644 --- a/distros/foxy/ecl-geometry/default.nix +++ b/distros/foxy/ecl-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-geometry"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_geometry/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "83b5cf1c8c4720710c6d85c2985dbb6b95a9afde299679ff1a5dcbe77b910ba5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_geometry/1.2.0-1"; + sha256 = "sha256-xItaixp9jAdB2ftbKSsjR0x5qfN19QCHzsx8iwehtto="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-io/default.nix b/distros/foxy/ecl-io/default.nix index df641e92e4..4e0b9c90c2 100644 --- a/distros/foxy/ecl-io/default.nix +++ b/distros/foxy/ecl-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-io"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/foxy/ecl_io/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "521ad2b9d3a64c4ea9cd8c7c689db9d07ad16b4acddb10a8f1e6b85ca3a16ccb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/foxy/ecl_io/1.1.0-1"; + sha256 = "sha256-S7CUJxdV2pbmtlVXLJmsuLngNjzF87QwDU+nFr/QK0I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-ipc/default.nix b/distros/foxy/ecl-ipc/default.nix index 62267c4736..3de23ba79b 100644 --- a/distros/foxy/ecl-ipc/default.nix +++ b/distros/foxy/ecl-ipc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-ipc"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_ipc/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "a2ec44f92ca7c8b061965a1f30d40d1a2ef7b91db6f332c206b3d29952add61d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_ipc/1.2.0-1"; + sha256 = "sha256-FFa+0VD2d6dXCCnLCghcZJpyW31Eg/nctb5sUSLHSko="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-license/default.nix b/distros/foxy/ecl-license/default.nix index f4299b696d..0d18a4b04e 100644 --- a/distros/foxy/ecl-license/default.nix +++ b/distros/foxy/ecl-license/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-license"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/foxy/ecl_license/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "9f8d4239be3316975aa152be73ece578f71ea0588d92c5ec77e4174c79b84779"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/foxy/ecl_license/1.0.2-2"; + sha256 = "sha256-Q1hwQNQkUNjPPIjQ1KRIOhrvJv6PanaYPTCiZIOjSrY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ecl-linear-algebra/default.nix b/distros/foxy/ecl-linear-algebra/default.nix index c41a8969b3..135bb72e03 100644 --- a/distros/foxy/ecl-linear-algebra/default.nix +++ b/distros/foxy/ecl-linear-algebra/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-linear-algebra"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_linear_algebra/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "3b1ddf1b7660308d68133915034fe9b493c1f722a17530f3de707babcff8d9a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_linear_algebra/1.2.0-1"; + sha256 = "sha256-upu315oRuih9S5JxJbp7BKPAQ5Lw8MyvcSYRHSa8V8o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-lite/default.nix b/distros/foxy/ecl-lite/default.nix index e1769162e4..0b65ef767b 100644 --- a/distros/foxy/ecl-lite/default.nix +++ b/distros/foxy/ecl-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-lite"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/foxy/ecl_lite/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "e2c49af84d52bbd6e4aa87565cbbc3970921b4ba2a4400c43b3ba693093379a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/foxy/ecl_lite/1.1.0-1"; + sha256 = "sha256-Bo3qZ6OV/BumHraTvYP3fAoz3XTj9B4wqOpJEA6G8JI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-manipulators/default.nix b/distros/foxy/ecl-manipulators/default.nix index ce85255e03..41b250d26d 100644 --- a/distros/foxy/ecl-manipulators/default.nix +++ b/distros/foxy/ecl-manipulators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-manipulators"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_manipulators/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "db115d83b800044588e1c126e977430b12ec094f0b347d064347b8353b3850fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_manipulators/1.2.0-1"; + sha256 = "sha256-VmWheBeQssYE6hObH6Q8ZTjDDk3d+gILN0neO5962LI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-math/default.nix b/distros/foxy/ecl-math/default.nix index 4c1342d433..293a6289f1 100644 --- a/distros/foxy/ecl-math/default.nix +++ b/distros/foxy/ecl-math/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-math"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_math/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "130441861953371a243817ffd77e56a2396082e1c5105e2b40da579fca45cae4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_math/1.2.0-1"; + sha256 = "sha256-NeevQ8lIx9k/BjzaS+pXu0qanSmP8jDhWZea+Irdp40="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-mobile-robot/default.nix b/distros/foxy/ecl-mobile-robot/default.nix index b676c6a3af..1423f36945 100644 --- a/distros/foxy/ecl-mobile-robot/default.nix +++ b/distros/foxy/ecl-mobile-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-mobile-robot"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_mobile_robot/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "a7e9ffe36fa537cef5959d255de1ecb4299eb7f43e401723e3af9c5587357029"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_mobile_robot/1.2.0-1"; + sha256 = "sha256-ZJpDyMOQ2S2KRu0cDW9KhWcQcX65/VPXwVdJFPgjhfI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-mpl/default.nix b/distros/foxy/ecl-mpl/default.nix index d6e4b23654..a8c3856b20 100644 --- a/distros/foxy/ecl-mpl/default.nix +++ b/distros/foxy/ecl-mpl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-mpl"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_mpl/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "9e9827b9bfb9e15a4828a21458fe7ed948003b863ef945ec9670c8998a4d9af7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_mpl/1.2.0-1"; + sha256 = "sha256-l99FWgGl1nE5eFxNQzR+bc0irB/bie030WEA1ego6Og="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-sigslots-lite/default.nix b/distros/foxy/ecl-sigslots-lite/default.nix index 965967750d..10c3dc2dd6 100644 --- a/distros/foxy/ecl-sigslots-lite/default.nix +++ b/distros/foxy/ecl-sigslots-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-sigslots-lite"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/foxy/ecl_sigslots_lite/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "02e614dabfd2f52815044f0c33bb8cf93151adf4dc4d83d89acb9846aa41eca9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/foxy/ecl_sigslots_lite/1.1.0-1"; + sha256 = "sha256-elwZkpMp4eUcXfApXChktl6PRIE0WF0419Hx9VEiWWE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-sigslots/default.nix b/distros/foxy/ecl-sigslots/default.nix index 218f1466d9..e7a76bd5c3 100644 --- a/distros/foxy/ecl-sigslots/default.nix +++ b/distros/foxy/ecl-sigslots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-sigslots"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_sigslots/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "721fbce748c41d9dc57e577d50f97bf45978d8bc55388e02b52694c167e4921b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_sigslots/1.2.0-1"; + sha256 = "sha256-nkJm6vfpxu7n9lNps5GBcxpNelElWQSA7jFdUBdlV+8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-statistics/default.nix b/distros/foxy/ecl-statistics/default.nix index 672820444b..4f19fe354e 100644 --- a/distros/foxy/ecl-statistics/default.nix +++ b/distros/foxy/ecl-statistics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-statistics"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_statistics/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "16b59215420e2a328f8df5afb24c708d2ab4e73279f31eff6a7e6604b1e84c77"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_statistics/1.2.0-1"; + sha256 = "sha256-ihFGoIYbMTs1LL87taJLwvXG5CG7VQJNc96FlIVQHWI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-streams/default.nix b/distros/foxy/ecl-streams/default.nix index 8b4e7abfe9..1c3d8c1c17 100644 --- a/distros/foxy/ecl-streams/default.nix +++ b/distros/foxy/ecl-streams/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-streams"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_streams/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "3a76a1086a981dacd080e33095ef4ebe0db9d575ea55b16ca64f4282939a1bd7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_streams/1.2.0-1"; + sha256 = "sha256-cIwVmTVfQpEp7ZnC7kABn/Hl+VyNGmWpVNLdogL0kK0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-threads/default.nix b/distros/foxy/ecl-threads/default.nix index 0dbc1c8f70..c5856a4904 100644 --- a/distros/foxy/ecl-threads/default.nix +++ b/distros/foxy/ecl-threads/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-threads"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_threads/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "373a8240e15afd301e0e03e48e4155025af4bfaa370870a6d322d92a9572042c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_threads/1.2.0-1"; + sha256 = "sha256-pFiYWcD064pU2dT6zvJzItS0u/CVSy9fL54r2Tzahs8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-time-lite/default.nix b/distros/foxy/ecl-time-lite/default.nix index 85ebf81cff..8e60452fd0 100644 --- a/distros/foxy/ecl-time-lite/default.nix +++ b/distros/foxy/ecl-time-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-time-lite"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/foxy/ecl_time_lite/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "f6e53e5fdcb6ae15de797a288c812aa5dc9dbca043696488ed2f992256a1819b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/foxy/ecl_time_lite/1.1.0-1"; + sha256 = "sha256-F7hnvoqFjhxfBRPDfxL4eEIuJbjRYwbug7duZli7tis="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-time/default.nix b/distros/foxy/ecl-time/default.nix index f16b39564c..6b4dd0ce6a 100644 --- a/distros/foxy/ecl-time/default.nix +++ b/distros/foxy/ecl-time/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-time"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_time/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "9c97d45c1d752cac140d83c4ec0ff64e990a78657d8a69fe1f3fef262d87a040"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_time/1.2.0-1"; + sha256 = "sha256-5KINboBBaSKuRE14RoJuehOaN4YOLPAmhkQxXNHgl5M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ecl-tools/default.nix b/distros/foxy/ecl-tools/default.nix index 6428b3a2fd..3814587ad9 100644 --- a/distros/foxy/ecl-tools/default.nix +++ b/distros/foxy/ecl-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-tools"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/foxy/ecl_tools/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "4a9651ff2fe597408b5c8507f16d58547ce3afa1c59a2927ab35a84577e20df4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/foxy/ecl_tools/1.0.2-2"; + sha256 = "sha256-BJkWbmR78WKJqT4tLjG5A0gAaL1TCcTsxmSxuKCFB0c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ecl-type-traits/default.nix b/distros/foxy/ecl-type-traits/default.nix index f017c445d6..f7751ebcae 100644 --- a/distros/foxy/ecl-type-traits/default.nix +++ b/distros/foxy/ecl-type-traits/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-type-traits"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_type_traits/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "fd0616ffcfa74e4b521da814bafafa1e3ac5d8f592339e64938b4d672d0e92a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_type_traits/1.2.0-1"; + sha256 = "sha256-sK14ZZxiJWS9v6fXeUWKKFTMnn4YBZ3b97t9BjXb0UY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/ecl-utilities/default.nix b/distros/foxy/ecl-utilities/default.nix index e9d8971fba..a828d2beba 100644 --- a/distros/foxy/ecl-utilities/default.nix +++ b/distros/foxy/ecl-utilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ecl-utilities"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/foxy/ecl_utilities/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "a01de5b9b42675e1f3b88b7cbdbe0a4a42ac4e6db07dd18a1a6d010af563d424"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/foxy/ecl_utilities/1.2.0-1"; + sha256 = "sha256-n6vDnkxG1bzKOCLHFemdbJ7CEypkYm74xXcU32N7ID0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/effort-controllers/default.nix b/distros/foxy/effort-controllers/default.nix index e71ab8b25c..ab2129a9d5 100644 --- a/distros/foxy/effort-controllers/default.nix +++ b/distros/foxy/effort-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-effort-controllers"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/effort_controllers/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "031d6d97d1549b3e0a780210fcc2736165493285ffd0ed03e005a1aa1e1ba795"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/effort_controllers/0.8.2-1"; + sha256 = "sha256-hLymCfwSrqmyn+LJJ03zNLyZrdz1awJkw0EyrURzbX0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; diff --git a/distros/foxy/eigen-stl-containers/default.nix b/distros/foxy/eigen-stl-containers/default.nix index e0891f1a47..00f172d77a 100644 --- a/distros/foxy/eigen-stl-containers/default.nix +++ b/distros/foxy/eigen-stl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-eigen-stl-containers"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/eigen_stl_containers-release/archive/release/foxy/eigen_stl_containers/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "5c00e7ae634ca8497711010a991e817f42e0ae75a244101e1defb177662e23cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "eigen_stl_containers-release"; + rev = "release/foxy/eigen_stl_containers/1.0.0-1"; + sha256 = "sha256-Zjjaom5lCGLMKC33kq6er1Ji54XUj/3hkSIWcBnXI+E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/eigen3-cmake-module/default.nix b/distros/foxy/eigen3-cmake-module/default.nix index af519dc50d..fb79574340 100644 --- a/distros/foxy/eigen3-cmake-module/default.nix +++ b/distros/foxy/eigen3-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-eigen3-cmake-module"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/eigen3_cmake_module-release/archive/release/foxy/eigen3_cmake_module/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "0f41b3b7ccb8094f1c74a0e357f50f1dc80fe6e6e685ae4dbdde83a93c6044fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "eigen3_cmake_module-release"; + rev = "release/foxy/eigen3_cmake_module/0.1.1-1"; + sha256 = "sha256-JYv6XaPTqspaLTKHbLNoNYx3ivXCTVAvRO3oNEhhxQ4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/eigenpy/default.nix b/distros/foxy/eigenpy/default.nix index be556ac925..2787068fcc 100644 --- a/distros/foxy/eigenpy/default.nix +++ b/distros/foxy/eigenpy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, cmake, doxygen, eigen, git, python3, python3Packages }: buildRosPackage { pname = "ros-foxy-eigenpy"; - version = "2.8.1-r1"; + version = "2.9.0-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/eigenpy-ros-release/archive/release/foxy/eigenpy/2.8.1-1.tar.gz"; - name = "2.8.1-1.tar.gz"; - sha256 = "812c011647a31c00cb088b51c13043454e5cb2c0e01741804f37b9e2711212d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "eigenpy-ros-release"; + rev = "release/foxy/eigenpy/2.9.0-1"; + sha256 = "sha256-jvDfJbfRdGMFzEWdOHDVaKU9nqkXE4sOyMhO5JyEnbI="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/foxy/eiquadprog/default.nix b/distros/foxy/eiquadprog/default.nix index be35e1a948..0f3dc9d35c 100644 --- a/distros/foxy/eiquadprog/default.nix +++ b/distros/foxy/eiquadprog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-eiquadprog"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/eiquadprog-ros-release/archive/release/foxy/eiquadprog/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "883d7e58c56768f94a4951d2a18641a99ddabbc33d55f558ee3ab7a16beef1d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "eiquadprog-ros-release"; + rev = "release/foxy/eiquadprog/1.2.2-1"; + sha256 = "sha256-G9h9hhzIb/HJgv+4opGT3nUwBYsHqPwoe8QvtmWeqwY="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/foxy/embree-vendor/default.nix b/distros/foxy/embree-vendor/default.nix index 9e094018ae..4d1aecb789 100644 --- a/distros/foxy/embree-vendor/default.nix +++ b/distros/foxy/embree-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-embree-vendor"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/embree_vendor-release/archive/release/foxy/embree_vendor/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "edb84502c8f4e4c53fe8614daf2e06aa29abcb98c28c87367901a67585e0a8e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "embree_vendor-release"; + rev = "release/foxy/embree_vendor/0.1.0-1"; + sha256 = "sha256-hY/B8LG+lg3WS6vaqLc8SmgawrnJuceBRrM/w4SANYw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/end-effector/default.nix b/distros/foxy/end-effector/default.nix index dfc37f2b62..c923db12e4 100644 --- a/distros/foxy/end-effector/default.nix +++ b/distros/foxy/end-effector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-end-effector"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ADVRHumanoids/ROSEndEffector2-release/archive/release/foxy/end_effector/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "6bca16099516adc976ece34a9d22593f355f43a3ad8f63601bc89db299555658"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ADVRHumanoids"; + repo = "ROSEndEffector2-release"; + rev = "release/foxy/end_effector/0.0.3-1"; + sha256 = "sha256-ekknhPMZLfKfZOxgAogAE544TJGKzLpaqEWgMr/NZ30="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/example-interfaces/default.nix b/distros/foxy/example-interfaces/default.nix index c3947b4eb9..47c9b18aab 100644 --- a/distros/foxy/example-interfaces/default.nix +++ b/distros/foxy/example-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-example-interfaces"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/example_interfaces-release/archive/release/foxy/example_interfaces/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "74a5cd21a531a90d5117d482943d18ad44f0b5b3679ec28a3331f32f660aa77d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "example_interfaces-release"; + rev = "release/foxy/example_interfaces/0.9.1-1"; + sha256 = "sha256-1y7LlCTk5Sg7s4HFKI8x4b4zNuA0/2d3+/rMtb9RbNQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/examples-rclcpp-minimal-action-client/default.nix b/distros/foxy/examples-rclcpp-minimal-action-client/default.nix index d2033f41c2..76da349206 100644 --- a/distros/foxy/examples-rclcpp-minimal-action-client/default.nix +++ b/distros/foxy/examples-rclcpp-minimal-action-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-minimal-action-client"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_minimal_action_client/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "1866704f3f5e5e80aa41fe2a99b8f6998d64aef3b4de1a9f862691ffd486615d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_minimal_action_client/0.9.4-1"; + sha256 = "sha256-hdz/p7qDp4K5Too5Elt+6UVyN3czfOpSzTCwmVIMilE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclcpp-minimal-action-server/default.nix b/distros/foxy/examples-rclcpp-minimal-action-server/default.nix index 4844ed848a..9a919f9f04 100644 --- a/distros/foxy/examples-rclcpp-minimal-action-server/default.nix +++ b/distros/foxy/examples-rclcpp-minimal-action-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-minimal-action-server"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_minimal_action_server/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "b11820cb03701ec57c54f3f89e29c2c1694c2fc1791d6d00631486c82a6744f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_minimal_action_server/0.9.4-1"; + sha256 = "sha256-vmK//RgC25K6K3gK8a9/pBgBT+Hejs3nPqT/5aTS/dU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclcpp-minimal-client/default.nix b/distros/foxy/examples-rclcpp-minimal-client/default.nix index d3c19905e2..f6b86537a6 100644 --- a/distros/foxy/examples-rclcpp-minimal-client/default.nix +++ b/distros/foxy/examples-rclcpp-minimal-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-minimal-client"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_minimal_client/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "1431441e74384885c9634ab1c8ab0b71d93b09f3bb9c86abd8a37c771b249e88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_minimal_client/0.9.4-1"; + sha256 = "sha256-MO4EdKpNztGzxY5Crk2h6Dc0pvFTQbdmFIrWUx7IFHo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclcpp-minimal-composition/default.nix b/distros/foxy/examples-rclcpp-minimal-composition/default.nix index d6fa48f8b6..0425150d24 100644 --- a/distros/foxy/examples-rclcpp-minimal-composition/default.nix +++ b/distros/foxy/examples-rclcpp-minimal-composition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-minimal-composition"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_minimal_composition/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "33eb358e6d1817e9e4fa96f87efb256f2c1b7e1c3c6f93aac1cf215c85a8710b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_minimal_composition/0.9.4-1"; + sha256 = "sha256-aIeOQY437zHX2+pS2QXalMXRc9pNaN41yZeA27SPqOc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclcpp-minimal-publisher/default.nix b/distros/foxy/examples-rclcpp-minimal-publisher/default.nix index 98219a7cf6..cd03cca96b 100644 --- a/distros/foxy/examples-rclcpp-minimal-publisher/default.nix +++ b/distros/foxy/examples-rclcpp-minimal-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-minimal-publisher"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_minimal_publisher/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "c6d9a29dac76a67743a018759f489e1370da3fcf0fa422c119c9e3c031cc796d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_minimal_publisher/0.9.4-1"; + sha256 = "sha256-PuNl42mabKccqIB42badaj/jyV7mmgZ+VGs72md+2YM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclcpp-minimal-service/default.nix b/distros/foxy/examples-rclcpp-minimal-service/default.nix index 351471789a..126532acf3 100644 --- a/distros/foxy/examples-rclcpp-minimal-service/default.nix +++ b/distros/foxy/examples-rclcpp-minimal-service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-minimal-service"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_minimal_service/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "43bb9f11b7272de46d7e0365d09cb3e384dc6c4ed26ab67910c1394ed459c22b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_minimal_service/0.9.4-1"; + sha256 = "sha256-+B1DPs7r/jkzXnD1gCTahyEHWuq0Swrulqtchzz0oZA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclcpp-minimal-subscriber/default.nix b/distros/foxy/examples-rclcpp-minimal-subscriber/default.nix index d0e15f1a8d..c23baae8af 100644 --- a/distros/foxy/examples-rclcpp-minimal-subscriber/default.nix +++ b/distros/foxy/examples-rclcpp-minimal-subscriber/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-minimal-subscriber"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_minimal_subscriber/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "1c98167c11f96fb9e906048ea027caba1837810e55d38b7b05684831bdbc9cf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_minimal_subscriber/0.9.4-1"; + sha256 = "sha256-R6pGWZ1NsXx91vcIqvWEDQzwtsrXGFn9zN/md9BS5rM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclcpp-minimal-timer/default.nix b/distros/foxy/examples-rclcpp-minimal-timer/default.nix index a344374327..a1ffb5d7e1 100644 --- a/distros/foxy/examples-rclcpp-minimal-timer/default.nix +++ b/distros/foxy/examples-rclcpp-minimal-timer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-minimal-timer"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_minimal_timer/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "b60787e3aa6033099bd8ebf49cfb91e5f50bffcc78b0d69f4053aa6cf492cfe9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_minimal_timer/0.9.4-1"; + sha256 = "sha256-28qPQdi0NxV6MD9wDDyz8OpgmR3uHS40Ish93Ya8avg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclcpp-multithreaded-executor/default.nix b/distros/foxy/examples-rclcpp-multithreaded-executor/default.nix index b071138157..3581334945 100644 --- a/distros/foxy/examples-rclcpp-multithreaded-executor/default.nix +++ b/distros/foxy/examples-rclcpp-multithreaded-executor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclcpp-multithreaded-executor"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclcpp_multithreaded_executor/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "2848531747ecfd0ff41b2c9152d7b2b7edb2b98e096fdbce05f153749352919a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclcpp_multithreaded_executor/0.9.4-1"; + sha256 = "sha256-yHayA7semwT66XLPjFGO7aweVqgtprdhY3ntFY376vU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/examples-rclpy-executors/default.nix b/distros/foxy/examples-rclpy-executors/default.nix index 8378d961e0..4ddd9f11bb 100644 --- a/distros/foxy/examples-rclpy-executors/default.nix +++ b/distros/foxy/examples-rclpy-executors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclpy-executors"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclpy_executors/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "a05afbd548cf17f0ac483da23da1462d9f86ce276e7e164b9a66c098d2515109"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclpy_executors/0.9.4-1"; + sha256 = "sha256-L+xNbIz+LAHSSDUlPIuL+p6P1YKRmZWkCxGpJsviOug="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/examples-rclpy-minimal-action-client/default.nix b/distros/foxy/examples-rclpy-minimal-action-client/default.nix index 533a8e8406..5d943fc157 100644 --- a/distros/foxy/examples-rclpy-minimal-action-client/default.nix +++ b/distros/foxy/examples-rclpy-minimal-action-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclpy-minimal-action-client"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclpy_minimal_action_client/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "fd4758fc8546ecd3c73015b56e68fd175a0d9d98554fd896508b0f593749ebe3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclpy_minimal_action_client/0.9.4-1"; + sha256 = "sha256-doXEGYB6RTZKtIrIP1/OuDPAHWLiO2dFie8CAwefHn4="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/examples-rclpy-minimal-action-server/default.nix b/distros/foxy/examples-rclpy-minimal-action-server/default.nix index 411daf1b0b..85188d97d6 100644 --- a/distros/foxy/examples-rclpy-minimal-action-server/default.nix +++ b/distros/foxy/examples-rclpy-minimal-action-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclpy-minimal-action-server"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclpy_minimal_action_server/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "e56a1361f6f40a4a45216df4f818f4a3b2e305bc29f9f02f66af6a15d1887363"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclpy_minimal_action_server/0.9.4-1"; + sha256 = "sha256-U5oE3t8cCXXo/CSxvSzvbr+UjDHeGdzix5P9rgnVo+Q="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/examples-rclpy-minimal-client/default.nix b/distros/foxy/examples-rclpy-minimal-client/default.nix index 5f5be1800e..53b6f95d7e 100644 --- a/distros/foxy/examples-rclpy-minimal-client/default.nix +++ b/distros/foxy/examples-rclpy-minimal-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclpy-minimal-client"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclpy_minimal_client/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "9dd2a581db9923ed156cd0794659ddf0b9904a2470c617a8500173211b1c13ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclpy_minimal_client/0.9.4-1"; + sha256 = "sha256-HLCKOsw94fZlvXyr7agDic7mx9J7pUznfZzzt4ep6OE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/examples-rclpy-minimal-publisher/default.nix b/distros/foxy/examples-rclpy-minimal-publisher/default.nix index 0c11b08fff..f0f1230091 100644 --- a/distros/foxy/examples-rclpy-minimal-publisher/default.nix +++ b/distros/foxy/examples-rclpy-minimal-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclpy-minimal-publisher"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclpy_minimal_publisher/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "fe44fdf51d22084dda499edda2b173c6347d3a647457bd79aaa09fa3cfffcc23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclpy_minimal_publisher/0.9.4-1"; + sha256 = "sha256-0pejZ5eGnZJ1GWg+BfF4QRz5sv5aJjaZPwOTHzVVNjA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/examples-rclpy-minimal-service/default.nix b/distros/foxy/examples-rclpy-minimal-service/default.nix index 97d78e4855..1ffce28a7f 100644 --- a/distros/foxy/examples-rclpy-minimal-service/default.nix +++ b/distros/foxy/examples-rclpy-minimal-service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclpy-minimal-service"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclpy_minimal_service/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "de1a16ebf51ca13ae2f0dc0cc9ac34d2884af8149902be3345327dc0ed5466be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclpy_minimal_service/0.9.4-1"; + sha256 = "sha256-bexhluAGg83739Ty0OXlLhgF9defTJVpDnZBOr6iAVc="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/examples-rclpy-minimal-subscriber/default.nix b/distros/foxy/examples-rclpy-minimal-subscriber/default.nix index bd88dd13ce..d035fbb02b 100644 --- a/distros/foxy/examples-rclpy-minimal-subscriber/default.nix +++ b/distros/foxy/examples-rclpy-minimal-subscriber/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-rclpy-minimal-subscriber"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/foxy/examples_rclpy_minimal_subscriber/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "0ad83811e146a1b5cc3c7b7492164c91f10291f9301fdfa35c444acc3155f226"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/foxy/examples_rclpy_minimal_subscriber/0.9.4-1"; + sha256 = "sha256-sJ6DF70eAiodMIsJDQK6X0Umco9HXJl5DHhmFOf8g/g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/examples-tf2-py/default.nix b/distros/foxy/examples-tf2-py/default.nix index d1b45514c1..d5eea6e44f 100644 --- a/distros/foxy/examples-tf2-py/default.nix +++ b/distros/foxy/examples-tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-examples-tf2-py"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/examples_tf2_py/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "1950b4506cdcb9ffc72b552cd11651a25ed256da9793efdcf159f29f26c63546"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/examples_tf2_py/0.13.13-1"; + sha256 = "sha256-dgTmVAlD7XgGdRUDrgmsA4ORj9O04DGN3P3iq13IgvQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/fastcdr/default.nix b/distros/foxy/fastcdr/default.nix index 99fc4a39d4..1ac9b82906 100644 --- a/distros/foxy/fastcdr/default.nix +++ b/distros/foxy/fastcdr/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-fastcdr"; version = "1.0.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fastcdr-release/archive/release/foxy/fastcdr/1.0.13-1.tar.gz"; - name = "1.0.13-1.tar.gz"; - sha256 = "7bfa6843defd50ed19c9c08ca7d13959b60be5aff12ffc40edd5b7e50daf411c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fastcdr-release"; + rev = "release/foxy/fastcdr/1.0.13-1"; + sha256 = "sha256-UmT5a7TRl4k178Ubc3FO6cWCbP6PIgchpHeCDibIRVk="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/fastrtps-cmake-module/default.nix b/distros/foxy/fastrtps-cmake-module/default.nix index 22e06da2b9..c23d63ad97 100644 --- a/distros/foxy/fastrtps-cmake-module/default.nix +++ b/distros/foxy/fastrtps-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-fastrtps-cmake-module"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/foxy/fastrtps_cmake_module/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "af9ed13934b1fb4cf80fe45cbce8575e072e6d70001ff980301abe69b6b24e82"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/foxy/fastrtps_cmake_module/1.0.4-1"; + sha256 = "sha256-5HyCJuy8rj2KUhM7JQNToNMvqvNOTT7joJUqw3B82Xw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/fastrtps/default.nix b/distros/foxy/fastrtps/default.nix index 9897645bc9..ecb444a257 100644 --- a/distros/foxy/fastrtps/default.nix +++ b/distros/foxy/fastrtps/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, asio, cmake, fastcdr, foonathan-memory-vendor, openssl, tinyxml-2 }: buildRosPackage { pname = "ros-foxy-fastrtps"; - version = "2.1.2-r1"; + version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fastrtps-release/archive/release/foxy/fastrtps/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "16b983d6018e778aa240cc2430f17561c5415b7466cf067faea850065b5a716f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fastrtps-release"; + rev = "release/foxy/fastrtps/2.1.3-1"; + sha256 = "sha256-CfMgGiOdzzGdZpfaIK13mz60Q44EBP19sW0jiKi3VoI="; + }; buildType = "cmake"; buildInputs = [ asio cmake ]; diff --git a/distros/foxy/filters/default.nix b/distros/foxy/filters/default.nix index 5bf2f03615..0969992155 100644 --- a/distros/foxy/filters/default.nix +++ b/distros/foxy/filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-filters"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/filters-release/archive/release/foxy/filters/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "60c7b2e8ac1e208d6c2815a4b468c24cfc739266974bae0a26369b13db8d47d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "filters-release"; + rev = "release/foxy/filters/2.0.2-1"; + sha256 = "sha256-eN7Qrf7jYCMYHktF+gjddjHLUz12i1drmbthvyLtDJU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/find-object-2d/default.nix b/distros/foxy/find-object-2d/default.nix index 33e91af226..7b6dfc5cae 100644 --- a/distros/foxy/find-object-2d/default.nix +++ b/distros/foxy/find-object-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-find-object-2d"; version = "0.7.0-r3"; - src = fetchurl { - url = "https://github.com/introlab/find_object_2d-release/archive/release/foxy/find_object_2d/0.7.0-3.tar.gz"; - name = "0.7.0-3.tar.gz"; - sha256 = "4d0ccbadb0b7d4240396631c5ba7c808d3f0f7e5b08a6c05ad5bb1a5e811f973"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "find_object_2d-release"; + rev = "release/foxy/find_object_2d/0.7.0-3"; + sha256 = "sha256-KtLe1v52K9gb/p4t0Yqdkc99Hgi67wNcFpmguOilOnA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/fluent-rviz/default.nix b/distros/foxy/fluent-rviz/default.nix index 179fc6c686..d93cb3cd41 100644 --- a/distros/foxy/fluent-rviz/default.nix +++ b/distros/foxy/fluent-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-fluent-rviz"; version = "0.0.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fluent_rviz-release/archive/release/foxy/fluent_rviz/0.0.3-3.tar.gz"; - name = "0.0.3-3.tar.gz"; - sha256 = "e3f3ecfeedfe1b1123ef79cd67577a226d680e2a28af3246b5863106d619104e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fluent_rviz-release"; + rev = "release/foxy/fluent_rviz/0.0.3-3"; + sha256 = "sha256-/LmzIiGEHhv+jlon28dyJAjyB233kvyupBzUS01rdjA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/fmi-adapter-examples/default.nix b/distros/foxy/fmi-adapter-examples/default.nix index f948804824..ef4e38ffd2 100644 --- a/distros/foxy/fmi-adapter-examples/default.nix +++ b/distros/foxy/fmi-adapter-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-fmi-adapter-examples"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmi_adapter-release/archive/release/foxy/fmi_adapter_examples/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "121b362ebdeb58a1f8a3decbb38e06c23bfd9fcf9c49dd42d10afbeeabf4ad53"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmi_adapter-release"; + rev = "release/foxy/fmi_adapter_examples/2.1.1-1"; + sha256 = "sha256-R5kjXvGqUx+ux+q1zgh54sd5aNSXWSJ1edV01iOh5Fc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/fmi-adapter/default.nix b/distros/foxy/fmi-adapter/default.nix index 09b515ad30..c6c2079247 100644 --- a/distros/foxy/fmi-adapter/default.nix +++ b/distros/foxy/fmi-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-fmi-adapter"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmi_adapter-release/archive/release/foxy/fmi_adapter/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "6417b0dbdd611d744660ce2308c37a621900f35beaf2d79aafdf88481f5565e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmi_adapter-release"; + rev = "release/foxy/fmi_adapter/2.1.1-1"; + sha256 = "sha256-pC2a5q3fbSAGFRlotIahHSzRm+tJOBSAjho9Q70/otU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake fmilibrary-vendor ]; diff --git a/distros/foxy/fmilibrary-vendor/default.nix b/distros/foxy/fmilibrary-vendor/default.nix index 250433b228..022283e72d 100644 --- a/distros/foxy/fmilibrary-vendor/default.nix +++ b/distros/foxy/fmilibrary-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-fmilibrary-vendor"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmilibrary_vendor-release/archive/release/foxy/fmilibrary_vendor/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "6522a9a7a98611615614fad9b50809a6275079c2ae0a3c8bbc2fff1221086cfa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmilibrary_vendor-release"; + rev = "release/foxy/fmilibrary_vendor/1.0.1-1"; + sha256 = "sha256-RwFS1j6Bue1ac96cXWL4i1A+KcMFWctqGRc0ZGeTR70="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/foxy/foonathan-memory-vendor/default.nix b/distros/foxy/foonathan-memory-vendor/default.nix index 24d556fc25..5a65b8f026 100644 --- a/distros/foxy/foonathan-memory-vendor/default.nix +++ b/distros/foxy/foonathan-memory-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-foonathan-memory-vendor"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foonathan_memory_vendor-release/archive/release/foxy/foonathan_memory_vendor/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "72237602a3dedee05aafe1ce726a97754debd386bada768617a3e6c90184f283"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foonathan_memory_vendor-release"; + rev = "release/foxy/foonathan_memory_vendor/1.2.0-1"; + sha256 = "sha256-0DgqmgXZ9PpV/sf51//kHGZGB6L/VNySZf+o8dWcCE4="; + }; buildType = "cmake"; buildInputs = [ git ]; diff --git a/distros/foxy/force-torque-sensor-broadcaster/default.nix b/distros/foxy/force-torque-sensor-broadcaster/default.nix index b01404be2a..ab63247ede 100644 --- a/distros/foxy/force-torque-sensor-broadcaster/default.nix +++ b/distros/foxy/force-torque-sensor-broadcaster/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-force-torque-sensor-broadcaster"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/force_torque_sensor_broadcaster/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "1c0d8d4c6604d69e299b38777942a2edeff10c3c546e1aebb46c4a05b6fd838f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/force_torque_sensor_broadcaster/0.8.2-1"; + sha256 = "sha256-8yKExrTAzS5Y/wOV4CBjtRYVNXrfG6Zzs1j0qYIj500="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/forward-command-controller/default.nix b/distros/foxy/forward-command-controller/default.nix index 40543e5b46..d22fdd3ef4 100644 --- a/distros/foxy/forward-command-controller/default.nix +++ b/distros/foxy/forward-command-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-forward-command-controller"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/forward_command_controller/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "15082cccfff06d3f79723d8cc48065ae4124301dc1648f4483ed822dd9ddb08e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/forward_command_controller/0.8.2-1"; + sha256 = "sha256-sQdk6PyhWDQ5VvtJxVHw9ox1j/AF2sszQ+l/8zTfv3U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; diff --git a/distros/foxy/four-wheel-steering-msgs/default.nix b/distros/foxy/four-wheel-steering-msgs/default.nix index e2fc7b1c1d..44c4679415 100644 --- a/distros/foxy/four-wheel-steering-msgs/default.nix +++ b/distros/foxy/four-wheel-steering-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-four-wheel-steering-msgs"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/four_wheel_steering_msgs-release/archive/release/foxy/four_wheel_steering_msgs/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "cfcd9be53b7fbc6539cff556d44317ba0dcfa3c4baf131944f8d58e7e8fd7f0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "four_wheel_steering_msgs-release"; + rev = "release/foxy/four_wheel_steering_msgs/2.0.1-1"; + sha256 = "sha256-lESkZ6d2jUSfCCCB5KsV8gJwBTO0EG7O4/LInYggSzc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/foxglove-msgs/default.nix b/distros/foxy/foxglove-msgs/default.nix index 739c5f439f..f7c02ec28e 100644 --- a/distros/foxy/foxglove-msgs/default.nix +++ b/distros/foxy/foxglove-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-foxglove-msgs"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_foxglove_msgs-release/archive/release/foxy/foxglove_msgs/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "570352f30b9381f996e4ccae627517bf7eefc26c52df3f122001da8005e5a5c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_foxglove_msgs-release"; + rev = "release/foxy/foxglove_msgs/2.1.1-1"; + sha256 = "sha256-WVd87BSDwF+o7s/HMSXhpwvIBHYpp6J263sCn635ILE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/gazebo-dev/default.nix b/distros/foxy/gazebo-dev/default.nix index e39f0e95a2..da907a950c 100644 --- a/distros/foxy/gazebo-dev/default.nix +++ b/distros/foxy/gazebo-dev/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gazebo-dev"; version = "3.5.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/foxy/gazebo_dev/3.5.3-1.tar.gz"; - name = "3.5.3-1.tar.gz"; - sha256 = "36aae42a263db7463a3179bed9b352a35ac7ca573986857a99467932b9e1c589"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/foxy/gazebo_dev/3.5.3-1"; + sha256 = "sha256-wXkKktwaihmpklyZF9yI2Mnp47Ptiwk+zRVSvUn8uGU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/gazebo-msgs/default.nix b/distros/foxy/gazebo-msgs/default.nix index 74ff293123..a9383be9b0 100644 --- a/distros/foxy/gazebo-msgs/default.nix +++ b/distros/foxy/gazebo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gazebo-msgs"; version = "3.5.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/foxy/gazebo_msgs/3.5.3-1.tar.gz"; - name = "3.5.3-1.tar.gz"; - sha256 = "1fafbcae164048e2c9cb475c6ac907efde4fea957531f872ece4e5894cf65b7f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/foxy/gazebo_msgs/3.5.3-1"; + sha256 = "sha256-Ui/fOeCh9eaRVr73r0+PfVFXqd0qEuKh1Wujp6n0zwY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/gazebo-plugins/default.nix b/distros/foxy/gazebo-plugins/default.nix index c80b410cbe..b3cb6b8398 100644 --- a/distros/foxy/gazebo-plugins/default.nix +++ b/distros/foxy/gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gazebo-plugins"; version = "3.5.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/foxy/gazebo_plugins/3.5.3-1.tar.gz"; - name = "3.5.3-1.tar.gz"; - sha256 = "911a05d3960d322bdc85e60dae32a166e6b424adee0e71471e3a5907bc53ddcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/foxy/gazebo_plugins/3.5.3-1"; + sha256 = "sha256-0/Y0/9VZDtw1POlD/wqTC5KMHFCpKDsgcyp9Brxso8I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/gazebo-ros-pkgs/default.nix b/distros/foxy/gazebo-ros-pkgs/default.nix index c8ac328f42..11875b730b 100644 --- a/distros/foxy/gazebo-ros-pkgs/default.nix +++ b/distros/foxy/gazebo-ros-pkgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gazebo-ros-pkgs"; version = "3.5.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/foxy/gazebo_ros_pkgs/3.5.3-1.tar.gz"; - name = "3.5.3-1.tar.gz"; - sha256 = "8083ac447d2182c6b51ddae54b56a039d525bb0c067bcf7b5f6aa2f710494ebf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/foxy/gazebo_ros_pkgs/3.5.3-1"; + sha256 = "sha256-lUe95Eka1dcUWEvYTY6uP191IWzNL1UhzWcl3kLSb1g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/gazebo-ros/default.nix b/distros/foxy/gazebo-ros/default.nix index abc9d33e86..3af4c13552 100644 --- a/distros/foxy/gazebo-ros/default.nix +++ b/distros/foxy/gazebo-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gazebo-ros"; version = "3.5.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/foxy/gazebo_ros/3.5.3-1.tar.gz"; - name = "3.5.3-1.tar.gz"; - sha256 = "a06b21a7abac1bf297791be915d52e5240aaed15c40a347c32dca71a64ad99a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/foxy/gazebo_ros/3.5.3-1"; + sha256 = "sha256-McyfHeZXhlBIGP6+hw+Ge6JgKN7xVROZDwvc2fG9UaY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/gazebo-ros2-control-demos/default.nix b/distros/foxy/gazebo-ros2-control-demos/default.nix index ad56d47ac5..74724a673f 100644 --- a/distros/foxy/gazebo-ros2-control-demos/default.nix +++ b/distros/foxy/gazebo-ros2-control-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gazebo-ros2-control-demos"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros2_control-release/archive/release/foxy/gazebo_ros2_control_demos/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "a334cf793368723dff3ee150f07a0529da92adc77fd5f1113ac939a6ee3191a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros2_control-release"; + rev = "release/foxy/gazebo_ros2_control_demos/0.1.1-2"; + sha256 = "sha256-CSl1avcsXaaljJCf86jqP9Mt7Ji2CHbEu2aWsVa4LXQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rclcpp-action ]; diff --git a/distros/foxy/gazebo-ros2-control/default.nix b/distros/foxy/gazebo-ros2-control/default.nix index 213270538d..1916b9c706 100644 --- a/distros/foxy/gazebo-ros2-control/default.nix +++ b/distros/foxy/gazebo-ros2-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gazebo-ros2-control"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros2_control-release/archive/release/foxy/gazebo_ros2_control/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "3bf7d6a6dd7f88ec803aab89c4bdd4c781e6b1f075fc6088deecc7ff42a951a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros2_control-release"; + rev = "release/foxy/gazebo_ros2_control/0.1.1-2"; + sha256 = "sha256-qgv3rt3EywnxPJY62RKk4sF+8FWzXNnELHlntP0ARqE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/gc-spl-2022/default.nix b/distros/foxy/gc-spl-2022/default.nix index d48f4540ae..208f369bb6 100644 --- a/distros/foxy/gc-spl-2022/default.nix +++ b/distros/foxy/gc-spl-2022/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gc-spl-2022"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/foxy/gc_spl_2022/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "15a5f4197725b8a783b37e20e999b3e2f18b2f6aec7edef2c112465acc7ef175"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/foxy/gc_spl_2022/0.0.1-1"; + sha256 = "sha256-2iMrRZncDtB8aaBlY0JW0qKauCZBHk0rKjJUQIFgKyM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/generated.nix b/distros/foxy/generated.nix index 6f39c261dc..9b6795ca42 100644 --- a/distros/foxy/generated.nix +++ b/distros/foxy/generated.nix @@ -4,8 +4,6 @@ self: super: { - acado-vendor = self.callPackage ./acado-vendor {}; - ackermann-msgs = self.callPackage ./ackermann-msgs {}; action-msgs = self.callPackage ./action-msgs {}; @@ -138,10 +136,6 @@ self: super: { angles = self.callPackage ./angles {}; - apex-containers = self.callPackage ./apex-containers {}; - - apex-test-tools = self.callPackage ./apex-test-tools {}; - apriltag = self.callPackage ./apriltag {}; aruco-opencv = self.callPackage ./aruco-opencv {}; @@ -160,8 +154,6 @@ 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 {}; @@ -352,10 +344,14 @@ self: super: { diagnostic-aggregator = self.callPackage ./diagnostic-aggregator {}; + diagnostic-common-diagnostics = self.callPackage ./diagnostic-common-diagnostics {}; + diagnostic-msgs = self.callPackage ./diagnostic-msgs {}; diagnostic-updater = self.callPackage ./diagnostic-updater {}; + diagnostics = self.callPackage ./diagnostics {}; + diff-drive-controller = self.callPackage ./diff-drive-controller {}; dolly = self.callPackage ./dolly {}; @@ -492,10 +488,6 @@ self: super: { end-effector = self.callPackage ./end-effector {}; - espeak-interfaces = self.callPackage ./espeak-interfaces {}; - - espeak-ros = self.callPackage ./espeak-ros {}; - example-interfaces = self.callPackage ./example-interfaces {}; examples-rclcpp-minimal-action-client = self.callPackage ./examples-rclcpp-minimal-action-client {}; @@ -714,6 +706,8 @@ self: super: { joy-teleop = self.callPackage ./joy-teleop {}; + joy-tester = self.callPackage ./joy-tester {}; + kartech-linear-actuator-msgs = self.callPackage ./kartech-linear-actuator-msgs {}; kdl-parser = self.callPackage ./kdl-parser {}; @@ -1100,8 +1094,6 @@ 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 {}; @@ -1210,8 +1202,6 @@ self: super: { pmb2-simulation = self.callPackage ./pmb2-simulation {}; - point-cloud-msg-wrapper = self.callPackage ./point-cloud-msg-wrapper {}; - pointcloud-to-laserscan = self.callPackage ./pointcloud-to-laserscan {}; pose-cov-ops = self.callPackage ./pose-cov-ops {}; @@ -1532,8 +1522,6 @@ self: super: { ros2trace = self.callPackage ./ros2trace {}; - ros2trace-analysis = self.callPackage ./ros2trace-analysis {}; - ros-base = self.callPackage ./ros-base {}; ros-core = self.callPackage ./ros-core {}; @@ -1880,8 +1868,6 @@ self: super: { teleop-twist-keyboard = self.callPackage ./teleop-twist-keyboard {}; - test-apex-test-tools = self.callPackage ./test-apex-test-tools {}; - test-bond = self.callPackage ./test-bond {}; test-interface-files = self.callPackage ./test-interface-files {}; @@ -1932,8 +1918,6 @@ self: super: { tracetools = self.callPackage ./tracetools {}; - tracetools-analysis = self.callPackage ./tracetools-analysis {}; - tracetools-image-pipeline = self.callPackage ./tracetools-image-pipeline {}; tracetools-launch = self.callPackage ./tracetools-launch {}; diff --git a/distros/foxy/geodesy/default.nix b/distros/foxy/geodesy/default.nix index 677d3d9a17..b2bf5da27e 100644 --- a/distros/foxy/geodesy/default.nix +++ b/distros/foxy/geodesy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-geodesy"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/foxy/geodesy/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "9b6d0e18310a4aa8c3b43eb11c29c74440c13322fbc049d8eab7506cbfa53864"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/foxy/geodesy/1.0.4-1"; + sha256 = "sha256-Mzm8AWuKEp7IOCpF3+LvcThDlbjh5/5D9ftJVe7R1AA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.catkin-pkg ]; diff --git a/distros/foxy/geographic-info/default.nix b/distros/foxy/geographic-info/default.nix index ba595a7b2c..b00189b962 100644 --- a/distros/foxy/geographic-info/default.nix +++ b/distros/foxy/geographic-info/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-geographic-info"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/foxy/geographic_info/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "73ed847171cb6611ee166d4c188d4c7fe9adc9b7e060ba494121534e31c6e502"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/foxy/geographic_info/1.0.4-1"; + sha256 = "sha256-Fem5FLsZ+lxPuX8NgnKK7k543+bE3uOlVAPQ/5sMLJM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/geographic-msgs/default.nix b/distros/foxy/geographic-msgs/default.nix index 23f5eac96e..16904164e8 100644 --- a/distros/foxy/geographic-msgs/default.nix +++ b/distros/foxy/geographic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-geographic-msgs"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/foxy/geographic_msgs/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "6b23c76410b89089b3407a155a2516b1035e5ac3ac489fe83b02cbf01cdb49d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/foxy/geographic_msgs/1.0.4-1"; + sha256 = "sha256-hbbW+QtNX3HdOdRx5JgV/D7VzcaZoXAPuiFiOWfvpQI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/geometric-shapes/default.nix b/distros/foxy/geometric-shapes/default.nix index ba71cfa4b7..b71a05b546 100644 --- a/distros/foxy/geometric-shapes/default.nix +++ b/distros/foxy/geometric-shapes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-geometric-shapes"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/moveit/geometric_shapes-release/archive/release/foxy/geometric_shapes/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "8e657ed648fe8eefb51479e6f2939938cf51e56bf2352bbaf15a9b220676b79a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "geometric_shapes-release"; + rev = "release/foxy/geometric_shapes/2.1.2-1"; + sha256 = "sha256-fKyq87F5dzlpnnoMG+LFuJyqkcGTPQeBgwnw5dEFigw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config rosidl-default-generators ]; diff --git a/distros/foxy/geometry-msgs/default.nix b/distros/foxy/geometry-msgs/default.nix index bc009f4ee4..1d2f6440ec 100644 --- a/distros/foxy/geometry-msgs/default.nix +++ b/distros/foxy/geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-geometry-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/geometry_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "e705e7f6da6f08ecfb2e0cde468584b15e6e2c7a39db754561d88bfcc2bd8e31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/geometry_msgs/2.0.5-1"; + sha256 = "sha256-qTGq3sEqCbOsLKes1AvwWmsNF9nwrgPbmtD1gOAo2bE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/geometry-tutorials/default.nix b/distros/foxy/geometry-tutorials/default.nix index d7066c191d..3370aa5e12 100644 --- a/distros/foxy/geometry-tutorials/default.nix +++ b/distros/foxy/geometry-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-geometry-tutorials"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/foxy/geometry_tutorials/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "ba686ba4ecd384f5245bb12a59bd1c34ce9b07ba3c7c583c0f478538ea6cce2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/foxy/geometry_tutorials/0.3.6-1"; + sha256 = "sha256-Cy6+rG9fkARM6Pr7xFDRN/CEObs8kkLsxj+qr4W2h0U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/geometry2/default.nix b/distros/foxy/geometry2/default.nix index f104128b72..e6aff42bda 100644 --- a/distros/foxy/geometry2/default.nix +++ b/distros/foxy/geometry2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-geometry2"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/geometry2/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "cb3541bd86f265d805bc71688d18b9ddb554ae96f6199a2be2719720621efd1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/geometry2/0.13.13-1"; + sha256 = "sha256-L+zcQ1BpUKUEdjX6P7SmZm0r5BdA/dPsNAunVPOvBF0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/gmock-vendor/default.nix b/distros/foxy/gmock-vendor/default.nix index 2e29ab5229..c49a24f7ea 100644 --- a/distros/foxy/gmock-vendor/default.nix +++ b/distros/foxy/gmock-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gmock-vendor"; version = "1.8.9001-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/googletest-release/archive/release/foxy/gmock_vendor/1.8.9001-1.tar.gz"; - name = "1.8.9001-1.tar.gz"; - sha256 = "581615dd9b22b96edc37031e5198792b5166e9ad36bda361f72d748c20c1ef38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "googletest-release"; + rev = "release/foxy/gmock_vendor/1.8.9001-1"; + sha256 = "sha256-5j1+2OErraTkKYg6aJ60Cd0w2yCe3a6o1Ou9//4WGGc="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/google-benchmark-vendor/default.nix b/distros/foxy/google-benchmark-vendor/default.nix index 73e3cb841f..7f982711da 100644 --- a/distros/foxy/google-benchmark-vendor/default.nix +++ b/distros/foxy/google-benchmark-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-google-benchmark-vendor"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/google_benchmark_vendor-release/archive/release/foxy/google_benchmark_vendor/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "6f2e2e257bb774b9d6746c39f86fc8b32a24f4edd27773939110f9b32e9705f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "google_benchmark_vendor-release"; + rev = "release/foxy/google_benchmark_vendor/0.0.3-1"; + sha256 = "sha256-RSqaND91QeTX2POtkVIGwJAy9evjeiVItx/yllJSEqM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/gps-msgs/default.nix b/distros/foxy/gps-msgs/default.nix index 011bea0f2b..a40ea95b6b 100644 --- a/distros/foxy/gps-msgs/default.nix +++ b/distros/foxy/gps-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gps-msgs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/foxy/gps_msgs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "4c700cee631e72df22f3e4312f1213da730f7c938e52715ea37bd9cddd55fb57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/foxy/gps_msgs/1.0.6-1"; + sha256 = "sha256-8GNuRYbpbk3rXhWYJY2RzwRhEYIqyjoSVU2aJuZsle8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/gps-tools/default.nix b/distros/foxy/gps-tools/default.nix index 85b10ce2d5..9e24daac34 100644 --- a/distros/foxy/gps-tools/default.nix +++ b/distros/foxy/gps-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gps-tools"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/foxy/gps_tools/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "3223365ce0c5438a0b785159b7b257e81c35dfb8ec96190e27c1285bbd8888d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/foxy/gps_tools/1.0.6-1"; + sha256 = "sha256-Q1+2FD0R1L6kO3uZJ34rigFlSnvbzBK+/l4vBCL4b3c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/foxy/gps-umd/default.nix b/distros/foxy/gps-umd/default.nix index 57611ebf8c..b316bec6ec 100644 --- a/distros/foxy/gps-umd/default.nix +++ b/distros/foxy/gps-umd/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gps-umd"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/foxy/gps_umd/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "1350fe0c955d3906d4b0886a73b3248ccd03ed69fea708a0ef7f5cd493648389"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/foxy/gps_umd/1.0.6-1"; + sha256 = "sha256-1oW6+zpd0kZ4StIyQIguYgxcmd3jnUEFHzuNGyc5K3Y="; + }; buildType = "catkin"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/gpsd-client/default.nix b/distros/foxy/gpsd-client/default.nix index 7497863c85..5adb21261b 100644 --- a/distros/foxy/gpsd-client/default.nix +++ b/distros/foxy/gpsd-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gpsd-client"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/foxy/gpsd_client/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "1ce0c161939546ec5c21658cb05ee9e9a0ae60a5fd11523d0cba4ce2da233fea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/foxy/gpsd_client/1.0.6-1"; + sha256 = "sha256-YEl++f2CZp1YkEOrdT8NTt5sCDECcWhROFUyT+I1qV8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/graph-msgs/default.nix b/distros/foxy/graph-msgs/default.nix index b6857c6997..a2e67779cd 100644 --- a/distros/foxy/graph-msgs/default.nix +++ b/distros/foxy/graph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-graph-msgs"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/graph_msgs-release/archive/release/foxy/graph_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "b90b8986b023301eab689d942df2592f01cb3423e64a1e880ae77df19dfc84c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "graph_msgs-release"; + rev = "release/foxy/graph_msgs/0.2.0-1"; + sha256 = "sha256-Zs/vEflqm3Ft6PVC5rmE7JAj2pPFja8QAhBxSsH93dg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/grasping-msgs/default.nix b/distros/foxy/grasping-msgs/default.nix index 6229b0630e..34530d45f3 100644 --- a/distros/foxy/grasping-msgs/default.nix +++ b/distros/foxy/grasping-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-grasping-msgs"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/grasping_msgs-ros2-gbp/archive/release/foxy/grasping_msgs/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "9b3cfc44a96fbf4c0b0a59489d7693aa3d696006aa7f184ade66e2e5cde04b00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "grasping_msgs-ros2-gbp"; + rev = "release/foxy/grasping_msgs/0.4.0-1"; + sha256 = "sha256-7jkZuQAfwrBxZtca5lsT7W9diA/c+snR1FHkf4JjZoM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/grbl-msgs/default.nix b/distros/foxy/grbl-msgs/default.nix index 68e1012547..ce7b2e8649 100644 --- a/distros/foxy/grbl-msgs/default.nix +++ b/distros/foxy/grbl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-grbl-msgs"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/flynneva/grbl_msgs-release/archive/release/foxy/grbl_msgs/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "3408a480eafe47cb705bd2f477f4d36d9e63d383ed566d49a4e7905a5daf3b18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "grbl_msgs-release"; + rev = "release/foxy/grbl_msgs/0.0.2-2"; + sha256 = "sha256-cjvc4arr+Z92IcwzqZryuU4FC2MY+FNpA+6JBe0dhiE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/grbl-ros/default.nix b/distros/foxy/grbl-ros/default.nix index 9758f7a4ef..6ba7f4dd47 100644 --- a/distros/foxy/grbl-ros/default.nix +++ b/distros/foxy/grbl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-grbl-ros"; version = "0.0.15-r1"; - src = fetchurl { - url = "https://github.com/flynneva/grbl_ros-release/archive/release/foxy/grbl_ros/0.0.15-1.tar.gz"; - name = "0.0.15-1.tar.gz"; - sha256 = "9b54ba04a2d8f07c6957fb8ec0c634ecd6cf49799f315f354f3641e5e114dfeb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "grbl_ros-release"; + rev = "release/foxy/grbl_ros/0.0.15-1"; + sha256 = "sha256-EizNk8GSbyTqKN5y4qXMT5yFRe5Yx0yqJHYirUXrnWk="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.pyserial ]; diff --git a/distros/foxy/grepros/default.nix b/distros/foxy/grepros/default.nix index 49d7239c26..fb56bd469c 100644 --- a/distros/foxy/grepros/default.nix +++ b/distros/foxy/grepros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-grepros"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/suurjaak/grepros-release/archive/release/foxy/grepros/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "458099985a6b8f212940f6cb4cfa52d116589d68f746373b65576a171f8d06e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "suurjaak"; + repo = "grepros-release"; + rev = "release/foxy/grepros/0.5.0-1"; + sha256 = "sha256-xNIkYkH5iGMMZWXABQF8VH5UPVyLZIyYW7MsG1MZG4E="; + }; buildType = "ament_python"; checkInputs = [ ament-cmake-pytest pythonPackages.pytest std-msgs ]; diff --git a/distros/foxy/gripper-controllers/default.nix b/distros/foxy/gripper-controllers/default.nix index 502a4c5ad7..4015b8148e 100644 --- a/distros/foxy/gripper-controllers/default.nix +++ b/distros/foxy/gripper-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gripper-controllers"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/gripper_controllers/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "9597cbf68eb73f7a985c1acfa6ec8d51e49f03a500e70bcbd2711f4cc48644cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/gripper_controllers/0.8.2-1"; + sha256 = "sha256-WhY+vkHVER6xgV420L820o1FrllmGeg8dM5BZeKvTpk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; diff --git a/distros/foxy/gscam/default.nix b/distros/foxy/gscam/default.nix index f65b55c220..d2e5f014ba 100644 --- a/distros/foxy/gscam/default.nix +++ b/distros/foxy/gscam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gscam"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gscam-release/archive/release/foxy/gscam/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "f2539ee337ae0b3a0ae099b825ec4db091154beb68c118a9f3df53cba7d8d1f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gscam-release"; + rev = "release/foxy/gscam/2.0.2-1"; + sha256 = "sha256-CKQzdZxZ6OZeWkirhmcrfJhb0hNN0vSimKIRHSUDT3k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/gtest-vendor/default.nix b/distros/foxy/gtest-vendor/default.nix index 6dcf3e9f8e..49052ca044 100644 --- a/distros/foxy/gtest-vendor/default.nix +++ b/distros/foxy/gtest-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-gtest-vendor"; version = "1.8.9001-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/googletest-release/archive/release/foxy/gtest_vendor/1.8.9001-1.tar.gz"; - name = "1.8.9001-1.tar.gz"; - sha256 = "44cb12b30c00c7b3d6001469d62ecaf1d27dfa271f867de849f35e9e6f23ba83"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "googletest-release"; + rev = "release/foxy/gtest_vendor/1.8.9001-1"; + sha256 = "sha256-Gy7APHYzmyiyJ1EB0rWCVbsh3zrdKeJTnIPiJ2edi1w="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/hardware-interface/default.nix b/distros/foxy/hardware-interface/default.nix index f235eb342b..10ee150392 100644 --- a/distros/foxy/hardware-interface/default.nix +++ b/distros/foxy/hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-hardware-interface"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/foxy/hardware_interface/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "529e5b4fc4ac3552187eeab903b980bc3798162b0a832821d9b90979af56221b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/foxy/hardware_interface/0.11.0-1"; + sha256 = "sha256-X3tLgGJEpUpk8mbJXsyJop56cRinqrn2qWIla+5H808="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/hls-lfcd-lds-driver/default.nix b/distros/foxy/hls-lfcd-lds-driver/default.nix index ec3ac61b8f..bfde9a5862 100644 --- a/distros/foxy/hls-lfcd-lds-driver/default.nix +++ b/distros/foxy/hls-lfcd-lds-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-hls-lfcd-lds-driver"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/hls_lfcd_lds_driver-release/archive/release/foxy/hls_lfcd_lds_driver/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "4f66e46c20c8c578dbe9ecb43d06662d422e3b2e262d400057fc5368839346e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "hls_lfcd_lds_driver-release"; + rev = "release/foxy/hls_lfcd_lds_driver/2.0.1-1"; + sha256 = "sha256-CeZgGf57xB5TKGE4yZhzNFcB4gnEl3uamF3wVQF3eYI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/hpp-fcl/default.nix b/distros/foxy/hpp-fcl/default.nix index a38d8a6856..cb9ec2c703 100644 --- a/distros/foxy/hpp-fcl/default.nix +++ b/distros/foxy/hpp-fcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-hpp-fcl"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/hpp_fcl-release/archive/release/foxy/hpp-fcl/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "b4296473da19156f008e0de41bee793a9f140b146752b1ea3167e2e822842d09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "hpp_fcl-release"; + rev = "release/foxy/hpp-fcl/2.2.0-1"; + sha256 = "sha256-qhSLoE/vV0hK4gPpF9GMI7r2l3o7uqNhQaSr+y00MiU="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git python3Packages.lxml ]; diff --git a/distros/foxy/husky-base/default.nix b/distros/foxy/husky-base/default.nix index 12f566d0f2..434f74b591 100644 --- a/distros/foxy/husky-base/default.nix +++ b/distros/foxy/husky-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-base"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_base/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "45abe0eb40c34cb0ff2f5966e1eace952d7a66627d5b77156597aca9bb8c3a6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_base/1.0.7-1"; + sha256 = "sha256-rwD8PzDLKTYXbRvrHMhQbW7beCosYaxKuZDbcIY6Bgo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/husky-bringup/default.nix b/distros/foxy/husky-bringup/default.nix index ca7ca7575a..514d4ed2d5 100644 --- a/distros/foxy/husky-bringup/default.nix +++ b/distros/foxy/husky-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-bringup"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_bringup/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "08cc70dab9604cee4bd0fc04d347bd3879457d470b5355a539f0b550329ea09b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_bringup/1.0.7-1"; + sha256 = "sha256-fQPcUh4v7OZBDtHrfoadDyQWdSCPF+6BwxYUyf4mAo4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/husky-control/default.nix b/distros/foxy/husky-control/default.nix index 55cb3d6598..3474a52ad5 100644 --- a/distros/foxy/husky-control/default.nix +++ b/distros/foxy/husky-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-control"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_control/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "885573fcb0d1e63219747c38757d1965669f205e2f490b12c84cb8b46b01e175"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_control/1.0.7-1"; + sha256 = "sha256-2iKOmjG2XtmMCdrJuSBOP7H+KEv0QQDwO7ddup2DWfc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/husky-description/default.nix b/distros/foxy/husky-description/default.nix index 8dc471670e..c534b969a0 100644 --- a/distros/foxy/husky-description/default.nix +++ b/distros/foxy/husky-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-description"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_description/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "19b1e057c9aab1660f2a9f61b28839133c44a463c6ce66f3ae6955762b7efa44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_description/1.0.7-1"; + sha256 = "sha256-X0SxLtZgpzQDEs0smM3PJfD2hC6wis3AZd8YQDsvJPY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/husky-desktop/default.nix b/distros/foxy/husky-desktop/default.nix index ff4b3e7aa2..b7519ecc73 100644 --- a/distros/foxy/husky-desktop/default.nix +++ b/distros/foxy/husky-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-desktop"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_desktop/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "21560266da1399025db0d84dc90a708c4208dddf47d5d01419759e82fae8b5c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_desktop/1.0.7-1"; + sha256 = "sha256-lI0oT6+Z7VURHQy7WYMAM0pbI19SNby4DAMy0jVRI18="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/husky-gazebo/default.nix b/distros/foxy/husky-gazebo/default.nix index dc5152a551..b4addaba61 100644 --- a/distros/foxy/husky-gazebo/default.nix +++ b/distros/foxy/husky-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-gazebo"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_gazebo/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "ad1860accae9114da1ed658e87dd300e18db34d585e2c8f02435d49f1d427914"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_gazebo/1.0.7-1"; + sha256 = "sha256-YjfPkbrElzx9F5iEKZ1V8bbW7GeMYyHT/bT38F4txJA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/husky-msgs/default.nix b/distros/foxy/husky-msgs/default.nix index e6932b6558..991f4f4e68 100644 --- a/distros/foxy/husky-msgs/default.nix +++ b/distros/foxy/husky-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-msgs"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_msgs/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "cf1c9adc08628160bd622271b3a89e37f7ae2e9ab011e86bc46be108317cd787"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_msgs/1.0.7-1"; + sha256 = "sha256-8QOoMxTXv0tZN0j3z9t7O9XLmpEKcaUX7FrUA9mAgiM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/husky-robot/default.nix b/distros/foxy/husky-robot/default.nix index 29ada62ddf..0c8ab48c8a 100644 --- a/distros/foxy/husky-robot/default.nix +++ b/distros/foxy/husky-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-robot"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_robot/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "a6826b911a5a541bc8338d44e701e82e752346112bae45e66bb1578f548b7180"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_robot/1.0.7-1"; + sha256 = "sha256-vGDqirvadVAfW56689zjoZcoipPSAUAoEOd1GLMPsBU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/husky-simulator/default.nix b/distros/foxy/husky-simulator/default.nix index 747dce3d84..e1cce3614e 100644 --- a/distros/foxy/husky-simulator/default.nix +++ b/distros/foxy/husky-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-simulator"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_simulator/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "72c78817ea2df607e2f22da6b35cca5f6a91c8b760ba0e9160f48427acd2c29a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_simulator/1.0.7-1"; + sha256 = "sha256-FrH+FLf8oWaaT7WL82EkZbnIOLO94j07qQvia5xvF9Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/husky-viz/default.nix b/distros/foxy/husky-viz/default.nix index 35fe90d7ff..87b9db0f17 100644 --- a/distros/foxy/husky-viz/default.nix +++ b/distros/foxy/husky-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-husky-viz"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/foxy/husky_viz/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "6fe27fd6224aacd509ac4357d84243c6c2306f3b724c8b4f883c3e1255cf39e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/foxy/husky_viz/1.0.7-1"; + sha256 = "sha256-dkEJkgNCRNM/ujJXNN/YmgbNlxHR3uOVEkdVFuMDPv0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ibeo-msgs/default.nix b/distros/foxy/ibeo-msgs/default.nix index 539bee38f1..c585af6456 100644 --- a/distros/foxy/ibeo-msgs/default.nix +++ b/distros/foxy/ibeo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ibeo-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/ibeo_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "dabef943871667ff41ec094c08509dd58f2447c49cc7cabe69411a301d25437e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/ibeo_msgs/3.1.0-1"; + sha256 = "sha256-IX8py4NZtoZNiric0XVCAQQEMsJ0jM2gVlF+wNYK7lI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/ifm3d-core/default.nix b/distros/foxy/ifm3d-core/default.nix index 3519815f62..f7f64728f0 100644 --- a/distros/foxy/ifm3d-core/default.nix +++ b/distros/foxy/ifm3d-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ifm3d-core"; version = "0.18.0-r4"; - src = fetchurl { - url = "https://github.com/ifm/ifm3d-release/archive/release/foxy/ifm3d_core/0.18.0-4.tar.gz"; - name = "0.18.0-4.tar.gz"; - sha256 = "d66698ff96c051522c171ca7c460e36738d95349a70a8f55929d4d4813b76b84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ifm"; + repo = "ifm3d-release"; + rev = "release/foxy/ifm3d_core/0.18.0-4"; + sha256 = "sha256-jeUy9mAyhsabDgK0Y3SmT6BdL6NFNrfrcM6u+ec5/vU="; + }; buildType = "cmake"; buildInputs = [ boost cmake ]; diff --git a/distros/foxy/ign-ros2-control-demos/default.nix b/distros/foxy/ign-ros2-control-demos/default.nix index 53edc4f5f6..ed9c379a05 100644 --- a/distros/foxy/ign-ros2-control-demos/default.nix +++ b/distros/foxy/ign-ros2-control-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ign-ros2-control-demos"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ign_ros2_control-release/archive/release/foxy/ign_ros2_control_demos/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "2ff34e5ea67b8997c3dadb65841ddb6858472da004388016ad33227568a1d79b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ign_ros2_control-release"; + rev = "release/foxy/ign_ros2_control_demos/0.1.5-1"; + sha256 = "sha256-PkL+YmeU8+HCFV7YsWEadMovuAeb3ZdBrsh2hwNe+WM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rclcpp-action ]; diff --git a/distros/foxy/image-common/default.nix b/distros/foxy/image-common/default.nix index ac0731c804..f7d8387d3b 100644 --- a/distros/foxy/image-common/default.nix +++ b/distros/foxy/image-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-common"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/foxy/image_common/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "869d51bb9e5a490d6f22ea6355ea4db8a96e29c3a8caedbf4183222759963d38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/foxy/image_common/2.4.0-1"; + sha256 = "sha256-jFlExb8GKnSkEALAGW/9Fn5Mp8TEcUMLxlD9QcMcMGA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/image-geometry/default.nix b/distros/foxy/image-geometry/default.nix index f8a7ef4a43..e22affad50 100644 --- a/distros/foxy/image-geometry/default.nix +++ b/distros/foxy/image-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-geometry"; version = "3.0.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/foxy/image_geometry/3.0.7-1.tar.gz"; - name = "3.0.7-1.tar.gz"; - sha256 = "323dc42a166ad381774c4608fb561ed5397388a5c3da2bad47028415089fd8d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/foxy/image_geometry/3.0.7-1"; + sha256 = "sha256-RIRX/Qs+emLde0yu9P4jOcs9EUjkuGCRormi+0yNz9E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros ]; diff --git a/distros/foxy/image-pipeline/default.nix b/distros/foxy/image-pipeline/default.nix index 559bc52c10..9f142b70ed 100644 --- a/distros/foxy/image-pipeline/default.nix +++ b/distros/foxy/image-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-pipeline"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/image_pipeline/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "72b65d8f093f79ce492d5c4daf5df33896eb02622fc7b6066d23d7095ce6332f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/image_pipeline/2.3.0-1"; + sha256 = "sha256-Dc4w2XCoYZxu0K01/MBactRee6X9bhyHjWPDIBd3k/g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/image-proc/default.nix b/distros/foxy/image-proc/default.nix index 64932b9cc0..cddaa83317 100644 --- a/distros/foxy/image-proc/default.nix +++ b/distros/foxy/image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-proc"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/image_proc/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "b0a7bb6fcd7df36b913421c5c6a13a4b9ed803af011bbcea75181b61fd79e705"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/image_proc/2.3.0-1"; + sha256 = "sha256-KuAHdaG8nzXAI5tD0i2NA/ENTf4jE6Cjz1mxFlcrF08="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/image-publisher/default.nix b/distros/foxy/image-publisher/default.nix index 4a281e5fac..e6397bd95e 100644 --- a/distros/foxy/image-publisher/default.nix +++ b/distros/foxy/image-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-publisher"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/image_publisher/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "e1d3dd1b5a9baa89d37fbe4abf91cb6d01ec1d76be25adbeb71970b1c156d81e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/image_publisher/2.3.0-1"; + sha256 = "sha256-1ufwWXuE3vDpriJophyDEWFpRlPw38ULIcw+gHm3FYc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/image-rotate/default.nix b/distros/foxy/image-rotate/default.nix index 9cfcef92c5..e1b705688f 100644 --- a/distros/foxy/image-rotate/default.nix +++ b/distros/foxy/image-rotate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-rotate"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/image_rotate/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "820b7792e1659c53e9f079848f8bd3009701796419e4aeffe3fc792a0797737c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/image_rotate/2.3.0-1"; + sha256 = "sha256-2lzESCYFdryaO+RGM8QFs/yKaDvr1AVfLqSJZ+8Pe4c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto class-loader ]; diff --git a/distros/foxy/image-tools/default.nix b/distros/foxy/image-tools/default.nix index 097c9473d8..f0f0e9edeb 100644 --- a/distros/foxy/image-tools/default.nix +++ b/distros/foxy/image-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-tools"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/image_tools/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "fec375d02308d9ee1ae15cf7a4389b8959df276217fb7edd56f026b3ee7308b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/image_tools/0.9.4-1"; + sha256 = "sha256-+Mpxve/ub1LVWJjLG5jceEKOyfprKpXQB45akDY/31s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/image-transport-plugins/default.nix b/distros/foxy/image-transport-plugins/default.nix index a165cafaab..2c8acbb412 100644 --- a/distros/foxy/image-transport-plugins/default.nix +++ b/distros/foxy/image-transport-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-transport-plugins"; version = "2.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/foxy/image_transport_plugins/2.3.3-1.tar.gz"; - name = "2.3.3-1.tar.gz"; - sha256 = "7b19313282785c7640029f68db7a3c4cfab2f46ce2781574fa64451ffac8ee4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/foxy/image_transport_plugins/2.3.3-1"; + sha256 = "sha256-Esd/BRDYc11jq/jXjx1GUruC29Yzs4KBKsDVV6fd2Dk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/image-transport/default.nix b/distros/foxy/image-transport/default.nix index 4b074eb014..db20696dfd 100644 --- a/distros/foxy/image-transport/default.nix +++ b/distros/foxy/image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-transport"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/foxy/image_transport/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "64ad0f4165a117b50536b0545615472a3dc38938110222f11d992530e90c0454"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/foxy/image_transport/2.4.0-1"; + sha256 = "sha256-LbXT5Bskfu+kZ5Rf3CA8/CubwG/IOPs6YQqM+2qSwlM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/image-view/default.nix b/distros/foxy/image-view/default.nix index 6ae9606d08..7f053e1ae2 100644 --- a/distros/foxy/image-view/default.nix +++ b/distros/foxy/image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-image-view"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/image_view/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "d8ff3584c4d32cea8ddb85b94059e9621c95b3cd0e248d269742760997f11e17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/image_view/2.3.0-1"; + sha256 = "sha256-9LEPzPCbeNNNkVu0//o2IFOQKKyAPbsCvr82c6o1LgE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/imu-complementary-filter/default.nix b/distros/foxy/imu-complementary-filter/default.nix index d513bcf20e..e422dd48ef 100644 --- a/distros/foxy/imu-complementary-filter/default.nix +++ b/distros/foxy/imu-complementary-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-imu-complementary-filter"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/foxy/imu_complementary_filter/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "59f4c53358e5bed435241d6b96098bfdc6f9e7eb7b7d417e8dcd3d977502aceb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/foxy/imu_complementary_filter/2.0.3-1"; + sha256 = "sha256-1u4cc/2DqGnlEleAltO4KeLEY3vykH4jdFTFqKny0YI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake geometry-msgs message-filters rclcpp sensor-msgs std-msgs tf2 tf2-ros ]; diff --git a/distros/foxy/imu-filter-madgwick/default.nix b/distros/foxy/imu-filter-madgwick/default.nix index 8042baaae4..440dedd318 100644 --- a/distros/foxy/imu-filter-madgwick/default.nix +++ b/distros/foxy/imu-filter-madgwick/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-imu-filter-madgwick"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/foxy/imu_filter_madgwick/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "ecd44aacd384ec18eb9da3f7ae576fc1632331a279bcacb61cb69172534ed363"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/foxy/imu_filter_madgwick/2.0.3-1"; + sha256 = "sha256-aaLrz8xqFlebBD49O1mm/KPegN86bxS+vqG2RG3xFKY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/imu-sensor-broadcaster/default.nix b/distros/foxy/imu-sensor-broadcaster/default.nix index e5dc4d3ecc..3675eca404 100644 --- a/distros/foxy/imu-sensor-broadcaster/default.nix +++ b/distros/foxy/imu-sensor-broadcaster/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-imu-sensor-broadcaster"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/imu_sensor_broadcaster/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "0211069ba6285d48660324f5d51a9167f37b3d769b9b3cde6e4f2ef0d23bbf60"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/imu_sensor_broadcaster/0.8.2-1"; + sha256 = "sha256-NlwRYrabjKT7kVhZttCAW0l6WfBP4L/xWiNa16MXqwo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/imu-tools/default.nix b/distros/foxy/imu-tools/default.nix index 209eb6ab3b..d92c57b86e 100644 --- a/distros/foxy/imu-tools/default.nix +++ b/distros/foxy/imu-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-imu-tools"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/foxy/imu_tools/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "711d04a76ab71d447824b520da25b6a02255348abe179a71720ac27fd77654e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/foxy/imu_tools/2.0.3-1"; + sha256 = "sha256-gGHAWxN+eKDeebQakfbV1zdJ4s07qe4CwAYY1sZiqUg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/interactive-marker-twist-server/default.nix b/distros/foxy/interactive-marker-twist-server/default.nix index b42a167f37..72d9c7d771 100644 --- a/distros/foxy/interactive-marker-twist-server/default.nix +++ b/distros/foxy/interactive-marker-twist-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-interactive-marker-twist-server"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/interactive_marker_twist_server-release/archive/release/foxy/interactive_marker_twist_server/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "e0958a2f57438f75d0a35eb85f910ed51fb617129b5d922b33196d0ff8eec78a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "interactive_marker_twist_server-release"; + rev = "release/foxy/interactive_marker_twist_server/2.0.0-2"; + sha256 = "sha256-rxLa/Tx6cz4cVvZagmSZOnYQU3sTVFLcdLh5ZnEmxRw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/interactive-markers/default.nix b/distros/foxy/interactive-markers/default.nix index d6b4057e57..b4de9fe851 100644 --- a/distros/foxy/interactive-markers/default.nix +++ b/distros/foxy/interactive-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-interactive-markers"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/interactive_markers-release/archive/release/foxy/interactive_markers/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "c02fd70c1e236a319bd846e8d73b16aafd967a998caf0c25981571abfcbb96eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "interactive_markers-release"; + rev = "release/foxy/interactive_markers/2.1.3-1"; + sha256 = "sha256-nL2sGALBXYM5P4WN1xhn6vjVsXJAsi5B7MC4jR/u9kc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/foxy/intra-process-demo/default.nix b/distros/foxy/intra-process-demo/default.nix index 080af6c2d4..c9a6a954c7 100644 --- a/distros/foxy/intra-process-demo/default.nix +++ b/distros/foxy/intra-process-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-intra-process-demo"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/intra_process_demo/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "2e58b507a97b578570ea24fed0698f547f0dc40e9e30864cf8f667da2e32c58c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/intra_process_demo/0.9.4-1"; + sha256 = "sha256-2SNA+8LB2+oXXOhXRKBuDwDBxo2r4/Cfpxuj/ZzDugw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake std-msgs ]; diff --git a/distros/foxy/io-context/default.nix b/distros/foxy/io-context/default.nix index 5e24a2611a..d64d33b7e8 100644 --- a/distros/foxy/io-context/default.nix +++ b/distros/foxy/io-context/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-io-context"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/transport_drivers-release/archive/release/foxy/io_context/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "6319763aa21c765ae1f070032c86a7d267dc1cffd66b4d72dcd1bb8a537b42ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "transport_drivers-release"; + rev = "release/foxy/io_context/1.0.0-1"; + sha256 = "sha256-g8MY8P9EC/btn5qbgIIezBjs8wo/WGUTylx4DMFt6Pc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/foxy/jackal-control/default.nix b/distros/foxy/jackal-control/default.nix index 7f6f888391..f595f72cae 100644 --- a/distros/foxy/jackal-control/default.nix +++ b/distros/foxy/jackal-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-jackal-control"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/foxy/jackal_control/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "97eeb525177c0695441b562ef3773e83b019d1aeecd91d91030444490616f646"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/foxy/jackal_control/1.0.1-1"; + sha256 = "sha256-ZiZ+RTF9R9ClJmJO66cLoJJcEq420mfw91+YhkMj4Ik="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/jackal-description/default.nix b/distros/foxy/jackal-description/default.nix index 0ecb067ac8..75fb40c25c 100644 --- a/distros/foxy/jackal-description/default.nix +++ b/distros/foxy/jackal-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-jackal-description"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/foxy/jackal_description/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "800ded481161714cba87cb0c7b95275647c314743db4ce9bca6670bd600cf2de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/foxy/jackal_description/1.0.1-1"; + sha256 = "sha256-rdzox8uj5f2CyrhFhZ0mDff8m+EzGYz6D25di0M/bEE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/jackal-gazebo/default.nix b/distros/foxy/jackal-gazebo/default.nix index 642f39ec65..d190ed676b 100644 --- a/distros/foxy/jackal-gazebo/default.nix +++ b/distros/foxy/jackal-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-jackal-gazebo"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_simulator-release/archive/release/foxy/jackal_gazebo/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "8f0be6d00d40427a8c25228aa86c5f557cec01bd1928efe37c25eaf884a3eeca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_simulator-release"; + rev = "release/foxy/jackal_gazebo/1.0.0-1"; + sha256 = "sha256-6t0sjVrpho2nHGtehW1JRpDi4ZWxlOLiIeOPwdT1DQ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/jackal-msgs/default.nix b/distros/foxy/jackal-msgs/default.nix index acd19e3d49..a168884956 100644 --- a/distros/foxy/jackal-msgs/default.nix +++ b/distros/foxy/jackal-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-jackal-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/foxy/jackal_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "ea4f510daae2761aa419fb8742dda67946f52dc87b02cda9d7048a1691144d18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/foxy/jackal_msgs/1.0.1-1"; + sha256 = "sha256-hggIjZMIOSKxdWiAWB4npRNxurXTRH3q+1RNy4uQ5Dk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/jackal-navigation/default.nix b/distros/foxy/jackal-navigation/default.nix index 26f79cfdaa..eeb3e75194 100644 --- a/distros/foxy/jackal-navigation/default.nix +++ b/distros/foxy/jackal-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-jackal-navigation"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/foxy/jackal_navigation/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "a7dfe807131fa2ea3129b75ead05e14a1071eede76b1a38280097f96c364f792"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/foxy/jackal_navigation/1.0.1-1"; + sha256 = "sha256-hHCcZHx5ubqlcq59UMKmbtdT50A21mfkJsWYZtH6eTA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/jackal-simulator/default.nix b/distros/foxy/jackal-simulator/default.nix index 4c8453625d..a59c11d8a4 100644 --- a/distros/foxy/jackal-simulator/default.nix +++ b/distros/foxy/jackal-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-jackal-simulator"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_simulator-release/archive/release/foxy/jackal_simulator/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "074e231e065beef98b81426ff2a81a1fea0ba2b152f942e373728a1106774f8f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_simulator-release"; + rev = "release/foxy/jackal_simulator/1.0.0-1"; + sha256 = "sha256-oW5TVuisSMuRdOkQaEgh2BpcKUB8Yei6qqa3VQlJuEU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/joint-state-broadcaster/default.nix b/distros/foxy/joint-state-broadcaster/default.nix index 17c7b241a4..dd0616a629 100644 --- a/distros/foxy/joint-state-broadcaster/default.nix +++ b/distros/foxy/joint-state-broadcaster/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-joint-state-broadcaster"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/joint_state_broadcaster/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "7a5507649dae8d1efcc89dc91635f570a3372cc0fef0027034d629a0efd8ef7e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/joint_state_broadcaster/0.8.2-1"; + sha256 = "sha256-q/yXtIHC+FkdVhlbEm9ThVHI8L9yuwhVBVuFlJmNoa4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/joint-state-controller/default.nix b/distros/foxy/joint-state-controller/default.nix index 7def32fb10..13bd299822 100644 --- a/distros/foxy/joint-state-controller/default.nix +++ b/distros/foxy/joint-state-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-joint-state-controller"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/joint_state_controller/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "b3c9c06ee9fc16e1f0d9dac387af2cac7fcf5f0e0f2f2357c5e9eba9d71cda0d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/joint_state_controller/0.8.2-1"; + sha256 = "sha256-i90dUpYaHBwrHRfsqf0IMnXHccyRC1RCQaR55/KAqDA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; diff --git a/distros/foxy/joint-state-publisher-gui/default.nix b/distros/foxy/joint-state-publisher-gui/default.nix index a7424a6630..30641ee2fe 100644 --- a/distros/foxy/joint-state-publisher-gui/default.nix +++ b/distros/foxy/joint-state-publisher-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-joint-state-publisher-gui"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joint_state_publisher-release/archive/release/foxy/joint_state_publisher_gui/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "59eb7392cf4604b0c3fcbe680ebbe42dd0b77d8a6ecdae83c721227880c6d040"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/foxy/joint_state_publisher_gui/2.2.0-1"; + sha256 = "sha256-W84l+lUNxOu7eBudWo5WPyXP4jAsdvyzkj/dsUKb63M="; + }; buildType = "ament_python"; propagatedBuildInputs = [ joint-state-publisher python-qt-binding rclpy ]; diff --git a/distros/foxy/joint-state-publisher/default.nix b/distros/foxy/joint-state-publisher/default.nix index abaac5109c..dadad649be 100644 --- a/distros/foxy/joint-state-publisher/default.nix +++ b/distros/foxy/joint-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-joint-state-publisher"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joint_state_publisher-release/archive/release/foxy/joint_state_publisher/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "bdc713f1db4c244dd98fcf1401f09c0a63d478f60ac1f1338ec03fafd5825ddd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/foxy/joint_state_publisher/2.2.0-1"; + sha256 = "sha256-9T/bX7rzYwP/oXz0tsPYAqQG8350HL0xyeMG/cs2fCE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-xmllint launch-testing launch-testing-ros pythonPackages.pytest ]; diff --git a/distros/foxy/joint-trajectory-controller/default.nix b/distros/foxy/joint-trajectory-controller/default.nix index b7d4af12ae..296a04fa34 100644 --- a/distros/foxy/joint-trajectory-controller/default.nix +++ b/distros/foxy/joint-trajectory-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-joint-trajectory-controller"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/joint_trajectory_controller/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "e3238b3da258484d667f7709666c94e975b2d890b6a03aa219ed186a10d77f9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/joint_trajectory_controller/0.8.2-1"; + sha256 = "sha256-GL9oT45ZMXNXC1jx55drYbJAJCLTdvkfxILkERRgaso="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/joy-linux/default.nix b/distros/foxy/joy-linux/default.nix index ae2db8b63a..e4b535989a 100644 --- a/distros/foxy/joy-linux/default.nix +++ b/distros/foxy/joy-linux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-joy-linux"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/foxy/joy_linux/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "95d97d9bfd85e6a8455bc36ca5d9a01aaab46ec8422e0abd0ead7f56b0b8cf4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/foxy/joy_linux/3.0.1-1"; + sha256 = "sha256-YlxOcZHQQLAdW445gBw6Vd10DRMHumRdZuFrqnSHfxU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/joy-teleop/default.nix b/distros/foxy/joy-teleop/default.nix index 46d0fe9fea..03ccce17c7 100644 --- a/distros/foxy/joy-teleop/default.nix +++ b/distros/foxy/joy-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-joy-teleop"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/foxy/joy_teleop/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "08b854eb78d0aee1f7c66c7418972db13e82ab7972355f4b55bd3be2bb12c128"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/foxy/joy_teleop/1.3.0-1"; + sha256 = "sha256-pOO81abXuYpWTZZ3XcPdFNVRBA04FYijCK3alScPZJ8="; + }; buildType = "ament_python"; checkInputs = [ action-tutorials-interfaces ament-copyright ament-flake8 ament-pep257 ament-xmllint example-interfaces geometry-msgs launch-ros launch-testing std-msgs std-srvs test-msgs ]; diff --git a/distros/foxy/joy-tester/default.nix b/distros/foxy/joy-tester/default.nix new file mode 100644 index 0000000000..43bef6fd03 --- /dev/null +++ b/distros/foxy/joy-tester/default.nix @@ -0,0 +1,28 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, python3Packages, pythonPackages, rclpy, sensor-msgs }: +buildRosPackage { + pname = "ros-foxy-joy-tester"; + version = "0.0.2-r2"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joy_tester-release"; + rev = "release/foxy/joy_tester/0.0.2-2"; + sha256 = "sha256-4aFhMjPuS3BCh6fHb0WNYkfy1WWLeNrxlXiK8vs/zGI="; + }; + + buildType = "ament_python"; + checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; + propagatedBuildInputs = [ python3Packages.tkinter rclpy sensor-msgs ]; + + meta = { + description = ''Simple GUI tool for testing joysticks/gamepads''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/foxy/joy/default.nix b/distros/foxy/joy/default.nix index b943716e12..1de2d8cfc2 100644 --- a/distros/foxy/joy/default.nix +++ b/distros/foxy/joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-joy"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/foxy/joy/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "8496b5e9a6373eb59e76102eef65d03ba758778f6f60ddde2fe10276fb12f901"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/foxy/joy/3.0.1-1"; + sha256 = "sha256-sauiwjGIBtXXEYc5gfyDZvhmNiep/5cLrXztXk65aDM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/kartech-linear-actuator-msgs/default.nix b/distros/foxy/kartech-linear-actuator-msgs/default.nix index 3f0f627ef8..12cafff7b7 100644 --- a/distros/foxy/kartech-linear-actuator-msgs/default.nix +++ b/distros/foxy/kartech-linear-actuator-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-kartech-linear-actuator-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/kartech_linear_actuator_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "9468c167457b815de99636cab4fc1c1d82a8c20954563604458b48bec42f6901"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/kartech_linear_actuator_msgs/3.1.0-1"; + sha256 = "sha256-qcWXse4zcpCNZzdVcuzHhdmteeLzg7h47JI6ypHf4YY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/kdl-parser/default.nix b/distros/foxy/kdl-parser/default.nix index 1aaec48415..d48da282eb 100644 --- a/distros/foxy/kdl-parser/default.nix +++ b/distros/foxy/kdl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-kdl-parser"; version = "2.4.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kdl_parser-release/archive/release/foxy/kdl_parser/2.4.1-2.tar.gz"; - name = "2.4.1-2.tar.gz"; - sha256 = "0b71cd7f018ca1ff7a088d37b83ce476d87d7c17001edc8bcde023817c1fadd4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kdl_parser-release"; + rev = "release/foxy/kdl_parser/2.4.1-2"; + sha256 = "sha256-G6nRlRfc/MemKQvc0mMCETGxSSL6OO5P7QEFYb9MxXE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/key-teleop/default.nix b/distros/foxy/key-teleop/default.nix index ddcdd1d6d1..16ee6e76dd 100644 --- a/distros/foxy/key-teleop/default.nix +++ b/distros/foxy/key-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-key-teleop"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/foxy/key_teleop/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "b4ac6357b734c50c591b8b5a9b783b26c29f82e7a1d1cb01dc60ccfff1e07130"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/foxy/key_teleop/1.3.0-1"; + sha256 = "sha256-87yL4CShLr4rcnlMktKgwgbI5fQEz2pKnQ2f50LTssY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/kobuki-core/default.nix b/distros/foxy/kobuki-core/default.nix index 68921cca6a..adbe4dcd2a 100644 --- a/distros/foxy/kobuki-core/default.nix +++ b/distros/foxy/kobuki-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-kobuki-core"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kobuki_core-release/archive/release/foxy/kobuki_core/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "4acc5dbc738b1b33d6621f4a2154cf0393b03888ac24fa3cc6f7d301103caa67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kobuki_core-release"; + rev = "release/foxy/kobuki_core/1.4.0-1"; + sha256 = "sha256-Bq/+5lnLAiJ2HQtIr0h6wB08J7OxRxT4YhcLHIrCUwI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/kobuki-firmware/default.nix b/distros/foxy/kobuki-firmware/default.nix index 23a2fda317..50266c8fb5 100644 --- a/distros/foxy/kobuki-firmware/default.nix +++ b/distros/foxy/kobuki-firmware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-kobuki-firmware"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/stonier/kobuki_firmware-release/archive/release/foxy/kobuki_firmware/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "7b0b378354b311045a6970f362e6bd0f6d9e58bc58343573bd732845b6297ebd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "kobuki_firmware-release"; + rev = "release/foxy/kobuki_firmware/1.2.0-1"; + sha256 = "sha256-bieNP7SYmjrth3ney7LQlvhZ6M4DEkOpP5L8VXtpI3U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/kobuki-ftdi/default.nix b/distros/foxy/kobuki-ftdi/default.nix index 29a8dbbb1f..0d67534164 100644 --- a/distros/foxy/kobuki-ftdi/default.nix +++ b/distros/foxy/kobuki-ftdi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-kobuki-ftdi"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/stonier/kobuki_ftdi-release/archive/release/foxy/kobuki_ftdi/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "cda5ab2f72ec067de9755cea8f98e7c596690c3ddb65eb4e9a3d3a472df34cfa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "kobuki_ftdi-release"; + rev = "release/foxy/kobuki_ftdi/1.0.0-1"; + sha256 = "sha256-xtx3VhcIxSg/UoHQ64Hfo8Z0D8zZwiB0xWd2zsrG178="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build pkg-config ]; diff --git a/distros/foxy/kobuki-ros-interfaces/default.nix b/distros/foxy/kobuki-ros-interfaces/default.nix index 1cb5f6682d..e37b87674e 100644 --- a/distros/foxy/kobuki-ros-interfaces/default.nix +++ b/distros/foxy/kobuki-ros-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-kobuki-ros-interfaces"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kobuki_ros_interfaces-release/archive/release/foxy/kobuki_ros_interfaces/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "c0c035ecf8d7b83316adb3ff3f4e49499d7fa1985a9ef75bdcb7e9645acd0e0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kobuki_ros_interfaces-release"; + rev = "release/foxy/kobuki_ros_interfaces/1.0.0-1"; + sha256 = "sha256-svbQG6e1o4u1HncdcNcx55XoYK99I02G7CxL2jvBZhs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/kobuki-velocity-smoother/default.nix b/distros/foxy/kobuki-velocity-smoother/default.nix index 186d3f88e6..66e5b003d4 100644 --- a/distros/foxy/kobuki-velocity-smoother/default.nix +++ b/distros/foxy/kobuki-velocity-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-kobuki-velocity-smoother"; version = "0.15.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kobuki_velocity_smoother-release/archive/release/foxy/kobuki_velocity_smoother/0.15.0-1.tar.gz"; - name = "0.15.0-1.tar.gz"; - sha256 = "51b5dfc94639fa5c5cc3ee0610db548eed51a3f0bb2f20e184052612f8cf2a76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kobuki_velocity_smoother-release"; + rev = "release/foxy/kobuki_velocity_smoother/0.15.0-1"; + sha256 = "sha256-kZmyem+NJit8xtwuRz5Zx8AkdojVm7/pxgSOR63CkcM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/foxy/lanelet2-core/default.nix b/distros/foxy/lanelet2-core/default.nix index 7bbce7502b..325cf15195 100644 --- a/distros/foxy/lanelet2-core/default.nix +++ b/distros/foxy/lanelet2-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-core"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_core/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "3bcea4bd78d7a3e84ffba38bda55c89b895dcae6c39e5f7d3c9dd2f9fdbcd982"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_core/1.1.1-1"; + sha256 = "sha256-NpBQJ/brNiWnlLzVj16s4Xq257hkZ+PCNAudtWfEkks="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2-examples/default.nix b/distros/foxy/lanelet2-examples/default.nix index 913634410f..4be52560e1 100644 --- a/distros/foxy/lanelet2-examples/default.nix +++ b/distros/foxy/lanelet2-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-examples"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_examples/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "df5c02978f9781b5385519cc6511e3fa6648c604b8a21c0cbe183d9e81997f55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_examples/1.1.1-1"; + sha256 = "sha256-r9Uj64Lgu/hODrKwkACMfUdwdOk9wBWovMNWD5KjTvM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2-io/default.nix b/distros/foxy/lanelet2-io/default.nix index ae39a0cea1..416a4f6fcf 100644 --- a/distros/foxy/lanelet2-io/default.nix +++ b/distros/foxy/lanelet2-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-io"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_io/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "408c1360908af9c0bd336550027a95b811f73fca34bf94f125bba5b89163b7c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_io/1.1.1-1"; + sha256 = "sha256-mW8p1j9qBuv8wPpmUu1kWNNJb7+pngf70mRvO8NciSc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2-maps/default.nix b/distros/foxy/lanelet2-maps/default.nix index 8d60430551..97dd1cfd76 100644 --- a/distros/foxy/lanelet2-maps/default.nix +++ b/distros/foxy/lanelet2-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-maps"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_maps/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "726c2de104e44915a022a29d52f7154effaed83958d5319df5418947ac08ed8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_maps/1.1.1-1"; + sha256 = "sha256-iDbAH06Tpfjgf4La3huKzwojpdvk7EPzGsU65+td7z8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2-projection/default.nix b/distros/foxy/lanelet2-projection/default.nix index fdb10b71d1..9b58ee612f 100644 --- a/distros/foxy/lanelet2-projection/default.nix +++ b/distros/foxy/lanelet2-projection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-projection"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_projection/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "7bc0f53273a52f01cd7939b11f8d7bb8537eeee16e5dc77079e33c62731f01bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_projection/1.1.1-1"; + sha256 = "sha256-g7mKXEdhoZS5qv8iio+6QG27tM/nleTmGWeaw66I+bU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2-python/default.nix b/distros/foxy/lanelet2-python/default.nix index f975c895ae..eb4aed4257 100644 --- a/distros/foxy/lanelet2-python/default.nix +++ b/distros/foxy/lanelet2-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-python"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_python/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "5237dcf5ed1f713d7b649a7cfccfe9ce7354f36fa8d8766c8db5b4727ecbe398"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_python/1.1.1-1"; + sha256 = "sha256-SfwKuO3PAhugfhidN7+7VHGaegF4UPhoRdhpJ3xjBIo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2-routing/default.nix b/distros/foxy/lanelet2-routing/default.nix index 1dd46b24cb..0e10dc693a 100644 --- a/distros/foxy/lanelet2-routing/default.nix +++ b/distros/foxy/lanelet2-routing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-routing"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_routing/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "bd6f9c0bb160e9ba0e1ae3672a072f1e2743a8e02d1b9e2e49a8dbbc723c3864"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_routing/1.1.1-1"; + sha256 = "sha256-bcQwF0woqvqfOeIO7haHyco3dmf6CNAotcyEVFPHkGk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2-traffic-rules/default.nix b/distros/foxy/lanelet2-traffic-rules/default.nix index 66d3158b06..449c36c381 100644 --- a/distros/foxy/lanelet2-traffic-rules/default.nix +++ b/distros/foxy/lanelet2-traffic-rules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-traffic-rules"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_traffic_rules/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "140a75c2da25cf7db53ecf533816122ced186ded6c08539e696a6b87e854aa64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_traffic_rules/1.1.1-1"; + sha256 = "sha256-f8lvg45yjWovjMCmp3Pdmr6KFejBnczY67qkvP5uFWw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2-validation/default.nix b/distros/foxy/lanelet2-validation/default.nix index 751af8c497..d655f5c24a 100644 --- a/distros/foxy/lanelet2-validation/default.nix +++ b/distros/foxy/lanelet2-validation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2-validation"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2_validation/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "4b59065a9f6fc4d9ad374a37757e8260620ceacf230bef0526df715ca03c8838"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2_validation/1.1.1-1"; + sha256 = "sha256-BjMp2DLjsi33ViCZSemJ1kXsu/o4W8xgoAIgna6cX5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/lanelet2/default.nix b/distros/foxy/lanelet2/default.nix index 64ddf292b4..eec9fe4883 100644 --- a/distros/foxy/lanelet2/default.nix +++ b/distros/foxy/lanelet2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lanelet2"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/foxy/lanelet2/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "807cf757bea51d3ef5fdc224ee075ab75c49acc6d5e27bdaf62d10e748b881ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/foxy/lanelet2/1.1.1-1"; + sha256 = "sha256-xW2nmdxh/bfs+AVc/+WN+rgfRzsuy9u8TH7w21x7g90="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ros-environment ]; diff --git a/distros/foxy/laser-geometry/default.nix b/distros/foxy/laser-geometry/default.nix index 98f0ede475..d1528ca865 100644 --- a/distros/foxy/laser-geometry/default.nix +++ b/distros/foxy/laser-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-laser-geometry"; version = "2.2.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/laser_geometry-release/archive/release/foxy/laser_geometry/2.2.0-3.tar.gz"; - name = "2.2.0-3.tar.gz"; - sha256 = "dbf17d584a0d8acc164779911a245c48e7157387b0c2f6f12a90f0512a3e0ecb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "laser_geometry-release"; + rev = "release/foxy/laser_geometry/2.2.0-3"; + sha256 = "sha256-jxdiRQwXxppakEcBzS3q3txXMjABld4D6ssE6G3/uQ0="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-cppcheck ament-cmake-cpplint ament-cmake-gmock ament-cmake-gtest ament-cmake-lint-cmake ament-cmake-uncrustify ]; diff --git a/distros/foxy/laser-proc/default.nix b/distros/foxy/laser-proc/default.nix index 1724fff493..8d2b199c0d 100644 --- a/distros/foxy/laser-proc/default.nix +++ b/distros/foxy/laser-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-laser-proc"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/laser_proc-release/archive/release/foxy/laser_proc/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "03c68a7d9b9cef1c049da4b6314cd86514f4f571e3ca02f004aaf92eb97514d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "laser_proc-release"; + rev = "release/foxy/laser_proc/1.0.2-1"; + sha256 = "sha256-h2lPjaJimCF/20eVEH3+ZS7CDqoML9voXq2B0x32NSY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/launch-pal/default.nix b/distros/foxy/launch-pal/default.nix index a417dc0bb1..136a4f0e11 100644 --- a/distros/foxy/launch-pal/default.nix +++ b/distros/foxy/launch-pal/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-pal"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/launch_pal-release/archive/release/foxy/launch_pal/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "425e307d49e8f8b032337755dcf081970bc2172884dd811adea7f76f0d0cd594"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "launch_pal-release"; + rev = "release/foxy/launch_pal/0.0.5-1"; + sha256 = "sha256-RprUKQSvMyiR7XK61Ni6pvbgqOxri91+KK7wVg2GDUY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/launch-param-builder/default.nix b/distros/foxy/launch-param-builder/default.nix index 31800cfe54..d01eb91306 100644 --- a/distros/foxy/launch-param-builder/default.nix +++ b/distros/foxy/launch-param-builder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-param-builder"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/launch_param_builder-release/archive/release/foxy/launch_param_builder/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "8c427e92d6cd8ff40edfa0d78462b0f8f84ac1068309fc1c82d59a4fe3cb4075"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "launch_param_builder-release"; + rev = "release/foxy/launch_param_builder/0.1.1-1"; + sha256 = "sha256-5wzPO7Vg6sA7heEmRxiLcDbilS5YyieLi8fBrtcJe/g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright pythonPackages.pytest ]; diff --git a/distros/foxy/launch-ros/default.nix b/distros/foxy/launch-ros/default.nix index 0acf7b4958..984d1fa84d 100644 --- a/distros/foxy/launch-ros/default.nix +++ b/distros/foxy/launch-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-ros"; version = "0.11.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/foxy/launch_ros/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "0e975c2ab68d4e6a7871120e27f757f27869c3f034c7e62b2cec6b79a52b459c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/foxy/launch_ros/0.11.7-1"; + sha256 = "sha256-9wtX7FSoXNx6kp9l/3ozs2kjnCrStIl1H+/aNTK88o8="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/launch-system-modes/default.nix b/distros/foxy/launch-system-modes/default.nix index 6bd22509ec..5b6845351b 100644 --- a/distros/foxy/launch-system-modes/default.nix +++ b/distros/foxy/launch-system-modes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-system-modes"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/microROS/system_modes-release/archive/release/foxy/launch_system_modes/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "c85d6dcc92090c918b9d4f3858bfb1c31a3269e584e30f59106808812085d5b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "microROS"; + repo = "system_modes-release"; + rev = "release/foxy/launch_system_modes/0.9.0-1"; + sha256 = "sha256-igv7EQutLOf+qcExGB554hDDTuFxB1P9COvQUY2izGA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/launch-testing-ament-cmake/default.nix b/distros/foxy/launch-testing-ament-cmake/default.nix index 07f4bbbcda..a6dba3a61f 100644 --- a/distros/foxy/launch-testing-ament-cmake/default.nix +++ b/distros/foxy/launch-testing-ament-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-testing-ament-cmake"; version = "0.10.10-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/foxy/launch_testing_ament_cmake/0.10.10-1.tar.gz"; - name = "0.10.10-1.tar.gz"; - sha256 = "ed220790960da2c0a0ed99cb939575736d25b1f4a8928df9c8107e9b28a53a06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/foxy/launch_testing_ament_cmake/0.10.10-1"; + sha256 = "sha256-+s6Gnh8arqe3WPQVyD+fqb1kjVEJZpGI/OZqU364naA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/launch-testing-ros/default.nix b/distros/foxy/launch-testing-ros/default.nix index 16d3ac3b31..e99f34c57b 100644 --- a/distros/foxy/launch-testing-ros/default.nix +++ b/distros/foxy/launch-testing-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-testing-ros"; version = "0.11.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/foxy/launch_testing_ros/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "57ffccbec642395bb40ea858cb18cb6c057ff59b521c6a152f17e2b09ba00ab0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/foxy/launch_testing_ros/0.11.7-1"; + sha256 = "sha256-AkehTKYcIxJPwJIengOVqKYtSqGpsR2zHuDREHF+Ma0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest std-msgs ]; diff --git a/distros/foxy/launch-testing/default.nix b/distros/foxy/launch-testing/default.nix index 764ade6571..39acb49747 100644 --- a/distros/foxy/launch-testing/default.nix +++ b/distros/foxy/launch-testing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-testing"; version = "0.10.10-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/foxy/launch_testing/0.10.10-1.tar.gz"; - name = "0.10.10-1.tar.gz"; - sha256 = "5596b2338ed124349d44eed27502201a21d8cc172f0d87bf15cf1861aac126e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/foxy/launch_testing/0.10.10-1"; + sha256 = "sha256-l3hct/4m/isxRERF9TmglhE7/mDnLTZ7bJ0RfOgeqb4="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch python3Packages.mock pythonPackages.pytest ]; diff --git a/distros/foxy/launch-xml/default.nix b/distros/foxy/launch-xml/default.nix index fcf0deba9d..d5fc4d4510 100644 --- a/distros/foxy/launch-xml/default.nix +++ b/distros/foxy/launch-xml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-xml"; version = "0.10.10-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/foxy/launch_xml/0.10.10-1.tar.gz"; - name = "0.10.10-1.tar.gz"; - sha256 = "21c6854c6ac810f803ed0917fc4a7fd8032078e08e20cfa239c0a7a7c64588cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/foxy/launch_xml/0.10.10-1"; + sha256 = "sha256-0TonmBh9dYjJE1qm1YJxdDFvDYgPqENqUt+nIS4h+qU="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/launch-yaml/default.nix b/distros/foxy/launch-yaml/default.nix index 2a70178989..eb53c5c093 100644 --- a/distros/foxy/launch-yaml/default.nix +++ b/distros/foxy/launch-yaml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch-yaml"; version = "0.10.10-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/foxy/launch_yaml/0.10.10-1.tar.gz"; - name = "0.10.10-1.tar.gz"; - sha256 = "03ca0e91094d6b38bf08043e53ddffcfc7565f767e24c176dec903afbfcef43e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/foxy/launch_yaml/0.10.10-1"; + sha256 = "sha256-VQbN9iozKGfyXd+QfKnx8D1y+xGrxz2z01C0nnfM7bw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/launch/default.nix b/distros/foxy/launch/default.nix index 8dad98c056..4d1e3554ee 100644 --- a/distros/foxy/launch/default.nix +++ b/distros/foxy/launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-launch"; version = "0.10.10-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/foxy/launch/0.10.10-1.tar.gz"; - name = "0.10.10-1.tar.gz"; - sha256 = "7ee1d3445f18c6ce8b29a9893a5ad147d7004f59bdbb299f7a8f63ed8cab3a59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/foxy/launch/0.10.10-1"; + sha256 = "sha256-EYKQCZQzzmjn8gQeLF7ZmJszLu63Jnao3rELP6m6CZQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/leo-description/default.nix b/distros/foxy/leo-description/default.nix index dd6297264f..05cf547e59 100644 --- a/distros/foxy/leo-description/default.nix +++ b/distros/foxy/leo-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-leo-description"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_common-release/archive/release/foxy/leo_description/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "6da57acb9f9cdcf5e6f3e4ce2cef4cb6959f2dc1d401c6748287bb7ee07b89ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_common-release"; + rev = "release/foxy/leo_description/1.1.0-1"; + sha256 = "sha256-+VNYse18mCzzr+FyLA3pGmXiLpN3DQCp+t7DwaAxkK4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/leo-desktop/default.nix b/distros/foxy/leo-desktop/default.nix index 0ffdf4e44c..57c6810e83 100644 --- a/distros/foxy/leo-desktop/default.nix +++ b/distros/foxy/leo-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-leo-desktop"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_desktop-release/archive/release/foxy/leo_desktop/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "1496c86b10fea2bc29c9100b328e002245457934e130cfa0a753993474f0b41f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_desktop-release"; + rev = "release/foxy/leo_desktop/1.0.0-1"; + sha256 = "sha256-XE6bELUXiwCtDeSj8KOP6NJd/rh3KeIKOQy5uxKJCNs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/leo-msgs/default.nix b/distros/foxy/leo-msgs/default.nix index adc0bdb58f..50b33eebe8 100644 --- a/distros/foxy/leo-msgs/default.nix +++ b/distros/foxy/leo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-leo-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_common-release/archive/release/foxy/leo_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "2ffd7fa4e43e30f0586fa9ae73ea15ef9fbc702b44d15f18b9697e71cd482a93"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_common-release"; + rev = "release/foxy/leo_msgs/1.1.0-1"; + sha256 = "sha256-boOryphikqMMf8uP/1Xmin2asRfNUBPWsu6qmbsoOqQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/leo-teleop/default.nix b/distros/foxy/leo-teleop/default.nix index fe6b177563..a7c74dfa5d 100644 --- a/distros/foxy/leo-teleop/default.nix +++ b/distros/foxy/leo-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-leo-teleop"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_common-release/archive/release/foxy/leo_teleop/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "0e6f486ff13ac9fe45396394fa905a4fbf15c87a6779b09ecfa50a30185ed352"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_common-release"; + rev = "release/foxy/leo_teleop/1.1.0-1"; + sha256 = "sha256-b+43cpCbYIO6jZvix2hLEbOH6RocS5OU2T9INwE/BBk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/leo-viz/default.nix b/distros/foxy/leo-viz/default.nix index dc86eb9edb..f220e2fc77 100644 --- a/distros/foxy/leo-viz/default.nix +++ b/distros/foxy/leo-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-leo-viz"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_desktop-release/archive/release/foxy/leo_viz/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "043b980487e2e2da5b3b3b9e630b9ae36384d6c9a8425202c2d5548cf84ec087"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_desktop-release"; + rev = "release/foxy/leo_viz/1.0.0-1"; + sha256 = "sha256-DYXWnzrgeZXXKfIsG/KHe/8dD6hhcw3Ta79O2gvbsVw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/leo/default.nix b/distros/foxy/leo/default.nix index 231906f500..86499418e5 100644 --- a/distros/foxy/leo/default.nix +++ b/distros/foxy/leo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-leo"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_common-release/archive/release/foxy/leo/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "20b2fdc32188a50de206d308dc75ba2e7b4b352c36ae2c140b82f05dbfaf0617"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_common-release"; + rev = "release/foxy/leo/1.1.0-1"; + sha256 = "sha256-WJCkGR4qkb8TRdBFlNCutulapd/7necmCkVaJlztRuI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/lgsvl-bridge/default.nix b/distros/foxy/lgsvl-bridge/default.nix index d8d67393b0..259a35fdcc 100644 --- a/distros/foxy/lgsvl-bridge/default.nix +++ b/distros/foxy/lgsvl-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lgsvl-bridge"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/lgsvl/ros2-lgsvl-bridge-release/archive/release/foxy/lgsvl_bridge/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "ec0bd4e77269a675434081b4ffcb3f807f2852136fd515672676e134c908d9ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lgsvl"; + repo = "ros2-lgsvl-bridge-release"; + rev = "release/foxy/lgsvl_bridge/0.2.1-1"; + sha256 = "sha256-PHh3ZRhcvdGEnYp6vBdFOgz0g0W49FVAlWOboKtMoC8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/lgsvl-msgs/default.nix b/distros/foxy/lgsvl-msgs/default.nix index 11b030734c..22e013256b 100644 --- a/distros/foxy/lgsvl-msgs/default.nix +++ b/distros/foxy/lgsvl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lgsvl-msgs"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/lgsvl/lgsvl_msgs-release/archive/release/foxy/lgsvl_msgs/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "a23b9f1f20257200a77a0287512c25f8f174d354e938560c8e6415a19e22ec2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lgsvl"; + repo = "lgsvl_msgs-release"; + rev = "release/foxy/lgsvl_msgs/0.0.4-1"; + sha256 = "sha256-Pd5TP0wLuUr0/m+WvLpkvURpB0d0hbik3SOPkifg8YU="; + }; buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/libcurl-vendor/default.nix b/distros/foxy/libcurl-vendor/default.nix index 005223ca3f..962eacf10c 100644 --- a/distros/foxy/libcurl-vendor/default.nix +++ b/distros/foxy/libcurl-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-libcurl-vendor"; version = "2.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/resource_retriever-release/archive/release/foxy/libcurl_vendor/2.3.4-1.tar.gz"; - name = "2.3.4-1.tar.gz"; - sha256 = "ff8636e6fce5807a762436f02ebc04a08784e18645cbdf8da1917438e321345b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "resource_retriever-release"; + rev = "release/foxy/libcurl_vendor/2.3.4-1"; + sha256 = "sha256-/FZnsxsglIPtlbeH3y+sCnx+xd5SqCwbDSkvEy72ir0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/libg2o/default.nix b/distros/foxy/libg2o/default.nix index b6c0b0939a..644d39f425 100644 --- a/distros/foxy/libg2o/default.nix +++ b/distros/foxy/libg2o/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-libg2o"; version = "2020.5.29-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libg2o-release/archive/release/foxy/libg2o/2020.5.29-1.tar.gz"; - name = "2020.5.29-1.tar.gz"; - sha256 = "a7e42da8c6c3cff4fe286b74e86101a27ef037a6cd1f935a6070473213dcb5b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libg2o-release"; + rev = "release/foxy/libg2o/2020.5.29-1"; + sha256 = "sha256-fABwvelYG0x4eq6Hx1wRF9y4AuAqqAMBNM18QId/wkk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/libmavconn/default.nix b/distros/foxy/libmavconn/default.nix index 918dc50779..076a7df375 100644 --- a/distros/foxy/libmavconn/default.nix +++ b/distros/foxy/libmavconn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-libmavconn"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/foxy/libmavconn/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "750b24520cf10f4237e5777c228c9df59f3149d3171621655b949c96782c7c40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/foxy/libmavconn/2.4.0-1"; + sha256 = "sha256-zQQtWJ7KocYWlfkpJ0fdoVomUNd//KTIlPYMu2y/f00="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.empy ]; diff --git a/distros/foxy/libnabo/default.nix b/distros/foxy/libnabo/default.nix index 56b5491029..20bab24459 100644 --- a/distros/foxy/libnabo/default.nix +++ b/distros/foxy/libnabo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-libnabo"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/nobleo/libnabo-release/archive/release/foxy/libnabo/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "4303b216d13fe042f0f9406e639296e699e134a6426afb05a6ab4cdf6f84ba8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "libnabo-release"; + rev = "release/foxy/libnabo/1.0.7-1"; + sha256 = "sha256-Jw5AWmdPvBZQlJgcl9gIvuvYSe/MxzFT8npWLQtu1i4="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/libphidget22/default.nix b/distros/foxy/libphidget22/default.nix index fef9f8fbc9..1a1e028a3c 100644 --- a/distros/foxy/libphidget22/default.nix +++ b/distros/foxy/libphidget22/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-libphidget22"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/libphidget22/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "a592430c589a1ff98b2ec86f8223186cd378a0781892aaf203c6fc9e0b37e581"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/libphidget22/2.1.2-1"; + sha256 = "sha256-O+/IrgXGrzo7tnZ+YeLiisrx0Q9HCQfOeZCymXN0m8s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/libpointmatcher/default.nix b/distros/foxy/libpointmatcher/default.nix index 872ba9b506..e6deb73de5 100644 --- a/distros/foxy/libpointmatcher/default.nix +++ b/distros/foxy/libpointmatcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-libpointmatcher"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/nobleo/libpointmatcher-release/archive/release/foxy/libpointmatcher/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "6ce722319db4c641a59403efa34f3ecb50e88877703659db8e561be52bb3f952"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "libpointmatcher-release"; + rev = "release/foxy/libpointmatcher/1.3.1-1"; + sha256 = "sha256-96czxG0jg3fhdnnpfunDXT5SeulBTS0I2wHxgBhzunA="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/librealsense2/default.nix b/distros/foxy/librealsense2/default.nix index 6830d3ead4..dda3912bbe 100644 --- a/distros/foxy/librealsense2/default.nix +++ b/distros/foxy/librealsense2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-librealsense2"; version = "2.51.1-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/librealsense2-release/archive/release/foxy/librealsense2/2.51.1-1.tar.gz"; - name = "2.51.1-1.tar.gz"; - sha256 = "6c7e79620d096bf900d4d2349ce340e561b117bca764511cba04ae643114c0c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "librealsense2-release"; + rev = "release/foxy/librealsense2/2.51.1-1"; + sha256 = "sha256-3HuLzqQw4ZCyuuU67nQjl2n3QIJK32eFtpOVFBKwRBo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake libusb1 openssl pkg-config udev ]; diff --git a/distros/foxy/libstatistics-collector/default.nix b/distros/foxy/libstatistics-collector/default.nix index 858c0bad2e..069928454d 100644 --- a/distros/foxy/libstatistics-collector/default.nix +++ b/distros/foxy/libstatistics-collector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-libstatistics-collector"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-tooling/libstatistics_collector-release/archive/release/foxy/libstatistics_collector/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "4c2c522acb68d2d0bab19dccbf33d40b878725d32b818911d172b0a9b7500174"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-tooling"; + repo = "libstatistics_collector-release"; + rev = "release/foxy/libstatistics_collector/1.0.1-1"; + sha256 = "sha256-Ot7fBUdW0/aoEDg0TFl8iBrguk31RS1qXCXROGz57Ks="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros rosidl-default-generators ]; diff --git a/distros/foxy/libyaml-vendor/default.nix b/distros/foxy/libyaml-vendor/default.nix index f6243531c3..b7ae67ce1e 100644 --- a/distros/foxy/libyaml-vendor/default.nix +++ b/distros/foxy/libyaml-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-libyaml-vendor"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libyaml_vendor-release/archive/release/foxy/libyaml_vendor/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "d708f94e913702062a24568fa0589bdc36de45fffb7423a7155de544b81066f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libyaml_vendor-release"; + rev = "release/foxy/libyaml_vendor/1.0.4-1"; + sha256 = "sha256-Joc1FjzPFxl6QGbovN/9V1aodctV+TC5TvSN4SYLoo4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/lifecycle-msgs/default.nix b/distros/foxy/lifecycle-msgs/default.nix index ecae214660..eb909434e2 100644 --- a/distros/foxy/lifecycle-msgs/default.nix +++ b/distros/foxy/lifecycle-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lifecycle-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/foxy/lifecycle_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "8e2652305e3379bbf1d57860fdaa674ac6133563b221612c485fd7c5d48145c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/foxy/lifecycle_msgs/1.0.0-1"; + sha256 = "sha256-y8QGXPHOYjucR3tx4kZVwJ3BZK+OST1mE6ZKW/sejKc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/lifecycle/default.nix b/distros/foxy/lifecycle/default.nix index 056706bc56..c3bfc0337b 100644 --- a/distros/foxy/lifecycle/default.nix +++ b/distros/foxy/lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lifecycle"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/lifecycle/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "6f82541ef6be771e6b2bd7bcd950e803b66f5e8dc78a77fff8104516d45b45bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/lifecycle/0.9.4-1"; + sha256 = "sha256-Wv5Ph7Jdc2lv/qSs2JJIejP9sPNRFQHtAQP8SWRvvqw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/logging-demo/default.nix b/distros/foxy/logging-demo/default.nix index 27ca967ef1..be1119b207 100644 --- a/distros/foxy/logging-demo/default.nix +++ b/distros/foxy/logging-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-logging-demo"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/logging_demo/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "3e32f44fab474883a8ce8cc5ec94fb1d68c471119063248a27d110fe147ded0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/logging_demo/0.9.4-1"; + sha256 = "sha256-Oi4GtdVXQdRma6tt0e/vFsuKbc38yqaeF9zT3f+Vq94="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-cmake rosidl-default-generators ]; diff --git a/distros/foxy/lsc-ros2-driver/default.nix b/distros/foxy/lsc-ros2-driver/default.nix index f898804c09..fa3a5f23b5 100644 --- a/distros/foxy/lsc-ros2-driver/default.nix +++ b/distros/foxy/lsc-ros2-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lsc-ros2-driver"; version = "1.0.0-r10"; - src = fetchurl { - url = "https://github.com/AutonicsLiDAR-release/lsc_ros2_driver-release/archive/release/foxy/lsc_ros2_driver/1.0.0-10.tar.gz"; - name = "1.0.0-10.tar.gz"; - sha256 = "886f88cbea772cbf6b794b944b00676d2ef24c0a0e2cf76c022002c9628b9358"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AutonicsLiDAR-release"; + repo = "lsc_ros2_driver-release"; + rev = "release/foxy/lsc_ros2_driver/1.0.0-10"; + sha256 = "sha256-YhMew+QHLeT6uE6uwB1IcCwYfF0l0eFXUw5PDso0JtY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/lua-vendor/default.nix b/distros/foxy/lua-vendor/default.nix index 9c1989af22..1b1810b947 100644 --- a/distros/foxy/lua-vendor/default.nix +++ b/distros/foxy/lua-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lua-vendor"; version = "0.0.1-r2"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/lua_vendor-release/archive/release/foxy/lua_vendor/0.0.1-2.tar.gz"; - name = "0.0.1-2.tar.gz"; - sha256 = "7708341794178f26d71ce7b6605ba4fc8c37ed4199413ebb85754cf5309ddad0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "lua_vendor-release"; + rev = "release/foxy/lua_vendor/0.0.1-2"; + sha256 = "sha256-c1qwqTfSwEHxneEQGoW9jl1aZqUYyl2vHBy7EM0CGNQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/lusb/default.nix b/distros/foxy/lusb/default.nix index 90554aba74..c8bbdd0a67 100644 --- a/distros/foxy/lusb/default.nix +++ b/distros/foxy/lusb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-lusb"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/lusb-release/archive/release/foxy/lusb/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "98b476cc1d755f1dcad7090affaec5cbf5594e917af57c11e1c0796fb6e1d4f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "lusb-release"; + rev = "release/foxy/lusb/2.0.1-1"; + sha256 = "sha256-YBKQ/Or1xZDZ9J/UFs2hk4TFSkAP332CH1FfsuKbcXE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/maliput-dragway/default.nix b/distros/foxy/maliput-dragway/default.nix index bbd2157582..42de74265c 100644 --- a/distros/foxy/maliput-dragway/default.nix +++ b/distros/foxy/maliput-dragway/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-dragway"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_dragway-release/archive/release/foxy/maliput_dragway/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "cc347a1c58da21b7e55b1e9f10b68da0d7bce79628cbb1f8794bde2c0d2076a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_dragway-release"; + rev = "release/foxy/maliput_dragway/0.1.4-1"; + sha256 = "sha256-ge0ey8sqPEQD4jDX+BSlUDK65hZIJNfQ8Q+LApWpyyM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput-drake/default.nix b/distros/foxy/maliput-drake/default.nix index fd51260f9a..d4beaf6801 100644 --- a/distros/foxy/maliput-drake/default.nix +++ b/distros/foxy/maliput-drake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-drake"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_drake-release/archive/release/foxy/maliput_drake/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "62c1eb10211bb8818d8593cbaa3e759763c4d5e52432445b8423f2c2272b1a7c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_drake-release"; + rev = "release/foxy/maliput_drake/0.1.1-1"; + sha256 = "sha256-ojySIFo+gDrJf/40vckXB+9CJyYw8cFXNLmzDIQOEq4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput-full/default.nix b/distros/foxy/maliput-full/default.nix index c066526232..2cb8cfe454 100644 --- a/distros/foxy/maliput-full/default.nix +++ b/distros/foxy/maliput-full/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-full"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_infrastructure-release/archive/release/foxy/maliput_full/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "004c3eed0fc6ca317254087ea8215baacea3843d551e68dd39a23163c38eb2e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_infrastructure-release"; + rev = "release/foxy/maliput_full/0.2.0-1"; + sha256 = "sha256-GRCBZf08T1jOWgni378CM+4bUCLE/Bs0dD1JL31h/70="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput-integration/default.nix b/distros/foxy/maliput-integration/default.nix index a9a12f7f9f..35ca335806 100644 --- a/distros/foxy/maliput-integration/default.nix +++ b/distros/foxy/maliput-integration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-integration"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_integration-release/archive/release/foxy/maliput_integration/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "c5bc9aab2aaa380b1002189e22b2890a15a9ea06116fbf0ef7b40cbcc59086c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_integration-release"; + rev = "release/foxy/maliput_integration/0.1.4-1"; + sha256 = "sha256-1FWPk+oZ0Xl3Tuc9dTlEpRhBeevXuPskgMJTzapLsTE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput-malidrive/default.nix b/distros/foxy/maliput-malidrive/default.nix index 543cc65ec8..13723da6d6 100644 --- a/distros/foxy/maliput-malidrive/default.nix +++ b/distros/foxy/maliput-malidrive/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-malidrive"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_malidrive-release/archive/release/foxy/maliput_malidrive/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "7db77cbb7a3ca75c56ebfd8eee378a7460e95f2cc215964fe23f2ad5908d2f9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_malidrive-release"; + rev = "release/foxy/maliput_malidrive/0.1.4-1"; + sha256 = "sha256-33AWyr13E5StNrkmBtJjWdsjDdkKT0TsUQryjcY4dCk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput-multilane/default.nix b/distros/foxy/maliput-multilane/default.nix index ea90cfd98b..529e45ac34 100644 --- a/distros/foxy/maliput-multilane/default.nix +++ b/distros/foxy/maliput-multilane/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-multilane"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_multilane-release/archive/release/foxy/maliput_multilane/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "3424358c4da51208c068e5e67155ca33cd2f7ffdad75ba973d7b9ad8dd1b3934"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_multilane-release"; + rev = "release/foxy/maliput_multilane/0.1.4-1"; + sha256 = "sha256-T0buTlxWJ9e9e5edq40TBU1WbnhsFK1VXnzdOuS1/GE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput-object-py/default.nix b/distros/foxy/maliput-object-py/default.nix index fcf5ed9f52..ad44073823 100644 --- a/distros/foxy/maliput-object-py/default.nix +++ b/distros/foxy/maliput-object-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-object-py"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_object_py-release/archive/release/foxy/maliput_object_py/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "eddd031f0f260c2e51ded66c6c1d42d0cd63e54efb13685076c18ba0bd071844"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_object_py-release"; + rev = "release/foxy/maliput_object_py/0.1.2-1"; + sha256 = "sha256-ZVH61cg7NEiAefInJN+NXCWXkjUCY6vC4XzzSKnkWi8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3 ]; diff --git a/distros/foxy/maliput-object/default.nix b/distros/foxy/maliput-object/default.nix index e1ee1058bf..69828db83d 100644 --- a/distros/foxy/maliput-object/default.nix +++ b/distros/foxy/maliput-object/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-object"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_object-release/archive/release/foxy/maliput_object/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "f45fa4db39dd785b45e8676924007534472e63590d1cc2ba5c2ef2c67ffd5e48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_object-release"; + rev = "release/foxy/maliput_object/0.1.2-1"; + sha256 = "sha256-v9xYVckxp/e3BoBssmGNzMvkiGc0yzqug7/sGXn7CjM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput-osm/default.nix b/distros/foxy/maliput-osm/default.nix index c669b793b9..01ff0fc223 100644 --- a/distros/foxy/maliput-osm/default.nix +++ b/distros/foxy/maliput-osm/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-clang-format, ament-cmake-gmock, ament-cmake-gtest, lanelet2-io, maliput, maliput-sparse }: buildRosPackage { pname = "ros-foxy-maliput-osm"; - version = "0.2.0-r1"; + version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_osm-release/archive/release/foxy/maliput_osm/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "1d4efc868d03997316e661e78c48942dc6e17f0f8288e7a626d05edecb515afd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_osm-release"; + rev = "release/foxy/maliput_osm/0.2.1-1"; + sha256 = "sha256-atBkkNgH6veyImyV69R2Oc3OmvcM8uyfu+xYssGdTVU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput-py/default.nix b/distros/foxy/maliput-py/default.nix index 6596250f04..f809f950ef 100644 --- a/distros/foxy/maliput-py/default.nix +++ b/distros/foxy/maliput-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput-py"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_py-release/archive/release/foxy/maliput_py/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "5991d3f0c949a3470a7cc4861bda6dd186c37b51c92a15ceab00c2246d9b645c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_py-release"; + rev = "release/foxy/maliput_py/0.1.4-1"; + sha256 = "sha256-y0KrRQ0yCLLy5tX2Rv0H2iTa9ZqB2ElRWqV9sfPDUcs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3 ]; diff --git a/distros/foxy/maliput-sparse/default.nix b/distros/foxy/maliput-sparse/default.nix index 9bedea815b..67139e1d60 100644 --- a/distros/foxy/maliput-sparse/default.nix +++ b/distros/foxy/maliput-sparse/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-clang-format, ament-cmake-gmock, ament-cmake-gtest, maliput }: buildRosPackage { pname = "ros-foxy-maliput-sparse"; - version = "0.2.0-r1"; + version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput_sparse-release/archive/release/foxy/maliput_sparse/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "dc5726126f02af283be9ac58cfe10a4810a2b9cf9a30de783a20ef4bf75cac5a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput_sparse-release"; + rev = "release/foxy/maliput_sparse/0.2.2-1"; + sha256 = "sha256-xtZ5bk2UEXkEctGaHVM9Pad70LRBH0f6vNn0kHA+P1g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/maliput/default.nix b/distros/foxy/maliput/default.nix index f8eb7f28a8..ce2e523391 100644 --- a/distros/foxy/maliput/default.nix +++ b/distros/foxy/maliput/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-maliput"; version = "1.0.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/maliput-release/archive/release/foxy/maliput/1.0.9-1.tar.gz"; - name = "1.0.9-1.tar.gz"; - sha256 = "0f3a17fe9dd947deb4aaadd5ca38b36957502f7e8ec79ea6ef3ef0d7a98b5379"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "maliput-release"; + rev = "release/foxy/maliput/1.0.9-1"; + sha256 = "sha256-QamvxvLy55xN2uiQs4ZbbYPbrSKwojZri21Ft9uJqjg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/map-msgs/default.nix b/distros/foxy/map-msgs/default.nix index cdf91d1340..5151eadab0 100644 --- a/distros/foxy/map-msgs/default.nix +++ b/distros/foxy/map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-map-msgs"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/navigation_msgs-release/archive/release/foxy/map_msgs/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "073a5dc040167eef7c3e3c38069da4c2b4167656dec561d07600cb535b97cd8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "navigation_msgs-release"; + rev = "release/foxy/map_msgs/2.0.2-2"; + sha256 = "sha256-vemOHvf1vmu6J7+MsTv7Gf4Go7Cxqc2m5ORmv54ABJw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/map-transformer/default.nix b/distros/foxy/map-transformer/default.nix index 34c9562e4f..06561766c2 100644 --- a/distros/foxy/map-transformer/default.nix +++ b/distros/foxy/map-transformer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-map-transformer"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/map_transformer-release/archive/release/foxy/map_transformer/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "d9f8ccf5a5879fa8965b65fa6f65b1d33503deb694b910eba3cd5ded46bff5ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "map_transformer-release"; + rev = "release/foxy/map_transformer/1.0.3-1"; + sha256 = "sha256-nSfWYekaZN2AK0OOrhM5iiLKNhVPTEMyNwqza2uaeOw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/mapviz-interfaces/default.nix b/distros/foxy/mapviz-interfaces/default.nix index b079ebe3aa..e88a4d4841 100644 --- a/distros/foxy/mapviz-interfaces/default.nix +++ b/distros/foxy/mapviz-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mapviz-interfaces"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/foxy/mapviz_interfaces/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "872320c65cdca9b4e1f4aa2f0e35001deb126e0dfaaabe896da40b7bc878f4bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/foxy/mapviz_interfaces/2.1.0-1"; + sha256 = "sha256-NoEP2SqqBorAIeUKon1IUPIT3tSvAvdcQsKpxyQNXNs="; + }; buildType = "ament_cmake"; buildInputs = [ builtin-interfaces marti-common-msgs rosidl-default-generators ]; diff --git a/distros/foxy/mapviz-plugins/default.nix b/distros/foxy/mapviz-plugins/default.nix index 35663f08ca..2d7b068308 100644 --- a/distros/foxy/mapviz-plugins/default.nix +++ b/distros/foxy/mapviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mapviz-plugins"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/foxy/mapviz_plugins/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "61ca617eae88cf33b3fa10d6865e43ef938b79d27ea07624a1f1b2a8a0d847bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/foxy/mapviz_plugins/2.1.0-1"; + sha256 = "sha256-YaZHfRT49tNLGcNYSuRfSCqCZ9HygG2/nqDRAvZhhw4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/mapviz/default.nix b/distros/foxy/mapviz/default.nix index 3d91337f29..c4eccefd58 100644 --- a/distros/foxy/mapviz/default.nix +++ b/distros/foxy/mapviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mapviz"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/foxy/mapviz/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "85137789c152bcd0bf0020d369422d2dc7138630a2fae26e3c9251866a4dd82d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/foxy/mapviz/2.1.0-1"; + sha256 = "sha256-3VAZVkl814yvxuyLHkxTGpOlPpord8E/4oPI2RlecWM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/marti-can-msgs/default.nix b/distros/foxy/marti-can-msgs/default.nix index da9096d0bc..86f773f406 100644 --- a/distros/foxy/marti-can-msgs/default.nix +++ b/distros/foxy/marti-can-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-marti-can-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_can_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "378a52bb42f7d0e2a15ef0fb0c5de0e193921a1f512db195d06a5876275a4a13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_can_msgs/1.4.0-1"; + sha256 = "sha256-gq62fgHvxOhXDr3ktGnPyOmD8892lDQhBSsiqogWxEg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/marti-common-msgs/default.nix b/distros/foxy/marti-common-msgs/default.nix index d9b0143174..fafaf89a0c 100644 --- a/distros/foxy/marti-common-msgs/default.nix +++ b/distros/foxy/marti-common-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-marti-common-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_common_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "0b08252c37bcaf8a68d2327c9fb0fea091c659bb3ff1e6aa208570cf24414982"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_common_msgs/1.4.0-1"; + sha256 = "sha256-3vmY4+8do2OkHEV6Vz9bMcXI817qf9gvYyP0w9LEOhE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/marti-dbw-msgs/default.nix b/distros/foxy/marti-dbw-msgs/default.nix index 286c3872d2..604a6e5ff8 100644 --- a/distros/foxy/marti-dbw-msgs/default.nix +++ b/distros/foxy/marti-dbw-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-marti-dbw-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_dbw_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "935ee0e10ba191473c4158f64e95f8f8020106da60f647837cbee5dd239e6ed1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_dbw_msgs/1.4.0-1"; + sha256 = "sha256-E5Pa0lWlB/4ioL1q0T3M2WTvgnOTe0+9d8OpGef1jAY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/marti-introspection-msgs/default.nix b/distros/foxy/marti-introspection-msgs/default.nix index af02f4df5e..46e0987c86 100644 --- a/distros/foxy/marti-introspection-msgs/default.nix +++ b/distros/foxy/marti-introspection-msgs/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime }: +{ lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-marti-introspection-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_introspection_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "a7098e03bc8ea72e87d82fde4c3fa353edb43f856bf2947438f9948b37c696b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_introspection_msgs/1.4.0-1"; + sha256 = "sha256-cTQ9mW5Pf9ZoQe9T5Rbq/KSJ+XEnzSIn4S4RGjBQ9cQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; - propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime ]; + propagatedBuildInputs = [ rosidl-default-runtime std-msgs ]; nativeBuildInputs = [ ament-cmake rosidl-default-generators ]; meta = { diff --git a/distros/foxy/marti-nav-msgs/default.nix b/distros/foxy/marti-nav-msgs/default.nix index 319a41b510..d0d8cb7f9d 100644 --- a/distros/foxy/marti-nav-msgs/default.nix +++ b/distros/foxy/marti-nav-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, geographic-msgs, geometry-msgs, marti-common-msgs, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-marti-nav-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_nav_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "51768a9a78ddf9166ab41cbe785971b2361d807b9902a6c021c1b61685d4bb84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_nav_msgs/1.4.0-1"; + sha256 = "sha256-fdH2Srkyq36OapORm/JkyC4OwJ3yQlDb8KlxVUSHtTM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/marti-perception-msgs/default.nix b/distros/foxy/marti-perception-msgs/default.nix index 29a4f64113..fe449377d5 100644 --- a/distros/foxy/marti-perception-msgs/default.nix +++ b/distros/foxy/marti-perception-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-marti-perception-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_perception_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "01cac831601fcd0294d8ef8b06670c4516f1d5255bb6b6db5647b1a397b42745"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_perception_msgs/1.4.0-1"; + sha256 = "sha256-m9f9qFdpWRyuknZQp8KZ8WgkgA5KtyHdvLqGYcySeBw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/marti-sensor-msgs/default.nix b/distros/foxy/marti-sensor-msgs/default.nix index e9165f3b07..b64606bf9f 100644 --- a/distros/foxy/marti-sensor-msgs/default.nix +++ b/distros/foxy/marti-sensor-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-foxy-marti-sensor-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_sensor_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "d2c4a05d7186475c3a9c8bc3a33d36c45450ff528814a9f5f6e0e8ad919f9327"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_sensor_msgs/1.4.0-1"; + sha256 = "sha256-6QTzEv+TddJDeBHXMRNuY6J5Eje9dFQwRDw/i6/lrvo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/marti-status-msgs/default.nix b/distros/foxy/marti-status-msgs/default.nix index c2fb98e583..b2f45893f4 100644 --- a/distros/foxy/marti-status-msgs/default.nix +++ b/distros/foxy/marti-status-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-marti-status-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_status_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "e5f409447bec9e82e53b6d1b40c0a8a207b27dcc856e789ef408e74115bd8af7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_status_msgs/1.4.0-1"; + sha256 = "sha256-TbNJmHUCkvVhbBmcwKqGNVcExyWQbiApYf91ADmdqjg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/marti-visualization-msgs/default.nix b/distros/foxy/marti-visualization-msgs/default.nix index 287453b9a6..6eb161de91 100644 --- a/distros/foxy/marti-visualization-msgs/default.nix +++ b/distros/foxy/marti-visualization-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, sensor-msgs }: buildRosPackage { pname = "ros-foxy-marti-visualization-msgs"; - version = "1.3.0-r1"; + version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/foxy/marti_visualization_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "dc29bd78e7f35d749ad4f42ee97e553f13708fddc25f4ade11d42a96df35a2d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/foxy/marti_visualization_msgs/1.4.0-1"; + sha256 = "sha256-976pwQH6K8jCCIwhRVNjaX1BNDGSuYIcNX0QgRpBd68="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/massrobotics-amr-sender/default.nix b/distros/foxy/massrobotics-amr-sender/default.nix index def68c342c..db959218cc 100644 --- a/distros/foxy/massrobotics-amr-sender/default.nix +++ b/distros/foxy/massrobotics-amr-sender/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-massrobotics-amr-sender"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/inorbit-ai/ros_amr_interop-release/archive/release/foxy/massrobotics_amr_sender/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "b9c69911bba3d3f4343fad093bcc3ba4eab28bf8225804167fb0419a6aea79f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "inorbit-ai"; + repo = "ros_amr_interop-release"; + rev = "release/foxy/massrobotics_amr_sender/1.0.0-2"; + sha256 = "sha256-nhjej3rjHMnjGVqLd5kgaJy1o5OTrRl0Gq/GMBBQq9Q="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 python3Packages.jsonschema python3Packages.mock python3Packages.pep8 pythonPackages.pytest ]; diff --git a/distros/foxy/mavlink/default.nix b/distros/foxy/mavlink/default.nix index f45f383f1a..dac35df892 100644 --- a/distros/foxy/mavlink/default.nix +++ b/distros/foxy/mavlink/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mavlink"; version = "2022.12.30-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavlink-gbp-release/archive/release/foxy/mavlink/2022.12.30-1.tar.gz"; - name = "2022.12.30-1.tar.gz"; - sha256 = "b4c10cd2d79b4dd500558ff4af0a52aa7af2dd7d09d0f4c1b6221538a813e025"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavlink-gbp-release"; + rev = "release/foxy/mavlink/2022.12.30-1"; + sha256 = "sha256-weCXfCMFBO/hfDHDLJs1Pc7lXxkWPFu9Ug1E0j4bbQI="; + }; buildType = "cmake"; buildInputs = [ ament-cmake cmake python3 python3Packages.future python3Packages.lxml ros-environment ]; diff --git a/distros/foxy/mavros-extras/default.nix b/distros/foxy/mavros-extras/default.nix index 4ebfa1d016..7770a8afda 100644 --- a/distros/foxy/mavros-extras/default.nix +++ b/distros/foxy/mavros-extras/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mavros-extras"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/foxy/mavros_extras/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "a0e304f117b7412559efd3f38f3bada24a665e2a8f51bd269c92fd057c06227e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/foxy/mavros_extras/2.4.0-1"; + sha256 = "sha256-PtIYTIYjcVKAIS0pP0hq1LdX+rB++3XRmqDHaZif8jM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python angles ]; diff --git a/distros/foxy/mavros-msgs/default.nix b/distros/foxy/mavros-msgs/default.nix index 9b91ccc5af..a54228efb7 100644 --- a/distros/foxy/mavros-msgs/default.nix +++ b/distros/foxy/mavros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mavros-msgs"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/foxy/mavros_msgs/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "0096509a3062bd4451307bb998ac9ef57643773b2dcabd6cb235aa5dce421640"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/foxy/mavros_msgs/2.4.0-1"; + sha256 = "sha256-wDx+TrJOa9Fy2q/W1rGM/YvHumOu3oiWQgQroVg0H1A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/mavros/default.nix b/distros/foxy/mavros/default.nix index 9a04dfef49..7407418350 100644 --- a/distros/foxy/mavros/default.nix +++ b/distros/foxy/mavros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mavros"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/foxy/mavros/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "00647f80c12dd32eb71f0051aac443150721154b6df49490d2298236c45503ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/foxy/mavros/2.4.0-1"; + sha256 = "sha256-vNoFZgoW95lOa0ryKo2cAkU20W/qQoNLgqDkdPSoV3k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python angles ]; diff --git a/distros/foxy/mcap-vendor/default.nix b/distros/foxy/mcap-vendor/default.nix index 896bae8df4..c603bdb640 100644 --- a/distros/foxy/mcap-vendor/default.nix +++ b/distros/foxy/mcap-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mcap-vendor"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/foxy/mcap_vendor/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "7fd2bc9b0891d1d6a71f976a7dc74bf96d7418e40bb1bf6e114ab8376c671235"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2_storage_mcap-release"; + rev = "release/foxy/mcap_vendor/0.6.0-1"; + sha256 = "sha256-FwRsZV6R2hRI7MVAgRqSGR3zEaLFuCY94hgoYGUI6ug="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/foxy/menge-vendor/default.nix b/distros/foxy/menge-vendor/default.nix index 8a540f6651..e932b1c157 100644 --- a/distros/foxy/menge-vendor/default.nix +++ b/distros/foxy/menge-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-menge-vendor"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/menge_vendor-release/archive/release/foxy/menge_vendor/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "6e3c898f2741cfa032a497738943927dc6f8b144e6dd4427e0085541212dee88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "menge_vendor-release"; + rev = "release/foxy/menge_vendor/1.0.0-1"; + sha256 = "sha256-pwDvm+FUMHbvtumRly3aV2QEDQ0UxPN8GlgjCe8TOZE="; + }; buildType = "catkin"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/message-filters/default.nix b/distros/foxy/message-filters/default.nix index 668310f067..d17610281b 100644 --- a/distros/foxy/message-filters/default.nix +++ b/distros/foxy/message-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-message-filters"; version = "3.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_message_filters-release/archive/release/foxy/message_filters/3.2.5-1.tar.gz"; - name = "3.2.5-1.tar.gz"; - sha256 = "35cb4cafbb194b82e153f64d35deb278852b396bce21b3f116fa02176cb7cbe0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_message_filters-release"; + rev = "release/foxy/message_filters/3.2.5-1"; + sha256 = "sha256-+xU3nEQma8QYqb7B+ha2Jg78ZqILS6sYS+/cPGB0+XE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros builtin-interfaces python-cmake-module rclcpp rclpy ]; diff --git a/distros/foxy/micro-ros-diagnostic-bridge/default.nix b/distros/foxy/micro-ros-diagnostic-bridge/default.nix index 97a9ba0f9b..85fbdd9f3f 100644 --- a/distros/foxy/micro-ros-diagnostic-bridge/default.nix +++ b/distros/foxy/micro-ros-diagnostic-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-micro-ros-diagnostic-bridge"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_diagnostics-release/archive/release/foxy/micro_ros_diagnostic_bridge/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "df65b98f82eb8169cec46d2c57132954f172e7b27e97e4b4fa800ab888b8c94e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_diagnostics-release"; + rev = "release/foxy/micro_ros_diagnostic_bridge/0.3.0-1"; + sha256 = "sha256-mBsQdSKOPVQJVBc/FxvaxH5NOtAJy3M+bYciq7eHg+c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/micro-ros-diagnostic-msgs/default.nix b/distros/foxy/micro-ros-diagnostic-msgs/default.nix index 4df8d42709..b07f196514 100644 --- a/distros/foxy/micro-ros-diagnostic-msgs/default.nix +++ b/distros/foxy/micro-ros-diagnostic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-micro-ros-diagnostic-msgs"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_diagnostics-release/archive/release/foxy/micro_ros_diagnostic_msgs/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "56db0f97346c8935919a71aa0149f39f032a811a1c927b1c58288ae3d0516845"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_diagnostics-release"; + rev = "release/foxy/micro_ros_diagnostic_msgs/0.3.0-1"; + sha256 = "sha256-SzsjLMKb42ISN6YTe6pUsmSDS9aBoczr3ayWBkrJAgU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/micro-ros-msgs/default.nix b/distros/foxy/micro-ros-msgs/default.nix index 38e9656de7..8a75007738 100644 --- a/distros/foxy/micro-ros-msgs/default.nix +++ b/distros/foxy/micro-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-micro-ros-msgs"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_msgs-release/archive/release/foxy/micro_ros_msgs/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "1f00588d7f0b7ef394d3b60d273439bb0603418898d6c380048304973ebce860"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_msgs-release"; + rev = "release/foxy/micro_ros_msgs/1.0.0-2"; + sha256 = "sha256-kuDv7e3C0BCXolx6ePv0TLEpK9E3OfLGFAh0K/9Wb8o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/microstrain-inertial-driver/default.nix b/distros/foxy/microstrain-inertial-driver/default.nix index 084f638bbb..f274bb7931 100644 --- a/distros/foxy/microstrain-inertial-driver/default.nix +++ b/distros/foxy/microstrain-inertial-driver/default.nix @@ -2,22 +2,26 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cpplint, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, jq, lifecycle-msgs, mavros-msgs, microstrain-inertial-msgs, nav-msgs, nmea-msgs, rclcpp-lifecycle, ros-environment, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: +{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cpplint, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, git, jq, lifecycle-msgs, mavros-msgs, microstrain-inertial-msgs, nav-msgs, nmea-msgs, rclcpp-lifecycle, ros-environment, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-foxy-microstrain-inertial-driver"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/foxy/microstrain_inertial_driver/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "357b3f92bda55a78d47c9cdab3819c9da9fc059ba27046024c44fa6ffe7fad15"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/foxy/microstrain_inertial_driver/3.0.0-1"; + sha256 = "sha256-OZKIsgqemRajXQ1xpFsAA9AitmFdk7DwZlaJMsTxJDI="; + }; buildType = "ament_cmake"; - buildInputs = [ curl jq ros-environment rosidl-default-generators ]; + buildInputs = [ curl git jq ros-environment rosidl-default-generators ]; checkInputs = [ ament-cmake-gtest ament-cpplint ]; propagatedBuildInputs = [ diagnostic-aggregator diagnostic-updater geometry-msgs lifecycle-msgs mavros-msgs microstrain-inertial-msgs nav-msgs nmea-msgs rclcpp-lifecycle rosidl-default-runtime sensor-msgs std-msgs std-srvs tf2 tf2-geometry-msgs tf2-ros ]; - nativeBuildInputs = [ rosidl-default-generators ]; + nativeBuildInputs = [ git rosidl-default-generators ]; meta = { description = ''The ros_mscl package provides a driver for the LORD/Microstrain inertial products.''; diff --git a/distros/foxy/microstrain-inertial-examples/default.nix b/distros/foxy/microstrain-inertial-examples/default.nix index 2d733dd69a..b78263f004 100644 --- a/distros/foxy/microstrain-inertial-examples/default.nix +++ b/distros/foxy/microstrain-inertial-examples/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, microstrain-inertial-msgs, rclcpp, rclcpp-components, rclpy, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-foxy-microstrain-inertial-examples"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/foxy/microstrain_inertial_examples/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "f8db51b40d7c44097cb9ce70bd385946255d556273c4d50064008e94984041fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/foxy/microstrain_inertial_examples/3.0.0-1"; + sha256 = "sha256-YzEuGLkXcxn35LDW2RzWaTtuyLA2lDz3vzbROI3D8zA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/microstrain-inertial-msgs/default.nix b/distros/foxy/microstrain-inertial-msgs/default.nix index e5444258e2..dd71b83e93 100644 --- a/distros/foxy/microstrain-inertial-msgs/default.nix +++ b/distros/foxy/microstrain-inertial-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, geometry-msgs, rosidl-default-generators, std-msgs }: buildRosPackage { pname = "ros-foxy-microstrain-inertial-msgs"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/foxy/microstrain_inertial_msgs/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "99c0c9338809e492d24efba660a0e07fb5170166ce3e47129c6adfe261697d11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/foxy/microstrain_inertial_msgs/3.0.0-1"; + sha256 = "sha256-b6iL7dD696BbltyHrGXGYyBrO04x+0iHvwhuSwBLRJw="; + }; buildType = "ament_cmake"; buildInputs = [ rosidl-default-generators ]; diff --git a/distros/foxy/microstrain-inertial-rqt/default.nix b/distros/foxy/microstrain-inertial-rqt/default.nix index 2930e32b7d..5740086e72 100644 --- a/distros/foxy/microstrain-inertial-rqt/default.nix +++ b/distros/foxy/microstrain-inertial-rqt/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, geometry-msgs, microstrain-inertial-msgs, nav-msgs, rclpy, rqt-gui, rqt-gui-py, std-msgs }: buildRosPackage { pname = "ros-foxy-microstrain-inertial-rqt"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/foxy/microstrain_inertial_rqt/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "46d85e5ef4fcc0886502283750e3245315f4ec72d782a3e2ee6410499ab3f026"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/foxy/microstrain_inertial_rqt/3.0.0-1"; + sha256 = "sha256-OvjYgtHC/5jU2RV8qNvN+c5ZV0rVScf1u1LaJwLt8BM="; + }; buildType = "ament_python"; propagatedBuildInputs = [ geometry-msgs microstrain-inertial-msgs nav-msgs rclpy rqt-gui rqt-gui-py std-msgs ]; diff --git a/distros/foxy/mimick-vendor/default.nix b/distros/foxy/mimick-vendor/default.nix index 5165c086f6..3b3d5be87e 100644 --- a/distros/foxy/mimick-vendor/default.nix +++ b/distros/foxy/mimick-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mimick-vendor"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mimick_vendor-release/archive/release/foxy/mimick_vendor/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "4dfca00a3bd3b7f4674dfed4db0604857bfe982207f6b9165ad02992afb64a60"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mimick_vendor-release"; + rev = "release/foxy/mimick_vendor/0.2.6-1"; + sha256 = "sha256-mEPo4xEmZ8KPnbqY8EQIfViRXT8Bz7tMU0wMSIOZBAk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/foxy/mobileye-560-660-msgs/default.nix b/distros/foxy/mobileye-560-660-msgs/default.nix index 477b6497fc..b945f1accb 100644 --- a/distros/foxy/mobileye-560-660-msgs/default.nix +++ b/distros/foxy/mobileye-560-660-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mobileye-560-660-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/mobileye_560_660_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "de53cebac614b0ff1a57718ce59e3f30d08b202da6f874b3be46a577fa110a9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/mobileye_560_660_msgs/3.1.0-1"; + sha256 = "sha256-5j8/l68b+iQTl0Dj0FKfSqNsvZrQARMyJgrS/aTTU7w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/mocap-msgs/default.nix b/distros/foxy/mocap-msgs/default.nix index 252483e2e8..eb72f579aa 100644 --- a/distros/foxy/mocap-msgs/default.nix +++ b/distros/foxy/mocap-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mocap-msgs"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/MOCAP4ROS2-Project/mocap_msgs-release/archive/release/foxy/mocap_msgs/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "81808d9ac8fc05485cc01e9c469c71e4436cf46ae843e758d24d170e9657f45b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MOCAP4ROS2-Project"; + repo = "mocap_msgs-release"; + rev = "release/foxy/mocap_msgs/0.0.3-1"; + sha256 = "sha256-p9KOpyPCi4aIyG5ore15EfRRKdMnbp+LM8gWCpDjoNg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/mouse-teleop/default.nix b/distros/foxy/mouse-teleop/default.nix index e0f2baea48..04cfb5f371 100644 --- a/distros/foxy/mouse-teleop/default.nix +++ b/distros/foxy/mouse-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mouse-teleop"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/foxy/mouse_teleop/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "f573f2e4c707e9f7d0765ffdb3ad3348fbfcbafe2e4fdc80c2be1ecb3b697434"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/foxy/mouse_teleop/1.3.0-1"; + sha256 = "sha256-e7Z2ycDQ6c5iskftouMX5osIQ17YJ6aS1Jn6tEPTs3w="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint ]; diff --git a/distros/foxy/move-base-msgs/default.nix b/distros/foxy/move-base-msgs/default.nix index 685219015c..04b86ac258 100644 --- a/distros/foxy/move-base-msgs/default.nix +++ b/distros/foxy/move-base-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-move-base-msgs"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/navigation_msgs-release/archive/release/foxy/move_base_msgs/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "0140d46a94a1a9c26cbeba8fbf4e512f461ad3fc8c193c56f24348f8b9fd5edb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "navigation_msgs-release"; + rev = "release/foxy/move_base_msgs/2.0.2-2"; + sha256 = "sha256-VC8BYd5e4BCHoLg80ftpJjEbyBPaN5dJUhDpTMEU9qE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/moveit-chomp-optimizer-adapter/default.nix b/distros/foxy/moveit-chomp-optimizer-adapter/default.nix index 9e2a63a960..4c135e0ad1 100644 --- a/distros/foxy/moveit-chomp-optimizer-adapter/default.nix +++ b/distros/foxy/moveit-chomp-optimizer-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-chomp-optimizer-adapter"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_chomp_optimizer_adapter/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "e115b2667935acecd4f54d8b20bc39321fa7f394246a6a372f6d9422f86dc52f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_chomp_optimizer_adapter/2.2.3-1"; + sha256 = "sha256-NVZasIUeW0BUDOFb/CFoUSfy5XyKB0IuDLEGJEdsgJo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-common/default.nix b/distros/foxy/moveit-common/default.nix index ad7f415e3a..e8f3165a5a 100644 --- a/distros/foxy/moveit-common/default.nix +++ b/distros/foxy/moveit-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-common"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_common/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "09f5891f3ccb59e3251a45158a7afd5c014be0b9c663b3be851aa4a9725b660c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_common/2.2.3-1"; + sha256 = "sha256-mOazhanKgLL/TVvTojQ8oI9jCvAxacwC4MDZbM39Dfk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-core/default.nix b/distros/foxy/moveit-core/default.nix index 7c32d7b25f..39a2e051ab 100644 --- a/distros/foxy/moveit-core/default.nix +++ b/distros/foxy/moveit-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-core"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_core/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "eaa14e326ffb03e88dc735f7cb1574a51854cf29dcac584dd942da08c01ee651"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_core/2.2.3-1"; + sha256 = "sha256-I6gG0TyqPL+5OZEOBa++6MVfO3JaHrLKkTN41SZsQ4U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common pkg-config ]; diff --git a/distros/foxy/moveit-kinematics/default.nix b/distros/foxy/moveit-kinematics/default.nix index f7211b6c11..45e0d7631c 100644 --- a/distros/foxy/moveit-kinematics/default.nix +++ b/distros/foxy/moveit-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-kinematics"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_kinematics/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "945a1aba5e751d6f7c6f9eb1f9845eaa5cd7e372ecd31c57e7625cfc644e78b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_kinematics/2.2.3-1"; + sha256 = "sha256-odcSyU3wwZ17xxv+LDFugiwVQyvZHHZNN72S8UT3/Kc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-msgs/default.nix b/distros/foxy/moveit-msgs/default.nix index efaba3d4ef..82e80cc304 100644 --- a/distros/foxy/moveit-msgs/default.nix +++ b/distros/foxy/moveit-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-msgs"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit_msgs-release/archive/release/foxy/moveit_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "507d19e081f64a7f4dcae9a50663f67c424e5884e4a3a024f284e7ffb6b9fc80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit_msgs-release"; + rev = "release/foxy/moveit_msgs/2.1.0-1"; + sha256 = "sha256-LE2vjdXycX3iBDuQhEFb2Mm/g/a/s1qOg+3K6EUppmA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/moveit-planners-chomp/default.nix b/distros/foxy/moveit-planners-chomp/default.nix index f46d56faeb..0dc9272376 100644 --- a/distros/foxy/moveit-planners-chomp/default.nix +++ b/distros/foxy/moveit-planners-chomp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-planners-chomp"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_planners_chomp/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "4612da44d93816c551a95e295abbb1fe7115ef18acdeffbeecee8382ebae3f23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_planners_chomp/2.2.3-1"; + sha256 = "sha256-aiC24huzu4YvtiHyhlbttK3CgEc4FDynVUDWvaLQD2k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-planners-ompl/default.nix b/distros/foxy/moveit-planners-ompl/default.nix index bce6cbbca0..8711c06ce4 100644 --- a/distros/foxy/moveit-planners-ompl/default.nix +++ b/distros/foxy/moveit-planners-ompl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-planners-ompl"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_planners_ompl/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "a26eaa86acd09f7023f172fccda3e99bb661ffad3325392000e1e2c614c585a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_planners_ompl/2.2.3-1"; + sha256 = "sha256-1WrziIt7eRFTQJ5BUvQKynP0BJ4Wze8QAfDa0DVx4AE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen3-cmake-module moveit-common ]; diff --git a/distros/foxy/moveit-planners/default.nix b/distros/foxy/moveit-planners/default.nix index ab10f66692..7c26897799 100644 --- a/distros/foxy/moveit-planners/default.nix +++ b/distros/foxy/moveit-planners/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-planners"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_planners/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "1e771ca66e3387f428155ad274517ca50996b74ea3184115f6e73da9ecba3214"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_planners/2.2.3-1"; + sha256 = "sha256-MN9I4ntAbip6SL2sjPRou8CvGT8LRJDZFqTWFzK0o1A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-plugins/default.nix b/distros/foxy/moveit-plugins/default.nix index b9eeac69cd..6d6104f524 100644 --- a/distros/foxy/moveit-plugins/default.nix +++ b/distros/foxy/moveit-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-plugins"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_plugins/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "6e84939a50bc25b2127cd9f57c2bc7a7d804b3987ae8df7f471cec61dbbb3370"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_plugins/2.2.3-1"; + sha256 = "sha256-x0qNb7A19ikW+AQhz6s8Jn6irmZZrTfbJFBx9ekpdgI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-resources-fanuc-description/default.nix b/distros/foxy/moveit-resources-fanuc-description/default.nix index a6f77a7392..5d1fbc2daa 100644 --- a/distros/foxy/moveit-resources-fanuc-description/default.nix +++ b/distros/foxy/moveit-resources-fanuc-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-resources-fanuc-description"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit_resources-release/archive/release/foxy/moveit_resources_fanuc_description/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "3f2a59160d0c2ff3ec9aa8d4bf8b517b531824c023130e2e64f1102564fc24d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit_resources-release"; + rev = "release/foxy/moveit_resources_fanuc_description/2.0.3-1"; + sha256 = "sha256-Ew9obyHw7uOo3eZKts0ONdVxWoddkFXq+i+W6wn593M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-resources-fanuc-moveit-config/default.nix b/distros/foxy/moveit-resources-fanuc-moveit-config/default.nix index 88420a047b..33887bcdbf 100644 --- a/distros/foxy/moveit-resources-fanuc-moveit-config/default.nix +++ b/distros/foxy/moveit-resources-fanuc-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-resources-fanuc-moveit-config"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit_resources-release/archive/release/foxy/moveit_resources_fanuc_moveit_config/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "f1c706ee57dfb10b13820e6fad6b5b7be934589ef3655de2328b6092ea2bcf2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit_resources-release"; + rev = "release/foxy/moveit_resources_fanuc_moveit_config/2.0.3-1"; + sha256 = "sha256-yU+epK+mBbWBgBdWxhcM+UlkPucehApKbfp1VS0yFhg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-resources-panda-description/default.nix b/distros/foxy/moveit-resources-panda-description/default.nix index cc7f1ffb94..31bb622b20 100644 --- a/distros/foxy/moveit-resources-panda-description/default.nix +++ b/distros/foxy/moveit-resources-panda-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-resources-panda-description"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit_resources-release/archive/release/foxy/moveit_resources_panda_description/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "bcaafbc47067f1c90cb506815cb3d7b157f85dc47893802860492dd3efc249e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit_resources-release"; + rev = "release/foxy/moveit_resources_panda_description/2.0.3-1"; + sha256 = "sha256-j8Zz+6LI58lXFQFYjG1Axa9kZNfLKwibEGFyZqkHPQU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-resources-panda-moveit-config/default.nix b/distros/foxy/moveit-resources-panda-moveit-config/default.nix index a31ef69509..2d26ecfdbc 100644 --- a/distros/foxy/moveit-resources-panda-moveit-config/default.nix +++ b/distros/foxy/moveit-resources-panda-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-resources-panda-moveit-config"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit_resources-release/archive/release/foxy/moveit_resources_panda_moveit_config/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "efc1f80d1ec1f053b2798eaeb2fc3d12d0269ced4aa927aab51574df3d037c24"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit_resources-release"; + rev = "release/foxy/moveit_resources_panda_moveit_config/2.0.3-1"; + sha256 = "sha256-sFikFur4DBbqIa1wH6+teVtmzNselPFLfCtkyYH3a3Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-resources-pr2-description/default.nix b/distros/foxy/moveit-resources-pr2-description/default.nix index 557f177b01..9c7e5f0c1b 100644 --- a/distros/foxy/moveit-resources-pr2-description/default.nix +++ b/distros/foxy/moveit-resources-pr2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-resources-pr2-description"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit_resources-release/archive/release/foxy/moveit_resources_pr2_description/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "fa3bdbfcf518c4eabdd8e1c593a6b47e8dbe6bf11c65a2b75a0675f82c6c0064"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit_resources-release"; + rev = "release/foxy/moveit_resources_pr2_description/2.0.3-1"; + sha256 = "sha256-/jVn71dQwsfcmbS7XSSQCpTfWVd73Qf7CGRurqOFqZM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-resources/default.nix b/distros/foxy/moveit-resources/default.nix index e1ab60c02b..ae5df798db 100644 --- a/distros/foxy/moveit-resources/default.nix +++ b/distros/foxy/moveit-resources/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-resources"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit_resources-release/archive/release/foxy/moveit_resources/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "8288d951e67cad097cbf517360cf4cced7d70192ad3f0d61790d11454757a368"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit_resources-release"; + rev = "release/foxy/moveit_resources/2.0.3-1"; + sha256 = "sha256-1lP1wkf4RW2NLoq/8orALTH2G+X12VbgiMAfyecnvCA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-ros-benchmarks/default.nix b/distros/foxy/moveit-ros-benchmarks/default.nix index c33411f9b1..1dcb2a5b68 100644 --- a/distros/foxy/moveit-ros-benchmarks/default.nix +++ b/distros/foxy/moveit-ros-benchmarks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-benchmarks"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_benchmarks/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "48c06d2ddf70a9fa6de2d98fd00e245606b775cfa5e24ad8bff4c2dfda86839e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_benchmarks/2.2.3-1"; + sha256 = "sha256-Zsas+dFmAyLBa4HAxI8G4plsWe1QVbLIhb9B0LM6xNI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-ros-move-group/default.nix b/distros/foxy/moveit-ros-move-group/default.nix index 730f799fa4..cc64012b2a 100644 --- a/distros/foxy/moveit-ros-move-group/default.nix +++ b/distros/foxy/moveit-ros-move-group/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-move-group"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_move_group/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "54203208a479cdea86656cc806112cb1949822696e5e7d6e41de856302490252"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_move_group/2.2.3-1"; + sha256 = "sha256-1ttFf7vmn0l6lQxVr8rEfXnMmw063TYyAYj3PBEUlJM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-ros-occupancy-map-monitor/default.nix b/distros/foxy/moveit-ros-occupancy-map-monitor/default.nix index c1331dc972..3682bb9780 100644 --- a/distros/foxy/moveit-ros-occupancy-map-monitor/default.nix +++ b/distros/foxy/moveit-ros-occupancy-map-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-occupancy-map-monitor"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_occupancy_map_monitor/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "e31d678dff6b2da0a7dbdcf874531cd8f4b00bd572566a6044cc361637cec253"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_occupancy_map_monitor/2.2.3-1"; + sha256 = "sha256-N05+6+RRPgEQpKr1pXwZcMYDVwgzQlRUAImvaR+gVuo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-ros-perception/default.nix b/distros/foxy/moveit-ros-perception/default.nix index 890c695c30..3523c61186 100644 --- a/distros/foxy/moveit-ros-perception/default.nix +++ b/distros/foxy/moveit-ros-perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-perception"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_perception/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "ba1884f8bfe96a25754f32f33082f945b721c28ed8d707f1d66eb7b2dee82ef1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_perception/2.2.3-1"; + sha256 = "sha256-dRfSf+euoYj/U313JbkpGFLMdylHY1Gwu9BMuHCQeQs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen moveit-common ]; diff --git a/distros/foxy/moveit-ros-planning-interface/default.nix b/distros/foxy/moveit-ros-planning-interface/default.nix index 9acf3b549e..3f9044dfe2 100644 --- a/distros/foxy/moveit-ros-planning-interface/default.nix +++ b/distros/foxy/moveit-ros-planning-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-planning-interface"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_planning_interface/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "ca37188371f43c950d16d706337959fa067539f8114613605fff60a2cf043a69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_planning_interface/2.2.3-1"; + sha256 = "sha256-xa5vk62MUNG3CgkkKGvVShCu+/s9iQN6ujfoCD7nZJ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen eigen3-cmake-module moveit-common ]; diff --git a/distros/foxy/moveit-ros-planning/default.nix b/distros/foxy/moveit-ros-planning/default.nix index b41b10c0b1..d76402a58f 100644 --- a/distros/foxy/moveit-ros-planning/default.nix +++ b/distros/foxy/moveit-ros-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-planning"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_planning/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "bdb3c9502aee29ad8bb9b38ed6d3128ca81134a54e713e8c2a0a16656b35d950"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_planning/2.2.3-1"; + sha256 = "sha256-+gMrk8eOnIYCsaeNq0PIysGmmWpCT0Aff+0qzZ6nEvk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-ros-robot-interaction/default.nix b/distros/foxy/moveit-ros-robot-interaction/default.nix index f1923105be..4696bf1eae 100644 --- a/distros/foxy/moveit-ros-robot-interaction/default.nix +++ b/distros/foxy/moveit-ros-robot-interaction/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-robot-interaction"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_robot_interaction/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "04d6e59b498c43899292fd11eb26da6725b7cc0cf6fc6afe00d424e98a322835"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_robot_interaction/2.2.3-1"; + sha256 = "sha256-7P7djeMILoJ1WiowWDrL2+6kxjRdEtaEKEmzi8YRXQ0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-ros-visualization/default.nix b/distros/foxy/moveit-ros-visualization/default.nix index a007936508..5231a89f4e 100644 --- a/distros/foxy/moveit-ros-visualization/default.nix +++ b/distros/foxy/moveit-ros-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-visualization"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_visualization/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "70527eeaebed9ee517d2f4f48a313b40a49c864d8aaa2fe723a5dd95bf3b233b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_visualization/2.2.3-1"; + sha256 = "sha256-2lz00ACcuTopMVY6DmjeDRcGmSvnHQCu7EJ2FXE2+z4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake class-loader eigen moveit-common ogre1_9 pkg-config qt5.qtbase ]; diff --git a/distros/foxy/moveit-ros-warehouse/default.nix b/distros/foxy/moveit-ros-warehouse/default.nix index 6747fd9598..9b79582e4c 100644 --- a/distros/foxy/moveit-ros-warehouse/default.nix +++ b/distros/foxy/moveit-ros-warehouse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros-warehouse"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros_warehouse/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "6f58e99828fedb3e10624741860f64b1ba261366a5e286716c708b0a8a3616ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros_warehouse/2.2.3-1"; + sha256 = "sha256-lblUVovPuudV1TuIWp6+1EBw9aHdsbtyZ2lbOwl4BC4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-ros/default.nix b/distros/foxy/moveit-ros/default.nix index e2a7af715e..14ae30c844 100644 --- a/distros/foxy/moveit-ros/default.nix +++ b/distros/foxy/moveit-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-ros"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_ros/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "e62b170fd4d2c530db892856e23a22e7a21b12a4e1477e4776f932f84fe0ba45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_ros/2.2.3-1"; + sha256 = "sha256-bLpyC0JyszPFcW2ARNB4PAr2xIM3StqUaY8au0XGMoA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-runtime/default.nix b/distros/foxy/moveit-runtime/default.nix index 603b786561..ee8792738f 100644 --- a/distros/foxy/moveit-runtime/default.nix +++ b/distros/foxy/moveit-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-runtime"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_runtime/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "80e4048cdfc58e9334d82dd33c048100b5a7816f91701a84a6c01f650e9c4d2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_runtime/2.2.3-1"; + sha256 = "sha256-blpJPBlMm/0MJzueusYHoZOk79H1X7FXJNFYaijRxMM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/moveit-servo/default.nix b/distros/foxy/moveit-servo/default.nix index 17fd021f1e..f6982ce61d 100644 --- a/distros/foxy/moveit-servo/default.nix +++ b/distros/foxy/moveit-servo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-servo"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_servo/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "eaa39c16fb6d17aae338557b53d075799d529311ae5dbd32ec17ec7b28ac3c56"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_servo/2.2.3-1"; + sha256 = "sha256-6TIbXs6dPpEey8z9/CZQk27MRT8gKhEroaafOmeTUjA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit-simple-controller-manager/default.nix b/distros/foxy/moveit-simple-controller-manager/default.nix index a2b54eb39c..56ba07c7d6 100644 --- a/distros/foxy/moveit-simple-controller-manager/default.nix +++ b/distros/foxy/moveit-simple-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit-simple-controller-manager"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit_simple_controller_manager/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "ec3eadf03ab111a3e9c45b3916c5a5d04867f8525f86362b4eef3a638b372b2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit_simple_controller_manager/2.2.3-1"; + sha256 = "sha256-VBb8bFOxSTY+TgomJ/pKKp+OmJLFWcoMAXRkTOQjWT4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/moveit/default.nix b/distros/foxy/moveit/default.nix index 02bcc1339a..a96d9e3226 100644 --- a/distros/foxy/moveit/default.nix +++ b/distros/foxy/moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-moveit"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/moveit/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "7379e46d8159298b5f07d71b02c450d6a66a6add7ecac0e7ca2ca02fab0998ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/moveit/2.2.3-1"; + sha256 = "sha256-hc6O3xBng9djQVOwUBzW53amHbvW8T/r65f8Px3LWtk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/mppic/default.nix b/distros/foxy/mppic/default.nix index e4809c35ea..65e95bcf65 100644 --- a/distros/foxy/mppic/default.nix +++ b/distros/foxy/mppic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mppic"; version = "0.2.1-r2"; - src = fetchurl { - url = "https://github.com/artofnothingness/mppic-release/archive/release/foxy/mppic/0.2.1-2.tar.gz"; - name = "0.2.1-2.tar.gz"; - sha256 = "1ba13c06c16a18b1c830205f64406fe6f5df722e841e1fca42488044bf3558c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artofnothingness"; + repo = "mppic-release"; + rev = "release/foxy/mppic/0.2.1-2"; + sha256 = "sha256-KSZDHAVRckwJAUOjgUaZ+bgclvest8CyXu9+57/2hnQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/mrpt-msgs/default.nix b/distros/foxy/mrpt-msgs/default.nix index 3044699a51..e7e8fe5f82 100644 --- a/distros/foxy/mrpt-msgs/default.nix +++ b/distros/foxy/mrpt-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mrpt-msgs"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mrpt_msgs-release/archive/release/foxy/mrpt_msgs/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "f7ca85feb2d8c0c0268f6ce4cdb78fe5e459f6bf3202e6ef6b7947b18de2deeb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mrpt_msgs-release"; + rev = "release/foxy/mrpt_msgs/0.4.4-1"; + sha256 = "sha256-FSw//54G9jpJoibViHkmDUI+/IqcjDC67ZxH4JOk4qk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/mrt-cmake-modules/default.nix b/distros/foxy/mrt-cmake-modules/default.nix index f8b4988ba2..219d1c0202 100644 --- a/distros/foxy/mrt-cmake-modules/default.nix +++ b/distros/foxy/mrt-cmake-modules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-mrt-cmake-modules"; version = "1.0.9-r1"; - src = fetchurl { - url = "https://github.com/KIT-MRT/mrt_cmake_modules-release/archive/release/foxy/mrt_cmake_modules/1.0.9-1.tar.gz"; - name = "1.0.9-1.tar.gz"; - sha256 = "5cdfc80bb4ea0a2225701ef2ed428945c0e819eb5ce748f59ab86499b2cb116c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KIT-MRT"; + repo = "mrt_cmake_modules-release"; + rev = "release/foxy/mrt_cmake_modules/1.0.9-1"; + sha256 = "sha256-ZjBS7JweCjrLxmiI/CCKGUmW4czdpkPzIF1PaDbqRkk="; + }; buildType = "catkin"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/multires-image/default.nix b/distros/foxy/multires-image/default.nix index 022b7f7b58..090ee4db75 100644 --- a/distros/foxy/multires-image/default.nix +++ b/distros/foxy/multires-image/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-multires-image"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/foxy/multires_image/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "c09784b831edca1061c1db0b63b40025e7a4f6377855dcb1053c0034ec0a0773"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/foxy/multires_image/2.1.0-1"; + sha256 = "sha256-eODML20S1hncOEJTFMGj1EUOHezuDThzQLFCT/sPsaQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/mvsim/default.nix b/distros/foxy/mvsim/default.nix index 62b7f498f7..0a0211125d 100644 --- a/distros/foxy/mvsim/default.nix +++ b/distros/foxy/mvsim/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-xmllint, ament-lint-auto, ament-lint-common, boost, box2d, cmake, cppzmq, mrpt2, nav-msgs, protobuf, python3, pythonPackages, ros-environment, ros2launch, sensor-msgs, tf2, tf2-geometry-msgs, visualization-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-xmllint, ament-lint-auto, ament-lint-common, boost, box2d, cmake, cppzmq, mrpt2, nav-msgs, protobuf, python3, python3Packages, pythonPackages, ros-environment, ros2launch, sensor-msgs, tf2, tf2-geometry-msgs, unzip, visualization-msgs, wget }: buildRosPackage { pname = "ros-foxy-mvsim"; - version = "0.4.3-r1"; + version = "0.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mvsim-release/archive/release/foxy/mvsim/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "1840a35cd4dc24f7b359929826883df6e36ad5eb5f456029cec233cd377f249d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mvsim-release"; + rev = "release/foxy/mvsim/0.5.1-2"; + sha256 = "sha256-E8duQNKx1R8uGZ3o3G3NSvLjxkRqwZDi+O2Moy0u38k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest ament-cmake-xmllint cmake ros-environment ]; checkInputs = [ ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ boost box2d cppzmq mrpt2 nav-msgs protobuf python3 pythonPackages.pybind11 ros2launch sensor-msgs tf2 tf2-geometry-msgs visualization-msgs ]; + propagatedBuildInputs = [ boost box2d cppzmq mrpt2 nav-msgs protobuf python3 python3Packages.protobuf pythonPackages.pybind11 ros2launch sensor-msgs tf2 tf2-geometry-msgs unzip visualization-msgs wget ]; nativeBuildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest cmake ]; meta = { diff --git a/distros/foxy/naoqi-bridge-msgs/default.nix b/distros/foxy/naoqi-bridge-msgs/default.nix index fb4104fc45..2d6242d45b 100644 --- a/distros/foxy/naoqi-bridge-msgs/default.nix +++ b/distros/foxy/naoqi-bridge-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-naoqi-bridge-msgs"; version = "2.0.0"; - src = fetchurl { - url = "https://github.com/ros-naoqi/naoqi_bridge_msgs2-release/archive/release/foxy/naoqi_bridge_msgs/2.0.0-0.tar.gz"; - name = "2.0.0-0.tar.gz"; - sha256 = "3c366aa6eeb8325c54fdb7136fb60fbba252c995207786fb57d101f1f079711e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "naoqi_bridge_msgs2-release"; + rev = "release/foxy/naoqi_bridge_msgs/2.0.0-0"; + sha256 = "sha256-AaG/G54fiOoMJ5eBb0/+P53U/xgguHfEhyoFfritTN0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/naoqi-driver/default.nix b/distros/foxy/naoqi-driver/default.nix index 723edc4b52..8e3b72c179 100644 --- a/distros/foxy/naoqi-driver/default.nix +++ b/distros/foxy/naoqi-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-naoqi-driver"; version = "2.0.0"; - src = fetchurl { - url = "https://github.com/ros-naoqi/naoqi_driver2-release/archive/release/foxy/naoqi_driver/2.0.0-0.tar.gz"; - name = "2.0.0-0.tar.gz"; - sha256 = "b4c3f77f1266343aee694328f741ccb925cc60d74172a831f18d99fd15951421"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "naoqi_driver2-release"; + rev = "release/foxy/naoqi_driver/2.0.0-0"; + sha256 = "sha256-1c4WSc7FAAmwhf5InFODoUhkp2v9KlF5W+qEMexjzgc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake diagnostic-msgs diagnostic-updater geometry-msgs sensor-msgs tf2-geometry-msgs tf2-msgs ]; diff --git a/distros/foxy/naoqi-libqi/default.nix b/distros/foxy/naoqi-libqi/default.nix index 736afea9e5..78ee5e6a5e 100644 --- a/distros/foxy/naoqi-libqi/default.nix +++ b/distros/foxy/naoqi-libqi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-naoqi-libqi"; version = "2.9.7-r2"; - src = fetchurl { - url = "https://github.com/ros-naoqi/libqi-release/archive/release/foxy/naoqi_libqi/2.9.7-2.tar.gz"; - name = "2.9.7-2.tar.gz"; - sha256 = "cd053401f821e95692d9aeccfeeb3718018b9758638402f9666a488f7b986383"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "libqi-release"; + rev = "release/foxy/naoqi_libqi/2.9.7-2"; + sha256 = "sha256-7bI4I10C1knEQwAgRkHL6FJyY7UWSBhvuLFTmYlgNmU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/naoqi-libqicore/default.nix b/distros/foxy/naoqi-libqicore/default.nix index 0ea6a8dc1d..238ea827f1 100644 --- a/distros/foxy/naoqi-libqicore/default.nix +++ b/distros/foxy/naoqi-libqicore/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-naoqi-libqicore"; version = "2.9.7"; - src = fetchurl { - url = "https://github.com/ros-naoqi/libqicore-release/archive/release/foxy/naoqi_libqicore/2.9.7-0.tar.gz"; - name = "2.9.7-0.tar.gz"; - sha256 = "fd7d2e92011aadf303c933e69875317ad8a70d51795dfebaf03f810d6aba7758"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "libqicore-release"; + rev = "release/foxy/naoqi_libqicore/2.9.7-0"; + sha256 = "sha256-hLcaaRY2n8iu8LP5doxZNdXajSdJKNeJqmG9V35cmII="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav-2d-msgs/default.nix b/distros/foxy/nav-2d-msgs/default.nix index 6aef6314e3..68d7f63bb3 100644 --- a/distros/foxy/nav-2d-msgs/default.nix +++ b/distros/foxy/nav-2d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav-2d-msgs"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav_2d_msgs/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "7f4be2d1efb9f1e77827c792e8cab646b88e47787b681a3addee6b7ad7ad16df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav_2d_msgs/0.4.7-1"; + sha256 = "sha256-NS0GedlbbqVtzuf3pEP20+kv2f4wffxhOlYBNIUdwrk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav-2d-utils/default.nix b/distros/foxy/nav-2d-utils/default.nix index eb27bce849..70df63280e 100644 --- a/distros/foxy/nav-2d-utils/default.nix +++ b/distros/foxy/nav-2d-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav-2d-utils"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav_2d_utils/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "d7308fd5064c7ec9fa4014d7d82333b01206b5292a7d7987fa3afda54b6d4daf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav_2d_utils/0.4.7-1"; + sha256 = "sha256-g90dTPLAnsm3uysOdEmzHnS0G+yjdHWMJpf5l2DL1I4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav-msgs/default.nix b/distros/foxy/nav-msgs/default.nix index 3f4b9ea927..30f04530b8 100644 --- a/distros/foxy/nav-msgs/default.nix +++ b/distros/foxy/nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/nav_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "3370ca9aeb5d136d71f1a5055714df946985a728fd51b2fe2bfc37035b11b526"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/nav_msgs/2.0.5-1"; + sha256 = "sha256-wY7FHObTiuKyqfjMoSnQRagRN1cEsS7YhZ5ibUyfd4Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/nav2-amcl/default.nix b/distros/foxy/nav2-amcl/default.nix index e3184356bc..5e2b140c62 100644 --- a/distros/foxy/nav2-amcl/default.nix +++ b/distros/foxy/nav2-amcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-amcl"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_amcl/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "58fc9ee11f9c40a752f84e06ddc24465cc1002e38f2d1a08454024ea6d18fa64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_amcl/0.4.7-1"; + sha256 = "sha256-sAoltOEqgF8W3pu45cbmJwDY72wlfe9vh6NvytwTL5c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-behavior-tree/default.nix b/distros/foxy/nav2-behavior-tree/default.nix index b6377e2091..b0ec87e70e 100644 --- a/distros/foxy/nav2-behavior-tree/default.nix +++ b/distros/foxy/nav2-behavior-tree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-behavior-tree"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_behavior_tree/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "1f5a789b9870488fa4e9370b61d08ec2a7871e2c5843d3e2ba9d814b04355dd9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_behavior_tree/0.4.7-1"; + sha256 = "sha256-D5VOQjV2dKsJo2g6n7d7Of0Usz5YZ4NVhzSGMwAd7pc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-bringup/default.nix b/distros/foxy/nav2-bringup/default.nix index ef748c5fdd..ac48c3d2c2 100644 --- a/distros/foxy/nav2-bringup/default.nix +++ b/distros/foxy/nav2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-bringup"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_bringup/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "f595d765dbe02de952ade8ec2c222283f5927ca0ba11b6c635944bd55a8eb600"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_bringup/0.4.7-1"; + sha256 = "sha256-6NyKhwnPAYprcIcoCeLj/1LURNXPvohga2fwmjgQNjE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav2-bt-navigator/default.nix b/distros/foxy/nav2-bt-navigator/default.nix index e463c30280..d0968e829c 100644 --- a/distros/foxy/nav2-bt-navigator/default.nix +++ b/distros/foxy/nav2-bt-navigator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-bt-navigator"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_bt_navigator/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "e031e5ef42973ecd72d395a82eaf9005c488f7041d28ce56793a45f5c966e934"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_bt_navigator/0.4.7-1"; + sha256 = "sha256-k/EB/R/5vDZXgj9+/Kt69PdvHLDFiMTycfV0evPEjNE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common std-srvs ]; diff --git a/distros/foxy/nav2-common/default.nix b/distros/foxy/nav2-common/default.nix index f4c1a9978a..6dbcb44e58 100644 --- a/distros/foxy/nav2-common/default.nix +++ b/distros/foxy/nav2-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-common"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_common/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "7e51ea2c4b218081fd12bfc123723d12239cd96171b3c45becd6cb89107acb0a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_common/0.4.7-1"; + sha256 = "sha256-02oDL1U6E+ScBFAXThz5Hir8RFINAP1UWGNDEmsAR3o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/foxy/nav2-controller/default.nix b/distros/foxy/nav2-controller/default.nix index ff434c24dd..ea29e23540 100644 --- a/distros/foxy/nav2-controller/default.nix +++ b/distros/foxy/nav2-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-controller"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_controller/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "9e22c78719dbd52bd3a3db096c827a3e2a2510b43e0a50581e2fb04e80921c06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_controller/0.4.7-1"; + sha256 = "sha256-4xL3NqCLM0pWfYUUFFpLuykR8xiJqN29x1eMEPHecdM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-core/default.nix b/distros/foxy/nav2-core/default.nix index 430342148e..bab8c29632 100644 --- a/distros/foxy/nav2-core/default.nix +++ b/distros/foxy/nav2-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-core"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_core/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "d228f81b5af07ecf7c356021b93cee83157b5093a293ab68d9146954e6964419"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_core/0.4.7-1"; + sha256 = "sha256-M0/+7QHDzDsGJoSLB1E992M+oAr73Upd5br8hMJp87g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-costmap-2d/default.nix b/distros/foxy/nav2-costmap-2d/default.nix index 04b7f70a72..588de03eb5 100644 --- a/distros/foxy/nav2-costmap-2d/default.nix +++ b/distros/foxy/nav2-costmap-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-costmap-2d"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_costmap_2d/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "a0547f62e47d8436f04fa72473c690c922b1cea6132aece7709e14ab1f26914f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_costmap_2d/0.4.7-1"; + sha256 = "sha256-db3nzuU97qjtn4HGD0JymGgQ+RfyL58ATeUoTul44Ls="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-dwb-controller/default.nix b/distros/foxy/nav2-dwb-controller/default.nix index dfcfc9555e..4fb134ee92 100644 --- a/distros/foxy/nav2-dwb-controller/default.nix +++ b/distros/foxy/nav2-dwb-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-dwb-controller"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_dwb_controller/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "e6c90d0f551c86f0d9a1458392121c77793b096c74304f50d401960de107ceae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_dwb_controller/0.4.7-1"; + sha256 = "sha256-hXx6qdk475BxogA0CZDegEXdJlPG+n1xgUYuRuTy5Zo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav2-gazebo-spawner/default.nix b/distros/foxy/nav2-gazebo-spawner/default.nix index 092311c0b9..e218545b21 100644 --- a/distros/foxy/nav2-gazebo-spawner/default.nix +++ b/distros/foxy/nav2-gazebo-spawner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-gazebo-spawner"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_gazebo_spawner/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "ec30455d4b3f44ff31669cafac1e188b61dc2db5046523f8c6c816687e594950"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_gazebo_spawner/0.4.7-1"; + sha256 = "sha256-t5ArmBw0wkO3kCpP+PmnXkVN4MpRX9GPphepWHxFhUw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-lint-auto ament-lint-common pythonPackages.pytest ]; diff --git a/distros/foxy/nav2-lifecycle-manager/default.nix b/distros/foxy/nav2-lifecycle-manager/default.nix index 76be9d974a..ba7ab2a6a7 100644 --- a/distros/foxy/nav2-lifecycle-manager/default.nix +++ b/distros/foxy/nav2-lifecycle-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-lifecycle-manager"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_lifecycle_manager/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "2e21b20760c53422d70fea1d01bf4dbefaf28be302736f2eb0aa25405ff0addd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_lifecycle_manager/0.4.7-1"; + sha256 = "sha256-j3OLzby4H9MPPNN3lybIFRJ6U/WpwzkZK+JIVuX3PTk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-map-server/default.nix b/distros/foxy/nav2-map-server/default.nix index 32c7add170..e6bdc9066b 100644 --- a/distros/foxy/nav2-map-server/default.nix +++ b/distros/foxy/nav2-map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-map-server"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_map_server/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "4e4c3e6324b6fa69e1718099b6ca6bcccb71b1b41a11be3a4f060a8ae5d5b08e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_map_server/0.4.7-1"; + sha256 = "sha256-P1Zbb9m9e0RzjdLO/LL8OZQvPNWctKZDaOw6CyB4NK0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-msgs/default.nix b/distros/foxy/nav2-msgs/default.nix index 2794a92b11..3917775383 100644 --- a/distros/foxy/nav2-msgs/default.nix +++ b/distros/foxy/nav2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-msgs"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_msgs/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "5c7c50ee178bfcdddb4247b835d8ab88cf8e58dbdbd74a07327f1c11406643d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_msgs/0.4.7-1"; + sha256 = "sha256-ph1r/ei0KxzyBSHIuuNtJW7VabXAQKeIWgN+F1xtX34="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-navfn-planner/default.nix b/distros/foxy/nav2-navfn-planner/default.nix index 8d8f5aafca..816c0d2140 100644 --- a/distros/foxy/nav2-navfn-planner/default.nix +++ b/distros/foxy/nav2-navfn-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-navfn-planner"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_navfn_planner/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "090cb7a44d2db65a30ef8c5bac18bbfddd308359a034138752724319a11a93b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_navfn_planner/0.4.7-1"; + sha256 = "sha256-W9/G0xFNXgTe5XG5DondieLpHuy+Cen5aYr8X8md8b0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav2-planner/default.nix b/distros/foxy/nav2-planner/default.nix index c422184e54..92f5eb77ab 100644 --- a/distros/foxy/nav2-planner/default.nix +++ b/distros/foxy/nav2-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-planner"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_planner/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "426725fb29e3d71efb36a407c8577d14aad007081481a1528d4fa967bb2566b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_planner/0.4.7-1"; + sha256 = "sha256-Ql7iggTWiHuu4fhvW2ogavNA3NgIyi40upc+z6lX9qo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav2-recoveries/default.nix b/distros/foxy/nav2-recoveries/default.nix index 6826af12f4..2c616733c4 100644 --- a/distros/foxy/nav2-recoveries/default.nix +++ b/distros/foxy/nav2-recoveries/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-recoveries"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_recoveries/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "55ea8ff904409ce6a6b3a68ff011117ddce0327aa563eccb680da14db1ada718"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_recoveries/0.4.7-1"; + sha256 = "sha256-pNYLvHfcLU9HZRrHsVGUZ6BT45giMxYoAiUPVptrlsk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common tf2 tf2-geometry-msgs ]; diff --git a/distros/foxy/nav2-regulated-pure-pursuit-controller/default.nix b/distros/foxy/nav2-regulated-pure-pursuit-controller/default.nix index b6494a27d3..00d82273de 100644 --- a/distros/foxy/nav2-regulated-pure-pursuit-controller/default.nix +++ b/distros/foxy/nav2-regulated-pure-pursuit-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-regulated-pure-pursuit-controller"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_regulated_pure_pursuit_controller/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "e152990904c4c4ca95a962997d6d6d78904efd9b8067d122d19fc6911479db38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_regulated_pure_pursuit_controller/0.4.7-1"; + sha256 = "sha256-3/AllSYU/z+/UGCukeaFzSe0UisHpkTt1PaBnQxKSms="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav2-rviz-plugins/default.nix b/distros/foxy/nav2-rviz-plugins/default.nix index f498e355df..f460b056eb 100644 --- a/distros/foxy/nav2-rviz-plugins/default.nix +++ b/distros/foxy/nav2-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-rviz-plugins"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_rviz_plugins/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "0323e28437cf16f0d7824b6d45e503de4fa61ec81f7e41b71d4c4415f0a46996"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_rviz_plugins/0.4.7-1"; + sha256 = "sha256-NjryyFJGdj1ypiNFK4nss0DHuRb24agneMTHFFU8WKs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav2-system-tests/default.nix b/distros/foxy/nav2-system-tests/default.nix index 11831a9914..61f5fddb29 100644 --- a/distros/foxy/nav2-system-tests/default.nix +++ b/distros/foxy/nav2-system-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-system-tests"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_system_tests/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "988d32cb78d232496cba3f947c9ebaf9ed3e5a2cfbc431dd8a798e1df135aa69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_system_tests/0.4.7-1"; + sha256 = "sha256-3/T876RI7oyb3xbfMajT52jONyyK2SLbCgBAAIZJj/w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-util/default.nix b/distros/foxy/nav2-util/default.nix index fb751c58a9..50f1df40da 100644 --- a/distros/foxy/nav2-util/default.nix +++ b/distros/foxy/nav2-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-util"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_util/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "0756331b2efb6d3a011bc8aea07f137366bed5b974d8217cb9e3e644101ac1ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_util/0.4.7-1"; + sha256 = "sha256-rirPDyreQq4VhtGt+cri4Yetco8f+V/dZQPIxm9DOEA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nav2-voxel-grid/default.nix b/distros/foxy/nav2-voxel-grid/default.nix index 4791078f73..63edc80421 100644 --- a/distros/foxy/nav2-voxel-grid/default.nix +++ b/distros/foxy/nav2-voxel-grid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-voxel-grid"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_voxel_grid/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "6cb15b7d90cecf330820221b3674f3076b113c9bd23b1327b0b3a8c977541f03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_voxel_grid/0.4.7-1"; + sha256 = "sha256-N/NGysTvtG/8LIw8r4afh/HLVc+vmGNkLLD27tfhvCo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/foxy/nav2-waypoint-follower/default.nix b/distros/foxy/nav2-waypoint-follower/default.nix index 6bf91d66be..3fd339c858 100644 --- a/distros/foxy/nav2-waypoint-follower/default.nix +++ b/distros/foxy/nav2-waypoint-follower/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nav2-waypoint-follower"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/nav2_waypoint_follower/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "bd04ec41c0e017aa118ba14d276a7b49ba868302b19b9d3676d715a86a6e73ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/nav2_waypoint_follower/0.4.7-1"; + sha256 = "sha256-/ZXZJSQKJhyeu789HACoMQnX9ZcIjsDt14UVY7SK6xs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/navigation2/default.nix b/distros/foxy/navigation2/default.nix index e0534e45aa..b78cf5ec89 100644 --- a/distros/foxy/navigation2/default.nix +++ b/distros/foxy/navigation2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-navigation2"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/navigation2/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "833940d28f8f346624ee4e7672ed60038b51799459666458344aa16a7c7f83e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/navigation2/0.4.7-1"; + sha256 = "sha256-qJ2zzy1M2NP0s0r/cAgDE4DZhhEdaShovSUf7YAdcJc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/neobotix-usboard-msgs/default.nix b/distros/foxy/neobotix-usboard-msgs/default.nix index 9527bb5ea1..c2df5f56f4 100644 --- a/distros/foxy/neobotix-usboard-msgs/default.nix +++ b/distros/foxy/neobotix-usboard-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-neobotix-usboard-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/neobotix_usboard_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "7daaa6ad2392569bb26cb3c35030db44ff13477b38216d222f19f3f7e3150037"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/neobotix_usboard_msgs/3.1.0-1"; + sha256 = "sha256-zD7LBugkWjlww5RsCcD0ng7drVyFRrY6UjI8+LMfwTA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/nerian-stereo/default.nix b/distros/foxy/nerian-stereo/default.nix index cea5114b57..adc9dc8d8a 100644 --- a/distros/foxy/nerian-stereo/default.nix +++ b/distros/foxy/nerian-stereo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nerian-stereo"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/nerian-vision/nerian_stereo_ros2-release/archive/release/foxy/nerian_stereo/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "33f56cf27bfb2363f02ad66a3ef9ad6ad162fb055a4916f9435e3f59dd58ed10"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nerian-vision"; + repo = "nerian_stereo_ros2-release"; + rev = "release/foxy/nerian_stereo/1.1.1-1"; + sha256 = "sha256-6CoVp+bNN3DR6PXmHMBsHHQjSlUDErcEe1MsKNvOF04="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/nmea-hardware-interface/default.nix b/distros/foxy/nmea-hardware-interface/default.nix index 1b04ea88b7..2574b9e52d 100644 --- a/distros/foxy/nmea-hardware-interface/default.nix +++ b/distros/foxy/nmea-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nmea-hardware-interface"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/nmea_hardware_interface-release/archive/release/foxy/nmea_hardware_interface/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "ffe94d9324cdca94875615be905d2efce8a43fd8943b11cb9485c7d94d647068"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "nmea_hardware_interface-release"; + rev = "release/foxy/nmea_hardware_interface/0.0.2-1"; + sha256 = "sha256-eZIbIzcc76gllAfqcCfYYlrIs8Tso8lkF8kx6+fabAQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/nmea-msgs/default.nix b/distros/foxy/nmea-msgs/default.nix index f065bc461b..b828600fa2 100644 --- a/distros/foxy/nmea-msgs/default.nix +++ b/distros/foxy/nmea-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nmea-msgs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nmea_msgs-release/archive/release/foxy/nmea_msgs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "5e2380f862e14ee32f7df168bc8d35c3d874db82e77d34444669a751ca6a7dfa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nmea_msgs-release"; + rev = "release/foxy/nmea_msgs/2.0.0-1"; + sha256 = "sha256-bswqgESVo01rxSNhUMSl4dZwBC88WoKlS55Dn0U5CQc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/nodl-python/default.nix b/distros/foxy/nodl-python/default.nix index a923e51a8a..3b907fdde3 100644 --- a/distros/foxy/nodl-python/default.nix +++ b/distros/foxy/nodl-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nodl-python"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nodl-release/archive/release/foxy/nodl_python/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "e0877d94c8a263f37fc70675cbef35906d0618793334bf725d02bb76db9ebe2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nodl-release"; + rev = "release/foxy/nodl_python/0.3.1-1"; + sha256 = "sha256-rHEAtKnNTsXSB1UGfZYRfy3DQXrnGFWNntTfJyxEymc="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-lint-auto ament-lint-common ament-mypy python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/foxy/nonpersistent-voxel-layer/default.nix b/distros/foxy/nonpersistent-voxel-layer/default.nix index 1d4e18aeec..d4b288dda1 100644 --- a/distros/foxy/nonpersistent-voxel-layer/default.nix +++ b/distros/foxy/nonpersistent-voxel-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-nonpersistent-voxel-layer"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/nonpersistent_voxel_layer-release/archive/release/foxy/nonpersistent_voxel_layer/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "e189c07f0f785bd3324cd9d28f25acf8a9baec967e79225cdf1a69ed5cd70d93"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "nonpersistent_voxel_layer-release"; + rev = "release/foxy/nonpersistent_voxel_layer/2.2.1-1"; + sha256 = "sha256-63ioQw5Ul5R5DuOFJoyahPFZRRClQJbp1NLmSdjDUy4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/novatel-gps-driver/default.nix b/distros/foxy/novatel-gps-driver/default.nix index d0ded9366f..09ec6b2733 100644 --- a/distros/foxy/novatel-gps-driver/default.nix +++ b/distros/foxy/novatel-gps-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-novatel-gps-driver"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/novatel_gps_driver-release/archive/release/foxy/novatel_gps_driver/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "cd9171fc6729a842caed9d6b12293be2a892f172e9dcf5a34861657d2a935fe3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/foxy/novatel_gps_driver/4.1.0-1"; + sha256 = "sha256-cZjlG6dRNZFhbj3Ss7eoWxudyZjsuebtPzpvz4watQA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/novatel-gps-msgs/default.nix b/distros/foxy/novatel-gps-msgs/default.nix index 6965480a57..caacafdda5 100644 --- a/distros/foxy/novatel-gps-msgs/default.nix +++ b/distros/foxy/novatel-gps-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-novatel-gps-msgs"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/novatel_gps_driver-release/archive/release/foxy/novatel_gps_msgs/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "dc0eda51c65eff846ca582e8d9b094c9a9305f1e210463e6fdbae8f8fdfe1292"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/foxy/novatel_gps_msgs/4.1.0-1"; + sha256 = "sha256-elfNxlJFo9e8ju38PBf3lPgK556DR5KyNBIPcvS7VMc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/ntpd-driver/default.nix b/distros/foxy/ntpd-driver/default.nix index 7632d5822a..65577a1e04 100644 --- a/distros/foxy/ntpd-driver/default.nix +++ b/distros/foxy/ntpd-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ntpd-driver"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/vooon/ntpd_driver-release/archive/release/foxy/ntpd_driver/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "dc9c3c62e48615600f094c5e555108445add91e13a27911fc402966f6b56a7f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vooon"; + repo = "ntpd_driver-release"; + rev = "release/foxy/ntpd_driver/2.2.0-1"; + sha256 = "sha256-Y3hISLK0EHzcJD4MrfgxDdmYH+cpgQTjbH3DCmbd0VE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ntrip-client/default.nix b/distros/foxy/ntrip-client/default.nix index 4776278152..71d0dbec00 100644 --- a/distros/foxy/ntrip-client/default.nix +++ b/distros/foxy/ntrip-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ntrip-client"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ntrip_client-release/archive/release/foxy/ntrip_client/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "877f06e1439f249ffbb640401fb9f724173f1d2ed9efb520e182ae4d9f345a93"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ntrip_client-release"; + rev = "release/foxy/ntrip_client/1.2.0-1"; + sha256 = "sha256-D2B2lApA/XdsUVc6tMvHaZBKPMxKG+1deA3REcfJSS8="; + }; buildType = "ament_python"; propagatedBuildInputs = [ mavros-msgs nmea-msgs rclpy std-msgs ]; diff --git a/distros/foxy/object-msgs/default.nix b/distros/foxy/object-msgs/default.nix index 58a5b21226..69e572685f 100644 --- a/distros/foxy/object-msgs/default.nix +++ b/distros/foxy/object-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-object-msgs"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_object_msgs-release/archive/release/foxy/object_msgs/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "16023cff6d62e6729af50405543afdbd844d9d211a1ee9b300328dc5e9c47edc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_object_msgs-release"; + rev = "release/foxy/object_msgs/0.4.0-1"; + sha256 = "sha256-avYFAzNzRjk69zTtxoDHnd6NkmTNj8npyJ2pIGd7g6M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/object-recognition-msgs/default.nix b/distros/foxy/object-recognition-msgs/default.nix index decc2a87ab..482b73a72f 100644 --- a/distros/foxy/object-recognition-msgs/default.nix +++ b/distros/foxy/object-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-object-recognition-msgs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/object_recognition_msgs-release/archive/release/foxy/object_recognition_msgs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "16ab384e99d3e6f75d017588c69f6d944cc0942c9f37efcf703db45d1f38a639"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "object_recognition_msgs-release"; + rev = "release/foxy/object_recognition_msgs/2.0.0-1"; + sha256 = "sha256-51GLrMSSWkdlTz5SBW9ImQilU5Rojo8emRiwZZtZtS0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/octomap-mapping/default.nix b/distros/foxy/octomap-mapping/default.nix index 61d1e42f04..41e0a9f8b5 100644 --- a/distros/foxy/octomap-mapping/default.nix +++ b/distros/foxy/octomap-mapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-octomap-mapping"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_mapping-release/archive/release/foxy/octomap_mapping/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "3f395af96d0a484f017211e8b75156e2e8d5830c5d12cc39e586d3be4ed64bac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_mapping-release"; + rev = "release/foxy/octomap_mapping/2.0.0-1"; + sha256 = "sha256-8X4kZ4yCTELXt6wgdUt0ftR0Nn+TvtK9cMWDMgapEhM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/octomap-msgs/default.nix b/distros/foxy/octomap-msgs/default.nix index 91de40954b..dea05c71e0 100644 --- a/distros/foxy/octomap-msgs/default.nix +++ b/distros/foxy/octomap-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-octomap-msgs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_msgs-release/archive/release/foxy/octomap_msgs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "fc4be1b8bf3c54baa958c5038b52178d5a0d652c3f96272e5cb70981cfc5796e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_msgs-release"; + rev = "release/foxy/octomap_msgs/2.0.0-1"; + sha256 = "sha256-97tbZTVcZMc2CB2JAW6gn0/ABahvBbfiC3jpHDIJJ6I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/octomap-ros/default.nix b/distros/foxy/octomap-ros/default.nix index f3b8023956..5690ff5c8e 100644 --- a/distros/foxy/octomap-ros/default.nix +++ b/distros/foxy/octomap-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-octomap-ros"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_ros-release/archive/release/foxy/octomap_ros/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "71a489c497eab3b8ebaa254356272247db3be9bb554fec5654b0cd1f0dcfc58c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_ros-release"; + rev = "release/foxy/octomap_ros/0.4.3-1"; + sha256 = "sha256-RD+gwS31k6UPEKegLdv6kSOha4ju5W2T5EwCpMkZ5Lc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/octomap-rviz-plugins/default.nix b/distros/foxy/octomap-rviz-plugins/default.nix index c586f70b14..8934476b21 100644 --- a/distros/foxy/octomap-rviz-plugins/default.nix +++ b/distros/foxy/octomap-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-octomap-rviz-plugins"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_rviz_plugins-release/archive/release/foxy/octomap_rviz_plugins/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "53ee0470b8a3a451ccb054de708759c9d45f8155d6e90783faeab49c73671be7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_rviz_plugins-release"; + rev = "release/foxy/octomap_rviz_plugins/2.0.0-1"; + sha256 = "sha256-M9xdQSP9dc1bw2Jkn7tJ506Ah5/lABFrjFf03Ot8828="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/octomap-server/default.nix b/distros/foxy/octomap-server/default.nix index d3e0e0a137..01b39776e9 100644 --- a/distros/foxy/octomap-server/default.nix +++ b/distros/foxy/octomap-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-octomap-server"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_mapping-release/archive/release/foxy/octomap_server/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "9f199491cbdf4079af611054fce039ea70d7b0d9a372a931d8c97bf5bf521697"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_mapping-release"; + rev = "release/foxy/octomap_server/2.0.0-1"; + sha256 = "sha256-Uh6hgimLc8sgK2A6cuJWe0IPqZeR6ljm1xQoNRwe9ck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/octomap/default.nix b/distros/foxy/octomap/default.nix index 81ea3ba1ef..4af884b098 100644 --- a/distros/foxy/octomap/default.nix +++ b/distros/foxy/octomap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-octomap"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/foxy/octomap/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "3c87ff348c5a0afd6f96c0f1ac077fecaccfc82d1fcd5f93ef2d1358dbba671f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/foxy/octomap/1.9.8-1"; + sha256 = "sha256-8DAIMo4RdqnTKlM9nK2fg9FEc9jiOtHIL52VQjvOY10="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/octovis/default.nix b/distros/foxy/octovis/default.nix index 2798311fff..3c3b906210 100644 --- a/distros/foxy/octovis/default.nix +++ b/distros/foxy/octovis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-octovis"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/foxy/octovis/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "c3d44b01d9b95bbeaffa4fb05e1fd789658d3db59e1320e481a1abbbbbd8ae8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/foxy/octovis/1.9.8-1"; + sha256 = "sha256-+mKBcmrJjmxjj9ANTkERK1qs3FIgtIAfMmGGKzxQ2hs="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/ompl/default.nix b/distros/foxy/ompl/default.nix index 8f53831816..afae636f40 100644 --- a/distros/foxy/ompl/default.nix +++ b/distros/foxy/ompl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ompl"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ompl-release/archive/release/foxy/ompl/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "d4805d21f58071855d0e835e60b2942bcdb3bc86179cb493ed2b9e8b4e5dc290"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ompl-release"; + rev = "release/foxy/ompl/1.5.0-1"; + sha256 = "sha256-LL8Dl1l2L4gFG/uVL+1x1HNno8IxDEbYyorYdg8KNbo="; + }; buildType = "cmake"; buildInputs = [ cmake pkg-config ]; diff --git a/distros/foxy/openzen-driver/default.nix b/distros/foxy/openzen-driver/default.nix index dab8a5909b..b6d9c68983 100644 --- a/distros/foxy/openzen-driver/default.nix +++ b/distros/foxy/openzen-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-openzen-driver"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/lp-research/openzen_sensor_ros2-release/archive/release/foxy/openzen_driver/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "13508ba2db05e446942b792dc0539e06546470a9071cb24c3543db431e3035f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lp-research"; + repo = "openzen_sensor_ros2-release"; + rev = "release/foxy/openzen_driver/1.2.0-2"; + sha256 = "sha256-Uy8ICCnPmuP/oIlfhQhSlp2soLk/U4Bq+d7GFAMqqBo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/oroca-rqt-command/default.nix b/distros/foxy/oroca-rqt-command/default.nix index ff896c065d..ea62eb0650 100644 --- a/distros/foxy/oroca-rqt-command/default.nix +++ b/distros/foxy/oroca-rqt-command/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-oroca-rqt-command"; version = "0.6.0-r3"; - src = fetchurl { - url = "https://github.com/oroca-release/oroca_rqt_command-release/archive/release/foxy/oroca_rqt_command/0.6.0-3.tar.gz"; - name = "0.6.0-3.tar.gz"; - sha256 = "7d67ed103dcacb1276741c2fc154962bc0aa72a87f9c96ef18aa9cc5a8a46672"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "oroca-release"; + repo = "oroca_rqt_command-release"; + rev = "release/foxy/oroca_rqt_command/0.6.0-3"; + sha256 = "sha256-oE4mJcND4qoRqL+5PmzNvEMHfQIeEV95MYlNRoqxVTc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/orocos-kdl/default.nix b/distros/foxy/orocos-kdl/default.nix index 231d5520f7..27a95d467e 100644 --- a/distros/foxy/orocos-kdl/default.nix +++ b/distros/foxy/orocos-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-orocos-kdl"; version = "3.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/orocos_kinematics_dynamics-release/archive/release/foxy/orocos_kdl/3.3.4-1.tar.gz"; - name = "3.3.4-1.tar.gz"; - sha256 = "833a045a938048afc42fc7f73466b686961d98d5763a8a2a05d0df29fa6dd704"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "orocos_kinematics_dynamics-release"; + rev = "release/foxy/orocos_kdl/3.3.4-1"; + sha256 = "sha256-OGJTX9wdGxUeopm3ThD1jhLJoYEQuTqZnMZSrdQiZO8="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/osqp-vendor/default.nix b/distros/foxy/osqp-vendor/default.nix index f789b78563..91c8a97691 100644 --- a/distros/foxy/osqp-vendor/default.nix +++ b/distros/foxy/osqp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-osqp-vendor"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osqp_vendor-release/archive/release/foxy/osqp_vendor/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "3cc877c1260cae0b745096199d1061a6482cf71f2870d8004d9142fd7686973a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osqp_vendor-release"; + rev = "release/foxy/osqp_vendor/0.2.0-1"; + sha256 = "sha256-I6jhthmRppj6fiDd1M+bbW8W/bsR5/0ur5UWcf4/ZGQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ros-environment ]; diff --git a/distros/foxy/osrf-pycommon/default.nix b/distros/foxy/osrf-pycommon/default.nix index f812c349bf..500e5041af 100644 --- a/distros/foxy/osrf-pycommon/default.nix +++ b/distros/foxy/osrf-pycommon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-osrf-pycommon"; version = "0.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osrf_pycommon-release/archive/release/foxy/osrf_pycommon/0.1.11-1.tar.gz"; - name = "0.1.11-1.tar.gz"; - sha256 = "62adc3d4029feb8f2baf55d7375d25f444e38e63a9c24795c78643e66d0d2b92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osrf_pycommon-release"; + rev = "release/foxy/osrf_pycommon/0.1.11-1"; + sha256 = "sha256-5M7L7dhYvWXtpaEY90h1QezIqBDIkTqU733lQGhqtuI="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.mock ]; diff --git a/distros/foxy/osrf-testing-tools-cpp/default.nix b/distros/foxy/osrf-testing-tools-cpp/default.nix index 3e8477c3aa..6c3dda89bf 100644 --- a/distros/foxy/osrf-testing-tools-cpp/default.nix +++ b/distros/foxy/osrf-testing-tools-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-osrf-testing-tools-cpp"; version = "1.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osrf_testing_tools_cpp-release/archive/release/foxy/osrf_testing_tools_cpp/1.3.4-1.tar.gz"; - name = "1.3.4-1.tar.gz"; - sha256 = "98f3344389c89ad4266310729ed091cc523b3bd3827760aa36e55b2eacf071f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osrf_testing_tools_cpp-release"; + rev = "release/foxy/osrf_testing_tools_cpp/1.3.4-1"; + sha256 = "sha256-ytnit3gdJ5NLEyG9QvEsrANMyBG5X3mDn8z4JZ98uzU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/ouster-msgs/default.nix b/distros/foxy/ouster-msgs/default.nix index 2ec1970b35..c917879613 100644 --- a/distros/foxy/ouster-msgs/default.nix +++ b/distros/foxy/ouster-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ouster-msgs"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/ros2_ouster_drivers-release/archive/release/foxy/ouster_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "9d2c2a5237fae91ade22094f6f1f5fc2baa2d57958185926f1210ea79c413a49"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "ros2_ouster_drivers-release"; + rev = "release/foxy/ouster_msgs/0.2.0-1"; + sha256 = "sha256-OV8QyTHYwCZNAno0PLyVflOh/iA73HF0hUHU3UtDaqM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ouxt-common/default.nix b/distros/foxy/ouxt-common/default.nix index ee0fb18389..39abe846d8 100644 --- a/distros/foxy/ouxt-common/default.nix +++ b/distros/foxy/ouxt-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ouxt-common"; version = "0.0.8-r2"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/ouxt_common-release/archive/release/foxy/ouxt_common/0.0.8-2.tar.gz"; - name = "0.0.8-2.tar.gz"; - sha256 = "6ffbece2115efefd24b253933d36fc292319ab1ed18821a9ca25fa5437d5e8cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "ouxt_common-release"; + rev = "release/foxy/ouxt_common/0.0.8-2"; + sha256 = "sha256-4nyGy7HVcpb5Cb/zBa9+kz8o7aXZyGqY2Fdy17Xd9ZY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ouxt-lint-common/default.nix b/distros/foxy/ouxt-lint-common/default.nix index 803275ae23..d3ec8e4856 100644 --- a/distros/foxy/ouxt-lint-common/default.nix +++ b/distros/foxy/ouxt-lint-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ouxt-lint-common"; version = "0.0.8-r2"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/ouxt_common-release/archive/release/foxy/ouxt_lint_common/0.0.8-2.tar.gz"; - name = "0.0.8-2.tar.gz"; - sha256 = "a0a39b499588769bce6675393941441202dda4d14ff1e425612c23a57b0e954c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "ouxt_common-release"; + rev = "release/foxy/ouxt_lint_common/0.0.8-2"; + sha256 = "sha256-CzvbzrJWL16B2/c63ryLS008hT4dSu50P4AhU+lsHpQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pacmod-msgs/default.nix b/distros/foxy/pacmod-msgs/default.nix index 8782029100..e964cfc6c8 100644 --- a/distros/foxy/pacmod-msgs/default.nix +++ b/distros/foxy/pacmod-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pacmod-msgs"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/foxy/pacmod_msgs/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "2339e91006ab1e3492f75d2c2b620cc5c1a99c2bf633811aa916d9093f97962b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/foxy/pacmod_msgs/3.1.0-1"; + sha256 = "sha256-hPEBGr+Q78JfkJm55oMSuIhKiQ0fuidvRGI/zv9JKDg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/pal-gazebo-worlds/default.nix b/distros/foxy/pal-gazebo-worlds/default.nix index 88d7a2427c..4aefe088c5 100644 --- a/distros/foxy/pal-gazebo-worlds/default.nix +++ b/distros/foxy/pal-gazebo-worlds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pal-gazebo-worlds"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_gazebo_worlds-ros2-release/archive/release/foxy/pal_gazebo_worlds/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "e5931f7ab146d082b390e936ab1c231039b55d648e72aec181ba8d4b7d62e4ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_gazebo_worlds-ros2-release"; + rev = "release/foxy/pal_gazebo_worlds/3.0.2-1"; + sha256 = "sha256-esU3pv3zI59rrioXrYePD3rZO8IxF9CZF/lc1Od3vYQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/foxy/pal-statistics-msgs/default.nix b/distros/foxy/pal-statistics-msgs/default.nix index 90d13624fb..f70b3f926b 100644 --- a/distros/foxy/pal-statistics-msgs/default.nix +++ b/distros/foxy/pal-statistics-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pal-statistics-msgs"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_statistics-release/archive/release/foxy/pal_statistics_msgs/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "a03ae26d1f588a3be67d74842ebe9480b03d7b4b9e830ec07924404fb662ecf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_statistics-release"; + rev = "release/foxy/pal_statistics_msgs/2.0.2-1"; + sha256 = "sha256-MK5S6pwF8nW5DXAlrwZIgnpf372fFD2OKm6tNF0AGwU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/pal-statistics/default.nix b/distros/foxy/pal-statistics/default.nix index ef22a237a4..9fff13edd3 100644 --- a/distros/foxy/pal-statistics/default.nix +++ b/distros/foxy/pal-statistics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pal-statistics"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_statistics-release/archive/release/foxy/pal_statistics/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "22f68620ffac68d0877998071324eb5ec40ec2c8d608597aac548ed830beec1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_statistics-release"; + rev = "release/foxy/pal_statistics/2.0.2-1"; + sha256 = "sha256-2nH8s/QciTdjFCpFtVtxgFMqA/RuyIOquYSlovrkvAo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/pcl-conversions/default.nix b/distros/foxy/pcl-conversions/default.nix index 6bc2602670..1fa2684c62 100644 --- a/distros/foxy/pcl-conversions/default.nix +++ b/distros/foxy/pcl-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pcl-conversions"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/foxy/pcl_conversions/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "ad11b9c5f72abe4f6a4990f7dba92a00ce3c87454f7dc946a6720b7f59cdf43d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/foxy/pcl_conversions/2.2.1-1"; + sha256 = "sha256-sQg11pbIv4ChuHqBrXNTodUsZ6J9sursATXB3FCsqNk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pcl-msgs/default.nix b/distros/foxy/pcl-msgs/default.nix index 232e576ef9..1819580dad 100644 --- a/distros/foxy/pcl-msgs/default.nix +++ b/distros/foxy/pcl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pcl-msgs"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pcl_msgs-release/archive/release/foxy/pcl_msgs/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "e75d920900d92afd182eb07d1419e4beff0f94b35d038c1664f132580fc0e1f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pcl_msgs-release"; + rev = "release/foxy/pcl_msgs/1.0.0-2"; + sha256 = "sha256-YdspDlpwU8CIVBKEa3kLCnDsR3MsuehC9zuvXtAnt4w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/pcl-ros/default.nix b/distros/foxy/pcl-ros/default.nix index c1efce1c30..ce59391c7e 100644 --- a/distros/foxy/pcl-ros/default.nix +++ b/distros/foxy/pcl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pcl-ros"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/foxy/pcl_ros/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "4c493dc3b4d0d13d6f29eeb78e63260ecdd849d01d51ddac594c3c59ef5de02e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/foxy/pcl_ros/2.2.1-1"; + sha256 = "sha256-ZbkWjEPtGMfpK7LgJQy9CypordAf6xvdi/oRl+sFfYI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pendulum-control/default.nix b/distros/foxy/pendulum-control/default.nix index 1c170f5167..376968e0bb 100644 --- a/distros/foxy/pendulum-control/default.nix +++ b/distros/foxy/pendulum-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pendulum-control"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/pendulum_control/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "863ce27f01834250fca91abc76fc448b716fc8c0c8c2882020509ea525e54e5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/pendulum_control/0.9.4-1"; + sha256 = "sha256-/ngkOTkHvEiMbdVwgI/yGy4pwQUtAGNnH3/Zpmqa954="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pendulum-msgs/default.nix b/distros/foxy/pendulum-msgs/default.nix index 6811c77d8e..b5d6484a18 100644 --- a/distros/foxy/pendulum-msgs/default.nix +++ b/distros/foxy/pendulum-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pendulum-msgs"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/pendulum_msgs/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "fe5d0b6af44b9323879d8588c354ed7539fb986462669b95b9d7623a84abecc9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/pendulum_msgs/0.9.4-1"; + sha256 = "sha256-lOkkDnlYnpOGeky2DuNE7KcHjO7zPO9h/wbS8wOg9tY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/pepper-meshes/default.nix b/distros/foxy/pepper-meshes/default.nix index 60f0a4d191..493f4e756a 100644 --- a/distros/foxy/pepper-meshes/default.nix +++ b/distros/foxy/pepper-meshes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pepper-meshes"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-naoqi/pepper_meshes2-release/archive/release/foxy/pepper_meshes/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "0d9d785bf61c7ca313490ac86596fdac73e703a1f9d6e2b61de63ffea6ae428d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "pepper_meshes2-release"; + rev = "release/foxy/pepper_meshes/2.0.1-1"; + sha256 = "sha256-x7TfmyylvHyBpFrOUKQGtaZikgDGcbMTBbtX4knsxeE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake openjdk ]; diff --git a/distros/foxy/perception-pcl/default.nix b/distros/foxy/perception-pcl/default.nix index b7d3e9c26d..ea1c95efcc 100644 --- a/distros/foxy/perception-pcl/default.nix +++ b/distros/foxy/perception-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-perception-pcl"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/foxy/perception_pcl/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "7918bd5cd469966350512c8d9cc70d3c52f3df180e2c38ff05060b4ed7c34da5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/foxy/perception_pcl/2.2.1-1"; + sha256 = "sha256-RlKY5Znn1hwoNu+cU09p8tlXjk12J/YuoCrek/27IRI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/performance-test-fixture/default.nix b/distros/foxy/performance-test-fixture/default.nix index 115c293414..b684bca6cd 100644 --- a/distros/foxy/performance-test-fixture/default.nix +++ b/distros/foxy/performance-test-fixture/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-performance-test-fixture"; version = "0.0.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/performance_test_fixture-release/archive/release/foxy/performance_test_fixture/0.0.9-1.tar.gz"; - name = "0.0.9-1.tar.gz"; - sha256 = "796a5e4aca50c9a1afed499bdc3af6972e2401b100f2993f2226e760f123e33b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "performance_test_fixture-release"; + rev = "release/foxy/performance_test_fixture/0.0.9-1"; + sha256 = "sha256-AGkyb6QjietsUExtcqvwhnGy5Sd2EFBT8JkBAd4rb4o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ament-cmake-export-dependencies ament-cmake-export-targets ament-cmake-test ]; diff --git a/distros/foxy/performance-test/default.nix b/distros/foxy/performance-test/default.nix index f666af52cd..9f1f1a0103 100644 --- a/distros/foxy/performance-test/default.nix +++ b/distros/foxy/performance-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-performance-test"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/performance_test-release/archive/release/foxy/performance_test/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "525cfade4a96984b86c41f451b3f15cf7617c346952e1a48139c437fd94513f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "performance_test-release"; + rev = "release/foxy/performance_test/1.2.1-1"; + sha256 = "sha256-u4mAwbA+JRMXmY53Z0E6Uz7BQJcVZkDovcmnVCK1KxU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake osrf-testing-tools-cpp rosidl-default-generators ]; diff --git a/distros/foxy/phidgets-accelerometer/default.nix b/distros/foxy/phidgets-accelerometer/default.nix index b556abf3b3..bead46cfa9 100644 --- a/distros/foxy/phidgets-accelerometer/default.nix +++ b/distros/foxy/phidgets-accelerometer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-accelerometer"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_accelerometer/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "2bbb3a148e162663b8a236bb614c84e8b802d17c60a35e241ef5e178e5645dd0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_accelerometer/2.1.2-1"; + sha256 = "sha256-I35ebxXUXohd1MwztXctFfRFUhyaAWuyt52XEv/wzLs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-analog-inputs/default.nix b/distros/foxy/phidgets-analog-inputs/default.nix index 66342fbe0f..678ee2173e 100644 --- a/distros/foxy/phidgets-analog-inputs/default.nix +++ b/distros/foxy/phidgets-analog-inputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-analog-inputs"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_analog_inputs/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "68de3330d81107cd47632be5dd6dc3950c81f3bb5bf52f3c160d4c41d232fd70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_analog_inputs/2.1.2-1"; + sha256 = "sha256-ncF9meKMLL6F7XAqv1JR755Uy58RlRVs58cjNJiI2MI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-api/default.nix b/distros/foxy/phidgets-api/default.nix index 70726b7e16..0fc2d1b76e 100644 --- a/distros/foxy/phidgets-api/default.nix +++ b/distros/foxy/phidgets-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-api"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_api/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "ad71b362a36d03cf333d374d229011f8f4f0652b47d2eff0b78069f3a01cd147"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_api/2.1.2-1"; + sha256 = "sha256-ErgzZdpB74bxy0YoyPNKOmZw7EvYeN3fMOpMoUcqr9E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-digital-inputs/default.nix b/distros/foxy/phidgets-digital-inputs/default.nix index 4baf00a50b..99fab096eb 100644 --- a/distros/foxy/phidgets-digital-inputs/default.nix +++ b/distros/foxy/phidgets-digital-inputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-digital-inputs"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_digital_inputs/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "a36f9e201a750fdb8c323b40a7f42799f875267cf19fe0214986b03b22f0f598"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_digital_inputs/2.1.2-1"; + sha256 = "sha256-Mwy3cjwPVWDIzzba0EgXHkqMn/ycZUP4Bf+HO1h+Zi8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-digital-outputs/default.nix b/distros/foxy/phidgets-digital-outputs/default.nix index 2750b38e7c..c1b2bcfc5a 100644 --- a/distros/foxy/phidgets-digital-outputs/default.nix +++ b/distros/foxy/phidgets-digital-outputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-digital-outputs"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_digital_outputs/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "af3cf33c950347d0b22e70200ba8892438a45eb561c17a4e13c4bf740bea0d71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_digital_outputs/2.1.2-1"; + sha256 = "sha256-c1B9DcHHYsoio8fPtZAaN91r6RTWPgyBM4E6kkgDxVw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-drivers/default.nix b/distros/foxy/phidgets-drivers/default.nix index 6ba12cbd74..83d47a0a7a 100644 --- a/distros/foxy/phidgets-drivers/default.nix +++ b/distros/foxy/phidgets-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-drivers"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_drivers/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "cbf2a624e2d0965c1b10e660b81df3e9698011dd705a9ad4af24377299fc0416"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_drivers/2.1.2-1"; + sha256 = "sha256-+2FfvVZIBUykNjBGVzzSfIUzrv2mxi0f3sPhA8rk3x4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/phidgets-gyroscope/default.nix b/distros/foxy/phidgets-gyroscope/default.nix index e0469cc107..725adcd26e 100644 --- a/distros/foxy/phidgets-gyroscope/default.nix +++ b/distros/foxy/phidgets-gyroscope/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-gyroscope"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_gyroscope/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "92cc37fa9a65a97e8fc3926ec74e5337e34bb2fbd77d45c9b75e69001443c409"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_gyroscope/2.1.2-1"; + sha256 = "sha256-yf/qslY06zl0M/uFb8j3Acf/2jdDaIH54S5yf+RfVj0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-high-speed-encoder/default.nix b/distros/foxy/phidgets-high-speed-encoder/default.nix index 0ae15777b5..ca716dbb82 100644 --- a/distros/foxy/phidgets-high-speed-encoder/default.nix +++ b/distros/foxy/phidgets-high-speed-encoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-high-speed-encoder"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_high_speed_encoder/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "b065f2002e42cb7f3e456d38794346aa07e6428a8a96b227cc627b18e56b252c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_high_speed_encoder/2.1.2-1"; + sha256 = "sha256-g67xfUVBP80M3HT3F6zBqX9L3VXaE++JdxjBbDsAAJc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-ik/default.nix b/distros/foxy/phidgets-ik/default.nix index 100933c8e5..0db7839a56 100644 --- a/distros/foxy/phidgets-ik/default.nix +++ b/distros/foxy/phidgets-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-ik"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_ik/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "e6d73610c1c819c64e894ae3a0eb6e5bfd59538bb2e777bab02ca6c1b9c16d76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_ik/2.1.2-1"; + sha256 = "sha256-LxOVm0Hn+aA5OtRKKr3j6uYjICgmaaOb03zsd+c/XwA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/phidgets-magnetometer/default.nix b/distros/foxy/phidgets-magnetometer/default.nix index 291f36baa8..f49ff85544 100644 --- a/distros/foxy/phidgets-magnetometer/default.nix +++ b/distros/foxy/phidgets-magnetometer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-magnetometer"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_magnetometer/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "362aab68803fa18ccc0a1b586f7ddee8bdf3b46762becd2d2e9dd1d9adde0e49"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_magnetometer/2.1.2-1"; + sha256 = "sha256-BzVeahIKRu6l3EmyeghSxwV/LOsNk/UqiejuW5Yte0s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-motors/default.nix b/distros/foxy/phidgets-motors/default.nix index 3cb7c7734d..dbb3cdec94 100644 --- a/distros/foxy/phidgets-motors/default.nix +++ b/distros/foxy/phidgets-motors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-motors"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_motors/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "9dc4a63d173cc2d092731fbf808a8755cfc1bcb39d8b0370cf33852248a1bef8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_motors/2.1.2-1"; + sha256 = "sha256-vAe5SQ0WEfJZ9ok7ZXv6Y6Kxvw9fEAtcKe2TQTB/YaQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-msgs/default.nix b/distros/foxy/phidgets-msgs/default.nix index 4b19465160..204b91f824 100644 --- a/distros/foxy/phidgets-msgs/default.nix +++ b/distros/foxy/phidgets-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-msgs"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_msgs/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "786b6b5ee0509a653e95000c25433c31ffbe4528b1defc04f6ff44f7c04fe226"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_msgs/2.1.2-1"; + sha256 = "sha256-NH+gZI+2DDEi+J/tE1Pwdd+68qQbAr4L1LKC3ARrS9Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/phidgets-spatial/default.nix b/distros/foxy/phidgets-spatial/default.nix index 18af0a3239..88a9232e05 100644 --- a/distros/foxy/phidgets-spatial/default.nix +++ b/distros/foxy/phidgets-spatial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-spatial"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_spatial/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "fac1edb693dd1d7882cd8213450cf61393876e8148f8ebce79712dcf16a11e9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_spatial/2.1.2-1"; + sha256 = "sha256-JGK95X+Zpv62X7afRBUL5XbhFQGQvl9Y5V8eJHXgFQk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/phidgets-temperature/default.nix b/distros/foxy/phidgets-temperature/default.nix index 4ef3dc758c..5f318664e2 100644 --- a/distros/foxy/phidgets-temperature/default.nix +++ b/distros/foxy/phidgets-temperature/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-phidgets-temperature"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/foxy/phidgets_temperature/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "0dc8d261431a54e04b3a2f9b4c1df8b6a962dd2d06c90e270e7e1d2733523db2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/foxy/phidgets_temperature/2.1.2-1"; + sha256 = "sha256-ujssbf0djG/e72D79bnUHXCRCr+Q0cZGO0lwGtsyZrc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/picknik-ament-copyright/default.nix b/distros/foxy/picknik-ament-copyright/default.nix index 4c852aea9e..5c5193ed68 100644 --- a/distros/foxy/picknik-ament-copyright/default.nix +++ b/distros/foxy/picknik-ament-copyright/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-picknik-ament-copyright"; version = "0.0.1-r2"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/picknik_ament_copyright-release/archive/release/foxy/picknik_ament_copyright/0.0.1-2.tar.gz"; - name = "0.0.1-2.tar.gz"; - sha256 = "c5d8bd85234f3480de334143c6f4248d5ed2fa1959561e3103b39f1bdc9914a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "picknik_ament_copyright-release"; + rev = "release/foxy/picknik_ament_copyright/0.0.1-2"; + sha256 = "sha256-Ks8KCascZrVj5c37J19tr+dJpViLiWCzinDYOIRrAIo="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/pinocchio/default.nix b/distros/foxy/pinocchio/default.nix index 8bc2e4df7c..24a977a204 100644 --- a/distros/foxy/pinocchio/default.nix +++ b/distros/foxy/pinocchio/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, clang, cmake, doxygen, eigen, eigenpy, git, hpp-fcl, python3, python3Packages, urdfdom }: buildRosPackage { pname = "ros-foxy-pinocchio"; - version = "2.6.12-r1"; + version = "2.6.14-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pinocchio-release/archive/release/foxy/pinocchio/2.6.12-1.tar.gz"; - name = "2.6.12-1.tar.gz"; - sha256 = "899f34b0aab5a35918a85eb1c5319db991ad4b0939241dc6873157126f0dee92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pinocchio-release"; + rev = "release/foxy/pinocchio/2.6.14-1"; + sha256 = "sha256-yft9ln4QMfdrybyACplCLY0BOPgaxeaDns6DkO7Q4b0="; + }; buildType = "cmake"; buildInputs = [ clang cmake doxygen git ]; diff --git a/distros/foxy/plansys2-bringup/default.nix b/distros/foxy/plansys2-bringup/default.nix index 1b19812223..7bfbad61a3 100644 --- a/distros/foxy/plansys2-bringup/default.nix +++ b/distros/foxy/plansys2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-bringup"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_bringup/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "c05c27d435cd3beca011e03f51702e26024cbf7d88c4797c2650617159fbece4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_bringup/1.0.10-1"; + sha256 = "sha256-nXpAnd6MDj53LskA+mblCVjPuxUZLaadVn4eNJuE/tU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-bt-actions/default.nix b/distros/foxy/plansys2-bt-actions/default.nix index 34654c560d..a4ec3ca6d4 100644 --- a/distros/foxy/plansys2-bt-actions/default.nix +++ b/distros/foxy/plansys2-bt-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-bt-actions"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_bt_actions/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "4c47a3165b9d70c7a2a7a776adaf1786f24e2f3c15de6e7ec918a4e89e002a2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_bt_actions/1.0.10-1"; + sha256 = "sha256-TLBUPZAGllFk1/fhVg2rSPNEzxBt7Bm3tHy0grnkUKk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-core/default.nix b/distros/foxy/plansys2-core/default.nix index c8438bda69..940ce0ee02 100644 --- a/distros/foxy/plansys2-core/default.nix +++ b/distros/foxy/plansys2-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-core"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_core/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "e38a558254f1f01a694e149466cfaecd2241fc9466cf4ebb0bab96581bcb8661"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_core/1.0.10-1"; + sha256 = "sha256-rFTLqfkosDOAWatfXX4d+0bNRKn8rona1yskASHYwCQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-domain-expert/default.nix b/distros/foxy/plansys2-domain-expert/default.nix index e45b080366..a3ae9c3e47 100644 --- a/distros/foxy/plansys2-domain-expert/default.nix +++ b/distros/foxy/plansys2-domain-expert/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-domain-expert"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_domain_expert/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "04733c12496eb67b36d05f1e0e9bd1b22e278d78647c2f9cd5d2340f02f9b1d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_domain_expert/1.0.10-1"; + sha256 = "sha256-buIhl1LRE+FsF8PZ0jCEP31nzY1ChQAssrjzGIddTBw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-executor/default.nix b/distros/foxy/plansys2-executor/default.nix index 9483b6777f..d872cff78a 100644 --- a/distros/foxy/plansys2-executor/default.nix +++ b/distros/foxy/plansys2-executor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-executor"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_executor/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "b9aa39e244b2aa96a088355a3506168e62aabf420007eb2f6dfaf92a4b8f975d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_executor/1.0.10-1"; + sha256 = "sha256-MhwdLeWJ+sNb8qwLo3VjyVV8gH40bKgnjORNgNueuao="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-lifecycle-manager/default.nix b/distros/foxy/plansys2-lifecycle-manager/default.nix index 34c2ada28e..74e7187206 100644 --- a/distros/foxy/plansys2-lifecycle-manager/default.nix +++ b/distros/foxy/plansys2-lifecycle-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-lifecycle-manager"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_lifecycle_manager/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "cd6e824d5918fc69ef0453d7fc5d71e982da9784ff13e84d0338272666e6e78c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_lifecycle_manager/1.0.10-1"; + sha256 = "sha256-Y1Of5wB3a7PyJ1E1uhS6n2lVlhdDu1qPPynfvVcvfLw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-msgs/default.nix b/distros/foxy/plansys2-msgs/default.nix index 33ca1e8162..67082d2f40 100644 --- a/distros/foxy/plansys2-msgs/default.nix +++ b/distros/foxy/plansys2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-msgs"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_msgs/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "bc3026589c88fbc30476215b344d1e36aadaa50580164e3049c2f83db593f236"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_msgs/1.0.10-1"; + sha256 = "sha256-IEF6Kp0AGfzER+YZQnhTIuDDZP0IiPn6yjPx0sPYu+w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-pddl-parser/default.nix b/distros/foxy/plansys2-pddl-parser/default.nix index f1d62ada88..42decb1f63 100644 --- a/distros/foxy/plansys2-pddl-parser/default.nix +++ b/distros/foxy/plansys2-pddl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-pddl-parser"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_pddl_parser/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "4fc997f2e7242c21eaa1256424d0ee46227b8d41768a6d69c85586cd89cdd62f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_pddl_parser/1.0.10-1"; + sha256 = "sha256-KkqaybxAMgQiTdNtr5Mo6AbPyRJUfEr5iMR5Tg8jDx8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-planner/default.nix b/distros/foxy/plansys2-planner/default.nix index aa1905db3e..838c1f0a0f 100644 --- a/distros/foxy/plansys2-planner/default.nix +++ b/distros/foxy/plansys2-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-planner"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_planner/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "f9dcba67f41fb56265d00d62b5f26951a9d74c1ddda535c1807d4b9f0850de07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_planner/1.0.10-1"; + sha256 = "sha256-oAlH1xlJfBp9x+uQq+FceEtxMOpUr2UGuP3XuKSyxbE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-popf-plan-solver/default.nix b/distros/foxy/plansys2-popf-plan-solver/default.nix index ecab296b91..9ff383f841 100644 --- a/distros/foxy/plansys2-popf-plan-solver/default.nix +++ b/distros/foxy/plansys2-popf-plan-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-popf-plan-solver"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_popf_plan_solver/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "264a5c29013274fc364393da3812d9358fcefcd9334dbd4d4fefea008c434ecd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_popf_plan_solver/1.0.10-1"; + sha256 = "sha256-2nL0wfWSroHJfHp1fVRbvDKnkC1a5yPCX/+cYqI3lC0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-problem-expert/default.nix b/distros/foxy/plansys2-problem-expert/default.nix index 1e4f0025c0..82aadbac2b 100644 --- a/distros/foxy/plansys2-problem-expert/default.nix +++ b/distros/foxy/plansys2-problem-expert/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-problem-expert"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_problem_expert/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "1da192f4ee4b104eb621d37fdefb6e4b4e96b923f38490bc979155db1e858e5d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_problem_expert/1.0.10-1"; + sha256 = "sha256-06E+wSPzMK37TzWDoL7Rlf4XJL8ZKqsqLs5RuAeyz9o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plansys2-terminal/default.nix b/distros/foxy/plansys2-terminal/default.nix index 2274530681..5a6330562c 100644 --- a/distros/foxy/plansys2-terminal/default.nix +++ b/distros/foxy/plansys2-terminal/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plansys2-terminal"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/foxy/plansys2_terminal/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "30d6e4330eb95448ff1df959a542a259f474640eb6b3f8663b315aa20d571598"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/foxy/plansys2_terminal/1.0.10-1"; + sha256 = "sha256-vTdAiORVoCig3Wq+4f0mN85xoc0MrgPCve8qFd3c0G4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plotjuggler-msgs/default.nix b/distros/foxy/plotjuggler-msgs/default.nix index 726e3ed285..c02b0e0f57 100644 --- a/distros/foxy/plotjuggler-msgs/default.nix +++ b/distros/foxy/plotjuggler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plotjuggler-msgs"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/facontidavide/plotjuggler_msgs-release/archive/release/foxy/plotjuggler_msgs/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "8eaaa4edd0769369814358e7d4efd264bfd86a604f731ca288b8510df2278a33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "plotjuggler_msgs-release"; + rev = "release/foxy/plotjuggler_msgs/0.2.1-1"; + sha256 = "sha256-LOj/zO/kVp+PLBNkVl/UyunkoA3npudzqmvzwcH5E9Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/plotjuggler-ros/default.nix b/distros/foxy/plotjuggler-ros/default.nix index e176affa1a..34dc79bdc1 100644 --- a/distros/foxy/plotjuggler-ros/default.nix +++ b/distros/foxy/plotjuggler-ros/default.nix @@ -5,13 +5,17 @@ { 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-foxy-plotjuggler-ros"; - version = "1.7.2-r1"; + version = "1.7.3-r1"; - src = fetchurl { - url = "https://github.com/PlotJuggler/plotjuggler-ros-plugins-release/archive/release/foxy/plotjuggler_ros/1.7.2-1.tar.gz"; - name = "1.7.2-1.tar.gz"; - sha256 = "b9ccd0527820889123388af70c416c86717b779845ff11a7c486e3280f85974f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PlotJuggler"; + repo = "plotjuggler-ros-plugins-release"; + rev = "release/foxy/plotjuggler_ros/1.7.3-1"; + sha256 = "sha256-VR0aaD5lX/Jm1qhLOCDHhTdwQIrnrPZlJDYTrMzGsIE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/plotjuggler/default.nix b/distros/foxy/plotjuggler/default.nix index 461454640a..38e1dca549 100644 --- a/distros/foxy/plotjuggler/default.nix +++ b/distros/foxy/plotjuggler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-plotjuggler"; version = "3.6.0-r1"; - src = fetchurl { - url = "https://github.com/facontidavide/plotjuggler-release/archive/release/foxy/plotjuggler/3.6.0-1.tar.gz"; - name = "3.6.0-1.tar.gz"; - sha256 = "8a96a76749e2e5617ff5d095a2752ed3b53682b1f642da97101ee276b233cef9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "plotjuggler-release"; + rev = "release/foxy/plotjuggler/3.6.0-1"; + sha256 = "sha256-nHSTE9bbmkR6byd/ACSbE16oscBg2pMgQIEUMdXFpg0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pluginlib/default.nix b/distros/foxy/pluginlib/default.nix index 83a4b1fb8c..1470f0d900 100644 --- a/distros/foxy/pluginlib/default.nix +++ b/distros/foxy/pluginlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pluginlib"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pluginlib-release/archive/release/foxy/pluginlib/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "df2d9db0e320e5e85de6e5048452620a9b13c4cb9bbe8fd267ac08df8f3f102a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pluginlib-release"; + rev = "release/foxy/pluginlib/2.5.4-1"; + sha256 = "sha256-Kio87f0AJQ6l6VX3iOeDFvb7g20m76E0cdIeeVOc3AY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pmb2-2dnav-gazebo/default.nix b/distros/foxy/pmb2-2dnav-gazebo/default.nix index 6ee4580fca..047926cb8b 100644 --- a/distros/foxy/pmb2-2dnav-gazebo/default.nix +++ b/distros/foxy/pmb2-2dnav-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-2dnav-gazebo"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_simulation-gbp/archive/release/foxy/pmb2_2dnav_gazebo/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "cb0cd5657a62eb893314ffe69deaca91b90e651e840eb8263bf192c8a180c4c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_simulation-gbp"; + rev = "release/foxy/pmb2_2dnav_gazebo/3.0.2-1"; + sha256 = "sha256-DoILVIWnbep7REpipKXbXnLX85MmV62Qka4AVeIYWGM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/pmb2-2dnav/default.nix b/distros/foxy/pmb2-2dnav/default.nix index 8877888c37..5d08765732 100644 --- a/distros/foxy/pmb2-2dnav/default.nix +++ b/distros/foxy/pmb2-2dnav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-2dnav"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_navigation-gbp/archive/release/foxy/pmb2_2dnav/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "f43b4e559d4067c33fab92e1be6b98af74e55abd4f7a1030e6cd09144f0e9311"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_navigation-gbp"; + rev = "release/foxy/pmb2_2dnav/3.0.1-1"; + sha256 = "sha256-7JpzMhfAXI2WONw4ADDgmf040ocujVAc80bmay6W3Dw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/pmb2-bringup/default.nix b/distros/foxy/pmb2-bringup/default.nix index ffde92bcbc..2a3b2ad78b 100644 --- a/distros/foxy/pmb2-bringup/default.nix +++ b/distros/foxy/pmb2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-bringup"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_robot-gbp/archive/release/foxy/pmb2_bringup/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "eb378424ce6b8046bc7abb2fe6c3298af2bbb33e569c2ded2c9871020ab1657c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_robot-gbp"; + rev = "release/foxy/pmb2_bringup/4.0.4-1"; + sha256 = "sha256-LpoAuxlKd4zSSK0tVhrHJ90wWBfTTLstr1VSZqDC2FE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/pmb2-controller-configuration/default.nix b/distros/foxy/pmb2-controller-configuration/default.nix index 710e676aea..3488c7d100 100644 --- a/distros/foxy/pmb2-controller-configuration/default.nix +++ b/distros/foxy/pmb2-controller-configuration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-controller-configuration"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_robot-gbp/archive/release/foxy/pmb2_controller_configuration/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "c16a5f264c729b2aee71f9ce04097ca84915cbf0744e18c7f94982f286141531"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_robot-gbp"; + rev = "release/foxy/pmb2_controller_configuration/4.0.4-1"; + sha256 = "sha256-D2oLdlssp2KpyMT4cFWmqaDF6ZIjAHnbuX0sQ6YkJfI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/pmb2-description/default.nix b/distros/foxy/pmb2-description/default.nix index 2fd8ccb7a5..8137243c7a 100644 --- a/distros/foxy/pmb2-description/default.nix +++ b/distros/foxy/pmb2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-description"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_robot-gbp/archive/release/foxy/pmb2_description/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "2bc1f8479f255e37d44a47a89847e4f98f8a14e42f6e12bebccd5c2e771851b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_robot-gbp"; + rev = "release/foxy/pmb2_description/4.0.4-1"; + sha256 = "sha256-QJYWgEoZLkzxXIT8rKDfddeQjaIX/n8ep1EhIDEGZRE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ament-cmake-python ]; diff --git a/distros/foxy/pmb2-gazebo/default.nix b/distros/foxy/pmb2-gazebo/default.nix index 69b7680633..bd03d249f2 100644 --- a/distros/foxy/pmb2-gazebo/default.nix +++ b/distros/foxy/pmb2-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-gazebo"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_simulation-gbp/archive/release/foxy/pmb2_gazebo/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "f2bd33f70cd2db2de754ba928f551100d6e61c3548ac6c81a541aa00c65584b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_simulation-gbp"; + rev = "release/foxy/pmb2_gazebo/3.0.2-1"; + sha256 = "sha256-Sw6mWWfTJh6gIE8W58TIwynIFx1iii2766sniNzq8Qg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/pmb2-maps/default.nix b/distros/foxy/pmb2-maps/default.nix index 157de9aee2..c948fc97e3 100644 --- a/distros/foxy/pmb2-maps/default.nix +++ b/distros/foxy/pmb2-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-maps"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_navigation-gbp/archive/release/foxy/pmb2_maps/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "ab3f6a6caacdb46babc92db0d073b4e7055474b1c9830f341cc013ec678a304a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_navigation-gbp"; + rev = "release/foxy/pmb2_maps/3.0.1-1"; + sha256 = "sha256-GmpfTOe2YhYRhPMoNnBx781cUXXpEXrFR1egI1xetWM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/pmb2-navigation/default.nix b/distros/foxy/pmb2-navigation/default.nix index 56676f0896..cab35fe6c6 100644 --- a/distros/foxy/pmb2-navigation/default.nix +++ b/distros/foxy/pmb2-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-navigation"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_navigation-gbp/archive/release/foxy/pmb2_navigation/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "ab57897df43f10b028519c2e844bf1a03f947be813f42d205cb459d9b24735c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_navigation-gbp"; + rev = "release/foxy/pmb2_navigation/3.0.1-1"; + sha256 = "sha256-9C8PR/s9El5Gss14s/vxW0RhmcnDbcmudih5p22EYG8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/pmb2-robot/default.nix b/distros/foxy/pmb2-robot/default.nix index 4028ee6a0f..a0699b10b5 100644 --- a/distros/foxy/pmb2-robot/default.nix +++ b/distros/foxy/pmb2-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-robot"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_robot-gbp/archive/release/foxy/pmb2_robot/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "cbb1425c6e135dee80443f4422de0819b2f16e2d0e41a45398bb25a274127aa4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_robot-gbp"; + rev = "release/foxy/pmb2_robot/4.0.4-1"; + sha256 = "sha256-jBMDy69oYB/rDZIj6GRPAlQjaWBgzakCyt3rMaUbSfk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pmb2-simulation/default.nix b/distros/foxy/pmb2-simulation/default.nix index 531a6bda55..a620d2eb37 100644 --- a/distros/foxy/pmb2-simulation/default.nix +++ b/distros/foxy/pmb2-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pmb2-simulation"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_simulation-gbp/archive/release/foxy/pmb2_simulation/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "c27c8f87c8118b62dcd47150f7030cffa6d4b00d76029f945699dae19fb55e2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_simulation-gbp"; + rev = "release/foxy/pmb2_simulation/3.0.2-1"; + sha256 = "sha256-ffQb7ef2ZeSm9EwmvvG8jnyfFSefbr4PpbrKk9vd3Eg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pointcloud-to-laserscan/default.nix b/distros/foxy/pointcloud-to-laserscan/default.nix index f97d10c5b7..41bd93975e 100644 --- a/distros/foxy/pointcloud-to-laserscan/default.nix +++ b/distros/foxy/pointcloud-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pointcloud-to-laserscan"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pointcloud_to_laserscan-release/archive/release/foxy/pointcloud_to_laserscan/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "32c421f51b02bb3b4b0b082b1b382c5e70764bf7cec67e790c6e19f9f0325277"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pointcloud_to_laserscan-release"; + rev = "release/foxy/pointcloud_to_laserscan/2.0.0-1"; + sha256 = "sha256-9F9IiesIUqp2MURE4gAU/JJF5DWDZDkLVOyHkcj5A/s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/pose-cov-ops/default.nix b/distros/foxy/pose-cov-ops/default.nix index e98a74d08a..1b20869063 100644 --- a/distros/foxy/pose-cov-ops/default.nix +++ b/distros/foxy/pose-cov-ops/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pose-cov-ops"; version = "0.3.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pose_cov_ops-release/archive/release/foxy/pose_cov_ops/0.3.8-1.tar.gz"; - name = "0.3.8-1.tar.gz"; - sha256 = "0fbc07f70b9b3afa4e5f3f585a985c45fbfb769b2b242456fd8905abb26534e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pose_cov_ops-release"; + rev = "release/foxy/pose_cov_ops/0.3.8-1"; + sha256 = "sha256-PedCn7b0uRpfsVpaUyJ5yPWogpyzEvsBI6xR2g6O7RE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest ament-cmake-xmllint cmake ros-environment ]; diff --git a/distros/foxy/position-controllers/default.nix b/distros/foxy/position-controllers/default.nix index 1f3dca4c73..01493e10e0 100644 --- a/distros/foxy/position-controllers/default.nix +++ b/distros/foxy/position-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-position-controllers"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/position_controllers/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "3e6f97847639bf7feb20b45aa02bbd3ec9d81d98e30ab5500004386d5c4e8f9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/position_controllers/0.8.2-1"; + sha256 = "sha256-GB72361fKLAGvIWbpyJUtPtLvxm3p9u5Tt/gftlzmjs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; diff --git a/distros/foxy/psen-scan-v2/default.nix b/distros/foxy/psen-scan-v2/default.nix index 6db1d2d2d6..f26f7aeac1 100644 --- a/distros/foxy/psen-scan-v2/default.nix +++ b/distros/foxy/psen-scan-v2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-psen-scan-v2"; version = "0.20.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/psen_scan_v2-ros2-release/archive/release/foxy/psen_scan_v2/0.20.0-1.tar.gz"; - name = "0.20.0-1.tar.gz"; - sha256 = "1ef11d8b0abcbfdde06f130e65f3b25edd253b1f4b8c6621aab7a2330882a95b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "psen_scan_v2-ros2-release"; + rev = "release/foxy/psen_scan_v2/0.20.0-1"; + sha256 = "sha256-P38ofVB478q7cBJPA6jWBGY+7s6ce1MlQIj7Zaat17I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/py-trees-ros-interfaces/default.nix b/distros/foxy/py-trees-ros-interfaces/default.nix index badca8af69..f92df354ea 100644 --- a/distros/foxy/py-trees-ros-interfaces/default.nix +++ b/distros/foxy/py-trees-ros-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-py-trees-ros-interfaces"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/stonier/py_trees_ros_interfaces-release/archive/release/foxy/py_trees_ros_interfaces/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "b06839cd575506d3cfcde376f52f1211d2e11ad13f6f07b20a6446cf00f621fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees_ros_interfaces-release"; + rev = "release/foxy/py_trees_ros_interfaces/2.0.3-1"; + sha256 = "sha256-/YAn9axu8hgAg09ST4zfeqgKuT03Ar4oCl3A9wNUdWg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/py-trees-ros/default.nix b/distros/foxy/py-trees-ros/default.nix index 129cb4d00c..30cf2b9b1f 100644 --- a/distros/foxy/py-trees-ros/default.nix +++ b/distros/foxy/py-trees-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-py-trees-ros"; version = "2.1.1-r3"; - src = fetchurl { - url = "https://github.com/stonier/py_trees_ros-release/archive/release/foxy/py_trees_ros/2.1.1-3.tar.gz"; - name = "2.1.1-3.tar.gz"; - sha256 = "1c6cbab03fd44a3c03dd7e5901f4d3e9aa0cfacf756cd923d44ecc43be847c03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees_ros-release"; + rev = "release/foxy/py_trees_ros/2.1.1-3"; + sha256 = "sha256-fvmmsLbxEeId3Jb2PQYnhcgzdIAJOZZ7QcMEodtaf1c="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.setuptools ]; diff --git a/distros/foxy/pybind11-vendor/default.nix b/distros/foxy/pybind11-vendor/default.nix index 68017ffc10..a97337044c 100644 --- a/distros/foxy/pybind11-vendor/default.nix +++ b/distros/foxy/pybind11-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-pybind11-vendor"; version = "2.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pybind11_vendor-release/archive/release/foxy/pybind11_vendor/2.2.7-1.tar.gz"; - name = "2.2.7-1.tar.gz"; - sha256 = "e0067446f3bf04e3470c67dee554233cfe2cca3d1cf56e4a602ecdb8050bdfe2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pybind11_vendor-release"; + rev = "release/foxy/pybind11_vendor/2.2.7-1"; + sha256 = "sha256-D+O9IJMdlZjOloFKvwu8ptAuCYSfn6yM0z/zVmZe6Tw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/foxy/python-cmake-module/default.nix b/distros/foxy/python-cmake-module/default.nix index d8feec5f90..4ab092808c 100644 --- a/distros/foxy/python-cmake-module/default.nix +++ b/distros/foxy/python-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-python-cmake-module"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/python_cmake_module-release/archive/release/foxy/python_cmake_module/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "8693f665b38570b167804d0bb681fd8ffcccc1b0d634a13dcaa67750bd9cceeb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "python_cmake_module-release"; + rev = "release/foxy/python_cmake_module/0.8.1-1"; + sha256 = "sha256-LOULK9QVVH9h2gJosDy87LqzQEpxSTeIW1aXg9DGKVI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/python-qt-binding/default.nix b/distros/foxy/python-qt-binding/default.nix index 0b7e52889c..77cbd95147 100644 --- a/distros/foxy/python-qt-binding/default.nix +++ b/distros/foxy/python-qt-binding/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-python-qt-binding"; version = "1.0.6-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/python_qt_binding-release/archive/release/foxy/python_qt_binding/1.0.6-2.tar.gz"; - name = "1.0.6-2.tar.gz"; - sha256 = "677afe0d5db221190285bf5a62827ce95442d3d2b2bdbeb296c3bd512748feab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "python_qt_binding-release"; + rev = "release/foxy/python_qt_binding/1.0.6-2"; + sha256 = "sha256-QNcdyIUJBKp6y7uXEq33g11p9Nz6PTyMAEBj0K1I2SE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/foxy/qpoases-vendor/default.nix b/distros/foxy/qpoases-vendor/default.nix index b374659140..fd8233a80e 100644 --- a/distros/foxy/qpoases-vendor/default.nix +++ b/distros/foxy/qpoases-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-qpoases-vendor"; version = "3.2.3-r2"; - src = fetchurl { - url = "https://github.com/Autoware-AI/qpoases_vendor-release/archive/release/foxy/qpoases_vendor/3.2.3-2.tar.gz"; - name = "3.2.3-2.tar.gz"; - sha256 = "5dd8deecfed630f13b4b913df8b17fad61ebb1f6976dde219b1f02df66050ba7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Autoware-AI"; + repo = "qpoases_vendor-release"; + rev = "release/foxy/qpoases_vendor/3.2.3-2"; + sha256 = "sha256-jUSNiB8b0P8JHYXdXeKMs5Ucxjk+fhbPqxcJnD2GIQ4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/qt-dotgraph/default.nix b/distros/foxy/qt-dotgraph/default.nix index 11e7765b54..3d060ba686 100644 --- a/distros/foxy/qt-dotgraph/default.nix +++ b/distros/foxy/qt-dotgraph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-qt-dotgraph"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/foxy/qt_dotgraph/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "f9e446a5abb8ed7cd475e7ebc010f035c0bfb212a61f3da9d55ca55da87cc66e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/foxy/qt_dotgraph/1.1.3-1"; + sha256 = "sha256-GvNQc+38HXgqEHFLTYI4NorBC9FmDEBMBXrWUBFXKn8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/qt-gui-app/default.nix b/distros/foxy/qt-gui-app/default.nix index ca9661def1..a10f22f744 100644 --- a/distros/foxy/qt-gui-app/default.nix +++ b/distros/foxy/qt-gui-app/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-qt-gui-app"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/foxy/qt_gui_app/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "d3ac7eb057b999393f423d79ad7b4646df60653c8e8b5791915af37a25a6fffd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/foxy/qt_gui_app/1.1.3-1"; + sha256 = "sha256-dgsuD8dIWIfTBDWaCQrW9+TKfD35nb9O+kqG2d+YfhI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/qt-gui-core/default.nix b/distros/foxy/qt-gui-core/default.nix index cda191c18a..f6cd724035 100644 --- a/distros/foxy/qt-gui-core/default.nix +++ b/distros/foxy/qt-gui-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-qt-gui-core"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/foxy/qt_gui_core/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "1b891a4fd2c59681d21cd99ad6fafe9d1cf54d4b20d56e757335fcedb1cdf37c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/foxy/qt_gui_core/1.1.3-1"; + sha256 = "sha256-JgdrPQfSv1Xn3TQtHdm5qj+TzZdxGbKthjYfI7uFEUI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/qt-gui-cpp/default.nix b/distros/foxy/qt-gui-cpp/default.nix index e2ca652c4f..e32201fc2c 100644 --- a/distros/foxy/qt-gui-cpp/default.nix +++ b/distros/foxy/qt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-qt-gui-cpp"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/foxy/qt_gui_cpp/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "15b48e76707aa4d4eaf441a63926e5d960808eb52ec358b8fb57b9fb857b3b3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/foxy/qt_gui_cpp/1.1.3-1"; + sha256 = "sha256-BhC4S7Y7roIWctFtm79Ijf/btj8GkQij+qPbAtykFVc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config python-qt-binding qt5.qtbase ]; diff --git a/distros/foxy/qt-gui-py-common/default.nix b/distros/foxy/qt-gui-py-common/default.nix index 8f7d9be097..14244ab9d7 100644 --- a/distros/foxy/qt-gui-py-common/default.nix +++ b/distros/foxy/qt-gui-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-qt-gui-py-common"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/foxy/qt_gui_py_common/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "2ad6a653a25b88d458f7a654ef9f0a122f321f656aac220e703fb135ee455a2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/foxy/qt_gui_py_common/1.1.3-1"; + sha256 = "sha256-QriMiVG1DlnmYXZzo2W2TQL5qiNDcML7s3qW3lW1L8I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/qt-gui/default.nix b/distros/foxy/qt-gui/default.nix index e724b2cb7e..4fb4c696f0 100644 --- a/distros/foxy/qt-gui/default.nix +++ b/distros/foxy/qt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-qt-gui"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/foxy/qt_gui/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "81b90472e1ac0b7800135c977440ad85c3ef7c61ffa0ec8b36de65e0450e947f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/foxy/qt_gui/1.1.3-1"; + sha256 = "sha256-lHA2jwW0/Mh3Jf1+ILldbEWCyIj7e2EPhsKf+di7hec="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.pyqt5 qt5.qtbase ]; diff --git a/distros/foxy/quality-of-service-demo-cpp/default.nix b/distros/foxy/quality-of-service-demo-cpp/default.nix index 782f39d9f6..e5006ccdd9 100644 --- a/distros/foxy/quality-of-service-demo-cpp/default.nix +++ b/distros/foxy/quality-of-service-demo-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-quality-of-service-demo-cpp"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/quality_of_service_demo_cpp/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "cef05dc84137d4e658675ba4d4b6ad031c378b7039a5fe1a40ed463f9d24e4fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/quality_of_service_demo_cpp/0.9.4-1"; + sha256 = "sha256-JLRaqWipE6CYDo2DgCs8dHjtLHj3nZ9b/Sz4k4ylDLQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw-implementation-cmake ]; diff --git a/distros/foxy/quality-of-service-demo-py/default.nix b/distros/foxy/quality-of-service-demo-py/default.nix index 5820199963..500743ca55 100644 --- a/distros/foxy/quality-of-service-demo-py/default.nix +++ b/distros/foxy/quality-of-service-demo-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-quality-of-service-demo-py"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/quality_of_service_demo_py/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "5d359325990ef368ce4c95b4228a6ef58c720c6d770a156c703693c65d3c9be7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/quality_of_service_demo_py/0.9.4-1"; + sha256 = "sha256-1lske0QMy6+2Xx7+/Fmtg5AloAhHws4tt/q/i2D4TIM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/quaternion-operation/default.nix b/distros/foxy/quaternion-operation/default.nix index 2b7bf19b2e..5342cb9758 100644 --- a/distros/foxy/quaternion-operation/default.nix +++ b/distros/foxy/quaternion-operation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-quaternion-operation"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/quaternion_operation-release/archive/release/foxy/quaternion_operation/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "8ce497e6156de01072993ba627ce8916bec87bd00b1d9b181dee6ef7c3091699"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "quaternion_operation-release"; + rev = "release/foxy/quaternion_operation/0.0.11-1"; + sha256 = "sha256-XFIOq/J1ybBjdR5TFUumOgHlYUH5o2Mcm9zh1zPijKo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/r2r-spl-7/default.nix b/distros/foxy/r2r-spl-7/default.nix index 4d73701dc2..34ef5eab65 100644 --- a/distros/foxy/r2r-spl-7/default.nix +++ b/distros/foxy/r2r-spl-7/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-r2r-spl-7"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/r2r_spl-release/archive/release/foxy/r2r_spl_7/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "5c6bcfdea32ca4f932d3368007c266a821538565faf6d1f79e1e4ff7790ee0a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "r2r_spl-release"; + rev = "release/foxy/r2r_spl_7/0.0.2-1"; + sha256 = "sha256-0CstGz4gBmDuk8yvG4smIDj7nLkIqZmrzTylrn8Xzyw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/radar-msgs/default.nix b/distros/foxy/radar-msgs/default.nix index 4d9e35a5e6..5c571d4076 100644 --- a/distros/foxy/radar-msgs/default.nix +++ b/distros/foxy/radar-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-radar-msgs"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/radar_msgs-release/archive/release/foxy/radar_msgs/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "31e6f86889e9e4e8d85de52b4a1041ce075baa3f801421a42d2fc6ece70ee1bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "radar_msgs-release"; + rev = "release/foxy/radar_msgs/0.2.1-1"; + sha256 = "sha256-09etKgWuUL3tN+uERho/rQvfxovMzjJUK+2J9fg5Sa4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/random-numbers/default.nix b/distros/foxy/random-numbers/default.nix index 9da6e6a410..dffe9edcae 100644 --- a/distros/foxy/random-numbers/default.nix +++ b/distros/foxy/random-numbers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-random-numbers"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/moveit/random_numbers-release/archive/release/foxy/random_numbers/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "f1760587db0f37ead708d4bd250a096d94ac4d6b46b8cd5092dc824786e1a5e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "random_numbers-release"; + rev = "release/foxy/random_numbers/2.0.1-1"; + sha256 = "sha256-hQN9n+tLK1rKA+wXOXW/TfT4RzrXxvaIfDlzgV+LJnU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/raptor-dbw-can/default.nix b/distros/foxy/raptor-dbw-can/default.nix index 9b6bb89a63..971ad7ea1f 100644 --- a/distros/foxy/raptor-dbw-can/default.nix +++ b/distros/foxy/raptor-dbw-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raptor-dbw-can"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/NewEagleRaptor/raptor-dbw-ros2-release/archive/release/foxy/raptor_dbw_can/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "3e1b0b13b8f0e686eb4e592c4aa4f330fed428a474b874d843ca6b69aeeadad1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "NewEagleRaptor"; + repo = "raptor-dbw-ros2-release"; + rev = "release/foxy/raptor_dbw_can/1.2.0-1"; + sha256 = "sha256-yaDG2EstOPr8Pa3NBQ2ZPN+67Fujj3kXaW9hkD4GoDA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/raptor-dbw-joystick/default.nix b/distros/foxy/raptor-dbw-joystick/default.nix index eb198bb7fd..9fccfe1ada 100644 --- a/distros/foxy/raptor-dbw-joystick/default.nix +++ b/distros/foxy/raptor-dbw-joystick/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raptor-dbw-joystick"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/NewEagleRaptor/raptor-dbw-ros2-release/archive/release/foxy/raptor_dbw_joystick/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "21b40c3fcb94b0cfb96587d36c26c87e89bb8aa04a9d665c3e216bd6d3187137"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "NewEagleRaptor"; + repo = "raptor-dbw-ros2-release"; + rev = "release/foxy/raptor_dbw_joystick/1.2.0-1"; + sha256 = "sha256-Z4qG9YMj5kwVWPXJhFJskz/vJpZcAVN0u3Hp+mW4KOE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/raptor-dbw-msgs/default.nix b/distros/foxy/raptor-dbw-msgs/default.nix index c048527b56..10f6a7c73c 100644 --- a/distros/foxy/raptor-dbw-msgs/default.nix +++ b/distros/foxy/raptor-dbw-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raptor-dbw-msgs"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/NewEagleRaptor/raptor-dbw-ros2-release/archive/release/foxy/raptor_dbw_msgs/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "e547e972516b2602a0678d4b7e7f39f02c71867f2c86665020185bd92d9cbde8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "NewEagleRaptor"; + repo = "raptor-dbw-ros2-release"; + rev = "release/foxy/raptor_dbw_msgs/1.2.0-1"; + sha256 = "sha256-gsew4aJwtwTOOXB/2+L/tnLNo0qj5xhbHPzyRNsT4Uc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto rosidl-default-generators ]; diff --git a/distros/foxy/raptor-pdu-msgs/default.nix b/distros/foxy/raptor-pdu-msgs/default.nix index 9634ad1c3c..39c5a72070 100644 --- a/distros/foxy/raptor-pdu-msgs/default.nix +++ b/distros/foxy/raptor-pdu-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raptor-pdu-msgs"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/NewEagleRaptor/raptor-dbw-ros2-release/archive/release/foxy/raptor_pdu_msgs/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "d9c680ed10febb546b341c8c2944d0c9a1b9f839aaf5aae4d22f0b386c557b2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "NewEagleRaptor"; + repo = "raptor-dbw-ros2-release"; + rev = "release/foxy/raptor_pdu_msgs/1.2.0-1"; + sha256 = "sha256-YwRaEfDzqb4PO12ulBbo3j+u8ZzWU4mWsupKazkpdFI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/raptor-pdu/default.nix b/distros/foxy/raptor-pdu/default.nix index 46084f7d5a..016743489a 100644 --- a/distros/foxy/raptor-pdu/default.nix +++ b/distros/foxy/raptor-pdu/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raptor-pdu"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/NewEagleRaptor/raptor-dbw-ros2-release/archive/release/foxy/raptor_pdu/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "4aed095d2b28abed7b9581a53b55dedbeb2b01006b16bc968e8373f1c0d3021f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "NewEagleRaptor"; + repo = "raptor-dbw-ros2-release"; + rev = "release/foxy/raptor_pdu/1.2.0-1"; + sha256 = "sha256-ALysAodsOryqZ/sy7pzKeJkBs+diuNL31aj3ysV0VoI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/raspimouse-description/default.nix b/distros/foxy/raspimouse-description/default.nix index bcabf6fff1..2a6d084350 100644 --- a/distros/foxy/raspimouse-description/default.nix +++ b/distros/foxy/raspimouse-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raspimouse-description"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/raspimouse_description-release/archive/release/foxy/raspimouse_description/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "4c14a50a79d663917064832aebf8d44ff60ad26c0d52faaebe53153977566c81"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse_description-release"; + rev = "release/foxy/raspimouse_description/1.0.0-1"; + sha256 = "sha256-yXilY0HdMKyAiNne7q6hEfsWFb/PDX0tlAl3aR3B6I0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/raspimouse-msgs/default.nix b/distros/foxy/raspimouse-msgs/default.nix index be6de61f35..3287592ccc 100644 --- a/distros/foxy/raspimouse-msgs/default.nix +++ b/distros/foxy/raspimouse-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raspimouse-msgs"; version = "1.1.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/raspimouse2-release/archive/release/foxy/raspimouse_msgs/1.1.0-4.tar.gz"; - name = "1.1.0-4.tar.gz"; - sha256 = "0ae01769bf1c313fe9a10e6b8b0974ff656a930f79e3dbe6be22aa964d4ed6ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse2-release"; + rev = "release/foxy/raspimouse_msgs/1.1.0-4"; + sha256 = "sha256-CSN6WtLzuH9nIEiMUG782NPARcJxOdqJuhTYBinP0c0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/raspimouse-navigation/default.nix b/distros/foxy/raspimouse-navigation/default.nix index adfc6a52e1..a9636fa7b5 100644 --- a/distros/foxy/raspimouse-navigation/default.nix +++ b/distros/foxy/raspimouse-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raspimouse-navigation"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/raspimouse_slam_navigation_ros2-release/archive/release/foxy/raspimouse_navigation/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "3d43298d5944eb355eaa6c0b8fac39b46be71d4ab337ca22dfcaef7cd19f374c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse_slam_navigation_ros2-release"; + rev = "release/foxy/raspimouse_navigation/1.0.0-1"; + sha256 = "sha256-VdAfQVkhne+yXvgBkK7QA6irGU9sWClofKiAd2I2jxQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/raspimouse-ros2-examples/default.nix b/distros/foxy/raspimouse-ros2-examples/default.nix index ecfe585348..a55389aee6 100644 --- a/distros/foxy/raspimouse-ros2-examples/default.nix +++ b/distros/foxy/raspimouse-ros2-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raspimouse-ros2-examples"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/raspimouse_ros2_examples-release/archive/release/foxy/raspimouse_ros2_examples/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "a6279ae1b455a48c4b296ebca57c9c2381bd761925fdb0db03611b97742165de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse_ros2_examples-release"; + rev = "release/foxy/raspimouse_ros2_examples/1.0.0-1"; + sha256 = "sha256-LHmWYLoZppZx4aDcUBkz+YqgJk4RfHRTaIRRm1TNgSI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/raspimouse-slam-navigation/default.nix b/distros/foxy/raspimouse-slam-navigation/default.nix index abd058f51d..e798515a19 100644 --- a/distros/foxy/raspimouse-slam-navigation/default.nix +++ b/distros/foxy/raspimouse-slam-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raspimouse-slam-navigation"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/raspimouse_slam_navigation_ros2-release/archive/release/foxy/raspimouse_slam_navigation/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "a722029f099573d81dc9e1a731199534ef038503579f035b7bbb24971982165d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse_slam_navigation_ros2-release"; + rev = "release/foxy/raspimouse_slam_navigation/1.0.0-1"; + sha256 = "sha256-ivTO7khAkTpNkrZKbzx+5Pz6tVr8t1V2BF2IIkVrlfc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/raspimouse-slam/default.nix b/distros/foxy/raspimouse-slam/default.nix index e2e7b98011..5b91e3ca39 100644 --- a/distros/foxy/raspimouse-slam/default.nix +++ b/distros/foxy/raspimouse-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raspimouse-slam"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/raspimouse_slam_navigation_ros2-release/archive/release/foxy/raspimouse_slam/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "e80cc0f7774846930638958c87e802bfbd1f03c9a7b8753616e7902d36e35fa9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse_slam_navigation_ros2-release"; + rev = "release/foxy/raspimouse_slam/1.0.0-1"; + sha256 = "sha256-cagNEf3XT1HxRZEFXC9Ucx0Bq6dvt2kWnKrgMg7dHow="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/raspimouse/default.nix b/distros/foxy/raspimouse/default.nix index 031ae69b43..76e8a61c4d 100644 --- a/distros/foxy/raspimouse/default.nix +++ b/distros/foxy/raspimouse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-raspimouse"; version = "1.1.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/raspimouse2-release/archive/release/foxy/raspimouse/1.1.0-4.tar.gz"; - name = "1.1.0-4.tar.gz"; - sha256 = "04e6f28ef5fa167d80e849e7665ecc658be8ca24c4660b2c02a0970164ebd98b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse2-release"; + rev = "release/foxy/raspimouse/1.1.0-4"; + sha256 = "sha256-a3ZgTUO09PXHN3WtNeDP1AgEDcTQrjAHRriZwH3lM+0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rc-common-msgs/default.nix b/distros/foxy/rc-common-msgs/default.nix index 54226a9356..515bfa3613 100644 --- a/distros/foxy/rc-common-msgs/default.nix +++ b/distros/foxy/rc-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rc-common-msgs"; version = "0.5.3-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_common_msgs_ros2-release/archive/release/foxy/rc_common_msgs/0.5.3-1.tar.gz"; - name = "0.5.3-1.tar.gz"; - sha256 = "27d6c4743c107216aaef6c0e1ba7adb1bc41d9869c24cc89461f66b03446839e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_common_msgs_ros2-release"; + rev = "release/foxy/rc_common_msgs/0.5.3-1"; + sha256 = "sha256-/ApqcAoxtUu0eHcF5gxxFhroOIdz457iCAONfAC2xxQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rc-dynamics-api/default.nix b/distros/foxy/rc-dynamics-api/default.nix index 708476795f..62882da3cc 100644 --- a/distros/foxy/rc-dynamics-api/default.nix +++ b/distros/foxy/rc-dynamics-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rc-dynamics-api"; version = "0.10.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_dynamics_api-release/archive/release/foxy/rc_dynamics_api/0.10.2-1.tar.gz"; - name = "0.10.2-1.tar.gz"; - sha256 = "dd99a64758059fa9e249f63f3532d620850826bc51ad2d674fcfa9409ea0040c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_dynamics_api-release"; + rev = "release/foxy/rc_dynamics_api/0.10.2-1"; + sha256 = "sha256-c2u2BXZrlHXLWvsgXvehhEMwU2jtwybKUBsqyTzQ0Ig="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/rc-genicam-api/default.nix b/distros/foxy/rc-genicam-api/default.nix index 2dd0f36684..39d80b3c27 100644 --- a/distros/foxy/rc-genicam-api/default.nix +++ b/distros/foxy/rc-genicam-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rc-genicam-api"; version = "2.5.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_genicam_api-release/archive/release/foxy/rc_genicam_api/2.5.12-1.tar.gz"; - name = "2.5.12-1.tar.gz"; - sha256 = "703174f821ddb554ad13dbb567e4f8f0f58072f6f2e09171b248d18425be06b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_genicam_api-release"; + rev = "release/foxy/rc_genicam_api/2.5.12-1"; + sha256 = "sha256-YkKXiMMUXT+aUMsQJFQ3PcRm8kWdFZTFd4NM5JLRheA="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/rc-genicam-driver/default.nix b/distros/foxy/rc-genicam-driver/default.nix index 1da0af674a..633b00e599 100644 --- a/distros/foxy/rc-genicam-driver/default.nix +++ b/distros/foxy/rc-genicam-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rc-genicam-driver"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_genicam_driver_ros2-release/archive/release/foxy/rc_genicam_driver/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "a02d5980198bbce997671ee666873f397ef4687f093b0b8efda3734738a580d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_genicam_driver_ros2-release"; + rev = "release/foxy/rc_genicam_driver/0.2.1-1"; + sha256 = "sha256-nRYR4RZ3PnqDi707KxIuq4SODUBru+GdMF+Ex296hEw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rc-reason-clients/default.nix b/distros/foxy/rc-reason-clients/default.nix index a8144fef2f..f6f7ed7040 100644 --- a/distros/foxy/rc-reason-clients/default.nix +++ b/distros/foxy/rc-reason-clients/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rc-reason-clients"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_reason_clients-release/archive/release/foxy/rc_reason_clients/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "9f6fc761497712168142296354efd49a180780f3d80f72e65996a016cdcdf672"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_reason_clients-release"; + rev = "release/foxy/rc_reason_clients/0.3.0-1"; + sha256 = "sha256-q8bf4j9FheYgZ5vye7iL7FeN6Z3sl01sbjjAokkfCKk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/rc-reason-msgs/default.nix b/distros/foxy/rc-reason-msgs/default.nix index 625ffdeb9e..1ad928cfe7 100644 --- a/distros/foxy/rc-reason-msgs/default.nix +++ b/distros/foxy/rc-reason-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rc-reason-msgs"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_reason_clients-release/archive/release/foxy/rc_reason_msgs/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "196d7862660b4c44b1c9729b3de31baadfe103442d0a87e7878c2607324588eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_reason_clients-release"; + rev = "release/foxy/rc_reason_msgs/0.3.0-1"; + sha256 = "sha256-FWe29dAS+fY/9FC6pRN7WNPRX8h4+F9C5240ZxrL1Fo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rcdiscover/default.nix b/distros/foxy/rcdiscover/default.nix index 5928e14eee..fbe05a82b9 100644 --- a/distros/foxy/rcdiscover/default.nix +++ b/distros/foxy/rcdiscover/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcdiscover"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rcdiscover-release/archive/release/foxy/rcdiscover/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "a78655ab6373401ce8b964d495302eec0e23c17da882aab606bb72fc3155985a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rcdiscover-release"; + rev = "release/foxy/rcdiscover/1.1.4-1"; + sha256 = "sha256-IzHfwuLyT18CS/9Qj/yMlO3ghLUflM1FesXkbpqXruE="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/rcgcd-spl-14-conversion/default.nix b/distros/foxy/rcgcd-spl-14-conversion/default.nix index db115c3350..7c87559930 100644 --- a/distros/foxy/rcgcd-spl-14-conversion/default.nix +++ b/distros/foxy/rcgcd-spl-14-conversion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcgcd-spl-14-conversion"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/foxy/rcgcd_spl_14_conversion/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "2895bdf6b6130e14a8daf05c52a77dfd61c44342852bc36cd19e534b1956f69f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/foxy/rcgcd_spl_14_conversion/0.0.1-1"; + sha256 = "sha256-Is7yDncbTegkOfmuz61AzpSXyLx7d+GsZN+Sr5102L8="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/rcgcd-spl-14/default.nix b/distros/foxy/rcgcd-spl-14/default.nix index f216921bc8..b82f7c0b85 100644 --- a/distros/foxy/rcgcd-spl-14/default.nix +++ b/distros/foxy/rcgcd-spl-14/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcgcd-spl-14"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/foxy/rcgcd_spl_14/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "83e8aaf6e0f29ef91261e5ba11996ceae30ba80eab29065b00969a76d0245efa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/foxy/rcgcd_spl_14/0.0.1-1"; + sha256 = "sha256-BEnL/a0/1SU44NUljxO8/LqgHYLMCmEQvR4Ra8pKJOc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rcgcrd-spl-4-conversion/default.nix b/distros/foxy/rcgcrd-spl-4-conversion/default.nix index 9e7d962835..e8e32ea400 100644 --- a/distros/foxy/rcgcrd-spl-4-conversion/default.nix +++ b/distros/foxy/rcgcrd-spl-4-conversion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcgcrd-spl-4-conversion"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/foxy/rcgcrd_spl_4_conversion/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "b0b528744b54bf9aa53ce17f70f00cc2e11e7e0b8b355fb032ad52f75fcf9275"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/foxy/rcgcrd_spl_4_conversion/0.0.1-1"; + sha256 = "sha256-KYbdLGy1OPZpqYnm+cu3tEgde7VN4r8E4NgrTd6L12Y="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/rcgcrd-spl-4/default.nix b/distros/foxy/rcgcrd-spl-4/default.nix index 7dca601539..f268b988fe 100644 --- a/distros/foxy/rcgcrd-spl-4/default.nix +++ b/distros/foxy/rcgcrd-spl-4/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcgcrd-spl-4"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/foxy/rcgcrd_spl_4/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "aa5453ef8ed730eb4eea66c67ac3a374f1e713d5d69f5fcbdb15b37a9fa29a51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/foxy/rcgcrd_spl_4/0.0.1-1"; + sha256 = "sha256-tcycfvVue0ZJjmjf4Hw9QnqB/pl/FwLOUHroOFr6H+E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rcl-action/default.nix b/distros/foxy/rcl-action/default.nix index 59ed1b87b0..00d7866fe7 100644 --- a/distros/foxy/rcl-action/default.nix +++ b/distros/foxy/rcl-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcl-action"; version = "1.1.14-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/foxy/rcl_action/1.1.14-1.tar.gz"; - name = "1.1.14-1.tar.gz"; - sha256 = "a9b503b6e3a4ba56dc7836e74df736a71db71b209c651aaa319cbdcc472e1479"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/foxy/rcl_action/1.1.14-1"; + sha256 = "sha256-VFC9wTTQcNt63gty4MYCdRGQxSlEbcwKRixlvdAn8nE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rcl-interfaces/default.nix b/distros/foxy/rcl-interfaces/default.nix index dc6a9abe5d..808c1b59ea 100644 --- a/distros/foxy/rcl-interfaces/default.nix +++ b/distros/foxy/rcl-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcl-interfaces"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/foxy/rcl_interfaces/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "7ae813d8948d769718a1c77a51861455a06cd738ebe7a861e926b07353b14cf7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/foxy/rcl_interfaces/1.0.0-1"; + sha256 = "sha256-1DCCqHesnqfJNkcIhbh4CLsZ20mPOOwsjmygnHD3enI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rcl-lifecycle/default.nix b/distros/foxy/rcl-lifecycle/default.nix index f9ab2386a4..7b76d560ff 100644 --- a/distros/foxy/rcl-lifecycle/default.nix +++ b/distros/foxy/rcl-lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcl-lifecycle"; version = "1.1.14-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/foxy/rcl_lifecycle/1.1.14-1.tar.gz"; - name = "1.1.14-1.tar.gz"; - sha256 = "d11117d7fd48995ac12a64794fd8f6a12cf916747da22728fd1140aaf1d11252"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/foxy/rcl_lifecycle/1.1.14-1"; + sha256 = "sha256-N9pcMK/6iKh43pa2rCuWANis6OPzsMK6ixRQhDjD2VE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rcl-logging-log4cxx/default.nix b/distros/foxy/rcl-logging-log4cxx/default.nix index af85b52f05..a0c80d6002 100644 --- a/distros/foxy/rcl-logging-log4cxx/default.nix +++ b/distros/foxy/rcl-logging-log4cxx/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcl-logging-log4cxx"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/foxy/rcl_logging_log4cxx/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "55d0928eff4e7e573a3fcb13b49319c6321fed83319a720d7dd21e228d641a18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/foxy/rcl_logging_log4cxx/1.1.0-1"; + sha256 = "sha256-MB02BcYx9T6Lr9+mXAhGulJJfYIIM+nknGCBEcPg1jk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python3Packages.empy ]; diff --git a/distros/foxy/rcl-logging-noop/default.nix b/distros/foxy/rcl-logging-noop/default.nix index 1043b54b9c..9798fffca6 100644 --- a/distros/foxy/rcl-logging-noop/default.nix +++ b/distros/foxy/rcl-logging-noop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcl-logging-noop"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/foxy/rcl_logging_noop/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "3fd52f9aea77dd82b1578d71bad2957664c4924d6546658f6b91d9d2153b41eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/foxy/rcl_logging_noop/1.1.0-1"; + sha256 = "sha256-fLSTnlvbQEDikWo+2KcIAo/ucmvitBlWh7COLOwPdDs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python3Packages.empy ]; diff --git a/distros/foxy/rcl-logging-spdlog/default.nix b/distros/foxy/rcl-logging-spdlog/default.nix index 617b807805..faea5ad017 100644 --- a/distros/foxy/rcl-logging-spdlog/default.nix +++ b/distros/foxy/rcl-logging-spdlog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcl-logging-spdlog"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/foxy/rcl_logging_spdlog/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "cd2d87435ef1c30ab82e5ef29d52b20f840efb3978baf1dccfc92dc68aeaa5f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/foxy/rcl_logging_spdlog/1.1.0-1"; + sha256 = "sha256-AMmX8rSGKj06T3hnO+7i02ghxPrz+THk/9XP48Yf7U0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rcl-yaml-param-parser/default.nix b/distros/foxy/rcl-yaml-param-parser/default.nix index 7490d6ae1d..91d6cac30d 100644 --- a/distros/foxy/rcl-yaml-param-parser/default.nix +++ b/distros/foxy/rcl-yaml-param-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcl-yaml-param-parser"; version = "1.1.14-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/foxy/rcl_yaml_param_parser/1.1.14-1.tar.gz"; - name = "1.1.14-1.tar.gz"; - sha256 = "6e3c7bf84c4c47de543669bd64b0d653af39f47f19ab2da9b48685d4d5179835"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/foxy/rcl_yaml_param_parser/1.1.14-1"; + sha256 = "sha256-mdc2OzlZXFptBAtzWNjHtyaPHTLN0A6xNP2/AyDShNI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rcutils ]; diff --git a/distros/foxy/rcl/default.nix b/distros/foxy/rcl/default.nix index ebc19c05fa..108d2614e0 100644 --- a/distros/foxy/rcl/default.nix +++ b/distros/foxy/rcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcl"; version = "1.1.14-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/foxy/rcl/1.1.14-1.tar.gz"; - name = "1.1.14-1.tar.gz"; - sha256 = "3df5ac418335d1a6b9172273e788555a647f33f98c88312e705dfccf50645703"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/foxy/rcl/1.1.14-1"; + sha256 = "sha256-R5tI+wO/QUU4b0Eq+mbvmK7rBnrPWs/rZ7K1kKNiAno="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rclc-examples/default.nix b/distros/foxy/rclc-examples/default.nix index b7c8ee5a5e..5cda463198 100644 --- a/distros/foxy/rclc-examples/default.nix +++ b/distros/foxy/rclc-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclc-examples"; version = "1.1.1-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/foxy/rclc_examples/1.1.1-1"; + sha256 = "sha256-lib7XHtNWRGqsIOCsSdY3r851CFJlvNfQPC22Ignuoc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rclc-lifecycle/default.nix b/distros/foxy/rclc-lifecycle/default.nix index 364bda141d..f6bb04b693 100644 --- a/distros/foxy/rclc-lifecycle/default.nix +++ b/distros/foxy/rclc-lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclc-lifecycle"; version = "1.1.1-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/foxy/rclc_lifecycle/1.1.1-1"; + sha256 = "sha256-24g4xvaaXSH8h9dbDCsKTUQE7/y2HBO8C9TMHvPn2WU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rclc-parameter/default.nix b/distros/foxy/rclc-parameter/default.nix index 3e8871a4f2..bfa0086192 100644 --- a/distros/foxy/rclc-parameter/default.nix +++ b/distros/foxy/rclc-parameter/default.nix @@ -7,11 +7,15 @@ 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/foxy/rclc_parameter/1.1.1-1"; + sha256 = "sha256-7Zw7DnzI3sn1NHsJTozOGASH5JSAX2xdrWnJpzIvayU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rclc/default.nix b/distros/foxy/rclc/default.nix index 0e26907491..384d946478 100644 --- a/distros/foxy/rclc/default.nix +++ b/distros/foxy/rclc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclc"; version = "1.1.1-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/foxy/rclc/1.1.1-1"; + sha256 = "sha256-AuLopKkz/CC2VZZI039uNW8mkH0P4zQmCKOALPKSrVI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-c ]; diff --git a/distros/foxy/rclcpp-action/default.nix b/distros/foxy/rclcpp-action/default.nix index 89e50d18d5..4922a56694 100644 --- a/distros/foxy/rclcpp-action/default.nix +++ b/distros/foxy/rclcpp-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclcpp-action"; version = "2.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/foxy/rclcpp_action/2.4.2-1.tar.gz"; - name = "2.4.2-1.tar.gz"; - sha256 = "39e3abdf2001cd8671547b55ebb907302eddfaf12c1b57f21a7c211481a25722"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/foxy/rclcpp_action/2.4.2-1"; + sha256 = "sha256-ud1+0TkZlf4EyI3ZVKBlqA8WR9FxpYOD5eH9gKXghQE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rclcpp-cascade-lifecycle/default.nix b/distros/foxy/rclcpp-cascade-lifecycle/default.nix index 680a67df08..bf4a4de8a1 100644 --- a/distros/foxy/rclcpp-cascade-lifecycle/default.nix +++ b/distros/foxy/rclcpp-cascade-lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclcpp-cascade-lifecycle"; version = "0.0.8-r1"; - src = fetchurl { - url = "https://github.com/fmrico/cascade_lifecycle-release/archive/release/foxy/rclcpp_cascade_lifecycle/0.0.8-1.tar.gz"; - name = "0.0.8-1.tar.gz"; - sha256 = "9cbd26130896e20268e8257b232fc9ea9d39b7978445f27d9746aa2fb7dd4aa5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fmrico"; + repo = "cascade_lifecycle-release"; + rev = "release/foxy/rclcpp_cascade_lifecycle/0.0.8-1"; + sha256 = "sha256-j7aUrL9nHcaWCsnd9G3x7JRGNQK0hdMZQX6baYZ5rUQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rclcpp-components/default.nix b/distros/foxy/rclcpp-components/default.nix index e1dd5009f3..428097fcc6 100644 --- a/distros/foxy/rclcpp-components/default.nix +++ b/distros/foxy/rclcpp-components/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclcpp-components"; version = "2.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/foxy/rclcpp_components/2.4.2-1.tar.gz"; - name = "2.4.2-1.tar.gz"; - sha256 = "05cd4ee2ddc0ba33e249a8b91a7f741f03de5d0ed821d76f7988fbc948b1606c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/foxy/rclcpp_components/2.4.2-1"; + sha256 = "sha256-kkzvZtn94Pcuyb7LO9HWdD6RVeHmjzJdaDOHXFXqYoc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rcpputils ]; diff --git a/distros/foxy/rclcpp-lifecycle/default.nix b/distros/foxy/rclcpp-lifecycle/default.nix index 9b4c0c8477..ea4e03b2b2 100644 --- a/distros/foxy/rclcpp-lifecycle/default.nix +++ b/distros/foxy/rclcpp-lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclcpp-lifecycle"; version = "2.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/foxy/rclcpp_lifecycle/2.4.2-1.tar.gz"; - name = "2.4.2-1.tar.gz"; - sha256 = "773a84b12ae819be7019f800593f994ce10286cd078c0c817fdab05fdb020e4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/foxy/rclcpp_lifecycle/2.4.2-1"; + sha256 = "sha256-+/CCG/hOy/elvkv7NqPe7C7Uv8JttQe9ZoejqssS6NA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rclcpp/default.nix b/distros/foxy/rclcpp/default.nix index 6256d92155..ce3f5fd940 100644 --- a/distros/foxy/rclcpp/default.nix +++ b/distros/foxy/rclcpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclcpp"; version = "2.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/foxy/rclcpp/2.4.2-1.tar.gz"; - name = "2.4.2-1.tar.gz"; - sha256 = "0707ac6d64ba4b7b518e31044d7877b77f7560c1782aaa0d20d5c1f65b2ee6f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/foxy/rclcpp/2.4.2-1"; + sha256 = "sha256-oeZwwM5plxT8/Uv9hozzJWozf/EwW/ppwDrAFGdHAc8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rclpy-message-converter-msgs/default.nix b/distros/foxy/rclpy-message-converter-msgs/default.nix index 61e841c43d..ff0fb5e78d 100644 --- a/distros/foxy/rclpy-message-converter-msgs/default.nix +++ b/distros/foxy/rclpy-message-converter-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclpy-message-converter-msgs"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rospy_message_converter-release/archive/release/foxy/rclpy_message_converter_msgs/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "0d1f795e0434c55b202450335d53fc37f97d31d40b76b4702a211df1a76de967"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rospy_message_converter-release"; + rev = "release/foxy/rclpy_message_converter_msgs/2.0.1-1"; + sha256 = "sha256-vWAM+JjdKQvohD6qBeuCVmL+zcOgq1szEkS8jYnSPkw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces rosidl-default-generators ]; diff --git a/distros/foxy/rclpy-message-converter/default.nix b/distros/foxy/rclpy-message-converter/default.nix index f31dd4f6bf..a55dd8dcf0 100644 --- a/distros/foxy/rclpy-message-converter/default.nix +++ b/distros/foxy/rclpy-message-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclpy-message-converter"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rospy_message_converter-release/archive/release/foxy/rclpy_message_converter/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "80bbc050357bf214780b8b72756aa6f50121cb2d4a73f04155de66537c1af3ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rospy_message_converter-release"; + rev = "release/foxy/rclpy_message_converter/2.0.1-1"; + sha256 = "sha256-4HeOI1VnkkBwlxa0SlJMAGbmV5bMUIvxslRecDwZm04="; + }; buildType = "ament_python"; buildInputs = [ builtin-interfaces rosidl-default-generators ]; diff --git a/distros/foxy/rclpy/default.nix b/distros/foxy/rclpy/default.nix index f2a1653054..ff267645b4 100644 --- a/distros/foxy/rclpy/default.nix +++ b/distros/foxy/rclpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rclpy"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclpy-release/archive/release/foxy/rclpy/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "c066930df80541b5ea917b38b81f3fa9d6aae96325a8087fa350f80efaa3cdf8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclpy-release"; + rev = "release/foxy/rclpy/1.0.11-1"; + sha256 = "sha256-QE6cyeJGgr4+L6ZjXsu/dvC5rNNCCtFMzD4M7oRp9FU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python-cmake-module rcutils rmw-implementation-cmake ]; diff --git a/distros/foxy/rcpputils/default.nix b/distros/foxy/rcpputils/default.nix index de164de2dd..55120bc3db 100644 --- a/distros/foxy/rcpputils/default.nix +++ b/distros/foxy/rcpputils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcpputils"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcpputils-release/archive/release/foxy/rcpputils/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "9320a98fab63a0e1b7516f5fb16d49f6bfd6f4a50f8e37f02c52296c410d4725"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcpputils-release"; + rev = "release/foxy/rcpputils/1.3.2-1"; + sha256 = "sha256-jYekHZ+I606+zQ1EpqYTJsGkcUitNBcYbkkfKdy1dvQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/foxy/rcutils/default.nix b/distros/foxy/rcutils/default.nix index accf2175f2..e3e528ef6f 100644 --- a/distros/foxy/rcutils/default.nix +++ b/distros/foxy/rcutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rcutils"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcutils-release/archive/release/foxy/rcutils/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "d946a8ab99a8abce8f229b10321a3fa4987a37cecd8b9ebd707cd29d951c5290"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcutils-release"; + rev = "release/foxy/rcutils/1.1.4-1"; + sha256 = "sha256-5bwJwuceUAJZg+PZyNfilagZOMAxz/BL0Vi4J1WBznY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python3Packages.empy ]; diff --git a/distros/foxy/realsense-examples/default.nix b/distros/foxy/realsense-examples/default.nix index 65edecef29..99965178b6 100644 --- a/distros/foxy/realsense-examples/default.nix +++ b/distros/foxy/realsense-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realsense-examples"; version = "2.0.8-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_intel_realsense-release/archive/release/foxy/realsense_examples/2.0.8-2.tar.gz"; - name = "2.0.8-2.tar.gz"; - sha256 = "c10a486b28d2da5619c45f25f418ab82c1aeda507659b3ea5df488054c01bbe8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_intel_realsense-release"; + rev = "release/foxy/realsense_examples/2.0.8-2"; + sha256 = "sha256-SwkeUGciJkH9Ig8kmMl3xL0v0OVmJxTwTSFPFV5AG9A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/realsense-hardware-interface/default.nix b/distros/foxy/realsense-hardware-interface/default.nix index 9ffb2c0a23..5512eb33a4 100644 --- a/distros/foxy/realsense-hardware-interface/default.nix +++ b/distros/foxy/realsense-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realsense-hardware-interface"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/realsense_hardware_interface-release/archive/release/foxy/realsense_hardware_interface/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "0d46b3c3c50593eb21c18e552069bf067aa944d3354f783e3dd034940e5d8a21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "realsense_hardware_interface-release"; + rev = "release/foxy/realsense_hardware_interface/0.0.2-1"; + sha256 = "sha256-DLvDRyaHLGlF/T6Y4g8Wda2zVZGiUzwqOHmLQ9IdPMo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/realsense-msgs/default.nix b/distros/foxy/realsense-msgs/default.nix index 51590418f8..7be931a92c 100644 --- a/distros/foxy/realsense-msgs/default.nix +++ b/distros/foxy/realsense-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realsense-msgs"; version = "2.0.8-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_intel_realsense-release/archive/release/foxy/realsense_msgs/2.0.8-2.tar.gz"; - name = "2.0.8-2.tar.gz"; - sha256 = "65cb51b57237afed75d0c9b198e39bc70c72952fbed8a7cbd87545add8c15523"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_intel_realsense-release"; + rev = "release/foxy/realsense_msgs/2.0.8-2"; + sha256 = "sha256-31WTJs276O9cczmX1YoxCufWxOGqiEWUeCz+DIAZImY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/realsense-node/default.nix b/distros/foxy/realsense-node/default.nix index 154823363d..0e7123d77e 100644 --- a/distros/foxy/realsense-node/default.nix +++ b/distros/foxy/realsense-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realsense-node"; version = "2.0.8-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_intel_realsense-release/archive/release/foxy/realsense_node/2.0.8-2.tar.gz"; - name = "2.0.8-2.tar.gz"; - sha256 = "479e3643d5d452c51ec032d3afc01dba88ba3f15e51008bf6b297a5a5b9d521a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_intel_realsense-release"; + rev = "release/foxy/realsense_node/2.0.8-2"; + sha256 = "sha256-Pk52f/R3A+m0pPFKXpiHCe/fkgtN5UWq0sM2VmdjN0U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/realsense-ros/default.nix b/distros/foxy/realsense-ros/default.nix index 0b13b5a9cc..3baa4ce408 100644 --- a/distros/foxy/realsense-ros/default.nix +++ b/distros/foxy/realsense-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realsense-ros"; version = "2.0.8-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_intel_realsense-release/archive/release/foxy/realsense_ros/2.0.8-2.tar.gz"; - name = "2.0.8-2.tar.gz"; - sha256 = "0f4d757d020f53183c5e5e5d2a17519b5b548967073e94cec21ad21a1b5bbba8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_intel_realsense-release"; + rev = "release/foxy/realsense_ros/2.0.8-2"; + sha256 = "sha256-DXPncfDccSbqjXwMtbyHfSTiUS2Cp+Nbt2syGAs90UM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/realsense2-camera-msgs/default.nix b/distros/foxy/realsense2-camera-msgs/default.nix index 60905947b4..128e4e36fb 100644 --- a/distros/foxy/realsense2-camera-msgs/default.nix +++ b/distros/foxy/realsense2-camera-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realsense2-camera-msgs"; version = "4.51.1-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_camera_msgs/4.51.1-1.tar.gz"; - name = "4.51.1-1.tar.gz"; - sha256 = "de810e982b2c49cd696b97da298451f309c6e2213a6ce3fded06a05e6c672df0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/foxy/realsense2_camera_msgs/4.51.1-1"; + sha256 = "sha256-n/1oSiCcxvKQEDde1zImo44mSgOwaFXd2GchxlVUexI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/realsense2-camera/default.nix b/distros/foxy/realsense2-camera/default.nix index a4deb1e09e..89e7ea8f09 100644 --- a/distros/foxy/realsense2-camera/default.nix +++ b/distros/foxy/realsense2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realsense2-camera"; version = "4.51.1-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_camera/4.51.1-1.tar.gz"; - name = "4.51.1-1.tar.gz"; - sha256 = "274547710bcf03a6c4f19816e0024426d76d29580ce5c3aab5e66d27edf77963"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/foxy/realsense2_camera/4.51.1-1"; + sha256 = "sha256-O/ta/1y9TxZ4fnhsBw20dq7eCrtG+nuRaN35kbJx2dc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/foxy/realsense2-description/default.nix b/distros/foxy/realsense2-description/default.nix index 2b23b6b33c..4d11751b41 100644 --- a/distros/foxy/realsense2-description/default.nix +++ b/distros/foxy/realsense2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realsense2-description"; version = "4.51.1-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_description/4.51.1-1.tar.gz"; - name = "4.51.1-1.tar.gz"; - sha256 = "2bb8b301f9ff7b89f33f8990df085702c3ffab0ed45a6fce93329ea53da392da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/foxy/realsense2_description/4.51.1-1"; + sha256 = "sha256-7xl3PXh5S904NsGFLRSC121dwycHugAR8VcHIP0yvXE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/realtime-tools/default.nix b/distros/foxy/realtime-tools/default.nix index f7501fcba9..390b3512cd 100644 --- a/distros/foxy/realtime-tools/default.nix +++ b/distros/foxy/realtime-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-realtime-tools"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/realtime_tools-release/archive/release/foxy/realtime_tools/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "7ccfcdccb6f2398cbe2e563fc7b458640fa6f0efeb5a44e5161eaa232df13a28"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "realtime_tools-release"; + rev = "release/foxy/realtime_tools/2.2.0-1"; + sha256 = "sha256-SeYdxrdbB+dhJByGSvIlB8iirsnXdBVSA1dDnvMOEdI="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gmock ament-lint-auto ament-lint-common rclcpp-action test-msgs ]; diff --git a/distros/foxy/resource-retriever/default.nix b/distros/foxy/resource-retriever/default.nix index eb28944270..f77355a78c 100644 --- a/distros/foxy/resource-retriever/default.nix +++ b/distros/foxy/resource-retriever/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-resource-retriever"; version = "2.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/resource_retriever-release/archive/release/foxy/resource_retriever/2.3.4-1.tar.gz"; - name = "2.3.4-1.tar.gz"; - sha256 = "268fa444bd603eb6879698154fecdeb0b29b76e2e03c4fe52b44433b61a90c06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "resource_retriever-release"; + rev = "release/foxy/resource_retriever/2.3.4-1"; + sha256 = "sha256-olGvFzLQMH9UJmwBvrLSRGVQ2RW3QrJKDiRDp2a4a+s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rmf-battery/default.nix b/distros/foxy/rmf-battery/default.nix index 032190492e..43cf9dcbc5 100644 --- a/distros/foxy/rmf-battery/default.nix +++ b/distros/foxy/rmf-battery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-battery"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_battery-release/archive/release/foxy/rmf_battery/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "42a984a1d6ffc379b7bd0189ca390074c821d2a5957d691b833c320da9e6a150"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_battery-release"; + rev = "release/foxy/rmf_battery/0.1.1-1"; + sha256 = "sha256-B5Ind7cMPaFPCNu651gqUr7i8w7o0AmryaNgkET75k4="; + }; buildType = "cmake"; checkInputs = [ ament-cmake-catch2 rmf-cmake-uncrustify ]; diff --git a/distros/foxy/rmf-building-map-msgs/default.nix b/distros/foxy/rmf-building-map-msgs/default.nix index 1a04ce8631..baa1cec120 100644 --- a/distros/foxy/rmf-building-map-msgs/default.nix +++ b/distros/foxy/rmf-building-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-building-map-msgs"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_building_map_msgs-release/archive/release/foxy/rmf_building_map_msgs/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "2b1a4311a35385da0020e6417583feca52c4a97b00fdd4db1b39a6e3b51abf2e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_building_map_msgs-release"; + rev = "release/foxy/rmf_building_map_msgs/1.2.0-1"; + sha256 = "sha256-snyMuXdNPfPqMZ8hpU/Lno8b23lqgRLHWYygxrKe3tQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-building-map-tools/default.nix b/distros/foxy/rmf-building-map-tools/default.nix index c6b5c85050..e96932d62a 100644 --- a/distros/foxy/rmf-building-map-tools/default.nix +++ b/distros/foxy/rmf-building-map-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-building-map-tools"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/foxy/rmf_building_map_tools/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "d7f8ecafd032ceed132ed18da3e0828762aba6cdc3ecf6a0d2c738d265a12158"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/foxy/rmf_building_map_tools/1.4.0-1"; + sha256 = "sha256-EnMTdw2WSNIgyf9oWqr/RvwB2uUsLU/VeeUdNv7zXO8="; + }; buildType = "ament_python"; checkInputs = [ pythonPackages.pytest ]; diff --git a/distros/foxy/rmf-building-sim-common/default.nix b/distros/foxy/rmf-building-sim-common/default.nix index 16d6dccf97..e27a8fc374 100644 --- a/distros/foxy/rmf-building-sim-common/default.nix +++ b/distros/foxy/rmf-building-sim-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-building-sim-common"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/foxy/rmf_building_sim_common/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "8d75d5fea3ac65eb0edab9fbbaeaa367ecbb7ac31b6a173b56e6326a163ab668"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/foxy/rmf_building_sim_common/1.3.1-1"; + sha256 = "sha256-PxX2yuXj1HZ3Y3vfOesQLYdg2KnT4/wM78T274bPlhM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-building-sim-gazebo-plugins/default.nix b/distros/foxy/rmf-building-sim-gazebo-plugins/default.nix index 36d99bd4f8..27b88a4271 100644 --- a/distros/foxy/rmf-building-sim-gazebo-plugins/default.nix +++ b/distros/foxy/rmf-building-sim-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-building-sim-gazebo-plugins"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/foxy/rmf_building_sim_gazebo_plugins/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "27a9346e3080f843fc568970c5a899599b10517b8b124755ec7c8648aca51f90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/foxy/rmf_building_sim_gazebo_plugins/1.3.1-1"; + sha256 = "sha256-6rWJBf14viDCp9C0o0YR2qSoQS9XfcfTp6x2yj0HA0M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-charger-msgs/default.nix b/distros/foxy/rmf-charger-msgs/default.nix index 0e622f930d..1a4646e036 100644 --- a/distros/foxy/rmf-charger-msgs/default.nix +++ b/distros/foxy/rmf-charger-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-charger-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_charger_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "2c6506fcab77988525c9a2de397fa44d449f697e19c81b496a7eb6fa68a58d76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_charger_msgs/1.4.0-1"; + sha256 = "sha256-Rp0ddy46iLVFboZH/62cfXKt70ETYqErTy0PCh/+rzc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-cmake-uncrustify/default.nix b/distros/foxy/rmf-cmake-uncrustify/default.nix index 20e09034c0..f3c7b2bcba 100644 --- a/distros/foxy/rmf-cmake-uncrustify/default.nix +++ b/distros/foxy/rmf-cmake-uncrustify/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-cmake-uncrustify"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_cmake_uncrustify-release/archive/release/foxy/rmf_cmake_uncrustify/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "9b944ee56be4a6dba660c38212522682ba9ac121e3352db10e9ff08ef5e415f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_cmake_uncrustify-release"; + rev = "release/foxy/rmf_cmake_uncrustify/1.2.0-1"; + sha256 = "sha256-YwXGjK9Uaj03Os5oVwylNtS6dDmirgOgm6bY+0K+8Ic="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/rmf-demos-assets/default.nix b/distros/foxy/rmf-demos-assets/default.nix index 129b4287d1..c49c58b89b 100644 --- a/distros/foxy/rmf-demos-assets/default.nix +++ b/distros/foxy/rmf-demos-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-demos-assets"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_demos-release/archive/release/foxy/rmf_demos_assets/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "b70ca632792307fc31668abd5a64ca35e8075724a477fccdd17b90dab9f24554"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_demos-release"; + rev = "release/foxy/rmf_demos_assets/1.3.2-1"; + sha256 = "sha256-Z3b8auagODK+P/r1SXe0wh8/Zups8ENfyJSK3Yt/5H0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-demos-dashboard-resources/default.nix b/distros/foxy/rmf-demos-dashboard-resources/default.nix index 588e2c5f51..5e296f21b9 100644 --- a/distros/foxy/rmf-demos-dashboard-resources/default.nix +++ b/distros/foxy/rmf-demos-dashboard-resources/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-demos-dashboard-resources"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_demos-release/archive/release/foxy/rmf_demos_dashboard_resources/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "ac4dab45e78f7c50ce74f0f37e6aae3be2590b4ae991934935dc598dd558acb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_demos-release"; + rev = "release/foxy/rmf_demos_dashboard_resources/1.3.2-1"; + sha256 = "sha256-gK7S1gyr3IzZzjDYQTMuOHJCsEAOYhzuv7BcJN/p8nw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-demos-gz/default.nix b/distros/foxy/rmf-demos-gz/default.nix index 84468a008b..2521f33e8f 100644 --- a/distros/foxy/rmf-demos-gz/default.nix +++ b/distros/foxy/rmf-demos-gz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-demos-gz"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_demos-release/archive/release/foxy/rmf_demos_gz/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "c17d0b8bcf7adf37d167bd3fcc10feec306f1af12699510913ea64b8e222db35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_demos-release"; + rev = "release/foxy/rmf_demos_gz/1.3.2-1"; + sha256 = "sha256-hZtqugmqa19MNRCevrhYoLuy5BfAo1WUDSywCwmgNVo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-demos-maps/default.nix b/distros/foxy/rmf-demos-maps/default.nix index 77ce9b4c63..8a7a29db0e 100644 --- a/distros/foxy/rmf-demos-maps/default.nix +++ b/distros/foxy/rmf-demos-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-demos-maps"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_demos-release/archive/release/foxy/rmf_demos_maps/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "e6825a90cdab87f37689211b8faccb30e2a37b39eb3c37f16dad3fea3889c2a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_demos-release"; + rev = "release/foxy/rmf_demos_maps/1.3.2-1"; + sha256 = "sha256-823ZU+iONSYdP0ZIu+xUHU1o3qynjuJqEklbLNtjXNg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmf-building-map-tools ros2run ]; diff --git a/distros/foxy/rmf-demos-panel/default.nix b/distros/foxy/rmf-demos-panel/default.nix index 27078b6a07..05f847aa6b 100644 --- a/distros/foxy/rmf-demos-panel/default.nix +++ b/distros/foxy/rmf-demos-panel/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-demos-panel"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_demos-release/archive/release/foxy/rmf_demos_panel/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "2c39f52031668251c0825b27164b83d0014879019788c5fc5114c88e6eca4e98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_demos-release"; + rev = "release/foxy/rmf_demos_panel/1.3.2-1"; + sha256 = "sha256-faMjYyBhbikgtOXeBgiS5War0yzf9guVNDP6O+xn/Vk="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.flask python3Packages.flask-cors rmf-demos-dashboard-resources rmf-fleet-msgs rmf-task-msgs ]; diff --git a/distros/foxy/rmf-demos-tasks/default.nix b/distros/foxy/rmf-demos-tasks/default.nix index f413d0b20e..ad5f4ff9ed 100644 --- a/distros/foxy/rmf-demos-tasks/default.nix +++ b/distros/foxy/rmf-demos-tasks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-demos-tasks"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_demos-release/archive/release/foxy/rmf_demos_tasks/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "c1397fc0cf29bb3c6b2595f73e8283e278cb69d6b4af45fe022495cbf3a8428a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_demos-release"; + rev = "release/foxy/rmf_demos_tasks/1.3.2-1"; + sha256 = "sha256-ne9WXmXw3+hseFgkBuuHOOFTv1x8vkZOYn3Vh8IujYo="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rmf-dispenser-msgs rmf-fleet-msgs rmf-lift-msgs rmf-task-msgs ]; diff --git a/distros/foxy/rmf-demos/default.nix b/distros/foxy/rmf-demos/default.nix index fb2b6f5e5e..9f8dec166d 100644 --- a/distros/foxy/rmf-demos/default.nix +++ b/distros/foxy/rmf-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-demos"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_demos-release/archive/release/foxy/rmf_demos/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "2ccccf738decc4583f70cd2754a69e64852d12a46d9458018a8be00f21e568f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_demos-release"; + rev = "release/foxy/rmf_demos/1.3.2-1"; + sha256 = "sha256-/opaDpTW4gHhMZ/gXLYCPuS8MV7zZrXYl000QUL0jxg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-dispenser-msgs/default.nix b/distros/foxy/rmf-dispenser-msgs/default.nix index 46a37cca96..c750042f52 100644 --- a/distros/foxy/rmf-dispenser-msgs/default.nix +++ b/distros/foxy/rmf-dispenser-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-dispenser-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_dispenser_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "e7441a4fd7590ff76e2514732ce765b06e22e25eebe3bc549ae0f57b21902213"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_dispenser_msgs/1.4.0-1"; + sha256 = "sha256-Z4x/wbSINjGVH7zc0hkfzySdo4o/7h72pITikGrjrmo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-door-msgs/default.nix b/distros/foxy/rmf-door-msgs/default.nix index aeb7872ea7..782420688f 100644 --- a/distros/foxy/rmf-door-msgs/default.nix +++ b/distros/foxy/rmf-door-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-door-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_door_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "2f225bb5fa54a832d4d4f838358c4d69c4a195d78dbf2e308ece6d647de72603"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_door_msgs/1.4.0-1"; + sha256 = "sha256-rmRZb6fvFGXaXZr0a0VWMxw6QxHECmhVl/XV9gr8EJY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-fleet-adapter-python/default.nix b/distros/foxy/rmf-fleet-adapter-python/default.nix index 43542be950..c4ad65913b 100644 --- a/distros/foxy/rmf-fleet-adapter-python/default.nix +++ b/distros/foxy/rmf-fleet-adapter-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-fleet-adapter-python"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/foxy/rmf_fleet_adapter_python/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "d993f63840b413c37a9d804d6343493a8975491cbbcd5403d7d6217cf80ade23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/foxy/rmf_fleet_adapter_python/1.4.0-1"; + sha256 = "sha256-VuUz2ZSwZSBSy+7eZgY1TnJmZFlK7aQLdtuqoOfZsdA="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-pytest ]; diff --git a/distros/foxy/rmf-fleet-adapter/default.nix b/distros/foxy/rmf-fleet-adapter/default.nix index 75a8527854..09e6e3a90b 100644 --- a/distros/foxy/rmf-fleet-adapter/default.nix +++ b/distros/foxy/rmf-fleet-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-fleet-adapter"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/foxy/rmf_fleet_adapter/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "d4d19a9bd4f2a803cd06739e62d0457b46e10bc05490994c24d2a9001022d4b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/foxy/rmf_fleet_adapter/1.4.0-1"; + sha256 = "sha256-rJiBXIiOhjSc3ZruX4Zq8QVgF7LzhEYkAMYH9XnxDXQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen libyamlcpp ]; diff --git a/distros/foxy/rmf-fleet-msgs/default.nix b/distros/foxy/rmf-fleet-msgs/default.nix index af424ab89c..13bf9ed4ed 100644 --- a/distros/foxy/rmf-fleet-msgs/default.nix +++ b/distros/foxy/rmf-fleet-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-fleet-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_fleet_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "baf1a625bd178c22f7b5ef3fcdb6f6a401720aa52fb4f41412f2d857d07df42d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_fleet_msgs/1.4.0-1"; + sha256 = "sha256-v4n+h89rKAvNJoABXpsSxf9v1k3kYHYmHmwXtOXHddc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-ingestor-msgs/default.nix b/distros/foxy/rmf-ingestor-msgs/default.nix index d34f40a618..796e04fbee 100644 --- a/distros/foxy/rmf-ingestor-msgs/default.nix +++ b/distros/foxy/rmf-ingestor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-ingestor-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_ingestor_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "5a6afefac6627f66850b053729fcb13b8b9c1e20aaa07f22f2928309eac135ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_ingestor_msgs/1.4.0-1"; + sha256 = "sha256-Xwiv4wp9G1bYLm+ehVeoA3LA7Ll/ahXilMPReTfbHNo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-lift-msgs/default.nix b/distros/foxy/rmf-lift-msgs/default.nix index a82dd727a6..b7da52fe55 100644 --- a/distros/foxy/rmf-lift-msgs/default.nix +++ b/distros/foxy/rmf-lift-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-lift-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_lift_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "0f6bb1441f407c44dc5809841bf7af6e833b1c216f88cf894dfe14ced3437c2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_lift_msgs/1.4.0-1"; + sha256 = "sha256-lXg6zjKTVLK5AlDM8fecDRUvg24tgr2q+IDyHXABF3A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-robot-sim-common/default.nix b/distros/foxy/rmf-robot-sim-common/default.nix index 5a02233383..a829d11812 100644 --- a/distros/foxy/rmf-robot-sim-common/default.nix +++ b/distros/foxy/rmf-robot-sim-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-robot-sim-common"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/foxy/rmf_robot_sim_common/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "190e376e2c67126c9dc175b335ff184cae2ee7a5bbcc58bce72d1accc4fc8d67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/foxy/rmf_robot_sim_common/1.3.1-1"; + sha256 = "sha256-BaXLYD0arYtoPNtffc5NcHlcRFAAWP1n72h9sDTS+Ts="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-robot-sim-gazebo-plugins/default.nix b/distros/foxy/rmf-robot-sim-gazebo-plugins/default.nix index 6e9ce33543..68cf5366f3 100644 --- a/distros/foxy/rmf-robot-sim-gazebo-plugins/default.nix +++ b/distros/foxy/rmf-robot-sim-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-robot-sim-gazebo-plugins"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/foxy/rmf_robot_sim_gazebo_plugins/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "c55e49919ad136b8ec6c94dc8f37a6c02b2c462bf6a0e8a1fe994f2c3039d7d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/foxy/rmf_robot_sim_gazebo_plugins/1.3.1-1"; + sha256 = "sha256-gbQaKwq1Msp09Y14FDNVxZi1pjQAn5wih7UXGpJ8BmM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-task-msgs/default.nix b/distros/foxy/rmf-task-msgs/default.nix index fd4588bcbe..6baa7af30f 100644 --- a/distros/foxy/rmf-task-msgs/default.nix +++ b/distros/foxy/rmf-task-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-task-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_task_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "323b4c6b89ee7eb73fa36a6fd98e0ed19f4a973b07d5289c5189bddfb95c7745"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_task_msgs/1.4.0-1"; + sha256 = "sha256-4BWQDtecTFbj8siecsuS4SSU362Vj3Az8xB8eI111cA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-task-ros2/default.nix b/distros/foxy/rmf-task-ros2/default.nix index eb931a54fe..a71205cc17 100644 --- a/distros/foxy/rmf-task-ros2/default.nix +++ b/distros/foxy/rmf-task-ros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-task-ros2"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/foxy/rmf_task_ros2/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "f1d65f23bbda5f441931a8491949fbef0a68dfdfedc87ff26853ac10076e3cbb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/foxy/rmf_task_ros2/1.4.0-1"; + sha256 = "sha256-U/6hiNKkex/Y5YJL3AOIH9VGJDmH0mwDRfqcbjGP30w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/foxy/rmf-task/default.nix b/distros/foxy/rmf-task/default.nix index 2de3af508e..7b35dee7f5 100644 --- a/distros/foxy/rmf-task/default.nix +++ b/distros/foxy/rmf-task/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-task"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_task-release/archive/release/foxy/rmf_task/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "9f2405d882be71c169b3735d07fb1a80c9614c031e6d5cb0df927e360ab17ef5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_task-release"; + rev = "release/foxy/rmf_task/1.0.0-1"; + sha256 = "sha256-At3ymxuK3gLiTpAVhq6igu0xldP+G2bzoGzefU1J8fc="; + }; buildType = "cmake"; checkInputs = [ ament-cmake-catch2 rmf-cmake-uncrustify ]; diff --git a/distros/foxy/rmf-traffic-editor-assets/default.nix b/distros/foxy/rmf-traffic-editor-assets/default.nix index 887383a7c8..bae9b14ba0 100644 --- a/distros/foxy/rmf-traffic-editor-assets/default.nix +++ b/distros/foxy/rmf-traffic-editor-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-traffic-editor-assets"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/foxy/rmf_traffic_editor_assets/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "62fba9ab1aa9a196bb36d4a609f5723b033adcecc53fd6a7da272aa389b586cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/foxy/rmf_traffic_editor_assets/1.4.0-1"; + sha256 = "sha256-L6xMiefljNX8Rx1gWZmOxfW/ubOD1hC+zoW+TZiAFOE="; + }; buildType = "ament_python"; diff --git a/distros/foxy/rmf-traffic-editor-test-maps/default.nix b/distros/foxy/rmf-traffic-editor-test-maps/default.nix index f99d61612f..cad0d3f166 100644 --- a/distros/foxy/rmf-traffic-editor-test-maps/default.nix +++ b/distros/foxy/rmf-traffic-editor-test-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-traffic-editor-test-maps"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/foxy/rmf_traffic_editor_test_maps/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "8ce04dfe020804ad0642750aa402275a5c6ebf2e4919bc026cf5f7c78a2dff00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/foxy/rmf_traffic_editor_test_maps/1.4.0-1"; + sha256 = "sha256-X9F+9NaAAQERryKP4W9r7mml8IJMZInQmSVnuPpF5+A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmf-building-map-tools ros2run ]; diff --git a/distros/foxy/rmf-traffic-editor/default.nix b/distros/foxy/rmf-traffic-editor/default.nix index 247ecb010b..ad8c441a27 100644 --- a/distros/foxy/rmf-traffic-editor/default.nix +++ b/distros/foxy/rmf-traffic-editor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-traffic-editor"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/foxy/rmf_traffic_editor/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "e0cb039e8af01b6d098e8ebcca5bfbf50130049185b9818888aa2d912ef53d08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/foxy/rmf_traffic_editor/1.4.0-1"; + sha256 = "sha256-yaXIUvNrO2a75jn3X9IPfylvRqPElKm6NlK212o+p28="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-index-cpp eigen libyamlcpp qt5.qtbase ]; diff --git a/distros/foxy/rmf-traffic-msgs/default.nix b/distros/foxy/rmf-traffic-msgs/default.nix index 51772d418e..23e62d1c77 100644 --- a/distros/foxy/rmf-traffic-msgs/default.nix +++ b/distros/foxy/rmf-traffic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-traffic-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_traffic_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "c2ef9e63a73c1b47f02488054a1fe7bc5df0be7589419b08b831f11c312e4b1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_traffic_msgs/1.4.0-1"; + sha256 = "sha256-Mv9su5WqnC+8E6S3zo9RVB3xFLreOZ+I7jStDiw9dd4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-traffic-ros2/default.nix b/distros/foxy/rmf-traffic-ros2/default.nix index 14659fc6eb..75cd43e3a6 100644 --- a/distros/foxy/rmf-traffic-ros2/default.nix +++ b/distros/foxy/rmf-traffic-ros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-traffic-ros2"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/foxy/rmf_traffic_ros2/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "274a86e3e71c8913cb39c37b6768dd007bfb144f46f7141afb62e17d8fbf7d4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/foxy/rmf_traffic_ros2/1.4.0-1"; + sha256 = "sha256-GvSLH+ay7D8Ml4Zr6PqFTB2XF4YIaIRsYXGFSDYSUhk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/foxy/rmf-traffic/default.nix b/distros/foxy/rmf-traffic/default.nix index 6eaff6371b..fc8075ab71 100644 --- a/distros/foxy/rmf-traffic/default.nix +++ b/distros/foxy/rmf-traffic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-traffic"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic-release/archive/release/foxy/rmf_traffic/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "70669dca18b82e6143c0c5d7602403a252dbf7cdac01104ede221b5cf4960f32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic-release"; + rev = "release/foxy/rmf_traffic/1.4.0-1"; + sha256 = "sha256-RuTAkrEF7VPPlx0KggMEtfzek8MnOVGr7200Rx91zu4="; + }; buildType = "cmake"; checkInputs = [ ament-cmake-catch2 rmf-cmake-uncrustify ]; diff --git a/distros/foxy/rmf-utils/default.nix b/distros/foxy/rmf-utils/default.nix index 87e679f14c..99bab35404 100644 --- a/distros/foxy/rmf-utils/default.nix +++ b/distros/foxy/rmf-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-utils"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_utils-release/archive/release/foxy/rmf_utils/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "6bdd40ab4b1b0d3d6d1228817d1bd015279b0d616ad5163de4be66f41a60e708"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_utils-release"; + rev = "release/foxy/rmf_utils/1.3.0-1"; + sha256 = "sha256-RzePMaMfqYXF3kxwlmlcTmOb1EdbiLzgAXZTkOnxj1I="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/rmf-visualization-building-systems/default.nix b/distros/foxy/rmf-visualization-building-systems/default.nix index 16b02bcb76..8b3b83294b 100644 --- a/distros/foxy/rmf-visualization-building-systems/default.nix +++ b/distros/foxy/rmf-visualization-building-systems/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-visualization-building-systems"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/foxy/rmf_visualization_building_systems/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "15f7d3933326b46871b64ee273b909d792de376540363ba55135530cf68b38c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/foxy/rmf_visualization_building_systems/1.2.1-1"; + sha256 = "sha256-HLTNa3Y61eJkV1uqUUfiTQh9DJ5ZmrpsvIM0+0rHyVI="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/rmf-visualization-fleet-states/default.nix b/distros/foxy/rmf-visualization-fleet-states/default.nix index 863fcff399..382cfc01e3 100644 --- a/distros/foxy/rmf-visualization-fleet-states/default.nix +++ b/distros/foxy/rmf-visualization-fleet-states/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-visualization-fleet-states"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/foxy/rmf_visualization_fleet_states/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "5ff35974d101145213bcb6757adaada49d7c2fc5830095940cbf0907ad09ddf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/foxy/rmf_visualization_fleet_states/1.2.1-1"; + sha256 = "sha256-rMXDIvuXpindhC3hcmSz5F6OXBofjkAey1qC+CPfaVc="; + }; buildType = "ament_python"; buildInputs = [ rmf-fleet-msgs ]; diff --git a/distros/foxy/rmf-visualization-msgs/default.nix b/distros/foxy/rmf-visualization-msgs/default.nix index 2c0fd6f371..c2e5ef7f43 100644 --- a/distros/foxy/rmf-visualization-msgs/default.nix +++ b/distros/foxy/rmf-visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-visualization-msgs"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization_msgs-release/archive/release/foxy/rmf_visualization_msgs/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "df2912d73cbd6526c1edddf4f126709663e1a95f532e2b6b2502caf67d7dd850"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization_msgs-release"; + rev = "release/foxy/rmf_visualization_msgs/1.2.0-1"; + sha256 = "sha256-f0qmm88R8ojtHtOAJxyMJRQyfj2ycFGIOQVZfRMWkyE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmf-visualization-rviz2-plugins/default.nix b/distros/foxy/rmf-visualization-rviz2-plugins/default.nix index 756bbfa6bd..2f9c46e82c 100644 --- a/distros/foxy/rmf-visualization-rviz2-plugins/default.nix +++ b/distros/foxy/rmf-visualization-rviz2-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-visualization-rviz2-plugins"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/foxy/rmf_visualization_rviz2_plugins/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "94d3952d198807f576f1b533a7c85c61c7cf9655d63ce00b9aa5341672f292d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/foxy/rmf_visualization_rviz2_plugins/1.2.1-1"; + sha256 = "sha256-zR5/3yPfBVaNLDjkYxxAyJuUouKiqCMSK2PTSOkakhM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/foxy/rmf-visualization-schedule/default.nix b/distros/foxy/rmf-visualization-schedule/default.nix index 508edfff3e..da5ae84e3b 100644 --- a/distros/foxy/rmf-visualization-schedule/default.nix +++ b/distros/foxy/rmf-visualization-schedule/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-visualization-schedule"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/foxy/rmf_visualization_schedule/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "a1fe87edbb5276abc219533a6f4b7970c559fbba32a3e2380b47fcc8f9819c8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/foxy/rmf_visualization_schedule/1.2.1-1"; + sha256 = "sha256-A9AVM+p613Yun00wftpISftnBP5GbAOu2Zvy5BXhGb8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-visualization/default.nix b/distros/foxy/rmf-visualization/default.nix index 8b15a1a9fb..dca17404a6 100644 --- a/distros/foxy/rmf-visualization/default.nix +++ b/distros/foxy/rmf-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-visualization"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/foxy/rmf_visualization/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "c8a75b715b70804b1820c00a9d4f4329238842fc3d0961035191c8cd06069186"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/foxy/rmf_visualization/1.2.1-1"; + sha256 = "sha256-gltCzDc0xlPFXncVu5VC3oXDeZ9aWLULzt2UtN4CqVg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rmf-workcell-msgs/default.nix b/distros/foxy/rmf-workcell-msgs/default.nix index c0b790dd4e..606c2ec2a7 100644 --- a/distros/foxy/rmf-workcell-msgs/default.nix +++ b/distros/foxy/rmf-workcell-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmf-workcell-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/foxy/rmf_workcell_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "20ef7de00f04af76311a4b12f1f03a3e12ef93533c364f4a26e59cf3a1953e54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/foxy/rmf_workcell_msgs/1.4.0-1"; + sha256 = "sha256-7ceVkXdVeIlNXF8DxmxSVAMdCARgDbbT1HtRXg5EP24="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmw-connext-cpp/default.nix b/distros/foxy/rmw-connext-cpp/default.nix index 0f41571c52..95af749ebc 100644 --- a/distros/foxy/rmw-connext-cpp/default.nix +++ b/distros/foxy/rmw-connext-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-connext-cpp"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_connext-release/archive/release/foxy/rmw_connext_cpp/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "e8f2d56f11d3530a8561d48b2af64a26763d26c5712c114bca9628b214fd180a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_connext-release"; + rev = "release/foxy/rmw_connext_cpp/1.0.3-1"; + sha256 = "sha256-J0s/U3f69GIa3K10zfUkVDcwmKHaYHILO3KZptvOjXQ="; + }; buildType = "ament_cmake"; buildInputs = [ rosidl-generator-dds-idl ]; diff --git a/distros/foxy/rmw-connext-shared-cpp/default.nix b/distros/foxy/rmw-connext-shared-cpp/default.nix index 1e120c555a..80f8cbd407 100644 --- a/distros/foxy/rmw-connext-shared-cpp/default.nix +++ b/distros/foxy/rmw-connext-shared-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-connext-shared-cpp"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_connext-release/archive/release/foxy/rmw_connext_shared_cpp/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "ab785510209d499f1c7c6a2709faccfa99b12ad9edc5833f024a69531c89e0ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_connext-release"; + rev = "release/foxy/rmw_connext_shared_cpp/1.0.3-1"; + sha256 = "sha256-yLQH5EorEsMIdYe6HarSXW7g4j8kOcHK+BdTUi19jUs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rcpputils rcutils rmw rosidl-cmake ]; diff --git a/distros/foxy/rmw-cyclonedds-cpp/default.nix b/distros/foxy/rmw-cyclonedds-cpp/default.nix index c01ee4505e..964bcef8ff 100644 --- a/distros/foxy/rmw-cyclonedds-cpp/default.nix +++ b/distros/foxy/rmw-cyclonedds-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-cyclonedds-cpp"; version = "0.7.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_cyclonedds-release/archive/release/foxy/rmw_cyclonedds_cpp/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "c8e32e4f343f1757f56c65028f74392a82d29513dc8a3b5e0f47b5dfa767dcf6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_cyclonedds-release"; + rev = "release/foxy/rmw_cyclonedds_cpp/0.7.11-1"; + sha256 = "sha256-ij79AT7EyrO6hla5p6I7tL7MhjLGlwOOWK+RBT4IA84="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rmw-dds-common/default.nix b/distros/foxy/rmw-dds-common/default.nix index 69386a5f0a..cddf41aa03 100644 --- a/distros/foxy/rmw-dds-common/default.nix +++ b/distros/foxy/rmw-dds-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-dds-common"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_dds_common-release/archive/release/foxy/rmw_dds_common/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "96d728be0c1a0a4253d95c8db028523adf8754476e51e353ea005f8c409e0cc3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_dds_common-release"; + rev = "release/foxy/rmw_dds_common/1.0.3-1"; + sha256 = "sha256-On8z2oAmI9DDWiQNwMLdnK38kQRjZ8GwvzFVPrCOGDU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rmw-fastrtps-cpp/default.nix b/distros/foxy/rmw-fastrtps-cpp/default.nix index 24228508d3..90f91eba7f 100644 --- a/distros/foxy/rmw-fastrtps-cpp/default.nix +++ b/distros/foxy/rmw-fastrtps-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-fastrtps-cpp"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/foxy/rmw_fastrtps_cpp/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "a4728def65732bfe146f65cd60c688bcd6ab155c22a2b748047812f8fce415b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/foxy/rmw_fastrtps_cpp/1.3.1-1"; + sha256 = "sha256-rHvIW+cX8kOV6CXhvHvvzh6kYDBbT+XIdps0X/029S0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rmw-fastrtps-dynamic-cpp/default.nix b/distros/foxy/rmw-fastrtps-dynamic-cpp/default.nix index 4175c96af2..ffb7099ea3 100644 --- a/distros/foxy/rmw-fastrtps-dynamic-cpp/default.nix +++ b/distros/foxy/rmw-fastrtps-dynamic-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-fastrtps-dynamic-cpp"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/foxy/rmw_fastrtps_dynamic_cpp/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "a2fb3ca5ecf41315c03db29937bb873aaa4c00f37c18a06a59ea804b42777030"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/foxy/rmw_fastrtps_dynamic_cpp/1.3.1-1"; + sha256 = "sha256-1BhHRDKLq7NDrsZ9zB08QozHwCEpRWrujInErnj7P9M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rmw-fastrtps-shared-cpp/default.nix b/distros/foxy/rmw-fastrtps-shared-cpp/default.nix index bbadf568ce..bfa0c24056 100644 --- a/distros/foxy/rmw-fastrtps-shared-cpp/default.nix +++ b/distros/foxy/rmw-fastrtps-shared-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-fastrtps-shared-cpp"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/foxy/rmw_fastrtps_shared_cpp/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "cbf19d45e787728d546c1d8be12133a5b7e01d8aac7ff8012b23e030209204e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/foxy/rmw_fastrtps_shared_cpp/1.3.1-1"; + sha256 = "sha256-GbdVohz39/KwgP1rG/g63FprPfnDSMWAq3Z6soj+s2M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rmw-implementation-cmake/default.nix b/distros/foxy/rmw-implementation-cmake/default.nix index 7134faa17a..fe5920c1a5 100644 --- a/distros/foxy/rmw-implementation-cmake/default.nix +++ b/distros/foxy/rmw-implementation-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-implementation-cmake"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw-release/archive/release/foxy/rmw_implementation_cmake/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "e04fd128652b0627abeb64c7057ab0bcb938135c9aa3f27f03ee17eed14cb8a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw-release"; + rev = "release/foxy/rmw_implementation_cmake/1.0.3-1"; + sha256 = "sha256-ZYYualT/5NE4PEXzZoqXImv867CdNlQSl4+HnZNiS1Q="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/rmw-implementation/default.nix b/distros/foxy/rmw-implementation/default.nix index 21ba274042..f1a442d0a8 100644 --- a/distros/foxy/rmw-implementation/default.nix +++ b/distros/foxy/rmw-implementation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw-implementation"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_implementation-release/archive/release/foxy/rmw_implementation/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "8a14c62d365b504a7f41c66d59efe4db844a35d8b95890cccf8919020f9f4e49"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_implementation-release"; + rev = "release/foxy/rmw_implementation/1.0.3-1"; + sha256 = "sha256-JQotXyje8l24JO7w8k1dA/bYma+v7Z7JWHcGQCAltLw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw rmw-connext-cpp rmw-cyclonedds-cpp rmw-fastrtps-cpp ]; diff --git a/distros/foxy/rmw/default.nix b/distros/foxy/rmw/default.nix index 06d698429a..b258aca937 100644 --- a/distros/foxy/rmw/default.nix +++ b/distros/foxy/rmw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rmw"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw-release/archive/release/foxy/rmw/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "1adbf739200ea200e3a9ddb44378055f752c898a4e0579e4010948f684ee6a3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw-release"; + rev = "release/foxy/rmw/1.0.3-1"; + sha256 = "sha256-hFZ/jypwbC4/x4/HsPnvq53eAPGYkarV48nB7AXM8Zk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ament-cmake-version ]; diff --git a/distros/foxy/robot-controllers-interface/default.nix b/distros/foxy/robot-controllers-interface/default.nix index 6ef26d1f58..4e23e7f25a 100644 --- a/distros/foxy/robot-controllers-interface/default.nix +++ b/distros/foxy/robot-controllers-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-robot-controllers-interface"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-ros2-release/archive/release/foxy/robot_controllers_interface/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "c34090c04dcef35df231de376dc095fb722460236635f1b9f2a9e3b6978667cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-ros2-release"; + rev = "release/foxy/robot_controllers_interface/0.8.1-1"; + sha256 = "sha256-9mHPtMaKJvMwpAGr/u2cBP40bC7Tl7xA8lTKwnirR0E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/robot-controllers-msgs/default.nix b/distros/foxy/robot-controllers-msgs/default.nix index 353b3c3abb..69f979adc6 100644 --- a/distros/foxy/robot-controllers-msgs/default.nix +++ b/distros/foxy/robot-controllers-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-robot-controllers-msgs"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-ros2-release/archive/release/foxy/robot_controllers_msgs/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "7fd891740e919d7c0e3ac402b58d335ae1942038cf6b1c99600c56fd8b5a82ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-ros2-release"; + rev = "release/foxy/robot_controllers_msgs/0.8.1-1"; + sha256 = "sha256-ISa5iW0hLsQwNqnCFYa9hQ7P8lyn76FSdkWq3wca0Wc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/robot-controllers/default.nix b/distros/foxy/robot-controllers/default.nix index 6e3d5c088a..3ba8fe9190 100644 --- a/distros/foxy/robot-controllers/default.nix +++ b/distros/foxy/robot-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-robot-controllers"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-ros2-release/archive/release/foxy/robot_controllers/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "28e3d71e94b70d65834bdfa0d821238ae24756c558815ad32ddbbd60dd9538e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-ros2-release"; + rev = "release/foxy/robot_controllers/0.8.1-1"; + sha256 = "sha256-xJ44OPEE6h3FTBroQiASQyRD0DFJJf2XanEvnmm1NFQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/robot-localization/default.nix b/distros/foxy/robot-localization/default.nix index f943cc2787..fa2f615544 100644 --- a/distros/foxy/robot-localization/default.nix +++ b/distros/foxy/robot-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-robot-localization"; version = "3.1.2-r1"; - src = fetchurl { - url = "https://github.com/cra-ros-pkg/robot_localization-release/archive/release/foxy/robot_localization/3.1.2-1.tar.gz"; - name = "3.1.2-1.tar.gz"; - sha256 = "495d5a7059f0edb14fdb145b723590360f4236d1f2fb8d59d7170735761cc91b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cra-ros-pkg"; + repo = "robot_localization-release"; + rev = "release/foxy/robot_localization/3.1.2-1"; + sha256 = "sha256-cWiwgcDFldzeouNSvD+l4PRYSeUgzOxa2b3k6ZFKSmw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces rosidl-default-generators ]; diff --git a/distros/foxy/robot-state-publisher/default.nix b/distros/foxy/robot-state-publisher/default.nix index 712853bd7e..bdcec58d2a 100644 --- a/distros/foxy/robot-state-publisher/default.nix +++ b/distros/foxy/robot-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-robot-state-publisher"; version = "2.4.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_state_publisher-release/archive/release/foxy/robot_state_publisher/2.4.5-1.tar.gz"; - name = "2.4.5-1.tar.gz"; - sha256 = "515d5f18cb4937f9854bd46d62731d394c72fe81f4ddcc26b900726eff45ab02"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_state_publisher-release"; + rev = "release/foxy/robot_state_publisher/2.4.5-1"; + sha256 = "sha256-UzbNiZgixh1R6pYa/NrAkWR53melD2m3xBa/4JFTsEM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/robot-upstart/default.nix b/distros/foxy/robot-upstart/default.nix index b6fb7774db..3fcfafbdda 100644 --- a/distros/foxy/robot-upstart/default.nix +++ b/distros/foxy/robot-upstart/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-robot-upstart"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/robot_upstart-release/archive/release/foxy/robot_upstart/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "4247d0c32fca3a7e92edc2b832b76924359a069df0c552af2a1e11646337e0f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "robot_upstart-release"; + rev = "release/foxy/robot_upstart/1.0.2-1"; + sha256 = "sha256-kNE7THXKJblslBfs8CGEAhPHPw0sZ202Rrixj7X5L4g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ros-base/default.nix b/distros/foxy/ros-base/default.nix index e9b326553e..e4ccd13806 100644 --- a/distros/foxy/ros-base/default.nix +++ b/distros/foxy/ros-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-base"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/foxy/ros_base/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "17b2a81b60bdf088408d1a349ca4c558ea69f70a90f30598dde5daae74786f23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/foxy/ros_base/0.9.2-1"; + sha256 = "sha256-nR5SRheYnBk8+7loqN5bUCt+vkE5EkXTVQqv3bhNc9M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ros-core/default.nix b/distros/foxy/ros-core/default.nix index 6461aecda3..7db7764673 100644 --- a/distros/foxy/ros-core/default.nix +++ b/distros/foxy/ros-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-core"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/foxy/ros_core/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "9ed6646dd29039eae6e11622bd07a88457e628f46526186b6359101752bf212c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/foxy/ros_core/0.9.2-1"; + sha256 = "sha256-GgmQ3tLgBqH2puv92UqiIAciCej15wR/g7FS1kqNScA="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake ament-cmake-auto ament-cmake-gmock ament-cmake-gtest ament-cmake-pytest ament-cmake-ros ament-index-cpp ament-index-python ament-lint-auto ament-lint-common class-loader common-interfaces launch launch-ros launch-testing launch-testing-ament-cmake launch-testing-ros launch-xml launch-yaml pluginlib rcl-lifecycle rclcpp rclcpp-lifecycle rclpy ros-environment ros2action ros2component ros2doctor ros2interface ros2launch ros2lifecycle ros2multicast ros2node ros2param ros2pkg ros2run ros2service ros2topic rosidl-default-generators rosidl-default-runtime sros2 sros2-cmake ]; diff --git a/distros/foxy/ros-environment/default.nix b/distros/foxy/ros-environment/default.nix index e9e72d53fc..f057cf7350 100644 --- a/distros/foxy/ros-environment/default.nix +++ b/distros/foxy/ros-environment/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-environment"; version = "2.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_environment-release/archive/release/foxy/ros_environment/2.5.1-1.tar.gz"; - name = "2.5.1-1.tar.gz"; - sha256 = "8d594c0fd0788f084b93283c11cf3991e5bdaf76b666c1b602b4df7ca7019ce8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_environment-release"; + rev = "release/foxy/ros_environment/2.5.1-1"; + sha256 = "sha256-i5kQhv5ItXnAhCDeJjE7AdKPl18VNNowlwLMHYzEh+Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/ros-ign-bridge/default.nix b/distros/foxy/ros-ign-bridge/default.nix index b8d467fa4a..f457f1ec51 100644 --- a/distros/foxy/ros-ign-bridge/default.nix +++ b/distros/foxy/ros-ign-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-ign-bridge"; version = "0.221.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/foxy/ros_ign_bridge/0.221.2-1.tar.gz"; - name = "0.221.2-1.tar.gz"; - sha256 = "ec186272bbfc483e9ef0d1d12767e7f1e6fa8a246da048bfc38866779da54b74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/foxy/ros_ign_bridge/0.221.2-1"; + sha256 = "sha256-7cn94z7LBUgCxNdq8TrKu4dHI46cnLKC69DVe5UiM0o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/ros-ign-image/default.nix b/distros/foxy/ros-ign-image/default.nix index 15b607c33f..7070d6ca8f 100644 --- a/distros/foxy/ros-ign-image/default.nix +++ b/distros/foxy/ros-ign-image/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-ign-image"; version = "0.221.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/foxy/ros_ign_image/0.221.2-1.tar.gz"; - name = "0.221.2-1.tar.gz"; - sha256 = "e749b6739d04888ba97f79ee5f7b819563bda26e617e9334a7671ecdc5872c45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/foxy/ros_ign_image/0.221.2-1"; + sha256 = "sha256-nRZySFkz13ZgEQsIH/WMLTkmiIJId/qjUsdeA3RaUDg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/ros-ign-interfaces/default.nix b/distros/foxy/ros-ign-interfaces/default.nix index 22b8d27cef..48b10a2f7d 100644 --- a/distros/foxy/ros-ign-interfaces/default.nix +++ b/distros/foxy/ros-ign-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-ign-interfaces"; version = "0.221.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/foxy/ros_ign_interfaces/0.221.2-1.tar.gz"; - name = "0.221.2-1.tar.gz"; - sha256 = "a7a55eb2c8bc0bca95d13563ffa43e77f86aa8984b0816bc12858153cf32aaa7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/foxy/ros_ign_interfaces/0.221.2-1"; + sha256 = "sha256-+3a+cFKppXUHVpA3FMX8hp65oiqKu8XFV7ZjthEB2Ng="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/ros-ign/default.nix b/distros/foxy/ros-ign/default.nix index 5ee707d326..4439d8be0b 100644 --- a/distros/foxy/ros-ign/default.nix +++ b/distros/foxy/ros-ign/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-ign"; version = "0.221.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/foxy/ros_ign/0.221.2-1.tar.gz"; - name = "0.221.2-1.tar.gz"; - sha256 = "e16c78fd9bf2039ea9a3b36b5c7dca8154894910bc4423ce8d82cfddc311279e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/foxy/ros_ign/0.221.2-1"; + sha256 = "sha256-1nZNU5qFx7TdDkJ7/L6/+PNIoRzOvzGcLFNmUcL17T0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ros-testing/default.nix b/distros/foxy/ros-testing/default.nix index e522d2940d..c9803d9986 100644 --- a/distros/foxy/ros-testing/default.nix +++ b/distros/foxy/ros-testing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-testing"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_testing-release/archive/release/foxy/ros_testing/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "1783e0898dfce13a9f07a4e96cba894d42770f15b1b95fb89221ee140d0b8190"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_testing-release"; + rev = "release/foxy/ros_testing/0.2.1-1"; + sha256 = "sha256-tBW42Psklw1N1JDHqQBUph9pRmFV4clEUmWQjialOaI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-core ament-cmake-export-dependencies ]; diff --git a/distros/foxy/ros-workspace/default.nix b/distros/foxy/ros-workspace/default.nix index 6515556fd0..845e295ed4 100644 --- a/distros/foxy/ros-workspace/default.nix +++ b/distros/foxy/ros-workspace/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros-workspace"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_workspace-release/archive/release/foxy/ros_workspace/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "e3797244bf456109aa2752c797d1f45d2875c576631cfa6291bc66a29abcc652"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_workspace-release"; + rev = "release/foxy/ros_workspace/1.0.2-1"; + sha256 = "sha256-FXiyjTZx5N94wlqTFY6bxysv+eiH6noKxFlYXOwcV2M="; + }; buildType = "cmake"; buildInputs = [ ament-cmake-core ament-package cmake ]; diff --git a/distros/foxy/ros1-bridge/default.nix b/distros/foxy/ros1-bridge/default.nix index 68bddbcd24..a9e75a082f 100644 --- a/distros/foxy/ros1-bridge/default.nix +++ b/distros/foxy/ros1-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros1-bridge"; version = "0.9.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros1_bridge-release/archive/release/foxy/ros1_bridge/0.9.6-1.tar.gz"; - name = "0.9.6-1.tar.gz"; - sha256 = "451d0c9556a59abfc130778943d7d358abcb8bc8df542af8b279e10c4a18f952"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros1_bridge-release"; + rev = "release/foxy/ros1_bridge/0.9.6-1"; + sha256 = "sha256-c/C49cUXHPC+bHxPx03pTDcyZ8NDPnc3GdSulDUdA9U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-index-python python3Packages.catkin-pkg rmw-implementation-cmake rosidl-cmake rosidl-parser ]; diff --git a/distros/foxy/ros1-rosbag-storage-vendor/default.nix b/distros/foxy/ros1-rosbag-storage-vendor/default.nix index c48786d341..3dd58057ca 100644 --- a/distros/foxy/ros1-rosbag-storage-vendor/default.nix +++ b/distros/foxy/ros1-rosbag-storage-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros1-rosbag-storage-vendor"; version = "0.0.10-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_bag_v2-release/archive/release/foxy/ros1_rosbag_storage_vendor/0.0.10-1.tar.gz"; - name = "0.0.10-1.tar.gz"; - sha256 = "906f93dd2429158441409477e5c63b7df183e1f0f2a8c4844d00139868e28817"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2_bag_v2-release"; + rev = "release/foxy/ros1_rosbag_storage_vendor/0.0.10-1"; + sha256 = "sha256-O/0sZt7sUPMGiJywvuNvsdw8Vcv5V5PGMcuF+0XmDk0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake boost bzip2 console-bridge git gpgme openssl pkg-config pluginlib ros1-bridge ]; diff --git a/distros/foxy/ros2-control-test-assets/default.nix b/distros/foxy/ros2-control-test-assets/default.nix index 59b3f05a11..52d7e01526 100644 --- a/distros/foxy/ros2-control-test-assets/default.nix +++ b/distros/foxy/ros2-control-test-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2-control-test-assets"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/foxy/ros2_control_test_assets/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "dd351b46efaf5ef394378704c9a16e77e27b3bff5a8c76018793b663536286ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/foxy/ros2_control_test_assets/0.11.0-1"; + sha256 = "sha256-e3NXrwx/ysnpJ2/mdYf1VMnkfRW5cCpUikE+8FTXZR0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ros2-control/default.nix b/distros/foxy/ros2-control/default.nix index dc6b9f657b..e425113685 100644 --- a/distros/foxy/ros2-control/default.nix +++ b/distros/foxy/ros2-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2-control"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/foxy/ros2_control/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "a07f274f21a59b7bcf2376f2b0f2296c00242734b4bb384a8aa6f7654e2c59e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/foxy/ros2_control/0.11.0-1"; + sha256 = "sha256-EHxyym4EIunb9+2QL0t+JsuvBINP1DQNxUlE/pDQbnI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ros2-controllers/default.nix b/distros/foxy/ros2-controllers/default.nix index 1713fc7dc8..d46155a964 100644 --- a/distros/foxy/ros2-controllers/default.nix +++ b/distros/foxy/ros2-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2-controllers"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/ros2_controllers/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "048166bd7d28136b0ccf39ce3365d63850035412fa7ac2e560c800ea2bae1cae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/ros2_controllers/0.8.2-1"; + sha256 = "sha256-e8131wmD5fKDIJj9fjfiBRccuqxkKYeyv8gIScgLM2U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ros2-ouster/default.nix b/distros/foxy/ros2-ouster/default.nix index a01b53b591..85de3ea18f 100644 --- a/distros/foxy/ros2-ouster/default.nix +++ b/distros/foxy/ros2-ouster/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2-ouster"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/ros2_ouster_drivers-release/archive/release/foxy/ros2_ouster/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "9e3e14ec2e09d2e4933ad22fa11e213b3c231eea02f380c13d5e44ee1cf68f00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "ros2_ouster_drivers-release"; + rev = "release/foxy/ros2_ouster/0.2.0-1"; + sha256 = "sha256-DTBgXDtfODgOLLLsYdBoYg3hrsgiDlmLbMKdKKB3xWQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ros2-socketcan/default.nix b/distros/foxy/ros2-socketcan/default.nix index 2e579312e6..68a02c4e4f 100644 --- a/distros/foxy/ros2-socketcan/default.nix +++ b/distros/foxy/ros2-socketcan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2-socketcan"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_socketcan-release/archive/release/foxy/ros2_socketcan/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "0e1d360e58b44ddfa46158a568d646042a0738513f9e42e801de5f73a3eabecb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_socketcan-release"; + rev = "release/foxy/ros2_socketcan/1.1.0-1"; + sha256 = "sha256-5X1Zt8nQDN5Bp9dZgz8CzQW6gMNhDsjMt0D6P1X/JSg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/ros2action/default.nix b/distros/foxy/ros2action/default.nix index 8da23a9793..e7dbde0506 100644 --- a/distros/foxy/ros2action/default.nix +++ b/distros/foxy/ros2action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2action"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2action/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "92e1669af381c2be1eace5b05d30d21b8fed7d670781bc53aecc3502f0a6c876"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2action/0.9.12-1"; + sha256 = "sha256-LrrI5ajH6/cd9BOqGLraZo7rlRaQ5nMYBMXrHjdGbmk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ros-testing test-msgs ]; diff --git a/distros/foxy/ros2bag/default.nix b/distros/foxy/ros2bag/default.nix index ae8d7bd15e..e5edee2fa4 100644 --- a/distros/foxy/ros2bag/default.nix +++ b/distros/foxy/ros2bag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2bag"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/ros2bag/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "da2c068ff21189869581513abe6724ea4fe7ba914a2f1b595c060d94fc19c423"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/ros2bag/0.3.9-1"; + sha256 = "sha256-dSkAG1ghaj9t3OnFof+eCMU2SOjqRsHr7qNrHwFJv8g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch-testing launch-testing-ros pythonPackages.pytest ]; diff --git a/distros/foxy/ros2cli-common-extensions/default.nix b/distros/foxy/ros2cli-common-extensions/default.nix index df2eae710c..e8e59e4a47 100644 --- a/distros/foxy/ros2cli-common-extensions/default.nix +++ b/distros/foxy/ros2cli-common-extensions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2cli-common-extensions"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli_common_extensions-release/archive/release/foxy/ros2cli_common_extensions/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "a4084d90a9eb5802668306ea9c563eb6e882015707e21f3a9c6ec6ef58927c0a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli_common_extensions-release"; + rev = "release/foxy/ros2cli_common_extensions/0.1.1-1"; + sha256 = "sha256-32uWObO3hDPv9L3mLpl5Vm3mz4eGpui9idqtKeQmQH0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ros2cli/default.nix b/distros/foxy/ros2cli/default.nix index 16935ed266..bd220bc427 100644 --- a/distros/foxy/ros2cli/default.nix +++ b/distros/foxy/ros2cli/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2cli"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2cli/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "f6147591aaa5a01caf1ba832733a60293a81890bae8f23f55b9448f572bd0dd8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2cli/0.9.12-1"; + sha256 = "sha256-q364uxhphqRctznVRTAsaruk+Bk9FVClGSqUqwqoK4M="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest test-msgs ]; diff --git a/distros/foxy/ros2component/default.nix b/distros/foxy/ros2component/default.nix index 3dc94a00ec..4edd37cac8 100644 --- a/distros/foxy/ros2component/default.nix +++ b/distros/foxy/ros2component/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2component"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2component/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "2cb7d11a05984ce5afc99a01f7f6e0839d62b542c2a2e70a634d7bc6da3b79ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2component/0.9.12-1"; + sha256 = "sha256-F42rk0x0/CK5p7DyNXgvghOpUfiqd244u2+ra5pmurg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/foxy/ros2controlcli/default.nix b/distros/foxy/ros2controlcli/default.nix index da3836724a..27dfb2de5f 100644 --- a/distros/foxy/ros2controlcli/default.nix +++ b/distros/foxy/ros2controlcli/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2controlcli"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/foxy/ros2controlcli/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "38ecf5735292de1b8762bc851d355735873807a159e895a32c612e4bdf059908"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/foxy/ros2controlcli/0.11.0-1"; + sha256 = "sha256-AN84XOCc8VwEs5ddOrtP3J3EZ+ZiIH7Ks5o6RUBhno0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint ]; diff --git a/distros/foxy/ros2interface/default.nix b/distros/foxy/ros2interface/default.nix index 39b81efeb0..7c61b52a88 100644 --- a/distros/foxy/ros2interface/default.nix +++ b/distros/foxy/ros2interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2interface"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2interface/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "6114af9426012aa3b39a40c69d628693aac0735bbd56a9686554e99e4e5dbcc2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2interface/0.9.12-1"; + sha256 = "sha256-z/zupH6RkvuG7J25FtD7HfNbrNwmi2HC7TowsB0qymE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ros-testing test-msgs ]; diff --git a/distros/foxy/ros2launch/default.nix b/distros/foxy/ros2launch/default.nix index 9a2bbe61af..1769c56b2d 100644 --- a/distros/foxy/ros2launch/default.nix +++ b/distros/foxy/ros2launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2launch"; version = "0.11.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/foxy/ros2launch/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "a902fd775def34d1b20bdfcf87f1e39e0b4394b79993048a8490bcb15ae5a71a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/foxy/ros2launch/0.11.7-1"; + sha256 = "sha256-lb8ZYI+zTEB22+Bpv/fIXlXk4Nh+lM9ycHtG8UqQvug="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ros2lifecycle-test-fixtures/default.nix b/distros/foxy/ros2lifecycle-test-fixtures/default.nix index 27ec68df9a..faa76ba8de 100644 --- a/distros/foxy/ros2lifecycle-test-fixtures/default.nix +++ b/distros/foxy/ros2lifecycle-test-fixtures/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2lifecycle-test-fixtures"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2lifecycle_test_fixtures/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "9351e2888e10b7e6b2ce4c3e1aee0ddcfbd8f62d4b77882de4a8c8b1e9f4cc1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2lifecycle_test_fixtures/0.9.12-1"; + sha256 = "sha256-F8AjY4VN9HMFGmfJkZhlIg2Jf/xICWpZVi8zLCMJM84="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ros2lifecycle/default.nix b/distros/foxy/ros2lifecycle/default.nix index 3e47a6c0f1..95973c18fd 100644 --- a/distros/foxy/ros2lifecycle/default.nix +++ b/distros/foxy/ros2lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2lifecycle"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2lifecycle/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "08cec578b06d54813f46e0e8083b363cff90c3f4135b1097e981436405b7115c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2lifecycle/0.9.12-1"; + sha256 = "sha256-y5As+50l+3b4f0RnS0dtPiyXYKDS55cKsU0FB7WWFVk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ros-testing ros2lifecycle-test-fixtures ]; diff --git a/distros/foxy/ros2multicast/default.nix b/distros/foxy/ros2multicast/default.nix index c2a1ab0b05..8f9f045a6e 100644 --- a/distros/foxy/ros2multicast/default.nix +++ b/distros/foxy/ros2multicast/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2multicast"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2multicast/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "0b4c2a5f05d0f917b22a53ddb6905a6b927dd194bc8d64c7d8a3284960a7c34b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2multicast/0.9.12-1"; + sha256 = "sha256-WE6ZD/GpSlkSGUFJAOO1a7jzyIAwYJ21ZhYmZSotvso="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/foxy/ros2node/default.nix b/distros/foxy/ros2node/default.nix index 05bcec5774..7bc22c9eac 100644 --- a/distros/foxy/ros2node/default.nix +++ b/distros/foxy/ros2node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2node"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2node/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "d65bb5ee8c3dc7c901d3faeddf697fd178676ceabc4d04848be728aa83dcfdfe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2node/0.9.12-1"; + sha256 = "sha256-3iJIRIVM842b1NMOXyw+awkFyseqjNcRQZajDPJR/do="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest rclpy ros-testing test-msgs ]; diff --git a/distros/foxy/ros2nodl/default.nix b/distros/foxy/ros2nodl/default.nix index 71d9c27600..1feea12c84 100644 --- a/distros/foxy/ros2nodl/default.nix +++ b/distros/foxy/ros2nodl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2nodl"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nodl-release/archive/release/foxy/ros2nodl/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "f500f0c85d048581b793e1cec2162f4fe2be349dacc67aef364fa4048bf8ff65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nodl-release"; + rev = "release/foxy/ros2nodl/0.3.1-1"; + sha256 = "sha256-8JQgseO9AxfsDy2YuxQ/dojS/6MOLaCKwBGUX8hIgwk="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-lint-auto ament-lint-common ament-mypy python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/foxy/ros2param/default.nix b/distros/foxy/ros2param/default.nix index 838f827a26..1c5bcf5c54 100644 --- a/distros/foxy/ros2param/default.nix +++ b/distros/foxy/ros2param/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2param"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2param/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "5455b95d3d2bac264f67fea7db7f3c34db84ee3be792a5b9e0d5940a1d548ce3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2param/0.9.12-1"; + sha256 = "sha256-PYsVNbeKpG/vvorOpJ02YCPUNrdTPdQbir8ckRJo8w0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros pythonPackages.pytest ]; diff --git a/distros/foxy/ros2pkg/default.nix b/distros/foxy/ros2pkg/default.nix index 1f2eb6dc4e..0965f7bfb0 100644 --- a/distros/foxy/ros2pkg/default.nix +++ b/distros/foxy/ros2pkg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2pkg"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2pkg/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "0bed29dbe18a4c29bacf739d8c63f6ed08c0f70c1591d1a634026a4874d954ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2pkg/0.9.12-1"; + sha256 = "sha256-UIFGTTVqkY6EVApeYkXpJVJEjRaykMrcJs8vRbysGys="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ros-testing ]; diff --git a/distros/foxy/ros2run/default.nix b/distros/foxy/ros2run/default.nix index 86ec8ca770..fab83f6c83 100644 --- a/distros/foxy/ros2run/default.nix +++ b/distros/foxy/ros2run/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2run"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2run/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "cb244e9f0052086f1556b9fe2f12f2648d449f18bfbd775d4ddcf798966eec21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2run/0.9.12-1"; + sha256 = "sha256-fOc1A1Jxn2zL6Gbn+VCkj4QIfCwlg6AV1Q9xYF+nOiU="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/foxy/ros2service/default.nix b/distros/foxy/ros2service/default.nix index f8f6bdf573..972ff45f54 100644 --- a/distros/foxy/ros2service/default.nix +++ b/distros/foxy/ros2service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2service"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2service/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "5a74946632bd6eac823ffceaae55c213c2783a1628930b284aca7d1fcf592865"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2service/0.9.12-1"; + sha256 = "sha256-gGMaRgaZVEWAj8XE7DIvt7KqIONuXEj/gHUvZaGItmY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ros-testing test-msgs ]; diff --git a/distros/foxy/ros2test/default.nix b/distros/foxy/ros2test/default.nix index 363b493d63..b108608af0 100644 --- a/distros/foxy/ros2test/default.nix +++ b/distros/foxy/ros2test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2test"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_testing-release/archive/release/foxy/ros2test/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "80aacb0c622b5a88e20299fd3f4bb9b8dee473171948c708a3e2c1adb59662a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_testing-release"; + rev = "release/foxy/ros2test/0.2.1-1"; + sha256 = "sha256-NOeUcdHSPJ7YfVeFEEXcX+SqdAUPUzntw1PIMYvJVKA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ros2topic/default.nix b/distros/foxy/ros2topic/default.nix index 8885a8594a..01147521d8 100644 --- a/distros/foxy/ros2topic/default.nix +++ b/distros/foxy/ros2topic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2topic"; version = "0.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/foxy/ros2topic/0.9.12-1.tar.gz"; - name = "0.9.12-1.tar.gz"; - sha256 = "b224cb8b4810bd489310df2e9897532e5de55123cfa45b50778dc4a69e583020"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/foxy/ros2topic/0.9.12-1"; + sha256 = "sha256-FWwbLqCq0XLlJ6BSsQ6RgFIey7FNaZmU+b6Uvm8FR5s="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint geometry-msgs pythonPackages.pytest ros-testing std-msgs test-msgs ]; diff --git a/distros/foxy/ros2trace/default.nix b/distros/foxy/ros2trace/default.nix index 8f00c8e652..2d423172e9 100644 --- a/distros/foxy/ros2trace/default.nix +++ b/distros/foxy/ros2trace/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ros2trace"; version = "1.0.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/foxy/ros2trace/1.0.5-2.tar.gz"; - name = "1.0.5-2.tar.gz"; - sha256 = "9cd998d905f4d740bf63d06a6713efb94e58344f75eaafea34a604c8becf6904"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/foxy/ros2trace/1.0.5-2"; + sha256 = "sha256-CgBKgBGhao/LTNw/4UXmK0cTI0HyMYufrg+ebI3reTI="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/foxy/rosapi-msgs/default.nix b/distros/foxy/rosapi-msgs/default.nix index 25610adabc..26c1fd09be 100644 --- a/distros/foxy/rosapi-msgs/default.nix +++ b/distros/foxy/rosapi-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosapi-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/foxy/rosapi_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "a26a27d80a6793d7a3d18ff938cd6ed9ed0d398790578a5096fd2940c7b0742c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/foxy/rosapi_msgs/1.3.1-1"; + sha256 = "sha256-Q4dTs68oi8RWGF2fto9PtQNCnoH23yoHPnNZkMLJBRE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-default-generators ]; diff --git a/distros/foxy/rosapi/default.nix b/distros/foxy/rosapi/default.nix index 9cd708e9c5..05053c76de 100644 --- a/distros/foxy/rosapi/default.nix +++ b/distros/foxy/rosapi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosapi"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/foxy/rosapi/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "d41c78147ec4a5d4d8cfdc49e3c10b4a8c4a3c93c10b14cb75e789b59aa4e01e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/foxy/rosapi/1.3.1-1"; + sha256 = "sha256-xyStRT/4J+A6f1qaIk41X5un6h8s/aFEGdHcIQofWHg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rosauth/default.nix b/distros/foxy/rosauth/default.nix index 516d76b8e5..5ba08d5b80 100644 --- a/distros/foxy/rosauth/default.nix +++ b/distros/foxy/rosauth/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosauth"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosauth-release/archive/release/foxy/rosauth/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "e688341cb53f75dfe44ce9372e32aec7ee4ed0c468abe6adf0d00b2d69664962"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosauth-release"; + rev = "release/foxy/rosauth/2.0.2-1"; + sha256 = "sha256-knzwMpG1mnsjrb91rWrZgR4OQJPbluWDCJpMy9iTgRo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros openssl rosidl-default-generators ]; diff --git a/distros/foxy/rosbag2-bag-v2-plugins/default.nix b/distros/foxy/rosbag2-bag-v2-plugins/default.nix index ad4b605b2e..3bb8d38083 100644 --- a/distros/foxy/rosbag2-bag-v2-plugins/default.nix +++ b/distros/foxy/rosbag2-bag-v2-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-bag-v2-plugins"; version = "0.0.10-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_bag_v2-release/archive/release/foxy/rosbag2_bag_v2_plugins/0.0.10-1.tar.gz"; - name = "0.0.10-1.tar.gz"; - sha256 = "0af1ade39d4ed3e5fdc742eeebcc29351ac49666a9f470ecb658aa45cf118e1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2_bag_v2-release"; + rev = "release/foxy/rosbag2_bag_v2_plugins/0.0.10-1"; + sha256 = "sha256-KN0T03pV9V1GrMjmTmEFNdm5itUwY2FEJhNWoGaZsaA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-compression/default.nix b/distros/foxy/rosbag2-compression/default.nix index 170bbb4de8..1bb1bd7a62 100644 --- a/distros/foxy/rosbag2-compression/default.nix +++ b/distros/foxy/rosbag2-compression/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-compression"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2_compression/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "4a6ab0de150dae4704a44edc72ea9f34337037e423598989ea7b5054972da84a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2_compression/0.3.9-1"; + sha256 = "sha256-xkbVdbGy87e3UOD/UHSg8KnA0T6OpeS4vDwmo0racWo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-converter-default-plugins/default.nix b/distros/foxy/rosbag2-converter-default-plugins/default.nix index fa2ecd8889..b3b805bca3 100644 --- a/distros/foxy/rosbag2-converter-default-plugins/default.nix +++ b/distros/foxy/rosbag2-converter-default-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-converter-default-plugins"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2_converter_default_plugins/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "c8fa7cdc58299965760ef0b3d95e886672fd5a9c24345b48ec18fd783850448a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2_converter_default_plugins/0.3.9-1"; + sha256 = "sha256-eBbvXF8BitrZ1CUqKlK5sEA8wZmASP5L3HvgEmiGuuY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-cpp/default.nix b/distros/foxy/rosbag2-cpp/default.nix index 7362e7623e..2d25dbeeeb 100644 --- a/distros/foxy/rosbag2-cpp/default.nix +++ b/distros/foxy/rosbag2-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-cpp"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2_cpp/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "0623fda4007032007e753aaf713e1fd7c863d607ab2d47b8730e92ade6696063"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2_cpp/0.3.9-1"; + sha256 = "sha256-jk3NF2NZWEEQBJDWE4ZurVGh0joGPsHq66ZWKcwisYQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-storage-default-plugins/default.nix b/distros/foxy/rosbag2-storage-default-plugins/default.nix index 7f98a8ddfa..6799a82963 100644 --- a/distros/foxy/rosbag2-storage-default-plugins/default.nix +++ b/distros/foxy/rosbag2-storage-default-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-storage-default-plugins"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2_storage_default_plugins/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "b7fe3b35448b47d2250b11cd67c8e2774c8c230027b86be539d7c2d0639a609b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2_storage_default_plugins/0.3.9-1"; + sha256 = "sha256-0PoC4MBmqp56rZCT83vSi4DU7nBPB6Uo1G9nmjZOjPU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-storage-mcap-testdata/default.nix b/distros/foxy/rosbag2-storage-mcap-testdata/default.nix index c9882f415a..4547396dc5 100644 --- a/distros/foxy/rosbag2-storage-mcap-testdata/default.nix +++ b/distros/foxy/rosbag2-storage-mcap-testdata/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-storage-mcap-testdata"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/foxy/rosbag2_storage_mcap_testdata/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "9f13c826b493d30288ff49fe6863680161e37037b9e6f77113719aa9d5d9b12e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2_storage_mcap-release"; + rev = "release/foxy/rosbag2_storage_mcap_testdata/0.6.0-1"; + sha256 = "sha256-49Y2YKzW2WMB+JDp0r1cUQMUjNYz+ggwnrnTQL6DDwc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rosbag2-storage-mcap/default.nix b/distros/foxy/rosbag2-storage-mcap/default.nix index e5989d35bc..da1dbfe73a 100644 --- a/distros/foxy/rosbag2-storage-mcap/default.nix +++ b/distros/foxy/rosbag2-storage-mcap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-storage-mcap"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/foxy/rosbag2_storage_mcap/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "488e351ffb941664b7fd4821f05b136b8feeb631035800a99cb5a51c089fb5ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2_storage_mcap-release"; + rev = "release/foxy/rosbag2_storage_mcap/0.6.0-1"; + sha256 = "sha256-VRylbzLxzMfEKGv5N/rjaDEBiwDD7rv/kIIYgIpOTb4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-storage/default.nix b/distros/foxy/rosbag2-storage/default.nix index 8570d2fbf6..e4b954375c 100644 --- a/distros/foxy/rosbag2-storage/default.nix +++ b/distros/foxy/rosbag2-storage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-storage"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2_storage/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "cb85ffbfb4c7f56a33536846a4e01b041d2e18230da1e8f49700e06b6358ed55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2_storage/0.3.9-1"; + sha256 = "sha256-IFi4OMX+mWDSC2G62vUlUn8yVYWXrND6NzP/kO24E84="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-test-common/default.nix b/distros/foxy/rosbag2-test-common/default.nix index 60884ed2dd..f9724ab5be 100644 --- a/distros/foxy/rosbag2-test-common/default.nix +++ b/distros/foxy/rosbag2-test-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-test-common"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2_test_common/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "850916cd7ec0395ddb5935524e8391047eeb9ac5effc8617fd26ce976a00eb29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2_test_common/0.3.9-1"; + sha256 = "sha256-dpnZgj0sHeAxI5ZW4wp3Ok7oS4d292SLvyedzzppIT4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-tests/default.nix b/distros/foxy/rosbag2-tests/default.nix index 8b793217fe..673cbcdd47 100644 --- a/distros/foxy/rosbag2-tests/default.nix +++ b/distros/foxy/rosbag2-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-tests"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2_tests/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "26edda1d351eb0e390784de7a1da1935b14e0a7bee407a28b441ec945b4d7e47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2_tests/0.3.9-1"; + sha256 = "sha256-Uqe75QfFZ5o5M5amvHt/xhX8SZD3bH6HF4GH0JrzXOY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbag2-transport/default.nix b/distros/foxy/rosbag2-transport/default.nix index f7fb643b5a..c24eb7a895 100644 --- a/distros/foxy/rosbag2-transport/default.nix +++ b/distros/foxy/rosbag2-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2-transport"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2_transport/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "f186303cdb48a31c21a681cfe94b5ab4d4f27da07d266e6a1cecb8ae5eba558f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2_transport/0.3.9-1"; + sha256 = "sha256-/kz7/6RfE3Sli4Ah9p8us4tzsB77SIK+M0cpJNDfcnk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rosbag2/default.nix b/distros/foxy/rosbag2/default.nix index f0f291d65b..4073abeed7 100644 --- a/distros/foxy/rosbag2/default.nix +++ b/distros/foxy/rosbag2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbag2"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/rosbag2/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "15d386a2a8e6324ca3bafe766b9ea2b11e5004fd2334fd86b33ed3220ab67a63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/rosbag2/0.3.9-1"; + sha256 = "sha256-5wxu9ayMQjYoGWzv3d/RL8/PQv/meAymxnfYOZSSTVs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosbridge-library/default.nix b/distros/foxy/rosbridge-library/default.nix index 93351aa5f0..acb9235900 100644 --- a/distros/foxy/rosbridge-library/default.nix +++ b/distros/foxy/rosbridge-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbridge-library"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/foxy/rosbridge_library/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "2130838174c2e3aa724f31013825a76d344a640447401190f984e2d49c2cdd88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/foxy/rosbridge_library/1.3.1-1"; + sha256 = "sha256-N/PN8jn57yPt/8PpynUAVchkFfftkKbyDD0SUeiNDRA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/foxy/rosbridge-msgs/default.nix b/distros/foxy/rosbridge-msgs/default.nix index 2123628d10..e28610013d 100644 --- a/distros/foxy/rosbridge-msgs/default.nix +++ b/distros/foxy/rosbridge-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbridge-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/foxy/rosbridge_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "91afa7f6aa1ecd21d850f50a5f0c847f92ea5005b8169823f4d588da82e1d4b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/foxy/rosbridge_msgs/1.3.1-1"; + sha256 = "sha256-fa8a7XqxoY7IgwXCc994LiFABO2+hCdOVKmPRxpT3PQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros builtin-interfaces rosidl-default-generators ]; diff --git a/distros/foxy/rosbridge-server/default.nix b/distros/foxy/rosbridge-server/default.nix index d136a95e22..2d0b264ee5 100644 --- a/distros/foxy/rosbridge-server/default.nix +++ b/distros/foxy/rosbridge-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbridge-server"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/foxy/rosbridge_server/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "cf9417459e21b3b1f377190ae1eb3e224ff506f60830d4f89fe5fecdfcf8d3ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/foxy/rosbridge_server/1.3.1-1"; + sha256 = "sha256-+/YXaqhSZxsnXK/roPCndJ03rrcWji3q1guEQ09g4jE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/foxy/rosbridge-suite/default.nix b/distros/foxy/rosbridge-suite/default.nix index 4a82226b43..082420f754 100644 --- a/distros/foxy/rosbridge-suite/default.nix +++ b/distros/foxy/rosbridge-suite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbridge-suite"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/foxy/rosbridge_suite/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "94366336bf1ed158fbf73b9ed9a3086a1f1d26ee685b5d0ba9df3160730a788c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/foxy/rosbridge_suite/1.3.1-1"; + sha256 = "sha256-GCCnTrZrj1fE7QXPG5N1kyb5GiaunUe6YsYLdnGRJJ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/rosbridge-test-msgs/default.nix b/distros/foxy/rosbridge-test-msgs/default.nix index 9295ac0ddc..5f75a01838 100644 --- a/distros/foxy/rosbridge-test-msgs/default.nix +++ b/distros/foxy/rosbridge-test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosbridge-test-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/foxy/rosbridge_test_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "314ce6933f744bf8247d3b62857d54722b0ac093e9843f94df720cbc83774800"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/foxy/rosbridge_test_msgs/1.3.1-1"; + sha256 = "sha256-QbIObUjU3gN7gPnoKMc6Yu+ZEnUDP+vtpzT81rjq2xg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rosee-msg/default.nix b/distros/foxy/rosee-msg/default.nix index 19ac4abb46..45afd0f4cd 100644 --- a/distros/foxy/rosee-msg/default.nix +++ b/distros/foxy/rosee-msg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosee-msg"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/ADVRHumanoids/rosee2_msg-release/archive/release/foxy/rosee_msg/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "b552235dc79a8e18a1acb015b78dee7d205f65c044043da4a73ad07cffddd4c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ADVRHumanoids"; + repo = "rosee2_msg-release"; + rev = "release/foxy/rosee_msg/0.0.2-2"; + sha256 = "sha256-JYoSP63MW/TTdrLINU5lttEVthNCyi9AOlmEi9GApD4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rosgraph-msgs/default.nix b/distros/foxy/rosgraph-msgs/default.nix index 7be346fa5e..7805da9be8 100644 --- a/distros/foxy/rosgraph-msgs/default.nix +++ b/distros/foxy/rosgraph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosgraph-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/foxy/rosgraph_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "6e1a01afa5d813591a92bd52a4e7d0bc75328bf7b8cd73ea9f88c8ee0b8bd860"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/foxy/rosgraph_msgs/1.0.0-1"; + sha256 = "sha256-dDmNumuBp2joNpJm+Qc6k+xzt+zCHgegqrWl3rXGUck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rosidl-adapter/default.nix b/distros/foxy/rosidl-adapter/default.nix index 6783f465f0..2bb44b07c7 100644 --- a/distros/foxy/rosidl-adapter/default.nix +++ b/distros/foxy/rosidl-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-adapter"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_adapter/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "71d40ff1ab72b18a1579e5593fb8ff8aab64881be96538c507be652248b97d2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_adapter/1.3.0-1"; + sha256 = "sha256-03UAQZmfds7u4qweGSd0NobdJ4xclUqwnuM+ek2ibRc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosidl-cmake/default.nix b/distros/foxy/rosidl-cmake/default.nix index 9ad6ca8235..b7788ee2cc 100644 --- a/distros/foxy/rosidl-cmake/default.nix +++ b/distros/foxy/rosidl-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-cmake"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_cmake/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "750bb42d4e07d3befb23a568b061f3a28f226113e2d723232ed29443a4f3d719"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_cmake/1.3.0-1"; + sha256 = "sha256-migHggNQhmWN1kjL1mHoQ5bRDWVH4/ZYxfqpH6HJX/0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/foxy/rosidl-default-generators/default.nix b/distros/foxy/rosidl-default-generators/default.nix index a123600409..b0e50f16f6 100644 --- a/distros/foxy/rosidl-default-generators/default.nix +++ b/distros/foxy/rosidl-default-generators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-default-generators"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/foxy/rosidl_default_generators/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "7d4f2be5e2751c8dbe70344468a104f061879cf1d4759d2117d946659431600d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_defaults-release"; + rev = "release/foxy/rosidl_default_generators/1.0.1-1"; + sha256 = "sha256-7weYP3HRQnH3O1sztjZw86tpbfkh4kMNNLB76NeB1O0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosidl-default-runtime/default.nix b/distros/foxy/rosidl-default-runtime/default.nix index c47e626c8d..2b4f6dd8b8 100644 --- a/distros/foxy/rosidl-default-runtime/default.nix +++ b/distros/foxy/rosidl-default-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-default-runtime"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/foxy/rosidl_default_runtime/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "4608ee420c651b7deb3d13923c61b5610b6f2c0a58c3edaf2f9650ffc34833bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_defaults-release"; + rev = "release/foxy/rosidl_default_runtime/1.0.1-1"; + sha256 = "sha256-LSmo6NS2PRqLdFwby1CtgM/lyAP9xgYImmskY6sOD68="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosidl-generator-c/default.nix b/distros/foxy/rosidl-generator-c/default.nix index d7e9f0568d..0ca1bd5cf7 100644 --- a/distros/foxy/rosidl-generator-c/default.nix +++ b/distros/foxy/rosidl-generator-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-generator-c"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_generator_c/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "333bbf1e9d414841db1a74ddb7ad3cc1cd0979c9f20380c0ecdfc2e38e233b8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_generator_c/1.3.0-1"; + sha256 = "sha256-5Cw7OVJ6js5o0Uiryh/rKuGrBECU3yJ7/51aBNQNymI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros ]; diff --git a/distros/foxy/rosidl-generator-cpp/default.nix b/distros/foxy/rosidl-generator-cpp/default.nix index 4e85363588..079c35bd78 100644 --- a/distros/foxy/rosidl-generator-cpp/default.nix +++ b/distros/foxy/rosidl-generator-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-generator-cpp"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_generator_cpp/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "15eeb5cd54272000cd0ac9f270ce708b2ac954a982c03267ee9fa281ad311392"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_generator_cpp/1.3.0-1"; + sha256 = "sha256-mMor/BjHlMDbhRwxs+vcDipXM9NR5OW2ySEC3w7BEfo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosidl-generator-dds-idl/default.nix b/distros/foxy/rosidl-generator-dds-idl/default.nix index 8e9f0efd0a..a5facdde04 100644 --- a/distros/foxy/rosidl-generator-dds-idl/default.nix +++ b/distros/foxy/rosidl-generator-dds-idl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-generator-dds-idl"; version = "0.7.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_dds-release/archive/release/foxy/rosidl_generator_dds_idl/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "ae83243db4ffc4f89b8bb1c795650f5555e5dfbdaec43a7adafcbfa576598633"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_dds-release"; + rev = "release/foxy/rosidl_generator_dds_idl/0.7.1-1"; + sha256 = "sha256-ZMBKnrO//0baCjYzMQlXlp9VJAZoez+fZ4Se7+CSBkE="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/rosidl-generator-py/default.nix b/distros/foxy/rosidl-generator-py/default.nix index d8dd42fb1c..0fe094724d 100644 --- a/distros/foxy/rosidl-generator-py/default.nix +++ b/distros/foxy/rosidl-generator-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-generator-py"; version = "0.9.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_python-release/archive/release/foxy/rosidl_generator_py/0.9.6-1.tar.gz"; - name = "0.9.6-1.tar.gz"; - sha256 = "ac70640eefea88a701766979f4afa8ae63cefcab6fd898edb993332c81c68eb1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_python-release"; + rev = "release/foxy/rosidl_generator_py/0.9.6-1"; + sha256 = "sha256-OrnUm0tWjseHJIHOI+bkQ0iyGZJSNX33Ksjt8K5LwiE="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-pytest ament-index-python ament-lint-auto ament-lint-common python-cmake-module python3Packages.numpy pythonPackages.pytest rmw rosidl-cmake rosidl-generator-c rosidl-generator-cpp rosidl-parser rosidl-typesupport-c rosidl-typesupport-connext-c rosidl-typesupport-fastrtps-c rosidl-typesupport-introspection-c rpyutils test-interface-files ]; diff --git a/distros/foxy/rosidl-parser/default.nix b/distros/foxy/rosidl-parser/default.nix index 2e428b5c41..30f6229c04 100644 --- a/distros/foxy/rosidl-parser/default.nix +++ b/distros/foxy/rosidl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-parser"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_parser/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "df8be42409db4104c507b0bd29be99b3484d7cd6313ed5be743281401e403943"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_parser/1.3.0-1"; + sha256 = "sha256-kTP8OLE4qgSq3+ChtG/hCtZqRbMY/fStNXhLqgUh/30="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosidl-runtime-c/default.nix b/distros/foxy/rosidl-runtime-c/default.nix index 359fd4c34f..142c833f12 100644 --- a/distros/foxy/rosidl-runtime-c/default.nix +++ b/distros/foxy/rosidl-runtime-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-runtime-c"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_runtime_c/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "0e5a40e5f007b14c7438ed47647993e25ee8c8f8e1cefc7173a31676a60b9a29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_runtime_c/1.3.0-1"; + sha256 = "sha256-vl2LZHTVeZudE/jJQl+Qlh+1UfBmxuOB5S+Jby5mX34="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rosidl-runtime-cpp/default.nix b/distros/foxy/rosidl-runtime-cpp/default.nix index 39f6e0fc08..5eca2a1d92 100644 --- a/distros/foxy/rosidl-runtime-cpp/default.nix +++ b/distros/foxy/rosidl-runtime-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-runtime-cpp"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_runtime_cpp/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "4e124b5bab7b8c0485d62976f0e674aecc24b2886a057e6a8c568bb73252291f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_runtime_cpp/1.3.0-1"; + sha256 = "sha256-lYYQ3IjyQ9+sRT0Ye4pb+liofmKCGyCdDPhL2VkG3PI="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common performance-test-fixture ]; diff --git a/distros/foxy/rosidl-runtime-py/default.nix b/distros/foxy/rosidl-runtime-py/default.nix index 94cee98730..a0018426bf 100644 --- a/distros/foxy/rosidl-runtime-py/default.nix +++ b/distros/foxy/rosidl-runtime-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-runtime-py"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_runtime_py-release/archive/release/foxy/rosidl_runtime_py/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "473cc66ae02a7bea0bcc51802a1d2547ae4fd13181370ceaa626e7a482b8b02f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_runtime_py-release"; + rev = "release/foxy/rosidl_runtime_py/0.9.1-1"; + sha256 = "sha256-QRwfvqs4bhzxzzonAanNbul+LzaxAUrhKPsU7LeR2UQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest std-msgs std-srvs test-msgs ]; diff --git a/distros/foxy/rosidl-typesupport-c/default.nix b/distros/foxy/rosidl-typesupport-c/default.nix index ca406ec951..a6684d8dfa 100644 --- a/distros/foxy/rosidl-typesupport-c/default.nix +++ b/distros/foxy/rosidl-typesupport-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-c"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/foxy/rosidl_typesupport_c/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "bada063b080ae58f96a7eb8d1b422500f47c1403afdf10ca2c0d42c1bf07bdbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport-release"; + rev = "release/foxy/rosidl_typesupport_c/1.0.2-1"; + sha256 = "sha256-lar2U2UwtY6xLAGWvok6s5h4n8DWqXNcX8jCiX9NJm4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-connext-c rosidl-typesupport-introspection-c ]; diff --git a/distros/foxy/rosidl-typesupport-connext-c/default.nix b/distros/foxy/rosidl-typesupport-connext-c/default.nix index 646de8ac62..5361bb2faf 100644 --- a/distros/foxy/rosidl-typesupport-connext-c/default.nix +++ b/distros/foxy/rosidl-typesupport-connext-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-connext-c"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/foxy/rosidl_typesupport_connext_c/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "60b24753c51030c08d9cce34541a2ce02d528759da2eb0006fdf8ceff243a204"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_connext-release"; + rev = "release/foxy/rosidl_typesupport_connext_c/1.0.3-1"; + sha256 = "sha256-ONJZ6yzlJapK9NTw9Ej4/c/W3oYrAzGqKDXUaii74lU="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/rosidl-typesupport-connext-cpp/default.nix b/distros/foxy/rosidl-typesupport-connext-cpp/default.nix index bd363a4dd3..91252b78dd 100644 --- a/distros/foxy/rosidl-typesupport-connext-cpp/default.nix +++ b/distros/foxy/rosidl-typesupport-connext-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-connext-cpp"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/foxy/rosidl_typesupport_connext_cpp/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "8edd59200934ec40dc9a1ff0b1b4e543c550f69efa8b5332735b686caede6ba7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_connext-release"; + rev = "release/foxy/rosidl_typesupport_connext_cpp/1.0.3-1"; + sha256 = "sha256-ah1NXOmQ1Whr93MAS40xAOzYiQ/HhWVP6G3bBh0BCao="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/rosidl-typesupport-cpp/default.nix b/distros/foxy/rosidl-typesupport-cpp/default.nix index 944777794b..f05f32bf67 100644 --- a/distros/foxy/rosidl-typesupport-cpp/default.nix +++ b/distros/foxy/rosidl-typesupport-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-cpp"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/foxy/rosidl_typesupport_cpp/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "51c964f33694c022a803cbffef9f2d2f3e864540436f15014485f449e730017c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport-release"; + rev = "release/foxy/rosidl_typesupport_cpp/1.0.2-1"; + sha256 = "sha256-jO4JejqLMZqTx0H8AryVhVYhrxrWFoICCDhTNleNXYQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-connext-cpp rosidl-typesupport-introspection-cpp ]; diff --git a/distros/foxy/rosidl-typesupport-fastrtps-c/default.nix b/distros/foxy/rosidl-typesupport-fastrtps-c/default.nix index 791bf98fa9..75527dbfa7 100644 --- a/distros/foxy/rosidl-typesupport-fastrtps-c/default.nix +++ b/distros/foxy/rosidl-typesupport-fastrtps-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-fastrtps-c"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/foxy/rosidl_typesupport_fastrtps_c/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "179c65edc79a738849459b8078b91922baa6974996cee99a7a7029efd4fa8bd7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/foxy/rosidl_typesupport_fastrtps_c/1.0.4-1"; + sha256 = "sha256-2GRGUQaA9RJY+cF+iBMgGS1alYFTnydE6hmgS3IZJnU="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common osrf-testing-tools-cpp performance-test-fixture ]; diff --git a/distros/foxy/rosidl-typesupport-fastrtps-cpp/default.nix b/distros/foxy/rosidl-typesupport-fastrtps-cpp/default.nix index 02c4c8d196..053b196505 100644 --- a/distros/foxy/rosidl-typesupport-fastrtps-cpp/default.nix +++ b/distros/foxy/rosidl-typesupport-fastrtps-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-fastrtps-cpp"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/foxy/rosidl_typesupport_fastrtps_cpp/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "86edb940683229c785785a9c254ef5b6cdcfdd51e10e7b94aa13cc80ac59be36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/foxy/rosidl_typesupport_fastrtps_cpp/1.0.4-1"; + sha256 = "sha256-WED3RotLLZ11BrZ9wDIOVvSL1O8OjEyNX2dwYXnVV1Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosidl-typesupport-interface/default.nix b/distros/foxy/rosidl-typesupport-interface/default.nix index 45ab4bec9a..caa5c89e3a 100644 --- a/distros/foxy/rosidl-typesupport-interface/default.nix +++ b/distros/foxy/rosidl-typesupport-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-interface"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_typesupport_interface/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "37a5dbbf0e001619240e55da703d90ddf91952c79568f32cc5d29662390b1bf1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_typesupport_interface/1.3.0-1"; + sha256 = "sha256-V783u2QgNlwZfz5IpsBDCCYY1AdeHBEmmDv+WR7l7ZQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rosidl-typesupport-introspection-c/default.nix b/distros/foxy/rosidl-typesupport-introspection-c/default.nix index cf5936f389..caa9e711d6 100644 --- a/distros/foxy/rosidl-typesupport-introspection-c/default.nix +++ b/distros/foxy/rosidl-typesupport-introspection-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-introspection-c"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_typesupport_introspection_c/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "c51be493975ddd6e2fe39bff263c33c7b0b8ac27e9e0f1eccd21f483da95340b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_typesupport_introspection_c/1.3.0-1"; + sha256 = "sha256-UpgUauv8g4GVcQuGt3trzca+Hm1r3+cIZf9IENg2i5w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rosidl-typesupport-introspection-cpp/default.nix b/distros/foxy/rosidl-typesupport-introspection-cpp/default.nix index 7932113960..531a91ffec 100644 --- a/distros/foxy/rosidl-typesupport-introspection-cpp/default.nix +++ b/distros/foxy/rosidl-typesupport-introspection-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosidl-typesupport-introspection-cpp"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/foxy/rosidl_typesupport_introspection_cpp/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "9ea72c465cf3ef182df57830b52b4574c348de93e744fbb7299499f9bccc0b30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/foxy/rosidl_typesupport_introspection_cpp/1.3.0-1"; + sha256 = "sha256-TC0obJG/Js5pnw6NO6HQpnJHWr+R45Rbau3METbChqE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/rosxbeepy/default.nix b/distros/foxy/rosxbeepy/default.nix index 42861475bf..fd9ccf83e2 100644 --- a/distros/foxy/rosxbeepy/default.nix +++ b/distros/foxy/rosxbeepy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rosxbeepy"; version = "0.0.1-r2"; - src = fetchurl { - url = "https://github.com/Sudharsan10/ROSXBee-release/archive/release/foxy/rosxbeepy/0.0.1-2.tar.gz"; - name = "0.0.1-2.tar.gz"; - sha256 = "e54e519941091da234061390d26f379e90f26f705125f4a1f9bcca6a27fa2617"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Sudharsan10"; + repo = "ROSXBee-release"; + rev = "release/foxy/rosxbeepy/0.0.1-2"; + sha256 = "sha256-6ooykAGOPuAdPg3xm2OgfNMuPPXnoWOJcok4rW959DU="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/rover-bringup/default.nix b/distros/foxy/rover-bringup/default.nix index e6a0dc6023..423d9c906f 100644 --- a/distros/foxy/rover-bringup/default.nix +++ b/distros/foxy/rover-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rover-bringup"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/roverrobotics_ros2-release/archive/release/foxy/rover_bringup/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "3523442a078155c2b153edcf9363f62d4f389357b2f23ba5872b83449118e49c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "roverrobotics_ros2-release"; + rev = "release/foxy/rover_bringup/0.1.1-2"; + sha256 = "sha256-nJsNOsWShqt7xcJVc/9mjHDm9AiF8ulelu+VeFYAoko="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rover-description/default.nix b/distros/foxy/rover-description/default.nix index 8da36e0964..b8c9b43949 100644 --- a/distros/foxy/rover-description/default.nix +++ b/distros/foxy/rover-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rover-description"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/roverrobotics_ros2-release/archive/release/foxy/rover_description/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "b5f901e2e0959833c1e705541852add919352a1a4e976e45ea79fedf172ee365"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "roverrobotics_ros2-release"; + rev = "release/foxy/rover_description/0.1.1-2"; + sha256 = "sha256-p7EDH+qtVX9jDzJ/IumY3F1OPk+fqRbE8cuCbxfUGHY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rover-driver/default.nix b/distros/foxy/rover-driver/default.nix index c395d5a6eb..20e97c92ff 100644 --- a/distros/foxy/rover-driver/default.nix +++ b/distros/foxy/rover-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rover-driver"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/roverrobotics_ros2-release/archive/release/foxy/rover_driver/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "cbf419b12e82a4843f01e69555f2a7a609736d02769fb3e5b0d58852c4582b8e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "roverrobotics_ros2-release"; + rev = "release/foxy/rover_driver/0.1.1-2"; + sha256 = "sha256-ytctUDFgd+AXTy3FciYDGwqj7GOJiwq6sERLhSuGZnI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rover-msgs/default.nix b/distros/foxy/rover-msgs/default.nix index 28ec4fbb66..500cc4fb3f 100644 --- a/distros/foxy/rover-msgs/default.nix +++ b/distros/foxy/rover-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rover-msgs"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/roverrobotics_ros2-release/archive/release/foxy/rover_msgs/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "fd622b49ee4cab060a1e50dc73ae99de1f66f0605db240c2cf9f83fc8a525285"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "roverrobotics_ros2-release"; + rev = "release/foxy/rover_msgs/0.1.1-2"; + sha256 = "sha256-Z4AtoiiR7om6ktKbQ0H2yJNeWxR16Fyfj8dr0EHNxhc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/rover-navigation/default.nix b/distros/foxy/rover-navigation/default.nix index 60c17fbc2e..3a46749f3a 100644 --- a/distros/foxy/rover-navigation/default.nix +++ b/distros/foxy/rover-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rover-navigation"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/roverrobotics_ros2-release/archive/release/foxy/rover_navigation/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "0344f646bddd472b1661821585166bb0b3eab2c8389b8e703cba57d15e862141"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "roverrobotics_ros2-release"; + rev = "release/foxy/rover_navigation/0.1.1-2"; + sha256 = "sha256-u9ndIYscN6o7qvbbp45jm5N74YkiThzsZUxwtBbv7QA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rover-simulation/default.nix b/distros/foxy/rover-simulation/default.nix index bd88befb3c..4321284e16 100644 --- a/distros/foxy/rover-simulation/default.nix +++ b/distros/foxy/rover-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rover-simulation"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/roverrobotics_ros2-release/archive/release/foxy/rover_simulation/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "25307e4c7b66b0f9f8abab68e457b7f87d5a9ebc323a7a981dfc0738f41a5ff9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "roverrobotics_ros2-release"; + rev = "release/foxy/rover_simulation/0.1.1-2"; + sha256 = "sha256-89scNdcIIIG4UGOqPAwpoagcyf7Ibq4wljOnhDFqgB4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rover-teleop/default.nix b/distros/foxy/rover-teleop/default.nix index dfb21d5ad5..1798e99da6 100644 --- a/distros/foxy/rover-teleop/default.nix +++ b/distros/foxy/rover-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rover-teleop"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/roverrobotics_ros2-release/archive/release/foxy/rover_teleop/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "7ecc599c243f529056201046b6f8d520619e0abcc9bee1b497b5deb990a7876c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "roverrobotics_ros2-release"; + rev = "release/foxy/rover_teleop/0.1.1-2"; + sha256 = "sha256-2K4NoCJz66NoypKd9KDJyZbg+WfuJ+ASrfPQ2Qdm5pw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/roverrobotics-ros2/default.nix b/distros/foxy/roverrobotics-ros2/default.nix index 99ed5c4764..b3d152bdf1 100644 --- a/distros/foxy/roverrobotics-ros2/default.nix +++ b/distros/foxy/roverrobotics-ros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-roverrobotics-ros2"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/roverrobotics_ros2-release/archive/release/foxy/roverrobotics_ros2/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "f023f5877ac477b58450fbdd5743150d656f3e83a82f5bdefd628d0ad3b53888"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "roverrobotics_ros2-release"; + rev = "release/foxy/roverrobotics_ros2/0.1.1-2"; + sha256 = "sha256-3Si9TWZpxKDRzuNUXNPg9dlFzEi0tfEVjJW1meif51o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rplidar-ros/default.nix b/distros/foxy/rplidar-ros/default.nix index 95b4969377..4bc6a4f367 100644 --- a/distros/foxy/rplidar-ros/default.nix +++ b/distros/foxy/rplidar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rplidar-ros"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/allenh1/rplidar_ros-release/archive/release/foxy/rplidar_ros/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "1c6953014038b0b8642f08b8b85bbe807bda36a6d0ebde093399024df075acff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "rplidar_ros-release"; + rev = "release/foxy/rplidar_ros/2.0.2-1"; + sha256 = "sha256-NIXU4rmre0ZJIQW6jsE3k4D930KpOzEz4/T7aAFy9Uw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ament-cmake-ros ]; diff --git a/distros/foxy/rpyutils/default.nix b/distros/foxy/rpyutils/default.nix index 3ef2e83cd3..f7e13a95d5 100644 --- a/distros/foxy/rpyutils/default.nix +++ b/distros/foxy/rpyutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rpyutils"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rpyutils-release/archive/release/foxy/rpyutils/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "45f694c9502c89b53cdb1258f084f6d3c4da2bd085fbfa1e999b15c1611352dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rpyutils-release"; + rev = "release/foxy/rpyutils/0.2.0-1"; + sha256 = "sha256-6A+zh2W0g6LS2wofdkzqkK4w7QVApxz+yj3GYOV/55o="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/foxy/rqt-action/default.nix b/distros/foxy/rqt-action/default.nix index 389d4446fd..2e71b95556 100644 --- a/distros/foxy/rqt-action/default.nix +++ b/distros/foxy/rqt-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-action"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_action-release/archive/release/foxy/rqt_action/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "ebfdef186a9446d7789f7d202e8fd74ac85a206b7c9e7494a80813256b0c3ad1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_action-release"; + rev = "release/foxy/rqt_action/1.0.1-1"; + sha256 = "sha256-S090Lwzztp6BSY0LHvzwzaxaXlXHdjLTPUNq8Jb+Aok="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding rclpy rqt-gui rqt-gui-py rqt-msg rqt-py-common ]; diff --git a/distros/foxy/rqt-common-plugins/default.nix b/distros/foxy/rqt-common-plugins/default.nix index f718bf8170..e5732b0b4c 100644 --- a/distros/foxy/rqt-common-plugins/default.nix +++ b/distros/foxy/rqt-common-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-common-plugins"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_common_plugins-release/archive/release/foxy/rqt_common_plugins/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "ba5adf2cf1b397c5fbb4ecc616a4c11df042d3931a1a97e1ee007129034971a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_common_plugins-release"; + rev = "release/foxy/rqt_common_plugins/1.0.0-1"; + sha256 = "sha256-KjNyLkiWu8q0pheNieDZos6VXPDneiYH4ZrGwufEKGg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rqt-console/default.nix b/distros/foxy/rqt-console/default.nix index 1f5e22b151..215af88f41 100644 --- a/distros/foxy/rqt-console/default.nix +++ b/distros/foxy/rqt-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-console"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_console-release/archive/release/foxy/rqt_console/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "e30be415ef6ffa55d20c4da0230ac456b9677cdb9dbc79a46a7fc34e983a22f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_console-release"; + rev = "release/foxy/rqt_console/1.1.2-1"; + sha256 = "sha256-BIE9k4e1ZKeiHoq7x6xDk6x72hYaG1eF3BBD8Y/XJPQ="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding rcl-interfaces rclpy rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/foxy/rqt-graph/default.nix b/distros/foxy/rqt-graph/default.nix index 7ddd3bef8b..0e3667b721 100644 --- a/distros/foxy/rqt-graph/default.nix +++ b/distros/foxy/rqt-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-graph"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_graph-release/archive/release/foxy/rqt_graph/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "e98bca25c7abffc7543313351c51203b385d5862d5faa62959f779203583e0fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_graph-release"; + rev = "release/foxy/rqt_graph/1.1.3-1"; + sha256 = "sha256-+pXBsOzXnlCOjsrzZrZwMT+yIJilR1ELXFN44StbclI="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding qt-dotgraph rqt-gui rqt-gui-py ]; diff --git a/distros/foxy/rqt-gui-cpp/default.nix b/distros/foxy/rqt-gui-cpp/default.nix index 3a2a7065d4..97803f6ce8 100644 --- a/distros/foxy/rqt-gui-cpp/default.nix +++ b/distros/foxy/rqt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-gui-cpp"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/foxy/rqt_gui_cpp/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "d1fa25e5c28e68a30851a41d238dc949c1607f49986a936f16937505af200d4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/foxy/rqt_gui_cpp/1.1.2-1"; + sha256 = "sha256-agAlO3vMzqaZggoRdzNIXjY78ZIykuTRqcKxRqOhJHU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/foxy/rqt-gui-py/default.nix b/distros/foxy/rqt-gui-py/default.nix index a1c17e14a8..03b805f02d 100644 --- a/distros/foxy/rqt-gui-py/default.nix +++ b/distros/foxy/rqt-gui-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-gui-py"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/foxy/rqt_gui_py/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "f1494bc84267c38a9189da464ec1b893af51efc7b6e3f6c7e87be9130095d2fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/foxy/rqt_gui_py/1.1.2-1"; + sha256 = "sha256-Z1xpdHqrroatppbZ89rbS8bNQO3WaHAfP9UPhXMW+Jg="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/rqt-gui/default.nix b/distros/foxy/rqt-gui/default.nix index 2e1ee3ef94..0722f8906b 100644 --- a/distros/foxy/rqt-gui/default.nix +++ b/distros/foxy/rqt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-gui"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/foxy/rqt_gui/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "fa8ac31e554aec867a54cf524e79a17a90e6a14727b349351d3ce599c4dcd783"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/foxy/rqt_gui/1.1.2-1"; + sha256 = "sha256-az4J0I6MA3LIr5nL5BnWXR2cr+6eGgPnO9V5h/nsSTs="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/rqt-image-view/default.nix b/distros/foxy/rqt-image-view/default.nix index 245410371a..62d912a2c1 100644 --- a/distros/foxy/rqt-image-view/default.nix +++ b/distros/foxy/rqt-image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-image-view"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_view-release/archive/release/foxy/rqt_image_view/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "3e89cdf8e7f901fc8bd16970ab61d66656cccbe6c6e892bf4ab08f9992510e55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_image_view-release"; + rev = "release/foxy/rqt_image_view/1.1.1-1"; + sha256 = "sha256-nnGCQz6FV1THxiOZknWHh0BMYkEK4FR2uh+hi2pPhCs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/foxy/rqt-moveit/default.nix b/distros/foxy/rqt-moveit/default.nix index ee002cf9eb..9eb0de2437 100644 --- a/distros/foxy/rqt-moveit/default.nix +++ b/distros/foxy/rqt-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-moveit"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_moveit-release/archive/release/foxy/rqt_moveit/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "b07e001bec2172fcd9a0756bf47f05857068928d61184e36980999a45bb6fa26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_moveit-release"; + rev = "release/foxy/rqt_moveit/1.0.1-1"; + sha256 = "sha256-A4bGoHfpokKaYjSrBzvtYgzyf6sJGECfPJCIM0iZgYU="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.setuptools rosidl-default-generators ]; diff --git a/distros/foxy/rqt-msg/default.nix b/distros/foxy/rqt-msg/default.nix index cb15533dc0..843be5cb40 100644 --- a/distros/foxy/rqt-msg/default.nix +++ b/distros/foxy/rqt-msg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-msg"; version = "1.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_msg-release/archive/release/foxy/rqt_msg/1.0.5-1.tar.gz"; - name = "1.0.5-1.tar.gz"; - sha256 = "99a54eeef627f2fcbd7c5a1ae133183c61145d321d21557381c52b7f9abfc1df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_msg-release"; + rev = "release/foxy/rqt_msg/1.0.5-1"; + sha256 = "sha256-lgOSPganjlWw+KGVnKmhKMQve6hobmxKSHmGrO/KyTI="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg rclpy rqt-console rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/foxy/rqt-plot/default.nix b/distros/foxy/rqt-plot/default.nix index a799855626..99aa7ae883 100644 --- a/distros/foxy/rqt-plot/default.nix +++ b/distros/foxy/rqt-plot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-plot"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_plot-release/archive/release/foxy/rqt_plot/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "8a275cdec0aa6e699be6052bea5d877ac1256877c54e2fc61c1329ea50ca3c69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_plot-release"; + rev = "release/foxy/rqt_plot/1.1.1-1"; + sha256 = "sha256-GUdgXDUmLAebny0V5AFQLeQiEIjWrYOpvRFgsz2FIAE="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg python3Packages.matplotlib python3Packages.numpy qt-gui-py-common rclpy rqt-gui rqt-gui-py rqt-py-common std-msgs ]; diff --git a/distros/foxy/rqt-publisher/default.nix b/distros/foxy/rqt-publisher/default.nix index d094dc6d57..35646866c7 100644 --- a/distros/foxy/rqt-publisher/default.nix +++ b/distros/foxy/rqt-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-publisher"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_publisher-release/archive/release/foxy/rqt_publisher/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "df8496cf5bca3a68c09c2375d4708df96f422b6ef03497eceaa085f68caf64b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_publisher-release"; + rev = "release/foxy/rqt_publisher/1.3.0-1"; + sha256 = "sha256-A5G91mCmvj1OCRiwqywIrsFwStxtXDjFGIJwFwYEE3w="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg qt-gui-py-common rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/foxy/rqt-py-common/default.nix b/distros/foxy/rqt-py-common/default.nix index c452811c50..d446fecbc1 100644 --- a/distros/foxy/rqt-py-common/default.nix +++ b/distros/foxy/rqt-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-py-common"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/foxy/rqt_py_common/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "3b4935a602734a0a52b7ed39622b43411e9d297541037c81ed5fc2373eabf112"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/foxy/rqt_py_common/1.1.2-1"; + sha256 = "sha256-DaXn6/0dt+0i5Osr6aLb10vUCMyt7en2Qkhpl7WWARs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rqt-py-console/default.nix b/distros/foxy/rqt-py-console/default.nix index 83155d9b39..a52e7f075f 100644 --- a/distros/foxy/rqt-py-console/default.nix +++ b/distros/foxy/rqt-py-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-py-console"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_py_console-release/archive/release/foxy/rqt_py_console/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "232841a16cb289ef21d6f2851c0826a98ba3940e6edc89f9fb6d6db458633c88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_py_console-release"; + rev = "release/foxy/rqt_py_console/1.0.2-1"; + sha256 = "sha256-yLjOc2LoQeh7Yx+T6GKB+Xbdm3NG47pMTU2gIzn+uZY="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding qt-gui qt-gui-py-common rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/foxy/rqt-reconfigure/default.nix b/distros/foxy/rqt-reconfigure/default.nix index 50607589ec..54cc30b644 100644 --- a/distros/foxy/rqt-reconfigure/default.nix +++ b/distros/foxy/rqt-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-reconfigure"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_reconfigure-release/archive/release/foxy/rqt_reconfigure/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "6b6c856a869f815c573da23e0f9bba96efc65d1a7f92153afd75f6afef8c69f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_reconfigure-release"; + rev = "release/foxy/rqt_reconfigure/1.0.8-1"; + sha256 = "sha256-Gs4D7boTF9pL2P0QK4kjX2CXjnfzken4zxeZjUSmh1U="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-xmllint ]; diff --git a/distros/foxy/rqt-robot-dashboard/default.nix b/distros/foxy/rqt-robot-dashboard/default.nix index 3e7c25d832..7c91e16c14 100644 --- a/distros/foxy/rqt-robot-dashboard/default.nix +++ b/distros/foxy/rqt-robot-dashboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-robot-dashboard"; version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_dashboard-release/archive/release/foxy/rqt_robot_dashboard/0.6.1-1.tar.gz"; - name = "0.6.1-1.tar.gz"; - sha256 = "d4f1a459e3e8327d57aa5c606ed219870db701ed3020b0d937dac83994ed2aa0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_dashboard-release"; + rev = "release/foxy/rqt_robot_dashboard/0.6.1-1"; + sha256 = "sha256-o2FskVGSpDLTcYD8PlfRgHpBlDa3UId/Xq+IlAvaZGY="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.setuptools ]; diff --git a/distros/foxy/rqt-robot-monitor/default.nix b/distros/foxy/rqt-robot-monitor/default.nix index 67969bee9f..658565faba 100644 --- a/distros/foxy/rqt-robot-monitor/default.nix +++ b/distros/foxy/rqt-robot-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-robot-monitor"; 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.5-1.tar.gz"; - name = "1.0.5-1.tar.gz"; - sha256 = "0aad78d4049e71e4134c5208b650763283c08434d737604ec4d27543f55d6aea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_robot_monitor-release"; + rev = "release/foxy/rqt_robot_monitor/1.0.5-1"; + sha256 = "sha256-4cOwsLyW7ouFZM1kNCA3d/8k1Ogm6pt51x0xuWtGqcA="; + }; buildType = "ament_python"; buildInputs = [ rosidl-default-generators ]; diff --git a/distros/foxy/rqt-robot-steering/default.nix b/distros/foxy/rqt-robot-steering/default.nix index 0e11f3d39d..642eb7285d 100644 --- a/distros/foxy/rqt-robot-steering/default.nix +++ b/distros/foxy/rqt-robot-steering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-robot-steering"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_steering-release/archive/release/foxy/rqt_robot_steering/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "7eea86618e3cca0ca733e5cc2248cb0d229f5f0fe64cf31cb3392ed6f63b88cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_robot_steering-release"; + rev = "release/foxy/rqt_robot_steering/1.0.0-1"; + sha256 = "sha256-GQCdfFYxE/yR3Eostcf+T9VKwP2N45EzidAhXz5uVrw="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python geometry-msgs python-qt-binding rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/foxy/rqt-runtime-monitor/default.nix b/distros/foxy/rqt-runtime-monitor/default.nix index f4bd134f17..88cd7f2bc6 100644 --- a/distros/foxy/rqt-runtime-monitor/default.nix +++ b/distros/foxy/rqt-runtime-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-runtime-monitor"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_runtime_monitor-release/archive/release/foxy/rqt_runtime_monitor/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "dcc8128caebc7c57f725c94691de328ebcb37085a739cb610e2d8135c43ef4c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_runtime_monitor-release"; + rev = "release/foxy/rqt_runtime_monitor/1.0.0-1"; + sha256 = "sha256-7LyebmhKcj1ltMsj4LbDUxXX5v9ejuW4g4lIKitP28Q="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/rqt-service-caller/default.nix b/distros/foxy/rqt-service-caller/default.nix index e9e55680bb..0dbe92ad59 100644 --- a/distros/foxy/rqt-service-caller/default.nix +++ b/distros/foxy/rqt-service-caller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-service-caller"; version = "1.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_service_caller-release/archive/release/foxy/rqt_service_caller/1.0.5-1.tar.gz"; - name = "1.0.5-1.tar.gz"; - sha256 = "345c29256ee1c7ccd34aa936bd089ee543db38079bade04366ed876641b98afb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_service_caller-release"; + rev = "release/foxy/rqt_service_caller/1.0.5-1"; + sha256 = "sha256-ZIAMenPCiVlqoXUvFI0pukwPJC43v4GOkQH7JEHO9W4="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/foxy/rqt-shell/default.nix b/distros/foxy/rqt-shell/default.nix index 706c6b0403..6b561f7ef5 100644 --- a/distros/foxy/rqt-shell/default.nix +++ b/distros/foxy/rqt-shell/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-shell"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_shell-release/archive/release/foxy/rqt_shell/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "ddae8c454b782e3cb1f361cef4adcb906c1c5cd7a2a8ef23d20d66f972e03059"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_shell-release"; + rev = "release/foxy/rqt_shell/1.0.2-1"; + sha256 = "sha256-TQTnT4NLOyyBYWKjB+/sJ7oGIkAG3FXQezqxdFXUGQc="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg qt-gui qt-gui-py-common rqt-gui rqt-gui-py ]; diff --git a/distros/foxy/rqt-srv/default.nix b/distros/foxy/rqt-srv/default.nix index 1022ff98aa..c704721d47 100644 --- a/distros/foxy/rqt-srv/default.nix +++ b/distros/foxy/rqt-srv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-srv"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_srv-release/archive/release/foxy/rqt_srv/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "7b126f474d382c6d52510f804ebc633a5b8f7b9912cfe3503404c1e4d8943df3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_srv-release"; + rev = "release/foxy/rqt_srv/1.0.3-1"; + sha256 = "sha256-q6xLT+in38OgaER7EjAFQvGQIqlXCP85eR4andyqu8g="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rclpy rqt-gui rqt-gui-py rqt-msg ]; diff --git a/distros/foxy/rqt-tf-tree/default.nix b/distros/foxy/rqt-tf-tree/default.nix index 149c1c58e4..3759c22500 100644 --- a/distros/foxy/rqt-tf-tree/default.nix +++ b/distros/foxy/rqt-tf-tree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-tf-tree"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_tf_tree-release/archive/release/foxy/rqt_tf_tree/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "46bba17833ddafac6af4a99df252632907b7087c38c4943bb59c325baaf0612e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_tf_tree-release"; + rev = "release/foxy/rqt_tf_tree/1.0.3-1"; + sha256 = "sha256-Iem5taVGzW7fx5/Jhe0p8NW94l/fccrko/HIhAf+/QA="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.mock ]; diff --git a/distros/foxy/rqt-top/default.nix b/distros/foxy/rqt-top/default.nix index b74e700e77..7f7e75aa8a 100644 --- a/distros/foxy/rqt-top/default.nix +++ b/distros/foxy/rqt-top/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-top"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_top-release/archive/release/foxy/rqt_top/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "93abf9fbb6cc63c1fcc7cb61b3c58bcfd8b747112a3fea0bde975d0d09d7ce22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_top-release"; + rev = "release/foxy/rqt_top/1.0.2-1"; + sha256 = "sha256-1HuHE0nfXmn2SZzagKTlYPIOS4z859Bdyv9dyGxbFJM="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.psutil rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/foxy/rqt-topic/default.nix b/distros/foxy/rqt-topic/default.nix index 04e69d7672..75b5e42700 100644 --- a/distros/foxy/rqt-topic/default.nix +++ b/distros/foxy/rqt-topic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt-topic"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_topic-release/archive/release/foxy/rqt_topic/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "34f176a2b9f398a41b8b05c40a1512177d7156a06de9206e8346e875d6d93509"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_topic-release"; + rev = "release/foxy/rqt_topic/1.3.0-2"; + sha256 = "sha256-T+B+9+QOzEt6pGpsBi7awLV0BTwSPw2cEL5EonoFonM="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-xmllint ]; diff --git a/distros/foxy/rqt/default.nix b/distros/foxy/rqt/default.nix index 78b06be77c..4f41cf5ca9 100644 --- a/distros/foxy/rqt/default.nix +++ b/distros/foxy/rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rqt"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/foxy/rqt/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "19eb2e617f89eb90e8f1bb10f322c6312198cd14b848c7a1396e7f7d259a44db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/foxy/rqt/1.1.2-1"; + sha256 = "sha256-J8El/vniT1uDWylxUepdNdebNWHnpfidcikjKYhyacQ="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rqt-gui rqt-gui-cpp rqt-gui-py rqt-py-common ]; diff --git a/distros/foxy/rt-manipulators-cpp/default.nix b/distros/foxy/rt-manipulators-cpp/default.nix index 1462407043..75a7f7ecf1 100644 --- a/distros/foxy/rt-manipulators-cpp/default.nix +++ b/distros/foxy/rt-manipulators-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rt-manipulators-cpp"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_manipulators_cpp-release/archive/release/foxy/rt_manipulators_cpp/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "e10b6a350ba61762f678f070614f15e70d1141684dffb02a3fadd00c7da519aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_manipulators_cpp-release"; + rev = "release/foxy/rt_manipulators_cpp/1.0.0-1"; + sha256 = "sha256-YUJkRUHMLukwe5vyCr9kFhmmkkBb/ezgelg3SKIop3w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rt-manipulators-examples/default.nix b/distros/foxy/rt-manipulators-examples/default.nix index 3b9575a9f9..e10583c996 100644 --- a/distros/foxy/rt-manipulators-examples/default.nix +++ b/distros/foxy/rt-manipulators-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rt-manipulators-examples"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_manipulators_cpp-release/archive/release/foxy/rt_manipulators_examples/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "8f3b1ee3e5aafaa221f3ffe7bdacf16ebf4764c69527782de1b6bb601ae608d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_manipulators_cpp-release"; + rev = "release/foxy/rt_manipulators_examples/1.0.0-1"; + sha256 = "sha256-dHVhmshZaD7z/hfD5tLkvXw6mehXEQSlivgKwLZ4YZM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rt-usb-9axisimu-driver/default.nix b/distros/foxy/rt-usb-9axisimu-driver/default.nix index 9ae5c8b09e..db39e8b1bb 100644 --- a/distros/foxy/rt-usb-9axisimu-driver/default.nix +++ b/distros/foxy/rt-usb-9axisimu-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rt-usb-9axisimu-driver"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_usb_9axisimu_driver-release/archive/release/foxy/rt_usb_9axisimu_driver/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "15b06d3e00389385bd7281cadc150770c7bb3b1da73349030b5a15163bf30536"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_usb_9axisimu_driver-release"; + rev = "release/foxy/rt_usb_9axisimu_driver/2.0.1-1"; + sha256 = "sha256-TkEWfWO53W9C6ZMN+GqZsVS52PXPSQpGuxicolcAYjw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rtabmap-ros/default.nix b/distros/foxy/rtabmap-ros/default.nix index db58459387..7028f0b812 100644 --- a/distros/foxy/rtabmap-ros/default.nix +++ b/distros/foxy/rtabmap-ros/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, ament-lint-auto, ament-lint-common, builtin-interfaces, class-loader, compressed-depth-image-transport, compressed-image-transport, cv-bridge, geometry-msgs, image-geometry, image-transport, laser-geometry, message-filters, nav-msgs, nav2-common, nav2-msgs, octomap, octomap-msgs, pcl, pcl-conversions, pluginlib, rclcpp, rclcpp-components, rclpy, ros-environment, rosgraph-msgs, rosidl-default-generators, rosidl-default-runtime, rtabmap, rviz-common, rviz-default-plugins, rviz-rendering, sensor-msgs, std-msgs, std-srvs, stereo-msgs, tf2, tf2-eigen, tf2-geometry-msgs, tf2-ros, visualization-msgs }: buildRosPackage { pname = "ros-foxy-rtabmap-ros"; - version = "0.20.22-r1"; + version = "0.20.23-r1"; - src = fetchurl { - url = "https://github.com/introlab/rtabmap_ros-release/archive/release/foxy/rtabmap_ros/0.20.22-1.tar.gz"; - name = "0.20.22-1.tar.gz"; - sha256 = "2d10f8270356d9768f39d97a3e48438bd79e83a86f93aa4f78ebf4a336e816f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "rtabmap_ros-release"; + rev = "release/foxy/rtabmap_ros/0.20.23-1"; + sha256 = "sha256-34iHBGfC3hD58WWrf+42sxkmsvO9nYOkqefNl05WewI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python pcl ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/rtcm-msgs/default.nix b/distros/foxy/rtcm-msgs/default.nix index 1ed579d9e3..77eaeecd71 100644 --- a/distros/foxy/rtcm-msgs/default.nix +++ b/distros/foxy/rtcm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rtcm-msgs"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rtcm_msgs-release/archive/release/foxy/rtcm_msgs/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "b89cd731ca9e6ef114feb481caf218ba3594630da17985adc72d92735af77790"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rtcm_msgs-release"; + rev = "release/foxy/rtcm_msgs/1.1.6-1"; + sha256 = "sha256-5yTtIdGostlOwChSlKKL4JivCyK284g0KYZxB6GBtBY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces ros-environment rosidl-default-generators ]; diff --git a/distros/foxy/rttest/default.nix b/distros/foxy/rttest/default.nix index a414a17d5a..4bc666109c 100644 --- a/distros/foxy/rttest/default.nix +++ b/distros/foxy/rttest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rttest"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/realtime_support-release/archive/release/foxy/rttest/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "5fe31ede66049996ed3ebcecc4e9b11d02e8adf8a633f6d50504a3f4911f434b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "realtime_support-release"; + rev = "release/foxy/rttest/0.9.0-1"; + sha256 = "sha256-ki2E8kUbSjrijdmtuRZnChwzcxY+567BSsjNs23EltM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ruckig/default.nix b/distros/foxy/ruckig/default.nix index 2e75ddb64e..1a5afb9ba1 100644 --- a/distros/foxy/ruckig/default.nix +++ b/distros/foxy/ruckig/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, cmake }: buildRosPackage { pname = "ros-foxy-ruckig"; - version = "0.6.3-r1"; + version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/pantor/ruckig-release/archive/release/foxy/ruckig/0.6.3-1.tar.gz"; - name = "0.6.3-1.tar.gz"; - sha256 = "cff3d3db056f7026f298f4b87c843781ceeec72947f706d1f861d69a96aed9a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pantor"; + repo = "ruckig-release"; + rev = "release/foxy/ruckig/0.9.2-1"; + sha256 = "sha256-xzv0PejVB2frTXtd7fnF72E49MOQaARx6boGHYzyVnQ="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/run-move-group/default.nix b/distros/foxy/run-move-group/default.nix index e41a132cd4..8e64edfa91 100644 --- a/distros/foxy/run-move-group/default.nix +++ b/distros/foxy/run-move-group/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-run-move-group"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/run_move_group/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "9c9283679849378a664eb793a45faa89507a1c6bace808ba1e1cc56215da2c54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/run_move_group/2.2.3-1"; + sha256 = "sha256-mdfpDoDKd8jeB9NhihDg1jRNqqS6d4L2/UbqxvYzeu4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/run-moveit-cpp/default.nix b/distros/foxy/run-moveit-cpp/default.nix index fc132dcab1..0e3f435332 100644 --- a/distros/foxy/run-moveit-cpp/default.nix +++ b/distros/foxy/run-moveit-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-run-moveit-cpp"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/run_moveit_cpp/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "4eaf91edfdaa1024450c5374d7fa8d57b7021b9f3c6a4899c1afa25b8b0eea25"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/run_moveit_cpp/2.2.3-1"; + sha256 = "sha256-7oFTeoHXpVJzWDGkLU9GRWKXh1Q7ohWMPyUah46kprY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/run-ompl-constrained-planning/default.nix b/distros/foxy/run-ompl-constrained-planning/default.nix index 241441a9f5..0424d30379 100644 --- a/distros/foxy/run-ompl-constrained-planning/default.nix +++ b/distros/foxy/run-ompl-constrained-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-run-ompl-constrained-planning"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/foxy/run_ompl_constrained_planning/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "53ecd09290add9920ab753edd5bb0fb4a1e5de7df60698f599bd48ae91fb49ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/foxy/run_ompl_constrained_planning/2.2.3-1"; + sha256 = "sha256-ySjL5k85Nzt5dxp3AiBnbzxJuimB8vvXiY8jxlED09s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-common ]; diff --git a/distros/foxy/rviz-assimp-vendor/default.nix b/distros/foxy/rviz-assimp-vendor/default.nix index cee83f619d..4c5d408add 100644 --- a/distros/foxy/rviz-assimp-vendor/default.nix +++ b/distros/foxy/rviz-assimp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-assimp-vendor"; version = "8.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/foxy/rviz_assimp_vendor/8.2.7-1.tar.gz"; - name = "8.2.7-1.tar.gz"; - sha256 = "06d09052b18a8222d98178030bcaf605af6ace29bf1eeae9fc22bf4497b9e969"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/foxy/rviz_assimp_vendor/8.2.7-1"; + sha256 = "sha256-yqWgV9+HBr/kepv28H6t0r4EuG8ZHnOBr+dg9UGx9rQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rviz-common/default.nix b/distros/foxy/rviz-common/default.nix index 3298138906..3ea6506223 100644 --- a/distros/foxy/rviz-common/default.nix +++ b/distros/foxy/rviz-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-common"; version = "8.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/foxy/rviz_common/8.2.7-1.tar.gz"; - name = "8.2.7-1.tar.gz"; - sha256 = "17d97b27ac15de8d4e52cbbc31797a15b95d16256f14f4de0f688d45670c5d43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/foxy/rviz_common/8.2.7-1"; + sha256 = "sha256-dfT03nj/VouSDlsft7WGeKB8+Pgrzvh0kBP0ItzbjCU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rviz-default-plugins/default.nix b/distros/foxy/rviz-default-plugins/default.nix index 82867ea7fb..90b59acbf6 100644 --- a/distros/foxy/rviz-default-plugins/default.nix +++ b/distros/foxy/rviz-default-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-default-plugins"; version = "8.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/foxy/rviz_default_plugins/8.2.7-1.tar.gz"; - name = "8.2.7-1.tar.gz"; - sha256 = "c5711b165c370be2f1f4a493da9b2439aa7369b14fc8922cf6d914b8fd749cab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/foxy/rviz_default_plugins/8.2.7-1"; + sha256 = "sha256-FU43HoQSKxPDgUFcGaQwQgV3X0sN1PiBdh+vlzt0xmc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rviz-imu-plugin/default.nix b/distros/foxy/rviz-imu-plugin/default.nix index 13c2bfd023..ba0efdc957 100644 --- a/distros/foxy/rviz-imu-plugin/default.nix +++ b/distros/foxy/rviz-imu-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-imu-plugin"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/foxy/rviz_imu_plugin/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "5e0221c97bee7ffbbd24a6c0f77e16b1c7055341cef45af6293fad9b9d650ebf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/foxy/rviz_imu_plugin/2.0.3-1"; + sha256 = "sha256-2G18uVrBRTNQw56i8e1G6UWTDwG7uiZIchSoyH14n6s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rviz-ogre-vendor/default.nix b/distros/foxy/rviz-ogre-vendor/default.nix index 2b51cd07f8..beb4bfd080 100644 --- a/distros/foxy/rviz-ogre-vendor/default.nix +++ b/distros/foxy/rviz-ogre-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-ogre-vendor"; version = "8.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/foxy/rviz_ogre_vendor/8.2.7-1.tar.gz"; - name = "8.2.7-1.tar.gz"; - sha256 = "9c586a9e4a2991bada8017a034fd4674d0d3ce593fe19bd36f28b2cc60c37b74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/foxy/rviz_ogre_vendor/8.2.7-1"; + sha256 = "sha256-LtK4JmDnLaFvTLjSufBUvrlB5BEjp+9jIFKvrU6Qq8U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git pkg-config ]; diff --git a/distros/foxy/rviz-rendering-tests/default.nix b/distros/foxy/rviz-rendering-tests/default.nix index 8c252ad3ec..5a46edfab5 100644 --- a/distros/foxy/rviz-rendering-tests/default.nix +++ b/distros/foxy/rviz-rendering-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-rendering-tests"; version = "8.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/foxy/rviz_rendering_tests/8.2.7-1.tar.gz"; - name = "8.2.7-1.tar.gz"; - sha256 = "49ed722e21c132845606de5fed8e30094aa54da5bca4f816f8e167ef2ba142dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/foxy/rviz_rendering_tests/8.2.7-1"; + sha256 = "sha256-mKeTB2ke3hNqoKnq5btnoNOJG5NAZAC7Yf+M5Lk9png="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/foxy/rviz-rendering/default.nix b/distros/foxy/rviz-rendering/default.nix index c56d282831..2d9e27c930 100644 --- a/distros/foxy/rviz-rendering/default.nix +++ b/distros/foxy/rviz-rendering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-rendering"; version = "8.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/foxy/rviz_rendering/8.2.7-1.tar.gz"; - name = "8.2.7-1.tar.gz"; - sha256 = "8d3a53754cc49fca39ccc95f29b7118d8467baff40d88857d05f1d503433f49b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/foxy/rviz_rendering/8.2.7-1"; + sha256 = "sha256-nZGcQgUZk4zT3Pz2wgda33C0yH9NnvFXVFLkgctbZjY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rviz-visual-testing-framework/default.nix b/distros/foxy/rviz-visual-testing-framework/default.nix index 0ae1eff800..25fee54c0a 100644 --- a/distros/foxy/rviz-visual-testing-framework/default.nix +++ b/distros/foxy/rviz-visual-testing-framework/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-visual-testing-framework"; version = "8.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/foxy/rviz_visual_testing_framework/8.2.7-1.tar.gz"; - name = "8.2.7-1.tar.gz"; - sha256 = "5bd9bc7e35b73324af5c73887bc14f79834e1070c50de679842b0c3ed0254526"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/foxy/rviz_visual_testing_framework/8.2.7-1"; + sha256 = "sha256-zrcGoJHpzaIA6IrpcGnM8SSEt5zHGkwaIh8L1k2L/OU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/foxy/rviz-visual-tools/default.nix b/distros/foxy/rviz-visual-tools/default.nix index 90e8b71a8f..f41fbeba44 100644 --- a/distros/foxy/rviz-visual-tools/default.nix +++ b/distros/foxy/rviz-visual-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz-visual-tools"; version = "4.0.3-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/rviz_visual_tools-release/archive/release/foxy/rviz_visual_tools/4.0.3-1.tar.gz"; - name = "4.0.3-1.tar.gz"; - sha256 = "6b42f0ff533c2ca3a28de57cebfdc9fb1951cf4780fd6d094a8eab9d623f4215"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "rviz_visual_tools-release"; + rev = "release/foxy/rviz_visual_tools/4.0.3-1"; + sha256 = "sha256-dCdOjFnc7q8H0jN0g6h1bgDpqsenojP9Ypr3xKnFC60="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/rviz2/default.nix b/distros/foxy/rviz2/default.nix index 6616d5cf9c..b7ce53d964 100644 --- a/distros/foxy/rviz2/default.nix +++ b/distros/foxy/rviz2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-rviz2"; version = "8.2.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/foxy/rviz2/8.2.7-1.tar.gz"; - name = "8.2.7-1.tar.gz"; - sha256 = "acdbb592645381fb14333971fca022eb352a9d6d71b918971e8afa34d1ea3a59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/foxy/rviz2/8.2.7-1"; + sha256 = "sha256-fLJGV3nyg/UpcGjIoj9bgOkV2SFeY1GYbVXSTYkm3J0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/foxy/sbg-driver/default.nix b/distros/foxy/sbg-driver/default.nix index 6e3d27a257..f9b1f86391 100644 --- a/distros/foxy/sbg-driver/default.nix +++ b/distros/foxy/sbg-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sbg-driver"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/SBG-Systems/sbg_ros2-release/archive/release/foxy/sbg_driver/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "ada708074bdf3f3972ea2e8db9e496cffbae3bf3a485ebc0418eb0a8b5926461"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SBG-Systems"; + repo = "sbg_ros2-release"; + rev = "release/foxy/sbg_driver/1.0.1-1"; + sha256 = "sha256-xon2as6QtEJR4VD9BxquN8SRK5jJWJpPp4U0yVvUb6A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/sdl2-vendor/default.nix b/distros/foxy/sdl2-vendor/default.nix index 4b92a0310c..f6bf2e93ca 100644 --- a/distros/foxy/sdl2-vendor/default.nix +++ b/distros/foxy/sdl2-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sdl2-vendor"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/foxy/sdl2_vendor/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "8c0f11beb1954efd3666813c0669eb26ff686571792528a42e659480f0c8532a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/foxy/sdl2_vendor/3.0.1-1"; + sha256 = "sha256-5eTWZW87tS5TM6Olf9LL+mjBgTPUI2nWFhU8TIZK1DM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/self-test/default.nix b/distros/foxy/self-test/default.nix index f765b792cd..ae4a31c71c 100644 --- a/distros/foxy/self-test/default.nix +++ b/distros/foxy/self-test/default.nix @@ -2,25 +2,29 @@ # Copyright 2023 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, diagnostic-msgs, diagnostic-updater, rclcpp }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, diagnostic-msgs, diagnostic-updater, rclcpp, ros-environment }: buildRosPackage { pname = "ros-foxy-self-test"; - version = "2.0.8-r2"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/foxy/self_test/2.0.8-2.tar.gz"; - name = "2.0.8-2.tar.gz"; - sha256 = "7a59d918b7b2ce03ad3496b1b8bcc79ac6eecbb35fed93a450fb7f5a6c56bcde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/foxy/self_test/3.1.0-1"; + sha256 = "sha256-1wNulwlhDpJbtfsi74Fq0lbouCl5TKsL3+ynHZAxyew="; + }; buildType = "ament_cmake"; - buildInputs = [ ament-cmake ]; + buildInputs = [ ament-cmake ros-environment ]; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ diagnostic-msgs diagnostic-updater rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { description = ''self_test''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/foxy/sensor-msgs-py/default.nix b/distros/foxy/sensor-msgs-py/default.nix index fc8eafea40..f20b5f7593 100644 --- a/distros/foxy/sensor-msgs-py/default.nix +++ b/distros/foxy/sensor-msgs-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sensor-msgs-py"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/sensor_msgs_py/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "06496f90d036df32d5f7d3a8178111a06ac58d4e5ab9feff8c3a3e7b7be5c23e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/sensor_msgs_py/2.0.5-1"; + sha256 = "sha256-DnZ2RKeiLFR/oMH1ctOETKMusPS32wnGUKijEbqoZio="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/sensor-msgs/default.nix b/distros/foxy/sensor-msgs/default.nix index 26ea53051e..ab3ff719c8 100644 --- a/distros/foxy/sensor-msgs/default.nix +++ b/distros/foxy/sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sensor-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/sensor_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "020defcd9349e33e49207f8321fa119290fa233c7118aad841b68c8303d36ac6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/sensor_msgs/2.0.5-1"; + sha256 = "sha256-qa3jJ2z4YCuiaToHNgy/qkTkyfa/A82uY/48St3yDvg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/septentrio-gnss-driver/default.nix b/distros/foxy/septentrio-gnss-driver/default.nix index 2c88d99fa7..60df07730e 100644 --- a/distros/foxy/septentrio-gnss-driver/default.nix +++ b/distros/foxy/septentrio-gnss-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-septentrio-gnss-driver"; version = "1.2.3-r1"; - src = fetchurl { - url = "https://github.com/septentrio-users/septentrio_gnss_driver_ros2-release/archive/release/foxy/septentrio_gnss_driver/1.2.3-1.tar.gz"; - name = "1.2.3-1.tar.gz"; - sha256 = "7015702867e1a8365a05b33064d897df428612c94cebc2398dfe07f12e29e191"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "septentrio-users"; + repo = "septentrio_gnss_driver_ros2-release"; + rev = "release/foxy/septentrio_gnss_driver/1.2.3-1"; + sha256 = "sha256-kCTbqq1KzuGhmwyJcXz5kKbZ7+9maCG6AATdtFnvZ8Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/serial-driver/default.nix b/distros/foxy/serial-driver/default.nix index 3fbe5a48a7..3ed2e4e574 100644 --- a/distros/foxy/serial-driver/default.nix +++ b/distros/foxy/serial-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-serial-driver"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/transport_drivers-release/archive/release/foxy/serial_driver/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "156514da3368035e73c93ec4f3437a8adee80b7dc98fdfef6932ba4d2b819d9d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "transport_drivers-release"; + rev = "release/foxy/serial_driver/1.0.0-1"; + sha256 = "sha256-JapHZwblAnYpkW5QvajYTHTXUafJZdtyjOIhxW40d8A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/foxy/shape-msgs/default.nix b/distros/foxy/shape-msgs/default.nix index 5aefa0a6c9..e924164062 100644 --- a/distros/foxy/shape-msgs/default.nix +++ b/distros/foxy/shape-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-shape-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/shape_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "ac6bb4f5e67d9d8784978faf4b1a9f47a0e2020ea22aec32940d6b64a0c68eb1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/shape_msgs/2.0.5-1"; + sha256 = "sha256-65hYG+4OlCkxt/1+C9UlRACekq25H1igYT46CJQ0Wzc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/shared-queues-vendor/default.nix b/distros/foxy/shared-queues-vendor/default.nix index 1b0574b5d3..0d0ded354e 100644 --- a/distros/foxy/shared-queues-vendor/default.nix +++ b/distros/foxy/shared-queues-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-shared-queues-vendor"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/shared_queues_vendor/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "e1551c0c9907346a1bb4e1b06b08f9bfbddeb999d9b5839486a5393557f3c598"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/shared_queues_vendor/0.3.9-1"; + sha256 = "sha256-GZruMZDL2Uj30ppD+l9j5JnZ0rv4ELTlhL77AY1v4k4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/sick-safetyscanners-base/default.nix b/distros/foxy/sick-safetyscanners-base/default.nix index 38ff26a85f..5fb8feba1a 100644 --- a/distros/foxy/sick-safetyscanners-base/default.nix +++ b/distros/foxy/sick-safetyscanners-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sick-safetyscanners-base"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_safetyscanners_base-release/archive/release/foxy/sick_safetyscanners_base/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "5135b0b92898039b9f24f62c96a117cf698e65df9e81d11e151a7edea81896ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_safetyscanners_base-release"; + rev = "release/foxy/sick_safetyscanners_base/1.0.1-1"; + sha256 = "sha256-v8e+QEXAyHT4/Cv6Qi6+2q+uqItCAru3gjWlN+vnUQY="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/sick-safetyscanners2-interfaces/default.nix b/distros/foxy/sick-safetyscanners2-interfaces/default.nix index d6dae8b00b..d8f0aa79dd 100644 --- a/distros/foxy/sick-safetyscanners2-interfaces/default.nix +++ b/distros/foxy/sick-safetyscanners2-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sick-safetyscanners2-interfaces"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_safetyscanners2_interfaces-release/archive/release/foxy/sick_safetyscanners2_interfaces/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "4062eb6538ef8d76e8316170f571196f7d526d51b6fa806b000ba46a6e615d15"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_safetyscanners2_interfaces-release"; + rev = "release/foxy/sick_safetyscanners2_interfaces/1.0.0-1"; + sha256 = "sha256-FFsjwMwXpIDUcZce2QdkhLAspn9kJgyNkvTQ8UhjUYQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/sick-safetyscanners2/default.nix b/distros/foxy/sick-safetyscanners2/default.nix index 66226a1414..01589648f0 100644 --- a/distros/foxy/sick-safetyscanners2/default.nix +++ b/distros/foxy/sick-safetyscanners2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sick-safetyscanners2"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_safetyscanners2-release/archive/release/foxy/sick_safetyscanners2/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "460a9bd31ff9d1c09b6302bbe12925d11ff0b93d778b2ecc2090746f474f0dec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_safetyscanners2-release"; + rev = "release/foxy/sick_safetyscanners2/1.0.3-1"; + sha256 = "sha256-i4ny7pd9nYqJwSKfiQE8KX/oMcPBPmXtcxUGiw3cx6g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/sick-scan2/default.nix b/distros/foxy/sick-scan2/default.nix index 4500332bd2..c85ccda047 100644 --- a/distros/foxy/sick-scan2/default.nix +++ b/distros/foxy/sick-scan2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sick-scan2"; version = "0.1.9-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_scan2-release/archive/release/foxy/sick_scan2/0.1.9-1.tar.gz"; - name = "0.1.9-1.tar.gz"; - sha256 = "1fbaf2a4944f195661ef778c79448d0d51a16ac3ac24b73a94b0e6bf436a7e3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_scan2-release"; + rev = "release/foxy/sick_scan2/0.1.9-1"; + sha256 = "sha256-IuPHbFlxT99wp4zJktcKuRRVLgZXmBXzGCQBleJmiZs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/simple-actions/default.nix b/distros/foxy/simple-actions/default.nix index 62d84c19d4..0117cd016b 100644 --- a/distros/foxy/simple-actions/default.nix +++ b/distros/foxy/simple-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-simple-actions"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/DLu/simple_actions-release/archive/release/foxy/simple_actions/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "c842b4e43dd1ecb1950292fab948ef022c182396a252eccd364907245dd19d93"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "simple_actions-release"; + rev = "release/foxy/simple_actions/0.2.1-1"; + sha256 = "sha256-NwJn4jspMkn8bZdj3z4bwQmkm017B0FXkjiGFfIl+cY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/foxy/simple-launch/default.nix b/distros/foxy/simple-launch/default.nix index 5e07aef56a..cc4eafd6aa 100644 --- a/distros/foxy/simple-launch/default.nix +++ b/distros/foxy/simple-launch/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-python, ament-index-python, launch, launch-ros, xacro }: buildRosPackage { pname = "ros-foxy-simple-launch"; - version = "1.6.1-r1"; + version = "1.6.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/simple_launch-release/archive/release/foxy/simple_launch/1.6.1-1.tar.gz"; - name = "1.6.1-1.tar.gz"; - sha256 = "cbcdc0ce95c3cf8b98c6500cc76c99a4d712a324942de61ae0629934ee6f5fb6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "simple_launch-release"; + rev = "release/foxy/simple_launch/1.6.2-1"; + sha256 = "sha256-mTdpp9QdRapkSJ5ElRJHiiDhAQKp9/ggLFQa+iXtTu0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/foxy/slam-toolbox/default.nix b/distros/foxy/slam-toolbox/default.nix index bd491e92ac..fe3bb7ee81 100644 --- a/distros/foxy/slam-toolbox/default.nix +++ b/distros/foxy/slam-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-slam-toolbox"; version = "2.4.1-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/slam_toolbox-release/archive/release/foxy/slam_toolbox/2.4.1-1.tar.gz"; - name = "2.4.1-1.tar.gz"; - sha256 = "2a747bea1e8fc99915296541eacbdbbbb007116181b64a9f369967b7935a969a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "slam_toolbox-release"; + rev = "release/foxy/slam_toolbox/2.4.1-1"; + sha256 = "sha256-jpAZCuupwhudknuOm38a+h8qU7HUdOl9z/Nd75E2I98="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/slider-publisher/default.nix b/distros/foxy/slider-publisher/default.nix index 31eaf5c21c..edba63b675 100644 --- a/distros/foxy/slider-publisher/default.nix +++ b/distros/foxy/slider-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-slider-publisher"; version = "2.2.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/slider_publisher-release/archive/release/foxy/slider_publisher/2.2.1-3.tar.gz"; - name = "2.2.1-3.tar.gz"; - sha256 = "8372f1621e5c216568059aead95a75f5c46b0944217d8675f8528f90637e2ee9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "slider_publisher-release"; + rev = "release/foxy/slider_publisher/2.2.1-3"; + sha256 = "sha256-szAUkWe0eQFk40CMBvoSKEw/Ut9x17ULIwx90BhW/TY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/smac-planner/default.nix b/distros/foxy/smac-planner/default.nix index 831b9866b1..11abd484bc 100644 --- a/distros/foxy/smac-planner/default.nix +++ b/distros/foxy/smac-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-smac-planner"; version = "0.4.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/foxy/smac_planner/0.4.7-1.tar.gz"; - name = "0.4.7-1.tar.gz"; - sha256 = "87fb6a70fbccf1fa15d1e129a26b478bad3fb97848931d55fffd7cd9d3c6ba89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/foxy/smac_planner/0.4.7-1"; + sha256 = "sha256-ZMWUrQju7rxXdEuF9wGV0xKxOyk/STNbbuGT6Zs5N9w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/smacc2-msgs/default.nix b/distros/foxy/smacc2-msgs/default.nix index 39e3191832..6953b9b5b6 100644 --- a/distros/foxy/smacc2-msgs/default.nix +++ b/distros/foxy/smacc2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-smacc2-msgs"; version = "0.2.0-r2"; - src = fetchurl { - url = "https://github.com/robosoft-ai/SMACC2-release/archive/release/foxy/smacc2_msgs/0.2.0-2.tar.gz"; - name = "0.2.0-2.tar.gz"; - sha256 = "93c70d854e29debfed1a295b312af1d737a213e7eb4f212bf9a17e0e6689fe89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robosoft-ai"; + repo = "SMACC2-release"; + rev = "release/foxy/smacc2_msgs/0.2.0-2"; + sha256 = "sha256-N2jeIJlvMhk9X0HYTEHUhX8c39AbRDOns77ijLEmMxg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/smacc2/default.nix b/distros/foxy/smacc2/default.nix index cc82721d4c..fab26023d6 100644 --- a/distros/foxy/smacc2/default.nix +++ b/distros/foxy/smacc2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-smacc2"; version = "0.2.0-r2"; - src = fetchurl { - url = "https://github.com/robosoft-ai/SMACC2-release/archive/release/foxy/smacc2/0.2.0-2.tar.gz"; - name = "0.2.0-2.tar.gz"; - sha256 = "613c6185074ebd40ea2e3f853cc2ae3bb56ff1b04e56ebd28a1b599bfb2fb8b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robosoft-ai"; + repo = "SMACC2-release"; + rev = "release/foxy/smacc2/0.2.0-2"; + sha256 = "sha256-wqqgWvNMkoXuptKt/mub8IdZ858s776Jd62je98ZJeU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/smclib/default.nix b/distros/foxy/smclib/default.nix index dbf65f3b26..22e8b90925 100644 --- a/distros/foxy/smclib/default.nix +++ b/distros/foxy/smclib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-smclib"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/foxy/smclib/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "3d19b736f333c9bd9763144c5023dbd5a4d8921ad49e56501a8cfe68f02fd2a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/foxy/smclib/2.1.0-1"; + sha256 = "sha256-3WMZLT95hdhYYCfuTK2J1jxni0ovwiqcQZnn7jQAwoc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/foxy/snowbot-operating-system/default.nix b/distros/foxy/snowbot-operating-system/default.nix index c90a8e1cb5..83f01a01da 100644 --- a/distros/foxy/snowbot-operating-system/default.nix +++ b/distros/foxy/snowbot-operating-system/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-snowbot-operating-system"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/snowbot_release/archive/release/foxy/snowbot_operating_system/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "e8347b0ff55173286f290afc16a95e7cc4d3fcd4e2f11f206ab9f29715f535eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "snowbot_release"; + rev = "release/foxy/snowbot_operating_system/0.1.0-1"; + sha256 = "sha256-VGfN1Bu6SVqFxWVdoLGf8d53Gk7IvGG6RRDK+j+H3Lw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/soccer-object-msgs/default.nix b/distros/foxy/soccer-object-msgs/default.nix index ce1fb55802..6fbcb553bb 100644 --- a/distros/foxy/soccer-object-msgs/default.nix +++ b/distros/foxy/soccer-object-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-soccer-object-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ijnek/soccer_object_msgs-release/archive/release/foxy/soccer_object_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "cc7b1fa14b89d3fa44bef7cb781a0838ae7bb7933251a6e3291120ccc9401462"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ijnek"; + repo = "soccer_object_msgs-release"; + rev = "release/foxy/soccer_object_msgs/1.0.1-1"; + sha256 = "sha256-L9tzxNygLV6DbioNwnYhQLIEZ49+s1/LRBiPsBXopTw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/sol-vendor/default.nix b/distros/foxy/sol-vendor/default.nix index 0278627425..76c8b48236 100644 --- a/distros/foxy/sol-vendor/default.nix +++ b/distros/foxy/sol-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sol-vendor"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/sol_vendor-release/archive/release/foxy/sol_vendor/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "f609b6a2ebf599844df510d6ead990bb5558090ae7bc2335f7ef75874ecad8fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "sol_vendor-release"; + rev = "release/foxy/sol_vendor/0.0.3-1"; + sha256 = "sha256-evTrBEB9O+4Q5o4mkGGcYCSddOKRPjv5HBwtTxbGkQk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/sophus/default.nix b/distros/foxy/sophus/default.nix index 19d0521cb1..d4ffd91656 100644 --- a/distros/foxy/sophus/default.nix +++ b/distros/foxy/sophus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sophus"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/sophus-release/archive/release/foxy/sophus/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "99781189c8556ca3e7e369b588103964bc1866e55a875b26aac9efb311f1b880"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "sophus-release"; + rev = "release/foxy/sophus/1.2.1-1"; + sha256 = "sha256-/fr0tgRRgBcz7eJIMTxzab4H3swd8AtsTXDhkUUPPDo="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/spacenav/default.nix b/distros/foxy/spacenav/default.nix index 67b8614dc7..34f61869fc 100644 --- a/distros/foxy/spacenav/default.nix +++ b/distros/foxy/spacenav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-spacenav"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/foxy/spacenav/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "d9ce40277ae6cbf04912a3bb544482fd6e37b93c89b11a896eb45928f5cb7c90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/foxy/spacenav/3.0.1-1"; + sha256 = "sha256-p9jrKPsanoulkXsclPZlz7xYmvCQitubN4UXn8pB5xY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/spatio-temporal-voxel-layer/default.nix b/distros/foxy/spatio-temporal-voxel-layer/default.nix index cd61fd146a..36bdab467a 100644 --- a/distros/foxy/spatio-temporal-voxel-layer/default.nix +++ b/distros/foxy/spatio-temporal-voxel-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-spatio-temporal-voxel-layer"; version = "2.1.4-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/spatio_temporal_voxel_layer-release/archive/release/foxy/spatio_temporal_voxel_layer/2.1.4-1.tar.gz"; - name = "2.1.4-1.tar.gz"; - sha256 = "0afe659f14a38c182e9023ae8fc366b9592fc254a7e41ed400904b812181c1b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "spatio_temporal_voxel_layer-release"; + rev = "release/foxy/spatio_temporal_voxel_layer/2.1.4-1"; + sha256 = "sha256-o8DDCujhpEmleUpWz2sX2eDDwQFXIcqlYgXV8E0ZwOs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/spdlog-vendor/default.nix b/distros/foxy/spdlog-vendor/default.nix index 1ea332d986..6b656ba10a 100644 --- a/distros/foxy/spdlog-vendor/default.nix +++ b/distros/foxy/spdlog-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-spdlog-vendor"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/spdlog_vendor-release/archive/release/foxy/spdlog_vendor/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "9cb16123ea0cd28d9405e155011697577c1aca151b898d9a28afa63d53ce8442"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "spdlog_vendor-release"; + rev = "release/foxy/spdlog_vendor/1.1.3-1"; + sha256 = "sha256-fETCIhbo8tOFCRJRdi9QId+xcNIYDslutXFqtLqbzAY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/splsm-7-conversion/default.nix b/distros/foxy/splsm-7-conversion/default.nix index 0a319a6eec..e1202d61a8 100644 --- a/distros/foxy/splsm-7-conversion/default.nix +++ b/distros/foxy/splsm-7-conversion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-splsm-7-conversion"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/r2r_spl-release/archive/release/foxy/splsm_7_conversion/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "1c64923a9353dec5e25355f67abeb5be4214aaa7aea09fd820a18aefff2a839e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "r2r_spl-release"; + rev = "release/foxy/splsm_7_conversion/0.0.2-1"; + sha256 = "sha256-kPqy85atS+k57IdQqO4Vgdk1npwjVGQ3RTdvIisZcec="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/splsm-7/default.nix b/distros/foxy/splsm-7/default.nix index eb85e49808..acded7ec82 100644 --- a/distros/foxy/splsm-7/default.nix +++ b/distros/foxy/splsm-7/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-splsm-7"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/r2r_spl-release/archive/release/foxy/splsm_7/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "1d317dfd35dab465b9c0c49c98d1a5c18eb14e7972207f0fe7b11d6c50ae6dde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "r2r_spl-release"; + rev = "release/foxy/splsm_7/0.0.2-1"; + sha256 = "sha256-A/Jeakm+MGcJzFEhPaPR8QD7ckuN9p1l4tS+4FhouNE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/sqlite3-vendor/default.nix b/distros/foxy/sqlite3-vendor/default.nix index 2819cb2508..032fc68d0e 100644 --- a/distros/foxy/sqlite3-vendor/default.nix +++ b/distros/foxy/sqlite3-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sqlite3-vendor"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/sqlite3_vendor/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "cf2a0488809b957a0bd612a3d7116d68193e70d4eaf1eb99bbb37cf0464e2329"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/sqlite3_vendor/0.3.9-1"; + sha256 = "sha256-mGdvzDc0RIdLBs4RKla3KBwVBNj7+2R4tdzekGu4pO8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/srdfdom/default.nix b/distros/foxy/srdfdom/default.nix index 26407798fa..c00ff973b0 100644 --- a/distros/foxy/srdfdom/default.nix +++ b/distros/foxy/srdfdom/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-srdfdom"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/moveit/srdfdom-release/archive/release/foxy/srdfdom/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "fcc96f1c6ef4ce5070a873bb588749215eb2ee5faeb1034610da72ebf0e4670f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "srdfdom-release"; + rev = "release/foxy/srdfdom/2.0.2-1"; + sha256 = "sha256-eglKkNuvnp75Yfykh8e2Urlpl9eqZEph8L0FqGhN8BI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake boost urdfdom-headers ]; diff --git a/distros/foxy/sros2-cmake/default.nix b/distros/foxy/sros2-cmake/default.nix index 8937bfa8e1..abe17fd8a2 100644 --- a/distros/foxy/sros2-cmake/default.nix +++ b/distros/foxy/sros2-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sros2-cmake"; version = "0.9.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/sros2-release/archive/release/foxy/sros2_cmake/0.9.5-1.tar.gz"; - name = "0.9.5-1.tar.gz"; - sha256 = "e4696c1064aab4a2c6c4d0941c623b2d54504f70ea69b173c5535d9a6532cee7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "sros2-release"; + rev = "release/foxy/sros2_cmake/0.9.5-1"; + sha256 = "sha256-7CdJhUpZmyJjUVioDZTwROFkuOWplZo/YB0WTn4e4eg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-test ]; diff --git a/distros/foxy/sros2/default.nix b/distros/foxy/sros2/default.nix index 0393afef22..4ce8257ee7 100644 --- a/distros/foxy/sros2/default.nix +++ b/distros/foxy/sros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-sros2"; version = "0.9.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/sros2-release/archive/release/foxy/sros2/0.9.5-1.tar.gz"; - name = "0.9.5-1.tar.gz"; - sha256 = "9e670d41917de8d9dc97fe8e49e96d5f8c8ff6494e2b99901345b86866ed3b14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "sros2-release"; + rev = "release/foxy/sros2/0.9.5-1"; + sha256 = "sha256-X224YA8fZhtNVHV5FOnrKPlo+Xj7DxCl6xQTVmCi8CA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 pythonPackages.pytest ros-testing test-msgs ]; diff --git a/distros/foxy/statistics-msgs/default.nix b/distros/foxy/statistics-msgs/default.nix index 8936e91716..546547e41c 100644 --- a/distros/foxy/statistics-msgs/default.nix +++ b/distros/foxy/statistics-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-statistics-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/foxy/statistics_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "30264294de37fcb855750b4cf7b8ba7b317367b191b2a8fe9d4249be3dec20d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/foxy/statistics_msgs/1.0.0-1"; + sha256 = "sha256-/cGsLZUNQzZhf5RV3eL6Kb4XLsrDfNz8/RufPplGmfg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/std-msgs/default.nix b/distros/foxy/std-msgs/default.nix index 6e5ac23234..68ecacce5f 100644 --- a/distros/foxy/std-msgs/default.nix +++ b/distros/foxy/std-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-std-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/std_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "bb8026fdafc7fa5c6b5e7e30f53e024b26723e18951318d94c7161f8f2955070"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/std_msgs/2.0.5-1"; + sha256 = "sha256-T7Z8DdcvzMmdz94nE13hJozDPOsNLm5gfaxRqxkIJ9I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/std-srvs/default.nix b/distros/foxy/std-srvs/default.nix index b62c2e68fd..d66034b82e 100644 --- a/distros/foxy/std-srvs/default.nix +++ b/distros/foxy/std-srvs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-std-srvs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/std_srvs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "6b4d11dee1b8698c622172cf981fa7441a70ed6ec330c1590d476d224803528a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/std_srvs/2.0.5-1"; + sha256 = "sha256-gVLRAXOD32GrhpN/DnGU9il8FbI80BbAyK4aCi5hj/w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/stereo-image-proc/default.nix b/distros/foxy/stereo-image-proc/default.nix index b57f0e7948..5a4ff5ec20 100644 --- a/distros/foxy/stereo-image-proc/default.nix +++ b/distros/foxy/stereo-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-stereo-image-proc"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/stereo_image_proc/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "08fc992a1a3e613f75227fc7edb2a05578c7bc70d5a4207c088ad187311ae422"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/stereo_image_proc/2.3.0-1"; + sha256 = "sha256-7UBAcCNQ7qg4RYLBs2h+Is5JTkZvAJCkVU7GNDXP4G0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/stereo-msgs/default.nix b/distros/foxy/stereo-msgs/default.nix index 90df0689d8..962c45e516 100644 --- a/distros/foxy/stereo-msgs/default.nix +++ b/distros/foxy/stereo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-stereo-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/stereo_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "ae6d8186396185a0acb15395f4ae464d32ef7417846d52a529ce111ce16788be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/stereo_msgs/2.0.5-1"; + sha256 = "sha256-iBZ41Xs8EgeafXngm0Uwv4Yx9XXuyfgj6Fh4vq6Ai3k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/stubborn-buddies-msgs/default.nix b/distros/foxy/stubborn-buddies-msgs/default.nix index 21cdfe5087..4ee12f3f9c 100644 --- a/distros/foxy/stubborn-buddies-msgs/default.nix +++ b/distros/foxy/stubborn-buddies-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-stubborn-buddies-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/stubborn_buddies-release/archive/release/foxy/stubborn_buddies_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "de34d205fa9836959a978197400c8566906156f2fcf6353ee62ba6ba3e918617"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "stubborn_buddies-release"; + rev = "release/foxy/stubborn_buddies_msgs/1.0.0-1"; + sha256 = "sha256-ca+tBYzurY7xkoSry24RR8HaTLuuHAEKuBOxT57QSXY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/stubborn-buddies/default.nix b/distros/foxy/stubborn-buddies/default.nix index ccf1ce6a7f..27a678e5ca 100644 --- a/distros/foxy/stubborn-buddies/default.nix +++ b/distros/foxy/stubborn-buddies/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-stubborn-buddies"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/stubborn_buddies-release/archive/release/foxy/stubborn_buddies/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "078d45e7645796f3097900a77778dada7232ec352fce9b00db861fd17e7ab152"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "stubborn_buddies-release"; + rev = "release/foxy/stubborn_buddies/1.0.0-1"; + sha256 = "sha256-gR08XIszXNwbw343ie74jForyMoXvqCbhynmzAN+Y/w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-console-util/default.nix b/distros/foxy/swri-console-util/default.nix index 23e3074896..d3777644ed 100644 --- a/distros/foxy/swri-console-util/default.nix +++ b/distros/foxy/swri-console-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-console-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_console_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "609f6581c3a64c478dc2bdba7e29911b85ab8da2487c67392e13bfd42aa57068"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_console_util/3.5.1-1"; + sha256 = "sha256-cAfc/u2PvG03VkKyIXZSbiTe3sRKCdF+OhmdScHVTnA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-console/default.nix b/distros/foxy/swri-console/default.nix index d7f2dbf092..a6e2c26832 100644 --- a/distros/foxy/swri-console/default.nix +++ b/distros/foxy/swri-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-console"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/swri_console-release/archive/release/foxy/swri_console/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "1aa0dc9dad687d04c57029b3dfc459c6c34a8690db0bf8d18143247ae9ef4d0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "swri_console-release"; + rev = "release/foxy/swri_console/2.0.1-1"; + sha256 = "sha256-81wUEyKnQ8TVzIf9anWaDGhd2cYqDlFpAF+sJ7FgluQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/swri-dbw-interface/default.nix b/distros/foxy/swri-dbw-interface/default.nix index fd2953179c..c1ede8dcfd 100644 --- a/distros/foxy/swri-dbw-interface/default.nix +++ b/distros/foxy/swri-dbw-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-dbw-interface"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_dbw_interface/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "d688e7dbdfe8ba44d662467efb809c8499a375c4e6a52ae7bf03dbd959c09967"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_dbw_interface/3.5.1-1"; + sha256 = "sha256-i8pbQNrdRdH5TczfrlfmGyMXZhNZ6fDNP8o1tAFDAbE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-geometry-util/default.nix b/distros/foxy/swri-geometry-util/default.nix index 35fa1e3035..62180a9859 100644 --- a/distros/foxy/swri-geometry-util/default.nix +++ b/distros/foxy/swri-geometry-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-geometry-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_geometry_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "6ed5d4d9d7df4f81333dd9c09b46d2709b3ef7ef21233600932eed0765d97bab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_geometry_util/3.5.1-1"; + sha256 = "sha256-dLYZDeFv9M2eOJPeM8Zn2yCDq3PZz1JCQ/ucNxMS8mc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/swri-image-util/default.nix b/distros/foxy/swri-image-util/default.nix index ab9acc658c..0e28841bbf 100644 --- a/distros/foxy/swri-image-util/default.nix +++ b/distros/foxy/swri-image-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-image-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_image_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "4b3ef49a48b15fd74b0a870bfca957456e99c2868d5ac5a36513b9e6a9487d71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_image_util/3.5.1-1"; + sha256 = "sha256-AdH4oRWWMWHk2BfGtOrHPlsuYJDjAe7UF/Jp0oPfK0c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/swri-math-util/default.nix b/distros/foxy/swri-math-util/default.nix index ed0bff60a2..bc15d96b9e 100644 --- a/distros/foxy/swri-math-util/default.nix +++ b/distros/foxy/swri-math-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-math-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_math_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "71ed8ef8ed49519653b8ab38aa0fd6de019770ebf3176b39dc8373bafe2c11c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_math_util/3.5.1-1"; + sha256 = "sha256-zBi0f77in3vfPFmWjJEMhlwAAiLj2B+9GCJfKKLHFuQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-opencv-util/default.nix b/distros/foxy/swri-opencv-util/default.nix index aa7e14f4ac..c8562207e4 100644 --- a/distros/foxy/swri-opencv-util/default.nix +++ b/distros/foxy/swri-opencv-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-opencv-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_opencv_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "b74416e706a133356609ff2dbb077127f13dab23501dbe0978fe4c8f491cf0e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_opencv_util/3.5.1-1"; + sha256 = "sha256-ssqSHHGSbjgpIXUFlGS3B/xClH/Ops3zGSYEASt68Kw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-prefix-tools/default.nix b/distros/foxy/swri-prefix-tools/default.nix index 597c739fbc..d103d035c1 100644 --- a/distros/foxy/swri-prefix-tools/default.nix +++ b/distros/foxy/swri-prefix-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-prefix-tools"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_prefix_tools/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "597b8f44f6f2ccc288dc8c8e6bde4995265f88e68d77398eb01928f2adc2d02e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_prefix_tools/3.5.1-1"; + sha256 = "sha256-dH5HNyJE9/48qkrSmDe1cN1n5Px9NWzhrfB76O47Uuc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-roscpp/default.nix b/distros/foxy/swri-roscpp/default.nix index 37bc78af55..544bcfcef8 100644 --- a/distros/foxy/swri-roscpp/default.nix +++ b/distros/foxy/swri-roscpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-roscpp"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_roscpp/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "9a672dd7025a6c7411887091898f1e4b1a6207a255954b940aac68b14a77f982"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_roscpp/3.5.1-1"; + sha256 = "sha256-14bRXIz/76iO3n+15Wef3nu3AQ2EFky++nDsPtad4rA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-cmake rosidl-default-generators ]; diff --git a/distros/foxy/swri-route-util/default.nix b/distros/foxy/swri-route-util/default.nix index 4a62508152..ba90e56b46 100644 --- a/distros/foxy/swri-route-util/default.nix +++ b/distros/foxy/swri-route-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-route-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_route_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "6f308035e9da1a0eb5a0e926d8df458347703a068a610e7d96b3d606341ec310"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_route_util/3.5.1-1"; + sha256 = "sha256-cOdL5x9OxxwwKnc4v2c91ZTknuJipZli6KXzQf3eJWE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-serial-util/default.nix b/distros/foxy/swri-serial-util/default.nix index 580485546d..93dffb83c2 100644 --- a/distros/foxy/swri-serial-util/default.nix +++ b/distros/foxy/swri-serial-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-serial-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_serial_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "417f60ca151d7a5218479b32c2b150c468cc8e06b3f75409e50d9bf50f38b7a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_serial_util/3.5.1-1"; + sha256 = "sha256-5WYFkS8lxtzfkxt0i1LrHgDmTnBotcjfDZgOrpWLLP8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-system-util/default.nix b/distros/foxy/swri-system-util/default.nix index 53e33c48eb..6f4bf3cb0a 100644 --- a/distros/foxy/swri-system-util/default.nix +++ b/distros/foxy/swri-system-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-system-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_system_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "9cb3d92c7690ffd6735783d860354421acc818c9eba49c0684bb2d29db877173"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_system_util/3.5.1-1"; + sha256 = "sha256-RVmxXs9fUTGh2ThWFQDsPbWr9g20i2rCG1CjqusayX4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/swri-transform-util/default.nix b/distros/foxy/swri-transform-util/default.nix index a450427e6f..1c820f9f61 100644 --- a/distros/foxy/swri-transform-util/default.nix +++ b/distros/foxy/swri-transform-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-swri-transform-util"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/foxy/swri_transform_util/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "16395bf2618211f424219c8376fd2cb15059479eb0e643c84ea8139e6e192a31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/foxy/swri_transform_util/3.5.1-1"; + sha256 = "sha256-JZrEbYFoFAgDSJCYxRmTEujv2o8bEw0DmnKY4Zgsobg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python pkg-config ]; diff --git a/distros/foxy/system-fingerprint/default.nix b/distros/foxy/system-fingerprint/default.nix index 554936ba48..87303bfc77 100644 --- a/distros/foxy/system-fingerprint/default.nix +++ b/distros/foxy/system-fingerprint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-system-fingerprint"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/MetroRobots/ros_system_fingerprint-release/archive/release/foxy/system_fingerprint/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "4c3b33e39880c21d910421393cc972b3848e8a5d7912026788aab5e69c85a5f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MetroRobots"; + repo = "ros_system_fingerprint-release"; + rev = "release/foxy/system_fingerprint/0.7.0-1"; + sha256 = "sha256-swG8fwjiFc0LXSlbA6Lml0jlh/VyNS//insRqM01fr0="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.GitPython rcl-interfaces rclpy ros2action ros2cli ros2node ros2param ros2topic ]; diff --git a/distros/foxy/system-metrics-collector/default.nix b/distros/foxy/system-metrics-collector/default.nix index b6c606e918..4a73c67ead 100644 --- a/distros/foxy/system-metrics-collector/default.nix +++ b/distros/foxy/system-metrics-collector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-system-metrics-collector"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros-tooling/system_metrics_collector-release/archive/release/foxy/system_metrics_collector/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "1b781a5d922279744556fd6bad6c48db88dae8ce17ed21d5abf8c70ad17f590a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-tooling"; + repo = "system_metrics_collector-release"; + rev = "release/foxy/system_metrics_collector/0.1.1-1"; + sha256 = "sha256-udhrr1Uzr8NnyxADISCZOOKuQOqvx2PI8o/o9PG7t4w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/system-modes-examples/default.nix b/distros/foxy/system-modes-examples/default.nix index c365d12213..4b716d35c0 100644 --- a/distros/foxy/system-modes-examples/default.nix +++ b/distros/foxy/system-modes-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-system-modes-examples"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/microROS/system_modes-release/archive/release/foxy/system_modes_examples/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "a74870f22ec802c61895f8330ef7b6a10cb6697dc5629c2bc75abc3a4bef4d13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "microROS"; + repo = "system_modes-release"; + rev = "release/foxy/system_modes_examples/0.9.0-1"; + sha256 = "sha256-0kfAi8ExAnUicuzTFtWKNQwRZP8qipcdbz4XUrg7EQM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/system-modes-msgs/default.nix b/distros/foxy/system-modes-msgs/default.nix index 2fe835fa41..43a84e0256 100644 --- a/distros/foxy/system-modes-msgs/default.nix +++ b/distros/foxy/system-modes-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-system-modes-msgs"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/microROS/system_modes-release/archive/release/foxy/system_modes_msgs/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "8eebfd37f1f9def3dbb28119bbfd4bd10776cb35c4ccd1857910b451a84211a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "microROS"; + repo = "system_modes-release"; + rev = "release/foxy/system_modes_msgs/0.9.0-1"; + sha256 = "sha256-UcVnvMWo1lcz8PljlXg4m53YoUKsphq4TbfgB7Z3dgw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/system-modes/default.nix b/distros/foxy/system-modes/default.nix index f6361cd63d..5e22f3c105 100644 --- a/distros/foxy/system-modes/default.nix +++ b/distros/foxy/system-modes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-system-modes"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/microROS/system_modes-release/archive/release/foxy/system_modes/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "50250aec9316d66a8e53e429cea7f4988f4005a23c60e28a60637201b6bda8ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "microROS"; + repo = "system_modes-release"; + rev = "release/foxy/system_modes/0.9.0-1"; + sha256 = "sha256-0KjnR6c32kc4yM0vwAGYI1LgRZn4tLfIZSO+UE2llbM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tango-icons-vendor/default.nix b/distros/foxy/tango-icons-vendor/default.nix index d0aa3a9753..32820809ad 100644 --- a/distros/foxy/tango-icons-vendor/default.nix +++ b/distros/foxy/tango-icons-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tango-icons-vendor"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tango_icons_vendor-release/archive/release/foxy/tango_icons_vendor/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "4b446b64501c6b98c051963c3902d4e6a282ecb44b0290ee0cd47a923cb643c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tango_icons_vendor-release"; + rev = "release/foxy/tango_icons_vendor/0.1.0-1"; + sha256 = "sha256-KYWpnGweFrcZ6B1TZpvga3g7b7BSw/gpETwjyjhaPz4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/teleop-tools-msgs/default.nix b/distros/foxy/teleop-tools-msgs/default.nix index 7acbde119b..0b4199d4d6 100644 --- a/distros/foxy/teleop-tools-msgs/default.nix +++ b/distros/foxy/teleop-tools-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-teleop-tools-msgs"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/foxy/teleop_tools_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "e713b77f99d7a90da0e86949b32705aec04af65d5a03bc6bb9e15827156f5043"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/foxy/teleop_tools_msgs/1.3.0-1"; + sha256 = "sha256-aJPfIXQj3fiXkpH0V5nGEywzdRvtnKtp2K1qWb/fw30="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/teleop-tools/default.nix b/distros/foxy/teleop-tools/default.nix index d78f9f44eb..c9d517609d 100644 --- a/distros/foxy/teleop-tools/default.nix +++ b/distros/foxy/teleop-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-teleop-tools"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/foxy/teleop_tools/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "b1a7d8e209c3cdb7bcb116a40bbc572ce257dd3a372b3558a63dee120d320580"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/foxy/teleop_tools/1.3.0-1"; + sha256 = "sha256-48SoF+QzzXtlB3WMrx9sEvMiaOJa+/JBmdQQBKMuTKg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/teleop-twist-joy/default.nix b/distros/foxy/teleop-twist-joy/default.nix index 9b34cbfa51..2be1d67b48 100644 --- a/distros/foxy/teleop-twist-joy/default.nix +++ b/distros/foxy/teleop-twist-joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-teleop-twist-joy"; version = "2.4.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_twist_joy-release/archive/release/foxy/teleop_twist_joy/2.4.3-1.tar.gz"; - name = "2.4.3-1.tar.gz"; - sha256 = "8496be1929173bdf1d2a11b56e2b25eda3d2072f6551cac6d18f0a4e6a845b2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_twist_joy-release"; + rev = "release/foxy/teleop_twist_joy/2.4.3-1"; + sha256 = "sha256-dL2vcoGwprRfLIcvS2fa9spvG3HHSGWWI8YYjmC5MVo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/teleop-twist-keyboard/default.nix b/distros/foxy/teleop-twist-keyboard/default.nix index 759b41f706..0cc949ad97 100644 --- a/distros/foxy/teleop-twist-keyboard/default.nix +++ b/distros/foxy/teleop-twist-keyboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-teleop-twist-keyboard"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_twist_keyboard-release/archive/release/foxy/teleop_twist_keyboard/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "f9db198aea5cf6c7e50963ce72fc7642c15f7eb843776d5119e498ea6eb9a1ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_twist_keyboard-release"; + rev = "release/foxy/teleop_twist_keyboard/2.3.2-1"; + sha256 = "sha256-lxwiaJp3eRsvCIRQzNZmogFEOdO5fLDA35rX8PgLx4s="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ]; diff --git a/distros/foxy/test-bond/default.nix b/distros/foxy/test-bond/default.nix index 8ef912ddd0..02b172edef 100644 --- a/distros/foxy/test-bond/default.nix +++ b/distros/foxy/test-bond/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-test-bond"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/foxy/test_bond/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "c4a91b0a9afb58e85866af66ebba05c8d6bb1a381eca200c2941225fd660f471"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/foxy/test_bond/2.1.0-1"; + sha256 = "sha256-4NUKlUkr25LU7CGmjae+lVanKcy7qTlX3PdSF0nBF3c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rclcpp-lifecycle rosidl-default-generators ]; diff --git a/distros/foxy/test-interface-files/default.nix b/distros/foxy/test-interface-files/default.nix index caf4e62a7d..0327ed2632 100644 --- a/distros/foxy/test-interface-files/default.nix +++ b/distros/foxy/test-interface-files/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-test-interface-files"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/test_interface_files-release/archive/release/foxy/test_interface_files/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "90359bb4913f6efa4a517faedbe243fff61b4824c6ec894bb96e70e75f166275"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "test_interface_files-release"; + rev = "release/foxy/test_interface_files/0.8.1-1"; + sha256 = "sha256-1LaOTUZ0PRrPCOWKAJIUsZPXslHoaCv/erPnexXKhAI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/foxy/test-launch-system-modes/default.nix b/distros/foxy/test-launch-system-modes/default.nix index 3959f908a4..405532b255 100644 --- a/distros/foxy/test-launch-system-modes/default.nix +++ b/distros/foxy/test-launch-system-modes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-test-launch-system-modes"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/microROS/system_modes-release/archive/release/foxy/test_launch_system_modes/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "700fc5b26ae1dbfe58891f793a8c64ebbfe6d3a2dfbb94c7729ae2428f2f1bb3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "microROS"; + repo = "system_modes-release"; + rev = "release/foxy/test_launch_system_modes/0.9.0-1"; + sha256 = "sha256-w5Fha94UpnDbj9nKGdwQoj7EwmqvKGhxG9qhUVNIJiA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/test-msgs/default.nix b/distros/foxy/test-msgs/default.nix index 257f46c3d6..52e30e73bc 100644 --- a/distros/foxy/test-msgs/default.nix +++ b/distros/foxy/test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-test-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/foxy/test_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "815db8351fd3e6af9e1efd322437b4b503dd466097c95dce9f8170f79c4db756"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/foxy/test_msgs/1.0.0-1"; + sha256 = "sha256-zc9j5LQOsE3Ka9Fwx1+zFF8owkg8psy07fjPJY+DHjA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators test-interface-files ]; diff --git a/distros/foxy/test-rmw-implementation/default.nix b/distros/foxy/test-rmw-implementation/default.nix index c43d1ffeb3..2eb48229b1 100644 --- a/distros/foxy/test-rmw-implementation/default.nix +++ b/distros/foxy/test-rmw-implementation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-test-rmw-implementation"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_implementation-release/archive/release/foxy/test_rmw_implementation/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "5f92130b441af78cb91c0b78673f070f81ff2c0de2be8a4035437ffe0ef83573"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_implementation-release"; + rev = "release/foxy/test_rmw_implementation/1.0.3-1"; + sha256 = "sha256-UEByB/VpwB9TayiQx9m/jnWpNgYbW6Rm+x8LbB7ydto="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tf-transformations/default.nix b/distros/foxy/tf-transformations/default.nix index 448b53b428..bf0c8ec5a0 100644 --- a/distros/foxy/tf-transformations/default.nix +++ b/distros/foxy/tf-transformations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf-transformations"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/DLu/tf_transformations_release/archive/release/foxy/tf_transformations/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "3121c9c3a744914be0069131884e86bcd0bbb1bc1bde0c517b895f15c3843235"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "tf_transformations_release"; + rev = "release/foxy/tf_transformations/1.0.2-1"; + sha256 = "sha256-F2TIhZSc35QZmOpEFI5ROWicRY4QTJ5einfCDJ8d6ks="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/tf2-bullet/default.nix b/distros/foxy/tf2-bullet/default.nix index f29a608857..407d05e4fb 100644 --- a/distros/foxy/tf2-bullet/default.nix +++ b/distros/foxy/tf2-bullet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-bullet"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_bullet/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "9cd398333a0c03e1fc9738d54139d190bf3318ca2447fe984db6aa21afee5e84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_bullet/0.13.13-1"; + sha256 = "sha256-SekqMNT4G9Gvjtdm64vgLxc9rhxq0h4jRF/3ZcuaSkA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tf2-eigen-kdl/default.nix b/distros/foxy/tf2-eigen-kdl/default.nix index 547d650823..7546bd16f5 100644 --- a/distros/foxy/tf2-eigen-kdl/default.nix +++ b/distros/foxy/tf2-eigen-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-eigen-kdl"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_eigen_kdl/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "5bb1329536a8126419ccc586eebbde1d336865605c58d0d9cb506023c7f70e30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_eigen_kdl/0.13.13-1"; + sha256 = "sha256-ZuInxS+UV+WCPQMzE3yLP6H96rrBvTCBjodlbZd6ywQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tf2-eigen/default.nix b/distros/foxy/tf2-eigen/default.nix index 562bb0250a..19d0d32cf4 100644 --- a/distros/foxy/tf2-eigen/default.nix +++ b/distros/foxy/tf2-eigen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-eigen"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_eigen/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "4d63f5892bfa59a007e7d2e397420d1c7163719f7e4484a0901e8a72a17c59e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_eigen/0.13.13-1"; + sha256 = "sha256-Oq4/hP/HTGmjfp+0fI/HLd4c90+Mpgp5ziNz7SbDO0o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tf2-geometry-msgs/default.nix b/distros/foxy/tf2-geometry-msgs/default.nix index b10549574d..2badf55852 100644 --- a/distros/foxy/tf2-geometry-msgs/default.nix +++ b/distros/foxy/tf2-geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-geometry-msgs"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_geometry_msgs/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "5a4ef0125f65f63c84439cfba4c18384dc97dab2ef05996a1f72c950141452a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_geometry_msgs/0.13.13-1"; + sha256 = "sha256-LrjVAWc0/Hepu+4OKC6CGMNq9ZHrDw/1A4slhE6XoTs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/tf2-kdl/default.nix b/distros/foxy/tf2-kdl/default.nix index ba759891ca..3fa275e9a8 100644 --- a/distros/foxy/tf2-kdl/default.nix +++ b/distros/foxy/tf2-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-kdl"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_kdl/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "557c3b9c5d4e8720142cf1eceb0276da6f2d03836d77a7e35fd306b2ecce23f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_kdl/0.13.13-1"; + sha256 = "sha256-U6kema1g/92CW6HvNBYidicGxctrxXMr50kP+ZXl5ls="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tf2-msgs/default.nix b/distros/foxy/tf2-msgs/default.nix index 43c74ad874..4142ff3648 100644 --- a/distros/foxy/tf2-msgs/default.nix +++ b/distros/foxy/tf2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-msgs"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_msgs/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "c8554ef51c1e58629116ddf7372ebcfcb6b18f4a5e8cd7d712bad2e6b2a27a6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_msgs/0.13.13-1"; + sha256 = "sha256-BBEHrz8xIfqkGgDQ8oA4NYw0moxHUgVecoAZO0c6fW8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/tf2-py/default.nix b/distros/foxy/tf2-py/default.nix index ada9f12af0..b445d117a6 100644 --- a/distros/foxy/tf2-py/default.nix +++ b/distros/foxy/tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-py"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_py/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "b2684f5d156a4a3a1d073dc9d027d7feccc858e4eb26257e84955b216a704547"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_py/0.13.13-1"; + sha256 = "sha256-96uhCJeWVfAkxu3r3gaeiMh0eQzMjO79UOycaa6717o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python-cmake-module ]; diff --git a/distros/foxy/tf2-ros/default.nix b/distros/foxy/tf2-ros/default.nix index 4076f95299..23f6ca315e 100644 --- a/distros/foxy/tf2-ros/default.nix +++ b/distros/foxy/tf2-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-ros"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_ros/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "c9f44077c5a28493674012177cb0fa1c9d735bf3cd28b0c8e0229fd685013b16"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_ros/0.13.13-1"; + sha256 = "sha256-wr9i3Jj8CuTTCjTBshxmZNSh6P8OnzrurHaQcQ8cNRs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python python-cmake-module ]; diff --git a/distros/foxy/tf2-sensor-msgs/default.nix b/distros/foxy/tf2-sensor-msgs/default.nix index d9823c92f8..70c951d91a 100644 --- a/distros/foxy/tf2-sensor-msgs/default.nix +++ b/distros/foxy/tf2-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-sensor-msgs"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_sensor_msgs/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "72fcb7a89cc8886efa3e07ec8f8093a10ea4563bb20bd909d170ecc990fe5469"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_sensor_msgs/0.13.13-1"; + sha256 = "sha256-OpJuZS11fg+eKkt72N5vI5l5n+Km6571GdbT2nBdbeA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/tf2-tools/default.nix b/distros/foxy/tf2-tools/default.nix index 55880266c9..91106588d4 100644 --- a/distros/foxy/tf2-tools/default.nix +++ b/distros/foxy/tf2-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2-tools"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2_tools/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "ea5a1790e35089726935be7a4fc71c0bd88cd618c25b974a4136db96b1ec520a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2_tools/0.13.13-1"; + sha256 = "sha256-hkGAMBkiZlUwCN3VBRHFK0LmiIvdyuljMeMlT48RLqA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tf2/default.nix b/distros/foxy/tf2/default.nix index 9f4b343c56..cc46a6bae1 100644 --- a/distros/foxy/tf2/default.nix +++ b/distros/foxy/tf2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tf2"; version = "0.13.13-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/foxy/tf2/0.13.13-1.tar.gz"; - name = "0.13.13-1.tar.gz"; - sha256 = "237081a5449c090c93028aebea2454dc1578faefe49f17f786040190033a05ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/foxy/tf2/0.13.13-1"; + sha256 = "sha256-p8GzwFZWDci3kH3bL84O+lHNJbdZ5Ze10tEvJKrJdao="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/theora-image-transport/default.nix b/distros/foxy/theora-image-transport/default.nix index 29b59a5cea..9d89ea274c 100644 --- a/distros/foxy/theora-image-transport/default.nix +++ b/distros/foxy/theora-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-theora-image-transport"; version = "2.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/foxy/theora_image_transport/2.3.3-1.tar.gz"; - name = "2.3.3-1.tar.gz"; - sha256 = "2435aebaff4096dce6b1d3478a56b8474ecddb768f51aaed54f97fb6ee6af1ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/foxy/theora_image_transport/2.3.3-1"; + sha256 = "sha256-BacWyDd8H7Wnc41HAg9LI8Pk1SzwMVkQKJeBP8pGdf0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/tile-map/default.nix b/distros/foxy/tile-map/default.nix index de8e7c0a4c..7ca6c4841d 100644 --- a/distros/foxy/tile-map/default.nix +++ b/distros/foxy/tile-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tile-map"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/foxy/tile_map/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "4c442a1e13ffea454c4cd65053f800a59a8afc6c3239a351ebd2d68e23ac41f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/foxy/tile_map/2.1.0-1"; + sha256 = "sha256-52MRKZupwfpYu8zwL2z42K4MYUwLpMOS2Nf5FFYnVsY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tinyxml-vendor/default.nix b/distros/foxy/tinyxml-vendor/default.nix index 6e89748f17..87b94e8215 100644 --- a/distros/foxy/tinyxml-vendor/default.nix +++ b/distros/foxy/tinyxml-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tinyxml-vendor"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tinyxml_vendor-release/archive/release/foxy/tinyxml_vendor/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "01d4cb774b1cbac4cd414d9ca3c11f9b8bc6848902990f25689f9a62f05958c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tinyxml_vendor-release"; + rev = "release/foxy/tinyxml_vendor/0.8.2-1"; + sha256 = "sha256-i4Agh+ALMy1/SugIEi0CXA8PONq7VOR42fI4sEUsY34="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tinyxml2-vendor/default.nix b/distros/foxy/tinyxml2-vendor/default.nix index 516d2dfa70..1a617296b3 100644 --- a/distros/foxy/tinyxml2-vendor/default.nix +++ b/distros/foxy/tinyxml2-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tinyxml2-vendor"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tinyxml2_vendor-release/archive/release/foxy/tinyxml2_vendor/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "56d1a7c6d3e3499724b9789195f307831ff7bd5ad0a67584169492997ee40659"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tinyxml2_vendor-release"; + rev = "release/foxy/tinyxml2_vendor/0.7.4-1"; + sha256 = "sha256-XCkABAH3SAXNFrMV5nNCdF3O0z6bDphjUSrQKT4AGnM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/tlsf-cpp/default.nix b/distros/foxy/tlsf-cpp/default.nix index a6e8367744..7ae2421563 100644 --- a/distros/foxy/tlsf-cpp/default.nix +++ b/distros/foxy/tlsf-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tlsf-cpp"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/realtime_support-release/archive/release/foxy/tlsf_cpp/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "328a773c98766bef4fa4f125d92a10dfedbbe4eb877fd69d9d761bbe62b66236"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "realtime_support-release"; + rev = "release/foxy/tlsf_cpp/0.9.0-1"; + sha256 = "sha256-Jkd53Lwe8cAiLyHNtmZBQl9eUbufqfEk773oPbzoBlg="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common rmw-implementation-cmake ]; diff --git a/distros/foxy/tlsf/default.nix b/distros/foxy/tlsf/default.nix index 673daee5d0..8e9fbb4529 100644 --- a/distros/foxy/tlsf/default.nix +++ b/distros/foxy/tlsf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tlsf"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tlsf-release/archive/release/foxy/tlsf/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "a05caf5872288699965f98be0380289af1fc7ef00f4c42d343dba09ab3be5b5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tlsf-release"; + rev = "release/foxy/tlsf/0.5.0-1"; + sha256 = "sha256-DcR1szJimLKC9gU2198lWl7bimXVYPPg2/CNiKEkvqI="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/foxy/topic-monitor/default.nix b/distros/foxy/topic-monitor/default.nix index ccfa43c678..a17a3f72b8 100644 --- a/distros/foxy/topic-monitor/default.nix +++ b/distros/foxy/topic-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-topic-monitor"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/foxy/topic_monitor/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "ab7b36f2d05bb919fa146660186e9abf3696e01e3bb2d156138ed6e950ec60f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/foxy/topic_monitor/0.9.4-1"; + sha256 = "sha256-6Qb1VFdpXSPQwDizEiLO3MVl+wKCD1WpLKEs3Vul8sA="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/tracetools-image-pipeline/default.nix b/distros/foxy/tracetools-image-pipeline/default.nix index 02d5d5ff72..4f75a5e30f 100644 --- a/distros/foxy/tracetools-image-pipeline/default.nix +++ b/distros/foxy/tracetools-image-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tracetools-image-pipeline"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/foxy/tracetools_image_pipeline/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "521af743592cf26c1c63ebc9b06713f69a258883ff573a031acc538865b4131d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/foxy/tracetools_image_pipeline/2.3.0-1"; + sha256 = "sha256-z5MPN4yMfEdCBhOPwnW2urwWBct93EdbSWnRZI14cws="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros pkg-config ]; diff --git a/distros/foxy/tracetools-launch/default.nix b/distros/foxy/tracetools-launch/default.nix index def28cfa99..a8f3a796a5 100644 --- a/distros/foxy/tracetools-launch/default.nix +++ b/distros/foxy/tracetools-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tracetools-launch"; version = "1.0.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/foxy/tracetools_launch/1.0.5-2.tar.gz"; - name = "1.0.5-2.tar.gz"; - sha256 = "7789d923e675d776aea16b103bf20e4bb8ca38534ac3f0712b59985e7190dfee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/foxy/tracetools_launch/1.0.5-2"; + sha256 = "sha256-qjWCRFd8X6ZeEKPRVOIK8QPdazIX/eJqGgAS7R01xEE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/foxy/tracetools-test/default.nix b/distros/foxy/tracetools-test/default.nix index 66b9388711..879b11e3d4 100644 --- a/distros/foxy/tracetools-test/default.nix +++ b/distros/foxy/tracetools-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tracetools-test"; version = "1.0.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/foxy/tracetools_test/1.0.5-2.tar.gz"; - name = "1.0.5-2.tar.gz"; - sha256 = "066770fa01463a384c5118c2a6c3ce86bc8a5807da57eea8c6b82fe13a1d58a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/foxy/tracetools_test/1.0.5-2"; + sha256 = "sha256-SBRgqFPuaa/H8CE571DhksMFYyGpG3tm/nlnq506Qe8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/foxy/tracetools/default.nix b/distros/foxy/tracetools/default.nix index cf8be86668..eda24a72eb 100644 --- a/distros/foxy/tracetools/default.nix +++ b/distros/foxy/tracetools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-tracetools"; version = "1.0.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/foxy/tracetools/1.0.5-2.tar.gz"; - name = "1.0.5-2.tar.gz"; - sha256 = "82e89315144b486b23e26cc59add26084f5d06173f2adcc04d7369e8b3a2eef3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/foxy/tracetools/1.0.5-2"; + sha256 = "sha256-VHXmXMYbeEnxG3llbDBqOAB/J9gh5iYka3DdnlmuZFc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros pkg-config ]; diff --git a/distros/foxy/trajectory-msgs/default.nix b/distros/foxy/trajectory-msgs/default.nix index 8828d692af..ad2c3fcd6d 100644 --- a/distros/foxy/trajectory-msgs/default.nix +++ b/distros/foxy/trajectory-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-trajectory-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/trajectory_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "ff1eef5fb5817998de660621cbe59a3c9403e31cfc05fb351131e1046d5aa383"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/trajectory_msgs/2.0.5-1"; + sha256 = "sha256-ZXZ5sUmMDoPG7w1D7KVc3Wpht3rV8FuF/mULKowCTpU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/transmission-interface/default.nix b/distros/foxy/transmission-interface/default.nix index ab77db34f1..ecc13c6401 100644 --- a/distros/foxy/transmission-interface/default.nix +++ b/distros/foxy/transmission-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-transmission-interface"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/foxy/transmission_interface/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "67b06775276e270b5b8aca63582f05daf3a5aa7d1ebf6e4d8b84000927193931"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/foxy/transmission_interface/0.11.0-1"; + sha256 = "sha256-NKouRLHd7h3gHUfX/Aq+2x942UOR6XjMGvXbvJWiO18="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtle-tf2-cpp/default.nix b/distros/foxy/turtle-tf2-cpp/default.nix index 94d414339d..d6aa136760 100644 --- a/distros/foxy/turtle-tf2-cpp/default.nix +++ b/distros/foxy/turtle-tf2-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtle-tf2-cpp"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/foxy/turtle_tf2_cpp/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "5338f78ea233a79ba969931a047b14005f9ccce95d784811a7e39210acb362ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/foxy/turtle_tf2_cpp/0.3.6-1"; + sha256 = "sha256-/+vZZp6tpMuKd5xAZHma9sMN5Q0aWVwbu5ZnKW6t2nQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtle-tf2-py/default.nix b/distros/foxy/turtle-tf2-py/default.nix index da78f8d000..66015f8e26 100644 --- a/distros/foxy/turtle-tf2-py/default.nix +++ b/distros/foxy/turtle-tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtle-tf2-py"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/foxy/turtle_tf2_py/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "608fb979c9338f246059aefaa6dd5582c1071e4f90044fa5d5f362ffe46ee600"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/foxy/turtle_tf2_py/0.3.6-1"; + sha256 = "sha256-KyrTt9hvh28k8MJ6EaD2AnuC3cH+nNMX5fYPjXkz6AA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/turtlebot3-bringup/default.nix b/distros/foxy/turtlebot3-bringup/default.nix index 05cdb9e9ce..2cb86963f6 100644 --- a/distros/foxy/turtlebot3-bringup/default.nix +++ b/distros/foxy/turtlebot3-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-bringup"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/foxy/turtlebot3_bringup/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "18f26261cb89d0a90a532d38f560000b1f3f7c750b35b999986a4caf6f406a5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/foxy/turtlebot3_bringup/2.1.1-1"; + sha256 = "sha256-j9kLO1/53UuhJVKgrRwsjs4pE+DnTFMYCJ2tWGNhLM4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlebot3-cartographer/default.nix b/distros/foxy/turtlebot3-cartographer/default.nix index 13aeea8bf7..a61eb3bd59 100644 --- a/distros/foxy/turtlebot3-cartographer/default.nix +++ b/distros/foxy/turtlebot3-cartographer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-cartographer"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/foxy/turtlebot3_cartographer/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "41434ea8cb23f4f6b0010affdfdc41261d5e4f0bab4f385ea61b94896717a4b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/foxy/turtlebot3_cartographer/2.1.1-1"; + sha256 = "sha256-frLsUB6lfIjAmU/QMwa41jwj1FGwaQ3/Xdz1QZOn/U4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlebot3-description/default.nix b/distros/foxy/turtlebot3-description/default.nix index aa97866c8d..a032e5d40b 100644 --- a/distros/foxy/turtlebot3-description/default.nix +++ b/distros/foxy/turtlebot3-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-description"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/foxy/turtlebot3_description/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "a797c9caf5baa92a4fd278d972d8c32e22252196d01249184b4013f56c44a13b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/foxy/turtlebot3_description/2.1.1-1"; + sha256 = "sha256-me1zzshj9JIWxmqXzfS8tcN9zpuqz6vISS41Kwzzsus="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlebot3-example/default.nix b/distros/foxy/turtlebot3-example/default.nix index 2018ae0e97..83e0d874ac 100644 --- a/distros/foxy/turtlebot3-example/default.nix +++ b/distros/foxy/turtlebot3-example/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-example"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/foxy/turtlebot3_example/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "5a4ef658d6bc1465b9f8966ae8972a979e3218188e63694c71b38ac2a2cafdd6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/foxy/turtlebot3_example/2.1.1-1"; + sha256 = "sha256-nh4qbKsh4JRJIpUyOIsHHns3mc5AQWKGGKosimiiCvo="; + }; buildType = "ament_python"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlebot3-fake-node/default.nix b/distros/foxy/turtlebot3-fake-node/default.nix index a74c53dd06..da4323d0f4 100644 --- a/distros/foxy/turtlebot3-fake-node/default.nix +++ b/distros/foxy/turtlebot3-fake-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-fake-node"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3_simulations-release/archive/release/foxy/turtlebot3_fake_node/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "421f133a1c3f049ef1ecb28ed78452ae89b9707cdbeff59547725d01e6c57e3c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/foxy/turtlebot3_fake_node/2.2.3-1"; + sha256 = "sha256-XdGO6U7HZbCm3yoxtqaoGK8JlEatuJTTbyIGS1aPk7U="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake geometry-msgs nav-msgs rclcpp robot-state-publisher sensor-msgs tf2 tf2-msgs turtlebot3-msgs ]; diff --git a/distros/foxy/turtlebot3-gazebo/default.nix b/distros/foxy/turtlebot3-gazebo/default.nix index b7f06d4e94..5eda6a5320 100644 --- a/distros/foxy/turtlebot3-gazebo/default.nix +++ b/distros/foxy/turtlebot3-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-gazebo"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3_simulations-release/archive/release/foxy/turtlebot3_gazebo/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "d0a90b9de5b1bd1b4d669c1eec7565ddc4153d47239eef32b87f7b806906cb11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/foxy/turtlebot3_gazebo/2.2.3-1"; + sha256 = "sha256-J0aLwsrPQILUg9AJ+GTC65gmF6AP1NFGEkG/oJdFS5U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlebot3-msgs/default.nix b/distros/foxy/turtlebot3-msgs/default.nix index 90a1403a73..d6a13323e1 100644 --- a/distros/foxy/turtlebot3-msgs/default.nix +++ b/distros/foxy/turtlebot3-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-msgs"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3_msgs-release/archive/release/foxy/turtlebot3_msgs/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "c719eb9258d4c141b716b01c4755071b43b79eeb4008033db5dda574e0cf5e2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3_msgs-release"; + rev = "release/foxy/turtlebot3_msgs/2.2.1-1"; + sha256 = "sha256-AfTC3VY2EzfPdav7DvNaPrB+NM5laHjJRrpSaWfb2Cw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/turtlebot3-navigation2/default.nix b/distros/foxy/turtlebot3-navigation2/default.nix index e43e84466a..0dc67dcaca 100644 --- a/distros/foxy/turtlebot3-navigation2/default.nix +++ b/distros/foxy/turtlebot3-navigation2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-navigation2"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/foxy/turtlebot3_navigation2/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "ffef43127cb706840e25dcdb563eb3fa1687ea1d3cc80148ff12798ffedae0c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/foxy/turtlebot3_navigation2/2.1.1-1"; + sha256 = "sha256-jDTIeuDQeHoSCuBtQt5FuNYDyoHuDx5XpqnVRulNdQ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlebot3-node/default.nix b/distros/foxy/turtlebot3-node/default.nix index 5000752bf8..e073e0a2aa 100644 --- a/distros/foxy/turtlebot3-node/default.nix +++ b/distros/foxy/turtlebot3-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-node"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/foxy/turtlebot3_node/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "00de388dca5096ec292744617db1b52acac455ca38a78682a9063cf445d199d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/foxy/turtlebot3_node/2.1.1-1"; + sha256 = "sha256-UbDbVjmPnZCHnuLtyVCKNTm/5wrlUq8s5kxq2FtsJJw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlebot3-simulations/default.nix b/distros/foxy/turtlebot3-simulations/default.nix index 4a20653c6e..b6e8797a49 100644 --- a/distros/foxy/turtlebot3-simulations/default.nix +++ b/distros/foxy/turtlebot3-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-simulations"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3_simulations-release/archive/release/foxy/turtlebot3_simulations/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "faaabdafc9b0404adebbbc0e1c72aec9807b4697c431c556e20b04aeb408d6cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/foxy/turtlebot3_simulations/2.2.3-1"; + sha256 = "sha256-+X4yNz7L3czKAp2pnE6waRG8ioOpiIsetzNO0FUtv2s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlebot3-teleop/default.nix b/distros/foxy/turtlebot3-teleop/default.nix index adfa4c82a8..c270ce028e 100644 --- a/distros/foxy/turtlebot3-teleop/default.nix +++ b/distros/foxy/turtlebot3-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3-teleop"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/foxy/turtlebot3_teleop/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "79c4d0d4666114f01713a56cb5a30a1e57febbdfb58ca1a6ae00a1c97c3e80fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/foxy/turtlebot3_teleop/2.1.1-1"; + sha256 = "sha256-jM3sJj2wrZN7KTJ4NbNwMZUw+dHf6tliDWVOx33yr78="; + }; buildType = "ament_python"; propagatedBuildInputs = [ geometry-msgs rclpy ]; diff --git a/distros/foxy/turtlebot3/default.nix b/distros/foxy/turtlebot3/default.nix index 4095792b1e..aece55f8a2 100644 --- a/distros/foxy/turtlebot3/default.nix +++ b/distros/foxy/turtlebot3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlebot3"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/foxy/turtlebot3/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "ac7355973a7a6b968e3ef0f19ad43bcabecd7341689a46075f8694cd85890244"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/foxy/turtlebot3/2.1.1-1"; + sha256 = "sha256-OrbeCW/B4vfZjfoE8t+7mOQ+dWQhrx1M+qN5msUPFQI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/turtlesim/default.nix b/distros/foxy/turtlesim/default.nix index c00e43ae88..9b67b0f422 100644 --- a/distros/foxy/turtlesim/default.nix +++ b/distros/foxy/turtlesim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-turtlesim"; version = "1.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_tutorials-release/archive/release/foxy/turtlesim/1.2.6-1.tar.gz"; - name = "1.2.6-1.tar.gz"; - sha256 = "4635433559f2b32c3a439ec39b6f7fbde68471c17f61540383c712492d50c1f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_tutorials-release"; + rev = "release/foxy/turtlesim/1.2.6-1"; + sha256 = "sha256-DBx5nXqNBzBLG+DLHKaqA5G7nFUdVGAeDtjkZPYQ3Ek="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/twist-mux/default.nix b/distros/foxy/twist-mux/default.nix index e42561f0ae..5be4cb7055 100644 --- a/distros/foxy/twist-mux/default.nix +++ b/distros/foxy/twist-mux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-twist-mux"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/twist_mux-release/archive/release/foxy/twist_mux/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "18805bae9e5dadc57609fe8255a31ac157e2a0289a24d1c21c24b70cdda940af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "twist_mux-release"; + rev = "release/foxy/twist_mux/4.0.1-1"; + sha256 = "sha256-T+FnegcZnhom09CNd6TJRq68KC26A8VXy62A8hN2QXE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/twist-stamper/default.nix b/distros/foxy/twist-stamper/default.nix index 2aaa37a739..1016bdbfde 100644 --- a/distros/foxy/twist-stamper/default.nix +++ b/distros/foxy/twist-stamper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-twist-stamper"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/twist_stamper-release/archive/release/foxy/twist_stamper/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "21f3f767fd9208615d73dde7aaedc46f144b3c2fe365a34bd25296100d73e814"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "twist_stamper-release"; + rev = "release/foxy/twist_stamper/0.0.3-1"; + sha256 = "sha256-AE3PKMNhcFfc7nbMllXSYBoKhQmRVHLCirRpDAEknEQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/ublox-gps/default.nix b/distros/foxy/ublox-gps/default.nix index 5a16c8e344..7bde59c442 100644 --- a/distros/foxy/ublox-gps/default.nix +++ b/distros/foxy/ublox-gps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ublox-gps"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/foxy/ublox_gps/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "b1ef018e9e276cb4cf3ec87978ef94326739e608de36465170a50181686f4b5d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/foxy/ublox_gps/2.1.0-1"; + sha256 = "sha256-n3dbh+lUL5+9O+Vv+oAWpb2I3AaL+qXaV4+bXPLux1c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/ublox-msgs/default.nix b/distros/foxy/ublox-msgs/default.nix index 70041f5f3a..ac5d22c7b8 100644 --- a/distros/foxy/ublox-msgs/default.nix +++ b/distros/foxy/ublox-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ublox-msgs"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/foxy/ublox_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "cc114c1e0cb3339e9678254001fb02ba943b54c897ed568203d17092e7a2ae59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/foxy/ublox_msgs/2.1.0-1"; + sha256 = "sha256-nkClSwl52aeps1kiJB3AaDZpgPC27B/RytMvqWKPxE4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-default-generators ]; diff --git a/distros/foxy/ublox-serialization/default.nix b/distros/foxy/ublox-serialization/default.nix index 626b7dd66d..dd73b0d4b2 100644 --- a/distros/foxy/ublox-serialization/default.nix +++ b/distros/foxy/ublox-serialization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ublox-serialization"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/foxy/ublox_serialization/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "4f42a93a500feac28525a5908300e3e19baf80334170c560bc1e522b0b1e5921"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/foxy/ublox_serialization/2.1.0-1"; + sha256 = "sha256-Uw/5BdvSN54TvW0V2PRxs495eGsRS3UCFk4dagg+VjY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ublox/default.nix b/distros/foxy/ublox/default.nix index 4e37b56146..1be2f8f0b1 100644 --- a/distros/foxy/ublox/default.nix +++ b/distros/foxy/ublox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ublox"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/foxy/ublox/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "3e5e64fd859c7f95736cb96bf761a3ea83a67ecd05a2265c00b243ef1bf55fbe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/foxy/ublox/2.1.0-1"; + sha256 = "sha256-iokC9SMbWrLeWu2MXudBkhn0jptS/cVuniQny1YajCA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/udp-driver/default.nix b/distros/foxy/udp-driver/default.nix index d1b803f012..472078d4f9 100644 --- a/distros/foxy/udp-driver/default.nix +++ b/distros/foxy/udp-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-udp-driver"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/transport_drivers-release/archive/release/foxy/udp_driver/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "86f5a94b58a8d74940bb43bcc3cbbddc670b3015150a0b077e977c5bd8169be3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "transport_drivers-release"; + rev = "release/foxy/udp_driver/1.0.0-1"; + sha256 = "sha256-i5VyXUk5htxwHpCopvfqoslECjlnRr8wS38P7EvFDck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/foxy/udp-msgs/default.nix b/distros/foxy/udp-msgs/default.nix index 66ca3217cf..3a18d3be6f 100644 --- a/distros/foxy/udp-msgs/default.nix +++ b/distros/foxy/udp-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-udp-msgs"; version = "0.0.3-r2"; - src = fetchurl { - url = "https://github.com/flynneva/udp_msgs-release/archive/release/foxy/udp_msgs/0.0.3-2.tar.gz"; - name = "0.0.3-2.tar.gz"; - sha256 = "3640e6e621147b16d70326cc86f81e9a5a2c713321662c44fa599fdfd1202e4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "udp_msgs-release"; + rev = "release/foxy/udp_msgs/0.0.3-2"; + sha256 = "sha256-g0Gi+BMs9cMS5t5Fh+epx+fKUhebhUczapOPMz9Bg5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/uncrustify-vendor/default.nix b/distros/foxy/uncrustify-vendor/default.nix index 8faf154cff..2d4dd8bbc6 100644 --- a/distros/foxy/uncrustify-vendor/default.nix +++ b/distros/foxy/uncrustify-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-uncrustify-vendor"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/uncrustify_vendor-release/archive/release/foxy/uncrustify_vendor/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "e43689110e4666ef4ca2e722c76dfd584aedc5d759a5bfdeac7ce33f61cbd9cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "uncrustify_vendor-release"; + rev = "release/foxy/uncrustify_vendor/1.4.0-1"; + sha256 = "sha256-h65qS/QImM9SV6H7bheuJxb5AH7gQOL4FoqXnvZ5yX8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/unique-identifier-msgs/default.nix b/distros/foxy/unique-identifier-msgs/default.nix index 7a5c4aa1a6..1047541888 100644 --- a/distros/foxy/unique-identifier-msgs/default.nix +++ b/distros/foxy/unique-identifier-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-unique-identifier-msgs"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/unique_identifier_msgs-release/archive/release/foxy/unique_identifier_msgs/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "7390b7af2ebe08a8f9f6d4f844ee36a7de0bdda6394abb636970e26d930d2ed5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "unique_identifier_msgs-release"; + rev = "release/foxy/unique_identifier_msgs/2.1.3-1"; + sha256 = "sha256-eY1F1KUy12A0gHWbric9mKwVbB6V3CIcYzC6uzDNv5M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/ur-bringup/default.nix b/distros/foxy/ur-bringup/default.nix index 9e0a8fe500..22447326be 100644 --- a/distros/foxy/ur-bringup/default.nix +++ b/distros/foxy/ur-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-bringup"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/foxy/ur_bringup/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "7dafb1e9059c5e11be824334c7011c00d3552204ac5a3f502ea5d6591a9a1d46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/foxy/ur_bringup/2.0.2-2"; + sha256 = "sha256-6P2WaORWyCJe/Ff/unau9m62bdLxQrBCATFRvL7pop4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ur-calibration/default.nix b/distros/foxy/ur-calibration/default.nix index ba3a3baae9..2496da714d 100644 --- a/distros/foxy/ur-calibration/default.nix +++ b/distros/foxy/ur-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-calibration"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/foxy/ur_calibration/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "45d2918cd9139d2b3271fc07c31529a6f84ae2d82bf84c05436615f6dc5ca538"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/foxy/ur_calibration/2.0.2-2"; + sha256 = "sha256-j9rVdit9VIx/5aRfLGEhAGaQGUFQIvDRyYr+HB6uUGQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ur-client-library/default.nix b/distros/foxy/ur-client-library/default.nix index 4fb484d7bb..a62097cdc2 100644 --- a/distros/foxy/ur-client-library/default.nix +++ b/distros/foxy/ur-client-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-client-library"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_Client_Library-release/archive/release/foxy/ur_client_library/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "0e1482bf7da7dd4653066451fa558fb0a900d0160bd2c32f37dda5ddbcb79f99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_Client_Library-release"; + rev = "release/foxy/ur_client_library/1.3.1-1"; + sha256 = "sha256-AYfd94IM+Etv+B7ZUeZWVMNr98mHHmGlCi5CUh8hhWo="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/ur-controllers/default.nix b/distros/foxy/ur-controllers/default.nix index f13fcf82c4..158b76d825 100644 --- a/distros/foxy/ur-controllers/default.nix +++ b/distros/foxy/ur-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-controllers"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/foxy/ur_controllers/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "af2d3866838b85de7c16d8399f090535f7789199cfd5a110bb7870fd4a866b01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/foxy/ur_controllers/2.0.2-2"; + sha256 = "sha256-cgN4+yy7Zr0Pqno/I371VEjJ2YRIK1qdK12TOxuAeNY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ur-dashboard-msgs/default.nix b/distros/foxy/ur-dashboard-msgs/default.nix index 54eaa5c11e..6651af046e 100644 --- a/distros/foxy/ur-dashboard-msgs/default.nix +++ b/distros/foxy/ur-dashboard-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-dashboard-msgs"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/foxy/ur_dashboard_msgs/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "249d0c38e3912e89cf472fc47c98318c28d0fe547d94d8a7c79fddef6b98a370"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/foxy/ur_dashboard_msgs/2.0.2-2"; + sha256 = "sha256-owic4nxnHxgMbpexuQCIAAfs7debGGAyaMMHsyZkSaw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/ur-description/default.nix b/distros/foxy/ur-description/default.nix index 3cfb00478c..8eaabf2aa3 100644 --- a/distros/foxy/ur-description/default.nix +++ b/distros/foxy/ur-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-description"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/foxy/ur_description/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "01f4db0ef0116f3f60d0c41ded738da68b3625cbb8859628b581442497c2d0c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/foxy/ur_description/2.0.2-2"; + sha256 = "sha256-sJMo89gXMtIqD0D3Q7xeJ45vX96t5zhmgGZ/zm0c4NA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ur-moveit-config/default.nix b/distros/foxy/ur-moveit-config/default.nix index ff61de77ee..7129293cbc 100644 --- a/distros/foxy/ur-moveit-config/default.nix +++ b/distros/foxy/ur-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-moveit-config"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/foxy/ur_moveit_config/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "8ab9b671f0e3eebc811e21f8924417313dfab467bbf60861d6eab6a293c14eb2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/foxy/ur_moveit_config/2.0.2-2"; + sha256 = "sha256-YtEPp8eTlCzLNm5Xsx6wJkcJrMB4PBjQUwUumhfryfw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/ur-msgs/default.nix b/distros/foxy/ur-msgs/default.nix index a6014cd429..38fb4ba4c1 100644 --- a/distros/foxy/ur-msgs/default.nix +++ b/distros/foxy/ur-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-msgs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ur_msgs-release/archive/release/foxy/ur_msgs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "71ab6336239fd1082a491f9c7ff7eb2321429591e54f46a291e6c0bd8d83b406"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ur_msgs-release"; + rev = "release/foxy/ur_msgs/2.0.0-1"; + sha256 = "sha256-JsglE/PolObyk2tuC9viw8JYmRlBJ8Ym7pjb5k+2EyQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/ur-robot-driver/default.nix b/distros/foxy/ur-robot-driver/default.nix index c817f970a6..11291f46f5 100644 --- a/distros/foxy/ur-robot-driver/default.nix +++ b/distros/foxy/ur-robot-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-ur-robot-driver"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/foxy/ur_robot_driver/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "aabafe12862568360b9af51e65084913c773119b362393f1a7172f0e4e878d1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/foxy/ur_robot_driver/2.0.2-2"; + sha256 = "sha256-CYdU5cAAExioqpWx/LzkDNEsk3CfTK+OzOiNzR9T3Vg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/urdf-test/default.nix b/distros/foxy/urdf-test/default.nix index d51fe2a47f..b2fb14ad68 100644 --- a/distros/foxy/urdf-test/default.nix +++ b/distros/foxy/urdf-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urdf-test"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/pal-gbp/urdf_test-ros2-gbp/archive/release/foxy/urdf_test/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "5021683ebf04a99d3c15ef5e16e824abebadb4347d77a9452c77fb9a6c6931dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "urdf_test-ros2-gbp"; + rev = "release/foxy/urdf_test/2.0.0-2"; + sha256 = "sha256-S2fE06+KJ7DbPzRcxsfJLx/O3g8h/wEKPlGzJl+Ni58="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/foxy/urdf-tutorial/default.nix b/distros/foxy/urdf-tutorial/default.nix index 9912e406b2..f5dbb2bde0 100644 --- a/distros/foxy/urdf-tutorial/default.nix +++ b/distros/foxy/urdf-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urdf-tutorial"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdf_tutorial-release/archive/release/foxy/urdf_tutorial/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "90a070ae9db4203819d830f59f618fdb57146c1dcf26fc1d2d80674e23e35153"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdf_tutorial-release"; + rev = "release/foxy/urdf_tutorial/1.0.0-1"; + sha256 = "sha256-dhLNYIbCsYEAiIdUFEka1ZMyW/sJOgJ3xw1t8xI4rhw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/urdf/default.nix b/distros/foxy/urdf/default.nix index ba9fdb6462..e0fb24e9cb 100644 --- a/distros/foxy/urdf/default.nix +++ b/distros/foxy/urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urdf"; version = "2.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdf-release/archive/release/foxy/urdf/2.4.0-2.tar.gz"; - name = "2.4.0-2.tar.gz"; - sha256 = "bf569f43cb821cad9d1bc0ef7d51ed9a00180ab67afe4d7b9e8ac64b82d3550d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdf-release"; + rev = "release/foxy/urdf/2.4.0-2"; + sha256 = "sha256-15LtyWVjZoEJGZS2mYyrCs4BChkj/aWR94me7VkmNnc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/urdfdom-headers/default.nix b/distros/foxy/urdfdom-headers/default.nix index d0dea30cad..b11eca3895 100644 --- a/distros/foxy/urdfdom-headers/default.nix +++ b/distros/foxy/urdfdom-headers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urdfdom-headers"; version = "1.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom_headers-release/archive/release/foxy/urdfdom_headers/1.0.5-1.tar.gz"; - name = "1.0.5-1.tar.gz"; - sha256 = "2f16837a20d3c4c1b2e1168bf3915b3f0c77d86b9b3f6be33248b6f38582e99a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom_headers-release"; + rev = "release/foxy/urdfdom_headers/1.0.5-1"; + sha256 = "sha256-lJ6+SPbBfHw8MA4RU+NqSCErpOXv1bM/FKl7lVkbsqY="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/urdfdom-py/default.nix b/distros/foxy/urdfdom-py/default.nix index 68c0d92d05..d04721fa25 100644 --- a/distros/foxy/urdfdom-py/default.nix +++ b/distros/foxy/urdfdom-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urdfdom-py"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom_py-release/archive/release/foxy/urdfdom_py/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "1ae1816fbc29bd091b7372ca429cbf0282ea10f23b2c862b135781af9ac96925"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom_py-release"; + rev = "release/foxy/urdfdom_py/1.0.0-1"; + sha256 = "sha256-PiRoLmUqvlkkNANyPcdycDdW31Cei9TIlX9+ntlaXeg="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.mock ]; diff --git a/distros/foxy/urdfdom/default.nix b/distros/foxy/urdfdom/default.nix index 5c39d0d08c..8cfdd1f9d1 100644 --- a/distros/foxy/urdfdom/default.nix +++ b/distros/foxy/urdfdom/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urdfdom"; version = "2.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom-release/archive/release/foxy/urdfdom/2.3.3-1.tar.gz"; - name = "2.3.3-1.tar.gz"; - sha256 = "8d07feb6325247a03f364bb574f7879fa1cfa8dc6a7e279aafb31166be240767"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom-release"; + rev = "release/foxy/urdfdom/2.3.3-1"; + sha256 = "sha256-DQ8f+j0pd7b9dnVbFUbe6UG44jmUUkkHq1twlANeI4c="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/urg-c/default.nix b/distros/foxy/urg-c/default.nix index 1afafd9022..bfbd84e676 100644 --- a/distros/foxy/urg-c/default.nix +++ b/distros/foxy/urg-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urg-c"; version = "1.0.4001-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_c-release/archive/release/foxy/urg_c/1.0.4001-1.tar.gz"; - name = "1.0.4001-1.tar.gz"; - sha256 = "0088bd027433808c53a2674cbca027e71f1dab18fe33f61dabb7db6d586634eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_c-release"; + rev = "release/foxy/urg_c/1.0.4001-1"; + sha256 = "sha256-d1sMppxyaGt43L2i5Eplkfen4tHz1t6hkC42mCbg0EM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/urg-node-msgs/default.nix b/distros/foxy/urg-node-msgs/default.nix index fd593c72a5..0dde5dca7a 100644 --- a/distros/foxy/urg-node-msgs/default.nix +++ b/distros/foxy/urg-node-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urg-node-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_node_msgs-release/archive/release/foxy/urg_node_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "546489e0d53b57b20c5211592fb8505624cc9f3fba93b2b46fd5cec13b0a0ae0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_node_msgs-release"; + rev = "release/foxy/urg_node_msgs/1.0.1-1"; + sha256 = "sha256-IBl7J8akPgn5ni5/8kPGDOh4Fklto+RggWCIxGald/w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/urg-node/default.nix b/distros/foxy/urg-node/default.nix index 04c3659daf..c6f9ae0a50 100644 --- a/distros/foxy/urg-node/default.nix +++ b/distros/foxy/urg-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-urg-node"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_node-release/archive/release/foxy/urg_node/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "8314b58a1ca008d6409201b53dd7f093654953e025f3515a0de4dbcb862f5af0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_node-release"; + rev = "release/foxy/urg_node/1.0.3-1"; + sha256 = "sha256-27MQJNEmYFBOySwwtuc7gyBw4vo6A+rKbd6QaII5i9k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/usb-cam/default.nix b/distros/foxy/usb-cam/default.nix index 3fe7fbc5b3..0bc6676104 100644 --- a/distros/foxy/usb-cam/default.nix +++ b/distros/foxy/usb-cam/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 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, camera-info-manager, ffmpeg, image-transport, image-transport-plugins, rclcpp, rclcpp-components, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, v4l-utils }: +{ lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, camera-info-manager, cv-bridge, ffmpeg, image-transport, image-transport-plugins, rclcpp, rclcpp-components, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, v4l-utils }: buildRosPackage { pname = "ros-foxy-usb-cam"; - version = "0.4.2-r1"; + version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/usb_cam-release/archive/release/foxy/usb_cam/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "4ebd79d187833e24d7d24a13209274c528d271f073c4c700a73dcc57674f4b3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "usb_cam-release"; + rev = "release/foxy/usb_cam/0.5.0-1"; + sha256 = "sha256-3wjtz8DMgg4mlm03YkmbNjtz/1KJoliSegTaaLLLuRw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto rosidl-default-generators ]; - checkInputs = [ ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ builtin-interfaces camera-info-manager ffmpeg image-transport image-transport-plugins rclcpp rclcpp-components rosidl-default-runtime sensor-msgs std-msgs std-srvs v4l-utils ]; + checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ builtin-interfaces camera-info-manager cv-bridge ffmpeg image-transport image-transport-plugins rclcpp rclcpp-components rosidl-default-runtime sensor-msgs std-msgs std-srvs v4l-utils ]; nativeBuildInputs = [ ament-cmake-auto rosidl-default-generators ]; meta = { diff --git a/distros/foxy/v4l2-camera/default.nix b/distros/foxy/v4l2-camera/default.nix index 1a74726ed4..e14ebaa8dd 100644 --- a/distros/foxy/v4l2-camera/default.nix +++ b/distros/foxy/v4l2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-v4l2-camera"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_v4l2_camera-release/archive/release/foxy/v4l2_camera/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "5113f32aaad8130e696901bed09af6b4a5b927733803281ddacbe4943e68f3b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_v4l2_camera-release"; + rev = "release/foxy/v4l2_camera/0.5.0-1"; + sha256 = "sha256-EoR55rJr2BXECCXTfRNLuNYA9XTUhVnaKpGWCccchAA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/velocity-controllers/default.nix b/distros/foxy/velocity-controllers/default.nix index 60431f73ba..3f8b585adf 100644 --- a/distros/foxy/velocity-controllers/default.nix +++ b/distros/foxy/velocity-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velocity-controllers"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/foxy/velocity_controllers/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "a23fc11b4b5905f3160d4cf9ea232d9f09594b817250ced94177685c1ac27dc1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/foxy/velocity_controllers/0.8.2-1"; + sha256 = "sha256-mW0Em/IkSFN4HraNaxBvlsy6kroYnHw3D0Bc35IokJg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; diff --git a/distros/foxy/velodyne-description/default.nix b/distros/foxy/velodyne-description/default.nix index ad3aed2a3d..6b7193aebb 100644 --- a/distros/foxy/velodyne-description/default.nix +++ b/distros/foxy/velodyne-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velodyne-description"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/foxy/velodyne_description/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "b556f0123b64775f17cd15fa4360df89a02bac01b3505d47c46c0538ec14a47e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/foxy/velodyne_description/2.0.3-1"; + sha256 = "sha256-vYig3j3DqPeSuEmGlDfvaH64IGdK8x/Yxx40R/Sv5j4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/velodyne-driver/default.nix b/distros/foxy/velodyne-driver/default.nix index 94fb741c30..2fafc27f73 100644 --- a/distros/foxy/velodyne-driver/default.nix +++ b/distros/foxy/velodyne-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velodyne-driver"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/foxy/velodyne_driver/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "9b53724abc6976b2fa6ea09db9adc0144c1b6ad398045e772a8f622a091c2d0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/foxy/velodyne_driver/2.1.1-1"; + sha256 = "sha256-9GwZp6n3lCArcvLjBA3EmiHw1vvzWJ5uQJiraj/3PNI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/velodyne-gazebo-plugins/default.nix b/distros/foxy/velodyne-gazebo-plugins/default.nix index 0e33e6c15d..f897679ebe 100644 --- a/distros/foxy/velodyne-gazebo-plugins/default.nix +++ b/distros/foxy/velodyne-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velodyne-gazebo-plugins"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/foxy/velodyne_gazebo_plugins/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "cab9041eda65ac7aa2ef5213658dc320582a807d3ad8ab7713051b95d5dfe6ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/foxy/velodyne_gazebo_plugins/2.0.3-1"; + sha256 = "sha256-TFxh7d/7+m5z05amlR634rbaqZYAHs06SxUx3ZlM/NI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/velodyne-laserscan/default.nix b/distros/foxy/velodyne-laserscan/default.nix index 785cf553c0..e47bcd46b1 100644 --- a/distros/foxy/velodyne-laserscan/default.nix +++ b/distros/foxy/velodyne-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velodyne-laserscan"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/foxy/velodyne_laserscan/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "6c8e5434b0d44c53c2239ec6d48f612e526e073d4ce925189c75036ba50290af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/foxy/velodyne_laserscan/2.1.1-1"; + sha256 = "sha256-/k0UhjrOgpneZONc0GF0jNT9JAlfjQ1aRQXDcT3to2Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/foxy/velodyne-msgs/default.nix b/distros/foxy/velodyne-msgs/default.nix index ded395e063..e5574a4739 100644 --- a/distros/foxy/velodyne-msgs/default.nix +++ b/distros/foxy/velodyne-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velodyne-msgs"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/foxy/velodyne_msgs/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "0e1988c6ca72a6ba237845af37bfbd41d46f10a0404ebf2c68202524d46ef857"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/foxy/velodyne_msgs/2.1.1-1"; + sha256 = "sha256-eXqrYnunRtHBjCDWr+xVUoqduNVBpXYe92JlGJnEvJ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/velodyne-pointcloud/default.nix b/distros/foxy/velodyne-pointcloud/default.nix index 18c61b3a5c..5c6ad96872 100644 --- a/distros/foxy/velodyne-pointcloud/default.nix +++ b/distros/foxy/velodyne-pointcloud/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velodyne-pointcloud"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/foxy/velodyne_pointcloud/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "c50a8b5c5affd431ec85665ce710532bf81a0d0f85d8fc4548d8c9c9e726c879"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/foxy/velodyne_pointcloud/2.1.1-1"; + sha256 = "sha256-MCmAaChpnpcdK+9qrgT7UkexwTngyYaYxz1eZgDMlg4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/velodyne-simulator/default.nix b/distros/foxy/velodyne-simulator/default.nix index 6fc77af30d..d1081db4fc 100644 --- a/distros/foxy/velodyne-simulator/default.nix +++ b/distros/foxy/velodyne-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velodyne-simulator"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/foxy/velodyne_simulator/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "25636001d479c886756f4bd9997d80612ba285e4dca006be55e717a1a705dc8f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/foxy/velodyne_simulator/2.0.3-1"; + sha256 = "sha256-Cu17nhMENoRv3E5+1HvQyw35oWBdZXPr9BQ3APt4Q0c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/velodyne/default.nix b/distros/foxy/velodyne/default.nix index b1b1cf2976..a921ea8e6f 100644 --- a/distros/foxy/velodyne/default.nix +++ b/distros/foxy/velodyne/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-velodyne"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/foxy/velodyne/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "7b8eea45da04784f481634bfeb2fd0c41990b24a69ea4ca412b329d2a90b187e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/foxy/velodyne/2.1.1-1"; + sha256 = "sha256-WP2U8RAaH7KjeTv8wZfm5J9yZlGtiNlw2zqNOmnZCGc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/vision-msgs/default.nix b/distros/foxy/vision-msgs/default.nix index dfc5f2237d..106b7aac75 100644 --- a/distros/foxy/vision-msgs/default.nix +++ b/distros/foxy/vision-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-vision-msgs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_msgs-release/archive/release/foxy/vision_msgs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "3f6e7fde4e470ccb2cbdc0235753a772bb7e2ad1f7f2c6a625a51a2d42f15894"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_msgs-release"; + rev = "release/foxy/vision_msgs/2.0.0-1"; + sha256 = "sha256-zHbSbgy/lIRRZ2FIgNyM5AWw7bKjcPCKCzzuImYKE5g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/vision-opencv/default.nix b/distros/foxy/vision-opencv/default.nix index 93af2254a5..2827cee5da 100644 --- a/distros/foxy/vision-opencv/default.nix +++ b/distros/foxy/vision-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-vision-opencv"; version = "3.0.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/foxy/vision_opencv/3.0.7-1.tar.gz"; - name = "3.0.7-1.tar.gz"; - sha256 = "a7ea35bf44556cf97af1ce3acba29c669cb25674b5eaadb9926b05d61e7108d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/foxy/vision_opencv/3.0.7-1"; + sha256 = "sha256-BU4TQR2EoFxmrB4OJzTN7KYT5UQfAJpAS59ZTjD57Aw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/visualization-msgs/default.nix b/distros/foxy/visualization-msgs/default.nix index c4b7342d1b..42d58cda70 100644 --- a/distros/foxy/visualization-msgs/default.nix +++ b/distros/foxy/visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-visualization-msgs"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/foxy/visualization_msgs/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "47e0214afe3e7a94c8b2a87d3408ab69ce860663e6d02aa1c3568e10cb0fad8e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/foxy/visualization_msgs/2.0.5-1"; + sha256 = "sha256-IPBMmwFCH4n25lNf/Oppy4klXd9FDwkvWCPjLAkWn84="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/vrpn-mocap/default.nix b/distros/foxy/vrpn-mocap/default.nix index 556804245c..ee0d446e37 100644 --- a/distros/foxy/vrpn-mocap/default.nix +++ b/distros/foxy/vrpn-mocap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-vrpn-mocap"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vrpn_mocap-release/archive/release/foxy/vrpn_mocap/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "7e2cf600915b00bdb04387d4d543bce6e49286a6ca53b93aee6ba99fde20a7b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vrpn_mocap-release"; + rev = "release/foxy/vrpn_mocap/1.0.3-1"; + sha256 = "sha256-yghDg5y4lcHd2MvyCvl/reTksyFDaIp0sHv/j9nlSSQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen eigen3-cmake-module ]; diff --git a/distros/foxy/vrpn/default.nix b/distros/foxy/vrpn/default.nix index cac607320b..3b98da0bd9 100644 --- a/distros/foxy/vrpn/default.nix +++ b/distros/foxy/vrpn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-vrpn"; version = "7.35.0-r8"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vrpn-release/archive/release/foxy/vrpn/7.35.0-8.tar.gz"; - name = "7.35.0-8.tar.gz"; - sha256 = "4d663529646e6697043507eff26ff773a71e01663373dc5c976a5b857bcfd7b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vrpn-release"; + rev = "release/foxy/vrpn/7.35.0-8"; + sha256 = "sha256-gVABNgsOIA99lKIlrcjjsnCvXMYzmJtNB/5AH1Im0Wc="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/foxy/vrxperience-bridge/default.nix b/distros/foxy/vrxperience-bridge/default.nix index 85912ebf19..545b831c56 100644 --- a/distros/foxy/vrxperience-bridge/default.nix +++ b/distros/foxy/vrxperience-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-vrxperience-bridge"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/autowarefoundation/ansys-vrxperience-ros2-release/archive/release/foxy/vrxperience_bridge/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "530a932a806d51335c1437b0a47fa3534c4ea786f8025c3cdbea4fce018df7c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autowarefoundation"; + repo = "ansys-vrxperience-ros2-release"; + rev = "release/foxy/vrxperience_bridge/1.0.0-1"; + sha256 = "sha256-PrqKCR6ItXT98llw8r0auWbSikqQchwfGBtZ4Ghseg0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto openjdk ]; diff --git a/distros/foxy/vrxperience-msgs/default.nix b/distros/foxy/vrxperience-msgs/default.nix index 7ea08bfea0..5fa781be55 100644 --- a/distros/foxy/vrxperience-msgs/default.nix +++ b/distros/foxy/vrxperience-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-vrxperience-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/autowarefoundation/ansys-vrxperience-ros2-release/archive/release/foxy/vrxperience_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "94c8ac5f9bf2b5d175e9c57f44c3c05a8ec28953c18eff9aef33117feda928a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autowarefoundation"; + repo = "ansys-vrxperience-ros2-release"; + rev = "release/foxy/vrxperience_msgs/1.0.0-1"; + sha256 = "sha256-+XCA8xK2tdmzRFCGN/UrZ6Dtiq+PbIcxSnpf/C8nnqI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/warehouse-ros-sqlite/default.nix b/distros/foxy/warehouse-ros-sqlite/default.nix index 4d1310e5ee..eff5a7cc7e 100644 --- a/distros/foxy/warehouse-ros-sqlite/default.nix +++ b/distros/foxy/warehouse-ros-sqlite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-warehouse-ros-sqlite"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/moveit/warehouse_ros_sqlite-release/archive/release/foxy/warehouse_ros_sqlite/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "d99bd59ef67f8480b45c7df251fc9f50c43c096b295f7bb6da2d752d3ee58ff4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "warehouse_ros_sqlite-release"; + rev = "release/foxy/warehouse_ros_sqlite/1.0.2-1"; + sha256 = "sha256-KckVzhUqqKqj7UTOM7k8fxoQGkMoO2XselDZgY/mdwE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake boost sqlite3-vendor ]; diff --git a/distros/foxy/warehouse-ros/default.nix b/distros/foxy/warehouse-ros/default.nix index de08b11323..c8376c6614 100644 --- a/distros/foxy/warehouse-ros/default.nix +++ b/distros/foxy/warehouse-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-warehouse-ros"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/moveit/warehouse_ros-release/archive/release/foxy/warehouse_ros/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "b6a9d43d7d0790ed9df2bffc86629c2007ed33158491da1470c595368fa74582"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "warehouse_ros-release"; + rev = "release/foxy/warehouse_ros/2.0.3-1"; + sha256 = "sha256-nrZf5I7wUpqq1GQYt6hsTv4HioTsqYc1Q8O4RVT8sv8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/webots-ros2-control/default.nix b/distros/foxy/webots-ros2-control/default.nix index 7b2b2e6cd3..5258898723 100644 --- a/distros/foxy/webots-ros2-control/default.nix +++ b/distros/foxy/webots-ros2-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, controller-manager, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, ros-environment, webots-ros2-driver }: buildRosPackage { pname = "ros-foxy-webots-ros2-control"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_control/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "b1af186e416059f75c092478f3b2b8d0623b9eec134054267144faa94dccb17e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_control/2023.0.1-1"; + sha256 = "sha256-SM/EQUSPfLDsUAKMxiDclz2mOrICDzzifBh2mcsYkkQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/foxy/webots-ros2-driver/default.nix b/distros/foxy/webots-ros2-driver/default.nix index 3fdfce1cce..e0e0e7100f 100644 --- a/distros/foxy/webots-ros2-driver/default.nix +++ b/distros/foxy/webots-ros2-driver/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, ament-lint-auto, ament-lint-common, geometry-msgs, pluginlib, python-cmake-module, rclcpp, rclpy, ros-environment, sensor-msgs, std-msgs, tf2-geometry-msgs, tf2-ros, tinyxml2-vendor, vision-msgs, webots-ros2-importer, webots-ros2-msgs }: buildRosPackage { pname = "ros-foxy-webots-ros2-driver"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_driver/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "997946ed72db983974767e12842a810f8ba2e684fd79ecd9c63b8d0076ae8d95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_driver/2023.0.1-1"; + sha256 = "sha256-cGbN+t3wzKf69CSiaHXDIKrCXGt169XkVBz35UVgpOY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python python-cmake-module ros-environment ]; diff --git a/distros/foxy/webots-ros2-epuck/default.nix b/distros/foxy/webots-ros2-epuck/default.nix index 0cd167c5f8..fa7e85a783 100644 --- a/distros/foxy/webots-ros2-epuck/default.nix +++ b/distros/foxy/webots-ros2-epuck/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, geometry-msgs, joint-state-broadcaster, nav-msgs, pythonPackages, rclpy, robot-state-publisher, rviz2, sensor-msgs, std-msgs, tf2-ros, webots-ros2-control, webots-ros2-driver, webots-ros2-msgs }: buildRosPackage { pname = "ros-foxy-webots-ros2-epuck"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_epuck/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "5c44cade24cc2ef166e39eebd96bea707dc8d953bb884f76028f1ed8ee764b0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_epuck/2023.0.1-1"; + sha256 = "sha256-BjZSzpiGfYr8DnNk9Vsqbf1kSB2Yu1uLi+BozXj9esM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/webots-ros2-importer/default.nix b/distros/foxy/webots-ros2-importer/default.nix index 788e63b28b..17daf929db 100644 --- a/distros/foxy/webots-ros2-importer/default.nix +++ b/distros/foxy/webots-ros2-importer/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, python3Packages, pythonPackages, xacro }: buildRosPackage { pname = "ros-foxy-webots-ros2-importer"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_importer/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "3b2ac4689a01a9d3eb9cdb75e65fbe2b1c0ffae978ec7c4c6fedd1a997b33a91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_importer/2023.0.1-1"; + sha256 = "sha256-IBlBrHZwPwyVdg6JNxe62ePHR18YugJysO0Tj1IpF54="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 python3Packages.numpy python3Packages.pillow python3Packages.pycodestyle pythonPackages.pytest ]; diff --git a/distros/foxy/webots-ros2-mavic/default.nix b/distros/foxy/webots-ros2-mavic/default.nix index 61bc12bde7..7dd7e73b7a 100644 --- a/distros/foxy/webots-ros2-mavic/default.nix +++ b/distros/foxy/webots-ros2-mavic/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, pythonPackages, rclpy, webots-ros2-driver }: buildRosPackage { pname = "ros-foxy-webots-ros2-mavic"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_mavic/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "0573b4cd2a1f269ac4bce9fa3441363b67356a857eee969066fae91ec7cbf688"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_mavic/2023.0.1-1"; + sha256 = "sha256-7yYbTKp0l3xBdOTQ507AzzgUdMeAXb9IqUsJrzmMi6g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/webots-ros2-msgs/default.nix b/distros/foxy/webots-ros2-msgs/default.nix index c6995e7f59..a9c48bf8dc 100644 --- a/distros/foxy/webots-ros2-msgs/default.nix +++ b/distros/foxy/webots-ros2-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs, vision-msgs }: buildRosPackage { pname = "ros-foxy-webots-ros2-msgs"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_msgs/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "f07057ed06e5c9f9c361092261098c2f5a8f1e1027c6c276dff67e96cd80898a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_msgs/2023.0.1-1"; + sha256 = "sha256-iu6eAQ1PiJ375beMsfM6eWJrynXiZaWP7m5Qo9zGhbA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/webots-ros2-tesla/default.nix b/distros/foxy/webots-ros2-tesla/default.nix index 81e5a167fa..e11150bdfb 100644 --- a/distros/foxy/webots-ros2-tesla/default.nix +++ b/distros/foxy/webots-ros2-tesla/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ackermann-msgs, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, python3Packages, pythonPackages, rclpy, webots-ros2-driver }: buildRosPackage { pname = "ros-foxy-webots-ros2-tesla"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_tesla/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "d4ac08bfa521103714997d76122be6403d29e88609a0a7f4ca0a0bc9ada2803e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_tesla/2023.0.1-1"; + sha256 = "sha256-ExnlF/FXLh6KhkMekyuMXzd6+Xj+Umqh/KgcWZEb4Fg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/webots-ros2-tests/default.nix b/distros/foxy/webots-ros2-tests/default.nix index 5416bcecfb..ab125a22f4 100644 --- a/distros/foxy/webots-ros2-tests/default.nix +++ b/distros/foxy/webots-ros2-tests/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, geometry-msgs, launch, launch-testing, launch-testing-ament-cmake, launch-testing-ros, pythonPackages, rclpy, ros2bag, rosbag2-storage-default-plugins, sensor-msgs, std-msgs, std-srvs, tf2-ros, webots-ros2-driver, webots-ros2-epuck, webots-ros2-mavic, webots-ros2-tesla, webots-ros2-tiago, webots-ros2-turtlebot, webots-ros2-universal-robot }: buildRosPackage { pname = "ros-foxy-webots-ros2-tests"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_tests/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "e6531a2293996011b842f354613fd6d3e9184655b69a1977cffc4decf0d46731"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_tests/2023.0.1-1"; + sha256 = "sha256-G4fCYbkt7CFYrvblNCbmbPHftEI7DANBT+de3OKx2L4="; + }; buildType = "ament_python"; buildInputs = [ rclpy ros2bag rosbag2-storage-default-plugins webots-ros2-driver ]; diff --git a/distros/foxy/webots-ros2-tiago/default.nix b/distros/foxy/webots-ros2-tiago/default.nix index 6bca2fe7b0..48c6efc53d 100644 --- a/distros/foxy/webots-ros2-tiago/default.nix +++ b/distros/foxy/webots-ros2-tiago/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, geometry-msgs, joint-state-broadcaster, pythonPackages, rclpy, robot-state-publisher, rviz2, tf2-ros, webots-ros2-control, webots-ros2-driver }: buildRosPackage { pname = "ros-foxy-webots-ros2-tiago"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_tiago/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "2068ae12db846a265269ad2283f541cf0b760448084829d65646144d189e169d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_tiago/2023.0.1-1"; + sha256 = "sha256-DIeE3GdW11x3tV1eygCv/wGQFQ9kQYE/OTOs7h930HM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/webots-ros2-turtlebot/default.nix b/distros/foxy/webots-ros2-turtlebot/default.nix index b030eac4c8..3950ae79cc 100644 --- a/distros/foxy/webots-ros2-turtlebot/default.nix +++ b/distros/foxy/webots-ros2-turtlebot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, joint-state-broadcaster, pythonPackages, rclpy, robot-state-publisher, rviz2, tf2-ros, webots-ros2-control, webots-ros2-driver }: buildRosPackage { pname = "ros-foxy-webots-ros2-turtlebot"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_turtlebot/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "4f78323066019c9c6d11cd541ec78fa67764ff7ebcc7deb9bba1db1b9d5b1d40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_turtlebot/2023.0.1-1"; + sha256 = "sha256-HgqpqoYT1hvAjoFRmb0Q0hpGDTc0UaGTfBYnhG+FRaw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/webots-ros2-universal-robot/default.nix b/distros/foxy/webots-ros2-universal-robot/default.nix index e199ee5bb2..91d22abaec 100644 --- a/distros/foxy/webots-ros2-universal-robot/default.nix +++ b/distros/foxy/webots-ros2-universal-robot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, control-msgs, controller-manager, joint-state-broadcaster, joint-trajectory-controller, pythonPackages, rclpy, robot-state-publisher, rviz2, trajectory-msgs, webots-ros2-control, webots-ros2-driver, xacro }: buildRosPackage { pname = "ros-foxy-webots-ros2-universal-robot"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2_universal_robot/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "ec671206dd448986011c7356c4d75b1278517f0b51a67e3a0cca619dc5f53235"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2_universal_robot/2023.0.1-1"; + sha256 = "sha256-2f5hfF2f1jSIUgifFrAFNdhBGbbVLMijz5WZm5udcWA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/webots-ros2/default.nix b/distros/foxy/webots-ros2/default.nix index f75869202e..979004a4f6 100644 --- a/distros/foxy/webots-ros2/default.nix +++ b/distros/foxy/webots-ros2/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, pythonPackages, rclpy, std-msgs, webots-ros2-control, webots-ros2-driver, webots-ros2-epuck, webots-ros2-importer, webots-ros2-mavic, webots-ros2-msgs, webots-ros2-tesla, webots-ros2-tests, webots-ros2-tiago, webots-ros2-turtlebot, webots-ros2-universal-robot }: buildRosPackage { pname = "ros-foxy-webots-ros2"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/foxy/webots_ros2/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "193c0c8dbde596488cd617da0b2cec62bde440dd3c0b645f05eefb4010afe8a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/foxy/webots_ros2/2023.0.1-1"; + sha256 = "sha256-qI4kmyOLqwwHbHNjhcO59V7MW2hTRVKCma8v1h4GUds="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest webots-ros2-tests ]; diff --git a/distros/foxy/wiimote-msgs/default.nix b/distros/foxy/wiimote-msgs/default.nix index 12d2a0c3d7..962e082f84 100644 --- a/distros/foxy/wiimote-msgs/default.nix +++ b/distros/foxy/wiimote-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-wiimote-msgs"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/foxy/wiimote_msgs/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "6c2b9554f6bae40e57d3e60948792622a2852e2135e1ce77a78333f772fecf99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/foxy/wiimote_msgs/3.0.1-1"; + sha256 = "sha256-DcCzI7pqnh3vDkWqS2XUVSzoV3JfHEAYmxUFRb2pxuw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto rosidl-default-generators ]; diff --git a/distros/foxy/wiimote/default.nix b/distros/foxy/wiimote/default.nix index 777f9fe00a..7291999c7a 100644 --- a/distros/foxy/wiimote/default.nix +++ b/distros/foxy/wiimote/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-wiimote"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/foxy/wiimote/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "1cde95d93447b9dc6b7212460b8d4675637e47ea31e7dd5ce4745fc799a5fd70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/foxy/wiimote/3.0.1-1"; + sha256 = "sha256-i/WGBYOoL0AbC0vUuodbMQTAcRjJiYDuD2mli7QFcWk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/foxy/wireless-msgs/default.nix b/distros/foxy/wireless-msgs/default.nix index 70869a8fdb..a62347e108 100644 --- a/distros/foxy/wireless-msgs/default.nix +++ b/distros/foxy/wireless-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-wireless-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/wireless-release/archive/release/foxy/wireless_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "4d6e0eb90a937d263b588edf958e823b9c9ea4a0a872c4402a19d968033d5e05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "wireless-release"; + rev = "release/foxy/wireless_msgs/1.0.0-1"; + sha256 = "sha256-VSMc5rxSt+r2dQ6J7XqKe/TzREqe9lq8KR9/r1crwCA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/foxy/wireless-watcher/default.nix b/distros/foxy/wireless-watcher/default.nix index 5fc22ee797..b184136eea 100644 --- a/distros/foxy/wireless-watcher/default.nix +++ b/distros/foxy/wireless-watcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-wireless-watcher"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/wireless-release/archive/release/foxy/wireless_watcher/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "0e0a76028b133b65ed851053a89815dc4466894e42820525700b44646f426987"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "wireless-release"; + rev = "release/foxy/wireless_watcher/1.0.0-1"; + sha256 = "sha256-zyVzWCGjMUizzl3UcYuiYkto+NUNdcDFxMXBRsLfVS8="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/foxy/xacro-live/default.nix b/distros/foxy/xacro-live/default.nix index dbe79ae37a..3d6d3b0083 100644 --- a/distros/foxy/xacro-live/default.nix +++ b/distros/foxy/xacro-live/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-xacro-live"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/orise-robotics/xacro_live-release/archive/release/foxy/xacro_live/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "6780833008e35d68270a5d75473fcc42544523af01b319ae26c1888770e2afcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "orise-robotics"; + repo = "xacro_live-release"; + rev = "release/foxy/xacro_live/0.1.1-1"; + sha256 = "sha256-Xya3CJV7MhAmejc/1ccN3xlagZhoSO6VGY2QIy3juDg="; + }; buildType = "ament_python"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/xacro/default.nix b/distros/foxy/xacro/default.nix index a7dc2e08a3..4c5e8337cf 100644 --- a/distros/foxy/xacro/default.nix +++ b/distros/foxy/xacro/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-xacro"; version = "2.0.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/xacro-release/archive/release/foxy/xacro/2.0.7-1.tar.gz"; - name = "2.0.7-1.tar.gz"; - sha256 = "a824cb5f545d8c9146ee835d0020db083b1f0edbc3d280bdc8c24198328a34fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "xacro-release"; + rev = "release/foxy/xacro/2.0.7-1"; + sha256 = "sha256-5jQLrEuz1WWJIJnpqyLBXOKVwC2psfhlPCPOOaFXjf4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/yaml-cpp-vendor/default.nix b/distros/foxy/yaml-cpp-vendor/default.nix index 3f3ab3e7d8..cc75bb5149 100644 --- a/distros/foxy/yaml-cpp-vendor/default.nix +++ b/distros/foxy/yaml-cpp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-yaml-cpp-vendor"; version = "7.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/yaml_cpp_vendor-release/archive/release/foxy/yaml_cpp_vendor/7.0.3-1.tar.gz"; - name = "7.0.3-1.tar.gz"; - sha256 = "dd8ad6666daa137958a46d5a679eb1d58c918ce9cc3c2c98d00c9f162803f9a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "yaml_cpp_vendor-release"; + rev = "release/foxy/yaml_cpp_vendor/7.0.3-1"; + sha256 = "sha256-k6fuKI14rWdjFrClCeCQQIIO+mord63bMTW6kQRRfmU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/foxy/zmqpp-vendor/default.nix b/distros/foxy/zmqpp-vendor/default.nix index 2ced799b83..2ae5b95362 100644 --- a/distros/foxy/zmqpp-vendor/default.nix +++ b/distros/foxy/zmqpp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-zmqpp-vendor"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/tier4/zmqpp_vendor-release/archive/release/foxy/zmqpp_vendor/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "efe0919a69f130328417e4099658b10219ecccfb59bad44d7b8183e4654ac209"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tier4"; + repo = "zmqpp_vendor-release"; + rev = "release/foxy/zmqpp_vendor/0.0.2-2"; + sha256 = "sha256-OHJpSJAua016kXvKxcD1ay55wprlXnqSL19uzz/el6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/foxy/zstd-vendor/default.nix b/distros/foxy/zstd-vendor/default.nix index 348aa92d07..829ff4e244 100644 --- a/distros/foxy/zstd-vendor/default.nix +++ b/distros/foxy/zstd-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-foxy-zstd-vendor"; version = "0.3.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/foxy/zstd_vendor/0.3.9-1.tar.gz"; - name = "0.3.9-1.tar.gz"; - sha256 = "188b22156f065f15c39e25d30b11b002ab5c01396a6819965dfe14ebb29db13e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/foxy/zstd_vendor/0.3.9-1"; + sha256 = "sha256-urB5lzEvZlwKrno8d6pK7//olyDV7krUHZDkb1jPhYY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/galactic/mapviz-plugins/default.nix b/distros/galactic/mapviz-plugins/default.nix index 96672e3f97..9d4c2dc1b0 100644 --- a/distros/galactic/mapviz-plugins/default.nix +++ b/distros/galactic/mapviz-plugins/default.nix @@ -8,9 +8,8 @@ buildRosPackage { version = "2.2.0-r3"; src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/galactic/mapviz_plugins/2.2.0-3.tar.gz"; - name = "2.2.0-3.tar.gz"; - sha256 = "6ab615be627a973e5b9f5d2a4701288ea0a87f2bab6f46f9c0eeb6d1ac5e0a63"; + url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/c45b7567928cd412f945dfe8d6169193392252dc.tar.gz"; + sha256 = "sha256-SZpeFsWOQQbYrmkwQ40273ywZ7p1pOl55nRFgcvpuOY="; }; buildType = "ament_cmake"; diff --git a/distros/galactic/marti-visualization-msgs/default.nix b/distros/galactic/marti-visualization-msgs/default.nix index 547410983e..8f62c3bf78 100644 --- a/distros/galactic/marti-visualization-msgs/default.nix +++ b/distros/galactic/marti-visualization-msgs/default.nix @@ -8,9 +8,8 @@ buildRosPackage { version = "1.3.0-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/galactic/marti_visualization_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "7c813003517abb0225b01f3211d16fa6256dab4d9982c44092790c9531b80746"; + url = "https://github.com/ros2-gbp/marti_messages-release/archive/5fadd636c91b09d6b1c66fb0a18c095a9eeddfb9.tar.gz"; + sha256 = "sha256-ln8TB7XB3itqW2qSG4noDxLwjdTJMrccgDELU/7sm+A="; }; buildType = "ament_cmake"; diff --git a/distros/galactic/velocity-controllers/default.nix b/distros/galactic/velocity-controllers/default.nix index c0ac3a01fe..37e3aff7c2 100644 --- a/distros/galactic/velocity-controllers/default.nix +++ b/distros/galactic/velocity-controllers/default.nix @@ -8,9 +8,8 @@ buildRosPackage { version = "1.5.1-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/galactic/velocity_controllers/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "bd17d70844f6b028bf3457ffad2d8d2ba67b7fec3dce15eb66585ce84e541a16"; + url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/1a4c17af215cc4b2084d177840ad2e4c6b059e62.tar.gz"; + sha256 = "sha256-KzMFydDmdDLuz20+qp/TYJMNshJ2NL4Eti1pH257OvE="; }; buildType = "ament_cmake"; diff --git a/distros/humble/acado-vendor/default.nix b/distros/humble/acado-vendor/default.nix index 12a2cbe714..69e0505b4f 100644 --- a/distros/humble/acado-vendor/default.nix +++ b/distros/humble/acado-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-acado-vendor"; version = "1.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/acado_vendor-release/archive/release/humble/acado_vendor/1.0.0-4.tar.gz"; - name = "1.0.0-4.tar.gz"; - sha256 = "4c3bf139bfe3d5b3007d94b84624b7cc20d3e1ab4522a950bc6c88d86ee1711f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "acado_vendor-release"; + rev = "release/humble/acado_vendor/1.0.0-4"; + sha256 = "sha256-8gA7ZwANcFmzyoc3egAGyB3xpAQlHrs4nK6U1/KanwA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ackermann-msgs/default.nix b/distros/humble/ackermann-msgs/default.nix index 1abe5ac70f..18ce95f284 100644 --- a/distros/humble/ackermann-msgs/default.nix +++ b/distros/humble/ackermann-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ackermann-msgs"; version = "2.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ackermann_msgs-release/archive/release/humble/ackermann_msgs/2.0.2-3.tar.gz"; - name = "2.0.2-3.tar.gz"; - sha256 = "c718834cdc18318cc85329d1fbaf14548eb9356f865c16bbbfed5d355870e690"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ackermann_msgs-release"; + rev = "release/humble/ackermann_msgs/2.0.2-3"; + sha256 = "sha256-zn0jbHQ6PrAlpzAwpr3Tu01dOE8TVcs0XYlTXL0x8wg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/action-msgs/default.nix b/distros/humble/action-msgs/default.nix index 06cd8d229d..e3cebbb684 100644 --- a/distros/humble/action-msgs/default.nix +++ b/distros/humble/action-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-action-msgs"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/humble/action_msgs/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "dbea032efe7fdd74415f1f6fefd2eb1c1f891cd27025ea54684992833ff9d4c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/humble/action_msgs/1.2.1-1"; + sha256 = "sha256-2ECLCT/VB0k48HVTOrmHkx3hEQftEjtYszess8KxctU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/action-tutorials-cpp/default.nix b/distros/humble/action-tutorials-cpp/default.nix index a439e68ada..4db7eb471b 100644 --- a/distros/humble/action-tutorials-cpp/default.nix +++ b/distros/humble/action-tutorials-cpp/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-tutorials-interfaces, ament-cmake, ament-lint-auto, ament-lint-common, rclcpp, rclcpp-action, rclcpp-components }: buildRosPackage { pname = "ros-humble-action-tutorials-cpp"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/action_tutorials_cpp/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "eb08d60baebd3f44a85e85f7ffc96ce502ad898c06db719a41e5ff1cb3e81fbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/action_tutorials_cpp/0.20.3-1"; + sha256 = "sha256-VC3e0ITKugwVYVLhQraNeunM4qPKkwWqNqgGYTEksdI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/action-tutorials-interfaces/default.nix b/distros/humble/action-tutorials-interfaces/default.nix index 07da34a24d..89d714fbd1 100644 --- a/distros/humble/action-tutorials-interfaces/default.nix +++ b/distros/humble/action-tutorials-interfaces/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-msgs, ament-cmake, ament-lint-auto, ament-lint-common, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-humble-action-tutorials-interfaces"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/action_tutorials_interfaces/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "63d4a00e7e06ef94ce93b99aef0495f9c549f8b4c83fe77d605fbe4b98f9b00c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/action_tutorials_interfaces/0.20.3-1"; + sha256 = "sha256-pMUQA3dcUvzxRPnPgHvmBBJFFkm73x1u1MJ980FhXy0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/action-tutorials-py/default.nix b/distros/humble/action-tutorials-py/default.nix index b716a79fe7..e0e91c25f2 100644 --- a/distros/humble/action-tutorials-py/default.nix +++ b/distros/humble/action-tutorials-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-tutorials-interfaces, ament-lint-auto, ament-lint-common, rclpy }: buildRosPackage { pname = "ros-humble-action-tutorials-py"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/action_tutorials_py/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "0d987305ad40e9c5eae9d70d82cb363f5a42a6f2b777debf46d04a2ff15c861d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/action_tutorials_py/0.20.3-1"; + sha256 = "sha256-m7w85i8y+cv3SfZ4NR5fricSx7EabHCHgHbsKkSqw5A="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/actionlib-msgs/default.nix b/distros/humble/actionlib-msgs/default.nix index 787b9bde01..0664e01285 100644 --- a/distros/humble/actionlib-msgs/default.nix +++ b/distros/humble/actionlib-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-actionlib-msgs"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/actionlib_msgs/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "6e53459a8c07b7fb754094ae9c440bb12d4677966ae2c877a5784e5dfa5495f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/actionlib_msgs/4.2.3-1"; + sha256 = "sha256-1jetL+PCqaiG/Wr34odo3waBRuKIrtC3XnYGQzZcFeI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/adaptive-component/default.nix b/distros/humble/adaptive-component/default.nix index ceba56df0c..c80400b62c 100644 --- a/distros/humble/adaptive-component/default.nix +++ b/distros/humble/adaptive-component/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-adaptive-component"; version = "0.2.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/adaptive_component-release/archive/release/humble/adaptive_component/0.2.1-2.tar.gz"; - name = "0.2.1-2.tar.gz"; - sha256 = "1f5342ab47d2ce73439426d4848febae2b6e8cbedceee193c9973399e67119c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "adaptive_component-release"; + rev = "release/humble/adaptive_component/0.2.1-2"; + sha256 = "sha256-W7/vGlSCfAW+RH7nsv4Po+MFZLDvwzuq/iSATbF9jaQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/admittance-controller/default.nix b/distros/humble/admittance-controller/default.nix index eea0c13b3c..cb336da2af 100644 --- a/distros/humble/admittance-controller/default.nix +++ b/distros/humble/admittance-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, control-msgs, control-toolbox, controller-interface, controller-manager, filters, generate-parameter-library, geometry-msgs, hardware-interface, joint-trajectory-controller, kinematics-interface, kinematics-interface-kdl, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, tf2, tf2-eigen, tf2-geometry-msgs, tf2-kdl, tf2-ros, trajectory-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, control-msgs, control-toolbox, controller-interface, controller-manager, filters, generate-parameter-library, geometry-msgs, hardware-interface, joint-trajectory-controller, kinematics-interface, kinematics-interface-kdl, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, tf2, tf2-eigen, tf2-geometry-msgs, tf2-kdl, tf2-ros, trajectory-msgs }: buildRosPackage { pname = "ros-humble-admittance-controller"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/admittance_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "ee541720cc76bf8a70c5ab343b182145c937d4899b6b76a943e81d64b179595a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/admittance_controller/2.16.0-1"; + sha256 = "sha256-JU2t4XIpmY17d0NEK5KSobZRejmMDDpx5YB2y67/KVs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock control-msgs controller-manager hardware-interface kinematics-interface-kdl ros2-control-test-assets ]; - propagatedBuildInputs = [ control-msgs control-toolbox controller-interface filters generate-parameter-library geometry-msgs hardware-interface joint-trajectory-controller kinematics-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools tf2 tf2-eigen tf2-geometry-msgs tf2-kdl tf2-ros trajectory-msgs ]; + propagatedBuildInputs = [ backward-ros control-msgs control-toolbox controller-interface filters generate-parameter-library geometry-msgs hardware-interface joint-trajectory-controller kinematics-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools tf2 tf2-eigen tf2-geometry-msgs tf2-kdl tf2-ros trajectory-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/affordance-primitives/default.nix b/distros/humble/affordance-primitives/default.nix index a08ef2e181..823831b5a5 100644 --- a/distros/humble/affordance-primitives/default.nix +++ b/distros/humble/affordance-primitives/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-affordance-primitives"; version = "0.1.0-r3"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/affordance_primitives-release/archive/release/humble/affordance_primitives/0.1.0-3.tar.gz"; - name = "0.1.0-3.tar.gz"; - sha256 = "eb25ae49b78c3cb702387927258cb4d68a4b1548b403209645a1e7495f5986fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "affordance_primitives-release"; + rev = "release/humble/affordance_primitives/0.1.0-3"; + sha256 = "sha256-GqEFF/3Ttnk78/fLYfjHlvn3mctvgNnkhS/qTJK/KTM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ament-acceleration/default.nix b/distros/humble/ament-acceleration/default.nix index ebc49a5299..b536eab966 100644 --- a/distros/humble/ament-acceleration/default.nix +++ b/distros/humble/ament-acceleration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-acceleration"; version = "0.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_acceleration-release/archive/release/humble/ament_acceleration/0.2.0-2.tar.gz"; - name = "0.2.0-2.tar.gz"; - sha256 = "3606c118c74ee5346e78a7889428d86e49a4644bbac8a586576c5966559cfa38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_acceleration-release"; + rev = "release/humble/ament_acceleration/0.2.0-2"; + sha256 = "sha256-tnkilfsTlrhC8xcFlu9E8VIt8hGsNKCcdD53KV8JRac="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-black/default.nix b/distros/humble/ament-black/default.nix index bbb2c2bb93..b179ec0b96 100644 --- a/distros/humble/ament-black/default.nix +++ b/distros/humble/ament-black/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-black"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/Timple/ament_black-release/archive/release/humble/ament_black/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "4d23c0ab86374546dc80ad9960e62ec571560068d3b0f6549e39470749c2f9f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Timple"; + repo = "ament_black-release"; + rev = "release/humble/ament_black/0.1.0-1"; + sha256 = "sha256-NIMCiRWgwau4ngagdScX3/OvxtmMNZ8bJKLEoHpvkMg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ament-clang-format/default.nix b/distros/humble/ament-clang-format/default.nix index e9ae058068..5a480a0588 100644 --- a/distros/humble/ament-clang-format/default.nix +++ b/distros/humble/ament-clang-format/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, clang, python3Packages, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-clang-format"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_clang_format/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "1adc72358c75a63632ee444018fc6562bf75de39fe757e0a080b2694df6760e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_clang_format/0.12.5-1"; + sha256 = "sha256-Du1xR470eaZlwdwsxHsnIS7EyIwRK87j9bHniDZ3gAg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ament-clang-tidy/default.nix b/distros/humble/ament-clang-tidy/default.nix index 3a50198dac..beb036a446 100644 --- a/distros/humble/ament-clang-tidy/default.nix +++ b/distros/humble/ament-clang-tidy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, clang, python3Packages, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-clang-tidy"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_clang_tidy/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "0aa7a2961b4e080b2cc60f79bf73e5db67991499223057888286c43610715230"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_clang_tidy/0.12.5-1"; + sha256 = "sha256-TDSlD9DOz9I0BmKBrkRfjvzFbvk0v71Cb5wy+mgONL4="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ament-cmake-auto/default.nix b/distros/humble/ament-cmake-auto/default.nix index 819ce2a097..4a69606fcc 100644 --- a/distros/humble/ament-cmake-auto/default.nix +++ b/distros/humble/ament-cmake-auto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-auto"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_auto/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "2a799ed5f1575ea2f121e3538595dad68a159ef0f5c452bc73cc69cb46f1392e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_auto/1.3.3-1"; + sha256 = "sha256-igkzfWUSQ1e5dGvLjp/04zVTirGkdVqlf38qLtFTEgE="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake ament-cmake-gtest ]; diff --git a/distros/humble/ament-cmake-black/default.nix b/distros/humble/ament-cmake-black/default.nix index 8870309767..3ce7de52ab 100644 --- a/distros/humble/ament-cmake-black/default.nix +++ b/distros/humble/ament-cmake-black/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-black"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/Timple/ament_black-release/archive/release/humble/ament_cmake_black/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "07045615bb575cfbd485e721dd76ce5ef2bb12e2e8dd56464325e061568de73b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Timple"; + repo = "ament_black-release"; + rev = "release/humble/ament_cmake_black/0.1.0-1"; + sha256 = "sha256-f4tdwPGgaZc8y9LbvCtbzmPELhuoePYuST3foQHfhDs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-catch2/default.nix b/distros/humble/ament-cmake-catch2/default.nix index ebb9217b6f..94015ab79c 100644 --- a/distros/humble/ament-cmake-catch2/default.nix +++ b/distros/humble/ament-cmake-catch2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-catch2"; version = "1.2.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_catch2-release/archive/release/humble/ament_cmake_catch2/1.2.0-3.tar.gz"; - name = "1.2.0-3.tar.gz"; - sha256 = "551db656fe2dce57ebd4998bc71a692e7ab5f8c8436d38fe9a44f156488d1d92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_catch2-release"; + rev = "release/humble/ament_cmake_catch2/1.2.0-3"; + sha256 = "sha256-tO+yhq78V4z0Tiq3cso46p8Nv2iIiy1GtgvMFrerMPI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-clang-format/default.nix b/distros/humble/ament-cmake-clang-format/default.nix index eefb457f9b..cf80a64aa5 100644 --- a/distros/humble/ament-cmake-clang-format/default.nix +++ b/distros/humble/ament-cmake-clang-format/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-clang-format, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test }: buildRosPackage { pname = "ros-humble-ament-cmake-clang-format"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_clang_format/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "b3293c64df9276ed06ffeb3334a438e63643a3215762fcb7d52ad6715f54cf64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_clang_format/0.12.5-1"; + sha256 = "sha256-R4BJUDD+CpLfyGP8bPqbyC8wv/gG5Ob5DPpBAbJ3YXQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-clang-tidy/default.nix b/distros/humble/ament-cmake-clang-tidy/default.nix index 574a78652a..3632ec1a33 100644 --- a/distros/humble/ament-cmake-clang-tidy/default.nix +++ b/distros/humble/ament-cmake-clang-tidy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-clang-tidy, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test }: buildRosPackage { pname = "ros-humble-ament-cmake-clang-tidy"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_clang_tidy/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "eb1b080fe1093b39e41fe8da73f417eb5528f325f22bfc8e46a73b11614a0011"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_clang_tidy/0.12.5-1"; + sha256 = "sha256-WN58L8b26GfRw3DZ2xA+HanJy9PCzPZhKxAirTkkMWU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-copyright/default.nix b/distros/humble/ament-cmake-copyright/default.nix index 6a5c3ea487..1d9a959d81 100644 --- a/distros/humble/ament-cmake-copyright/default.nix +++ b/distros/humble/ament-cmake-copyright/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-copyright }: buildRosPackage { pname = "ros-humble-ament-cmake-copyright"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_copyright/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "12c5d8fc38ea2b54f7d3640e7be3a8b984c297fd744741b46b208c358b33b011"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_copyright/0.12.5-1"; + sha256 = "sha256-7/q9uY0mFhVcvwWgZ/PRAEQSPl1AwY4b88e6pmC+6j4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-core/default.nix b/distros/humble/ament-cmake-core/default.nix index 650fcc1e2c..1190e8d23b 100644 --- a/distros/humble/ament-cmake-core/default.nix +++ b/distros/humble/ament-cmake-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-core"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_core/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "9b5467c69940af913207eeea4473d4cd91e0e14195b0fe6b5d730702b0f7bcf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_core/1.3.3-1"; + sha256 = "sha256-gwtT+S6FpdYa6rRcWCgpyRpMQFHuY7BHn3miNZlMSmo="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-package cmake python3Packages.catkin-pkg ]; diff --git a/distros/humble/ament-cmake-cppcheck/default.nix b/distros/humble/ament-cmake-cppcheck/default.nix index f3432dfefd..1f93dcda4c 100644 --- a/distros/humble/ament-cmake-cppcheck/default.nix +++ b/distros/humble/ament-cmake-cppcheck/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-cppcheck }: buildRosPackage { pname = "ros-humble-ament-cmake-cppcheck"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_cppcheck/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "db5210f90bd76a9d4aab17535c2ccbf653b8508af6f5202e0ba72ada2581c911"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_cppcheck/0.12.5-1"; + sha256 = "sha256-gLcXaMQm52CF5RnIYDbYuHcOHX30+gmCAEF27Q/fGC4="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-copyright ament-cmake-lint-cmake ]; diff --git a/distros/humble/ament-cmake-cpplint/default.nix b/distros/humble/ament-cmake-cpplint/default.nix index 9acc1cb09b..52c143977d 100644 --- a/distros/humble/ament-cmake-cpplint/default.nix +++ b/distros/humble/ament-cmake-cpplint/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-cpplint }: buildRosPackage { pname = "ros-humble-ament-cmake-cpplint"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_cpplint/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "b16ab77ed736d321a8cb11cc1916511c972c627898e8ceea84e061f1a1f50689"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_cpplint/0.12.5-1"; + sha256 = "sha256-aJ50ruWQL6IGGjMLC1FLiY9TVo5ABxnqMtOpMACARAs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-export-definitions/default.nix b/distros/humble/ament-cmake-export-definitions/default.nix index 767b6584c3..688d8cb647 100644 --- a/distros/humble/ament-cmake-export-definitions/default.nix +++ b/distros/humble/ament-cmake-export-definitions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-export-definitions"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_export_definitions/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "a3dfc269b207e94169cacea4137de7b47f672129173615bd505222eaeb5d9690"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_export_definitions/1.3.3-1"; + sha256 = "sha256-DoA2yaxCNVUL6NWaFDFURuS10vkpMoIwW0aq/b2EG/A="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-export-dependencies/default.nix b/distros/humble/ament-cmake-export-dependencies/default.nix index 0789760aa4..3d5cf5f2d0 100644 --- a/distros/humble/ament-cmake-export-dependencies/default.nix +++ b/distros/humble/ament-cmake-export-dependencies/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-export-dependencies"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_export_dependencies/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "1f26324067688fb38c2f6204c7cb827beb273b54c6680fe52ed31d772fc147a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_export_dependencies/1.3.3-1"; + sha256 = "sha256-+7nRIEUbC6zU5gxFC0IfC4aWXN2Sa22qLQ+QMIaESkQ="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-libraries ]; diff --git a/distros/humble/ament-cmake-export-include-directories/default.nix b/distros/humble/ament-cmake-export-include-directories/default.nix index e47acd8022..3f1210b491 100644 --- a/distros/humble/ament-cmake-export-include-directories/default.nix +++ b/distros/humble/ament-cmake-export-include-directories/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-export-include-directories"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_export_include_directories/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "6b284e11aaf24cef27a77a49e1b7d1b441f7882fda44a019dfecf5e9b0315fcc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_export_include_directories/1.3.3-1"; + sha256 = "sha256-DWVm0fIDWi2gqGnLjvcuQMqUAdEFylfBUt17ewaPYlY="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-export-interfaces/default.nix b/distros/humble/ament-cmake-export-interfaces/default.nix index e2e0b3cce0..d1162c2186 100644 --- a/distros/humble/ament-cmake-export-interfaces/default.nix +++ b/distros/humble/ament-cmake-export-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-export-interfaces"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_export_interfaces/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "a60240f40c4db22e3f7578b6dd650ca815724b789d9c9dc19642d0b36792eb99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_export_interfaces/1.3.3-1"; + sha256 = "sha256-uHG3DKGkjdpMLgrK4B7M2aJNQUPg8F8gQgDEMUpdSfw="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-libraries ]; diff --git a/distros/humble/ament-cmake-export-libraries/default.nix b/distros/humble/ament-cmake-export-libraries/default.nix index f0436fd1d8..babf4541f8 100644 --- a/distros/humble/ament-cmake-export-libraries/default.nix +++ b/distros/humble/ament-cmake-export-libraries/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-export-libraries"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_export_libraries/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "f8605e6c31637922fc171d5400371b5d130af8d91221bdf329f097a25efc1aa6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_export_libraries/1.3.3-1"; + sha256 = "sha256-V9kE3wODat+ABJ/nA8tZrCHsUXlimNQwbIyfT2UUpiw="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-export-link-flags/default.nix b/distros/humble/ament-cmake-export-link-flags/default.nix index eb43fef11d..aa204f153a 100644 --- a/distros/humble/ament-cmake-export-link-flags/default.nix +++ b/distros/humble/ament-cmake-export-link-flags/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-export-link-flags"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_export_link_flags/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "cf9f98ebed77cc74f789f3326334525fbc3c5386caf08610c4ef231fea17fc4d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_export_link_flags/1.3.3-1"; + sha256 = "sha256-uuhZvTNJguzfNJglcVnYTQrQ7zb//CihUngHdXp08ao="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-export-targets/default.nix b/distros/humble/ament-cmake-export-targets/default.nix index 87e4cc609a..e5b094cf0b 100644 --- a/distros/humble/ament-cmake-export-targets/default.nix +++ b/distros/humble/ament-cmake-export-targets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-export-targets"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_export_targets/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "f2bd9bf276cae7a4b337fa86bc859a54da973daf12f4088a5aff6273b9b4cdd4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_export_targets/1.3.3-1"; + sha256 = "sha256-4zH9+bHbS13p1mrqGXfUDqGYTrNHtTml8aSHNqc6zB8="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-libraries ]; diff --git a/distros/humble/ament-cmake-flake8/default.nix b/distros/humble/ament-cmake-flake8/default.nix index ddcaaafd44..9f06c63600 100644 --- a/distros/humble/ament-cmake-flake8/default.nix +++ b/distros/humble/ament-cmake-flake8/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-flake8 }: buildRosPackage { pname = "ros-humble-ament-cmake-flake8"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_flake8/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "e81b08b2b214a56f74bd0b16606eca0ca3ccdb372958969f3473d5419449e9a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_flake8/0.12.5-1"; + sha256 = "sha256-N/sKPQh5l8M1QqXQQyGesUVViFkUkoqdtenl0hBGDa8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-gen-version-h/default.nix b/distros/humble/ament-cmake-gen-version-h/default.nix index 12813a096d..5ef3c2bbf1 100644 --- a/distros/humble/ament-cmake-gen-version-h/default.nix +++ b/distros/humble/ament-cmake-gen-version-h/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-gen-version-h"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_gen_version_h/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "33dc631c68e58cae517a082e86f5f1004ae1d0dae4c0cde991965fe8d7f5854b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_gen_version_h/1.3.3-1"; + sha256 = "sha256-9Mt+4kpBVxG1NQGTQcZ81OqVHrjHxpJqdY0Zs6uN4u4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-package ]; diff --git a/distros/humble/ament-cmake-gmock/default.nix b/distros/humble/ament-cmake-gmock/default.nix index 26ceea9034..680b90e907 100644 --- a/distros/humble/ament-cmake-gmock/default.nix +++ b/distros/humble/ament-cmake-gmock/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-gmock"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_gmock/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "a37634468574e8263a843e16111e12a5901fdb54a2b890ad7e8dbb04a16cfecc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_gmock/1.3.3-1"; + sha256 = "sha256-uhVu2t7ZmWIYSieb2Yg8GnB1J4GxZeM+O4IcyVS1UBQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-google-benchmark/default.nix b/distros/humble/ament-cmake-google-benchmark/default.nix index 9e0a18a3f6..7d1cd7afda 100644 --- a/distros/humble/ament-cmake-google-benchmark/default.nix +++ b/distros/humble/ament-cmake-google-benchmark/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-google-benchmark"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_google_benchmark/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "762939aac2a79e9059b71adca07e16fe4bef0ef84db2485798b65b27064b48ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_google_benchmark/1.3.3-1"; + sha256 = "sha256-bHLVLGonmPBSK78L0Q78FBpeCNUQEd5yiKP+7f7FueE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ament-cmake-export-dependencies ament-cmake-python ]; diff --git a/distros/humble/ament-cmake-gtest/default.nix b/distros/humble/ament-cmake-gtest/default.nix index 1bf57a8f70..78039933ec 100644 --- a/distros/humble/ament-cmake-gtest/default.nix +++ b/distros/humble/ament-cmake-gtest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-gtest"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_gtest/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "692b6c436aca4ce2c4657e0f23786fc9d54e8b88f6f9bf030273a1d4dab9547e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_gtest/1.3.3-1"; + sha256 = "sha256-5MCdwvIRJ163spl3G6O81aaRy0cogrm25uj1baHfS6M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-include-directories/default.nix b/distros/humble/ament-cmake-include-directories/default.nix index 5134323967..0a2444396c 100644 --- a/distros/humble/ament-cmake-include-directories/default.nix +++ b/distros/humble/ament-cmake-include-directories/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-include-directories"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_include_directories/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "bdbdfb68156ad05d0c4e1efcbb740daebe6901de167484d92c6d2cff64a06ca7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_include_directories/1.3.3-1"; + sha256 = "sha256-kit0Oft+xNt4emoss689+zeQsU0Or+ghjtHzKqtDuak="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-libraries/default.nix b/distros/humble/ament-cmake-libraries/default.nix index bf9ac997ed..19a7dc4172 100644 --- a/distros/humble/ament-cmake-libraries/default.nix +++ b/distros/humble/ament-cmake-libraries/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-libraries"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_libraries/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "8ed69af0500f3ead82d816b5d20f5e1bbc75a0132fd35d1e798d58b4ef0e18be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_libraries/1.3.3-1"; + sha256 = "sha256-KRYSAFQ5QAY/GEty9Hhkb4aZ/h7lokvOdN6H0b1ZIeI="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-lint-cmake/default.nix b/distros/humble/ament-cmake-lint-cmake/default.nix index 70526ec646..25052fc0cd 100644 --- a/distros/humble/ament-cmake-lint-cmake/default.nix +++ b/distros/humble/ament-cmake-lint-cmake/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-core, ament-cmake-test, ament-lint-cmake }: buildRosPackage { pname = "ros-humble-ament-cmake-lint-cmake"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_lint_cmake/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "7d34d4511c1fffa775cbd9fb724f4121c23d548920f6efd242cb03b0f9d145f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_lint_cmake/0.12.5-1"; + sha256 = "sha256-JUPqUCkUtOQkLJKzYIUUBA3EQZd418nNsZjol9unBXU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-mypy/default.nix b/distros/humble/ament-cmake-mypy/default.nix index 6e32bf920b..14f80accc9 100644 --- a/distros/humble/ament-cmake-mypy/default.nix +++ b/distros/humble/ament-cmake-mypy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-mypy }: buildRosPackage { pname = "ros-humble-ament-cmake-mypy"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_mypy/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "3fcf00a7211f028170735d16575ee77b8613f2884a0c8f785504d9dca92dc7ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_mypy/0.12.5-1"; + sha256 = "sha256-5i7Ki6iVoIYuFewhafZNt3RNMRLQL1rCTkRfzYmIL8E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-nose/default.nix b/distros/humble/ament-cmake-nose/default.nix index c105f3ee44..eeabb0c404 100644 --- a/distros/humble/ament-cmake-nose/default.nix +++ b/distros/humble/ament-cmake-nose/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-nose"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_nose/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "8d7d89228db7a4da8e2106f6b3fd5e313361dd888d911f53b1a739be8b98c0df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_nose/1.3.3-1"; + sha256 = "sha256-xqCcXV53RPssa8CJ62ET+tMXDAO7NWGx+m4y102QhnY="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test python3Packages.nose ]; diff --git a/distros/humble/ament-cmake-pclint/default.nix b/distros/humble/ament-cmake-pclint/default.nix index f7bccfea9d..936922c155 100644 --- a/distros/humble/ament-cmake-pclint/default.nix +++ b/distros/humble/ament-cmake-pclint/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-pclint }: buildRosPackage { pname = "ros-humble-ament-cmake-pclint"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_pclint/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "0a2742a919fae7b37031961db7063134a17658775f83509b996b7072efa87003"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_pclint/0.12.5-1"; + sha256 = "sha256-YSeTHV3flMhJAc9PnFRbs7f7FO7pMFL1D2cM20IM/HE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-pep257/default.nix b/distros/humble/ament-cmake-pep257/default.nix index 98f489eaf4..a7c35cef6a 100644 --- a/distros/humble/ament-cmake-pep257/default.nix +++ b/distros/humble/ament-cmake-pep257/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-pep257 }: buildRosPackage { pname = "ros-humble-ament-cmake-pep257"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_pep257/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "cad627b9584fce8199ec91d93d74947d5c43180062b41ce23766feb1290b84d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_pep257/0.12.5-1"; + sha256 = "sha256-RXiU2Z17kDQTijtnxIEVzwNYXoS17Bz4YboB6wAHifA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-pycodestyle/default.nix b/distros/humble/ament-cmake-pycodestyle/default.nix index 4fef3adb5e..e56467a295 100644 --- a/distros/humble/ament-cmake-pycodestyle/default.nix +++ b/distros/humble/ament-cmake-pycodestyle/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-pycodestyle }: buildRosPackage { pname = "ros-humble-ament-cmake-pycodestyle"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_pycodestyle/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "8fce4bad40efa66110a28decc9d5c67cdfa8ff106c4e2ec7cae68cadc971c40f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_pycodestyle/0.12.5-1"; + sha256 = "sha256-nwgaOzJnl8NhDm6sDsQ1mc402h1LfS+hpGoEJpJaq/M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-pyflakes/default.nix b/distros/humble/ament-cmake-pyflakes/default.nix index 5d2186af71..53a1a972f0 100644 --- a/distros/humble/ament-cmake-pyflakes/default.nix +++ b/distros/humble/ament-cmake-pyflakes/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-pyflakes }: buildRosPackage { pname = "ros-humble-ament-cmake-pyflakes"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_pyflakes/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "ba6bd60624118e2e064f92dc51e080b638f885f5b93f99996783b95455edc3d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_pyflakes/0.12.5-1"; + sha256 = "sha256-jfyftbP6Pe782nNmbprv9qRqIXy0eahermmQDuAter4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-pytest/default.nix b/distros/humble/ament-cmake-pytest/default.nix index cb786f2d4d..1fbfbce62e 100644 --- a/distros/humble/ament-cmake-pytest/default.nix +++ b/distros/humble/ament-cmake-pytest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-pytest"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_pytest/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "9c251c17c5e6a740c42bb58cdb18253e0e2164286c0db09c5e73f1bb945c2f03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_pytest/1.3.3-1"; + sha256 = "sha256-0b+b8z4J0Y0dBxYgOOYPrblPPrzK8dnBNh664f/rX5Q="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test pythonPackages.pytest ]; diff --git a/distros/humble/ament-cmake-python/default.nix b/distros/humble/ament-cmake-python/default.nix index b4ec8a647f..ff50669163 100644 --- a/distros/humble/ament-cmake-python/default.nix +++ b/distros/humble/ament-cmake-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-python"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_python/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "bd336c96655968c454b20d27c1c8274f4b69db71c993c1c344ebaaec45754fef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_python/1.3.3-1"; + sha256 = "sha256-3zjkbdyCBEsNRqFuP1sRPsgUBs+rbdMMl3QgAPWKSxI="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-ros/default.nix b/distros/humble/ament-cmake-ros/default.nix index 56286bb108..52e3828427 100644 --- a/distros/humble/ament-cmake-ros/default.nix +++ b/distros/humble/ament-cmake-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-ros"; version = "0.10.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_ros-release/archive/release/humble/ament_cmake_ros/0.10.0-3.tar.gz"; - name = "0.10.0-3.tar.gz"; - sha256 = "450f306cb53f820c9048af0f61d5638efb706d1a981ec8710c5c7636f1a363fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_ros-release"; + rev = "release/humble/ament_cmake_ros/0.10.0-3"; + sha256 = "sha256-fCRDap4nVGju+HLPT86v9gsHtGkQq/S3TyttMg+ykbI="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/ament-cmake-target-dependencies/default.nix b/distros/humble/ament-cmake-target-dependencies/default.nix index 00c84d19a3..1ff712a1a0 100644 --- a/distros/humble/ament-cmake-target-dependencies/default.nix +++ b/distros/humble/ament-cmake-target-dependencies/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-target-dependencies"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_target_dependencies/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "d82a5e7491ccaa05ba68a160c94d5fad33de4244da7c7eebae966785e3ddbf28"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_target_dependencies/1.3.3-1"; + sha256 = "sha256-HdFr3OaOiZShFisqUNYYqlnmDy/MHJzBG4UfOQgZ6s8="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-include-directories ament-cmake-libraries ]; diff --git a/distros/humble/ament-cmake-test/default.nix b/distros/humble/ament-cmake-test/default.nix index 478d634541..df42ae8ef3 100644 --- a/distros/humble/ament-cmake-test/default.nix +++ b/distros/humble/ament-cmake-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-test"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_test/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "c71c80230e5a1ae0bd39423820ce91fd07a96393c9706216cbcd626f13b31fd1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_test/1.3.3-1"; + sha256 = "sha256-NfHVqmYRIL1xFOqmeBAJ+uOAVXb7ApgyVb6hfu6ugVk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/humble/ament-cmake-uncrustify/default.nix b/distros/humble/ament-cmake-uncrustify/default.nix index 6c90c1e6b0..5884155b95 100644 --- a/distros/humble/ament-cmake-uncrustify/default.nix +++ b/distros/humble/ament-cmake-uncrustify/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-uncrustify }: buildRosPackage { pname = "ros-humble-ament-cmake-uncrustify"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_uncrustify/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "20036c569fce83cfeda726b6d23c3fe78844a2ef63870bb0ba7563418997a5ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_uncrustify/0.12.5-1"; + sha256 = "sha256-CL+NW0GC6KfnXYQ7Kl2a1K4DoH8i/4jPt0eKjDhq7vs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-version/default.nix b/distros/humble/ament-cmake-version/default.nix index abf7657874..8a76bd3651 100644 --- a/distros/humble/ament-cmake-version/default.nix +++ b/distros/humble/ament-cmake-version/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake-version"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake_version/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "eeb9bcec5bc479821c333903c7d32324201d6f30f8042db59fcfb1f95d20628d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake_version/1.3.3-1"; + sha256 = "sha256-u2pk+dUmYOB7uMOrx0/aPdWk+YyL+icx/aRPdEbG+3E="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake-xmllint/default.nix b/distros/humble/ament-cmake-xmllint/default.nix index 2ede20fc35..11e3f4e4b9 100644 --- a/distros/humble/ament-cmake-xmllint/default.nix +++ b/distros/humble/ament-cmake-xmllint/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-lint-cmake, ament-cmake-test, ament-xmllint }: buildRosPackage { pname = "ros-humble-ament-cmake-xmllint"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cmake_xmllint/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "ee20539e98c8f8eff391ce14eebce48aa9c540be221fd3cf8937c4cff57d59fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cmake_xmllint/0.12.5-1"; + sha256 = "sha256-oVfF7E17995qGaTOs4NJEnV7Iw5wHVS8TZNekjSFDU8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ament-cmake/default.nix b/distros/humble/ament-cmake/default.nix index 40f9033b40..51108536cc 100644 --- a/distros/humble/ament-cmake/default.nix +++ b/distros/humble/ament-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-cmake"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/humble/ament_cmake/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "ffea9f8eedfbbea9127b7074c015ae0fb1216ed41f62dd0ec53175c7dc8d4db2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/humble/ament_cmake/1.3.3-1"; + sha256 = "sha256-ay/0pxYJ7oCbXngKB+qrFop23QwQlU4bF5mlP089hbQ="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-definitions ament-cmake-export-dependencies ament-cmake-export-include-directories ament-cmake-export-interfaces ament-cmake-export-libraries ament-cmake-export-link-flags ament-cmake-export-targets ament-cmake-gen-version-h ament-cmake-libraries ament-cmake-python ament-cmake-target-dependencies ament-cmake-test ament-cmake-version cmake ]; diff --git a/distros/humble/ament-copyright/default.nix b/distros/humble/ament-copyright/default.nix index 940f2e3f4f..3841a7ba6c 100644 --- a/distros/humble/ament-copyright/default.nix +++ b/distros/humble/ament-copyright/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-flake8, ament-lint, ament-pep257, python3Packages, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-copyright"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_copyright/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "5f601024aab64705724f1b4b05029f601b51bc98c524253ec364bc8125f3d947"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_copyright/0.12.5-1"; + sha256 = "sha256-dA5PvlB4wlZJ4KfXumBTQ9zpV0c3pAoBIGqH/lA+5TI="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ament-cppcheck/default.nix b/distros/humble/ament-cppcheck/default.nix index f8eaf316cf..0bb27e0ee9 100644 --- a/distros/humble/ament-cppcheck/default.nix +++ b/distros/humble/ament-cppcheck/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, cppcheck }: buildRosPackage { pname = "ros-humble-ament-cppcheck"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cppcheck/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "e823c45592e9224b5ad693f36b160328b0394b85ab9408237a1c884c63eccf05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cppcheck/0.12.5-1"; + sha256 = "sha256-kl5+OqxIAxvUYlqE33xy0zyhxVYVdwcYJxZ1+bkOe40="; + }; buildType = "ament_python"; propagatedBuildInputs = [ cppcheck ]; diff --git a/distros/humble/ament-cpplint/default.nix b/distros/humble/ament-cpplint/default.nix index fdead63aa1..2e025bad5d 100644 --- a/distros/humble/ament-cpplint/default.nix +++ b/distros/humble/ament-cpplint/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-cpplint"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_cpplint/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "4cd1c31cbfa5e7825615bf590ebf603acbd05d4cfe7cf980653ff792002165b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_cpplint/0.12.5-1"; + sha256 = "sha256-AwpOpgroWyb39N4NG15Igjtl6/ZUNjzn7+wqEE+B99E="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ament-download/default.nix b/distros/humble/ament-download/default.nix index 92a278fdef..b650e4bdb7 100644 --- a/distros/humble/ament-download/default.nix +++ b/distros/humble/ament-download/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-download"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/samsung-ros/ament_download-release/archive/release/humble/ament_download/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "531c9b9a5ec77687257edfc3bf46cbc17458c596eda66f434974c38f9a4945e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "samsung-ros"; + repo = "ament_download-release"; + rev = "release/humble/ament_download/0.0.5-1"; + sha256 = "sha256-6V9DhJraMIbNz3xeSeczpOFyaWgBqKsz2vQV4jFl6qk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ament-flake8/default.nix b/distros/humble/ament-flake8/default.nix index df4b737196..71a5170124 100644 --- a/distros/humble/ament-flake8/default.nix +++ b/distros/humble/ament-flake8/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-lint, python3Packages }: buildRosPackage { pname = "ros-humble-ament-flake8"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_flake8/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "ad87e95387c9ae963988260851ec4cfcb2a0a2efbabb5bb4a06f2c3e9ce98754"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_flake8/0.12.5-1"; + sha256 = "sha256-3zcX5XkFXvbLvb3VUD0wHOkuAt+1go4mn7lh8STtT6g="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-lint python3Packages.flake8 ]; diff --git a/distros/humble/ament-index-cpp/default.nix b/distros/humble/ament-index-cpp/default.nix index ee20051086..6761854251 100644 --- a/distros/humble/ament-index-cpp/default.nix +++ b/distros/humble/ament-index-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-index-cpp"; version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_index-release/archive/release/humble/ament_index_cpp/1.4.0-2.tar.gz"; - name = "1.4.0-2.tar.gz"; - sha256 = "68019c1d5ef3aae614d9d9c5945a3bffbd2ada16a3b23561b91f4fd2fd4e8d5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_index-release"; + rev = "release/humble/ament_index_cpp/1.4.0-2"; + sha256 = "sha256-iYmaYBy5DwvmUykT0T2Nb/aFvEuaoH90l2MJ4Gv+b18="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ament-index-python/default.nix b/distros/humble/ament-index-python/default.nix index d440ed4754..de875d4f8f 100644 --- a/distros/humble/ament-index-python/default.nix +++ b/distros/humble/ament-index-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-index-python"; version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_index-release/archive/release/humble/ament_index_python/1.4.0-2.tar.gz"; - name = "1.4.0-2.tar.gz"; - sha256 = "90ec6fd306f83cf1955ff016f0c1eb02d81f43697280b87f93f748a748bcb825"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_index-release"; + rev = "release/humble/ament_index_python/1.4.0-2"; + sha256 = "sha256-Eluo22bK4KuPUMkCjalwbcwiyKqjEnAixb1Roz2Rb1I="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ament-lint-auto/default.nix b/distros/humble/ament-lint-auto/default.nix index 72e7140742..e7afb152f6 100644 --- a/distros/humble/ament-lint-auto/default.nix +++ b/distros/humble/ament-lint-auto/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-core, ament-cmake-test }: buildRosPackage { pname = "ros-humble-ament-lint-auto"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_lint_auto/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "6c2caa02e546d9dcb9725d28236f0dd8c7a6cc5b02b9f99da49edeb21f831924"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_lint_auto/0.12.5-1"; + sha256 = "sha256-O9rMOfkVDa8FHJM5T8bC7LeB0BTbMQ2RTkxUCbXWRv8="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test ]; diff --git a/distros/humble/ament-lint-cmake/default.nix b/distros/humble/ament-lint-cmake/default.nix index 4de56469e4..9ad9e11732 100644 --- a/distros/humble/ament-lint-cmake/default.nix +++ b/distros/humble/ament-lint-cmake/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-lint-cmake"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_lint_cmake/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "3ffcdf7e021e4e0fb308ce17e7ff0f72cdffa5a2b4ab43182ff362f5e40eaa17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_lint_cmake/0.12.5-1"; + sha256 = "sha256-0FSUR3d0/9tqNwX3FYjwjPCiAkISph0oBldoEgrRbXc="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ament-lint-common/default.nix b/distros/humble/ament-lint-common/default.nix index 76ce9d27a3..c35f9c9131 100644 --- a/distros/humble/ament-lint-common/default.nix +++ b/distros/humble/ament-lint-common/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-copyright, ament-cmake-core, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-export-dependencies, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-uncrustify, ament-cmake-xmllint }: buildRosPackage { pname = "ros-humble-ament-lint-common"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_lint_common/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "a3cfd268ee771cb4f4ed01c77726ca8ebaecdd01fedd673652212bbe96f3f66c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_lint_common/0.12.5-1"; + sha256 = "sha256-rAoc95dVARZ5MQLg+R4kdGOQ1BylXXFpUK6mKovf7xU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-export-dependencies ]; diff --git a/distros/humble/ament-lint/default.nix b/distros/humble/ament-lint/default.nix index 2afaeac60a..37618b9908 100644 --- a/distros/humble/ament-lint/default.nix +++ b/distros/humble/ament-lint/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, }: buildRosPackage { pname = "ros-humble-ament-lint"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_lint/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "d8e491b4bb58e3199fcb6bcbd183c4788213b1dcbb734b805b765aed5d4ae96e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_lint/0.12.5-1"; + sha256 = "sha256-BfDRIfm9upmKGba/NT9OXO1x3DkRnmuPK0HK5EWafKM="; + }; buildType = "ament_python"; diff --git a/distros/humble/ament-mypy/default.nix b/distros/humble/ament-mypy/default.nix index 6a21973b2d..596f0201c4 100644 --- a/distros/humble/ament-mypy/default.nix +++ b/distros/humble/ament-mypy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-flake8, python3Packages, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-mypy"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_mypy/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "1f7362f503b5a4d1585bf06dcaffb691852a4b7f20380d161c89af6efb862a9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_mypy/0.12.5-1"; + sha256 = "sha256-0JNhcX5+sOQNgopemQ39cTWJ29RSCdWa+6xepCkZtWI="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/humble/ament-nodl/default.nix b/distros/humble/ament-nodl/default.nix index 826ec89c30..84c75ec511 100644 --- a/distros/humble/ament-nodl/default.nix +++ b/distros/humble/ament-nodl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-nodl"; version = "0.1.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_nodl-release/archive/release/humble/ament_nodl/0.1.0-4.tar.gz"; - name = "0.1.0-4.tar.gz"; - sha256 = "c5582c2a5856fabbe768ed8b465b35ee95fa905f422630e82454e95d01640873"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_nodl-release"; + rev = "release/humble/ament_nodl/0.1.0-4"; + sha256 = "sha256-9azhFZrnSaHJiIRFdPiDTiDO3j2v3eKxQBNdAEFwd5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ament-package/default.nix b/distros/humble/ament-package/default.nix index bb32d233df..35eeaee74a 100644 --- a/distros/humble/ament-package/default.nix +++ b/distros/humble/ament-package/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-package"; version = "0.14.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_package-release/archive/release/humble/ament_package/0.14.0-4.tar.gz"; - name = "0.14.0-4.tar.gz"; - sha256 = "7f1ea32fff4a703c6eafb5a3dd4956a4824adec8c612326099ac434c9af7d743"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_package-release"; + rev = "release/humble/ament_package/0.14.0-4"; + sha256 = "sha256-Ts6Pl7nF9GmL1gZhVdxh41pg24BQX99ilG1Exmsjwas="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.flake8 pythonPackages.pytest ]; diff --git a/distros/humble/ament-pclint/default.nix b/distros/humble/ament-pclint/default.nix index 483b313605..b1c89e48f9 100644 --- a/distros/humble/ament-pclint/default.nix +++ b/distros/humble/ament-pclint/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-pclint"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_pclint/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "a6a97f1e330c4de23654bd57fa14a36f578572e31d76a7e4564a0d64b901515e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_pclint/0.12.5-1"; + sha256 = "sha256-RT70VAUkM+yE8xwbwA4VOYtYeP0GobGs7Rv63vX5sJY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ament-pep257/default.nix b/distros/humble/ament-pep257/default.nix index 22595ccbd9..8ad31ac93e 100644 --- a/distros/humble/ament-pep257/default.nix +++ b/distros/humble/ament-pep257/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-flake8, ament-lint, python3Packages, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-pep257"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_pep257/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "0b9da27cbc56c5c701483fdea85866edcad8f1a397c2f68d026039378d136dd2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_pep257/0.12.5-1"; + sha256 = "sha256-1Zohzcx+U/5m2T7IkhQvKL3JDMm6tkFC/c81/NLXv2s="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 pythonPackages.pytest ]; diff --git a/distros/humble/ament-pycodestyle/default.nix b/distros/humble/ament-pycodestyle/default.nix index 78bac18b21..5746b53f85 100644 --- a/distros/humble/ament-pycodestyle/default.nix +++ b/distros/humble/ament-pycodestyle/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, python3Packages }: buildRosPackage { pname = "ros-humble-ament-pycodestyle"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_pycodestyle/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "9a05f03913f3525a68c18036205c772adbb0dfc0575b5529d93a27dfb654f16a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_pycodestyle/0.12.5-1"; + sha256 = "sha256-1HsXrvbdu6ziy1vl7wxa+FhQKQpOvx2jQNtRga6+j5s="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.pycodestyle ]; diff --git a/distros/humble/ament-pyflakes/default.nix b/distros/humble/ament-pyflakes/default.nix index cfcadbc7b3..ebf133e049 100644 --- a/distros/humble/ament-pyflakes/default.nix +++ b/distros/humble/ament-pyflakes/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-pycodestyle, python3Packages, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-pyflakes"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_pyflakes/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "99a00f6183ad94d9085885eba634202b15f80aeaa7ab209da2a31ce94da4d382"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_pyflakes/0.12.5-1"; + sha256 = "sha256-FeoLKt5fXRgnljpF2tpmMm/yTuREaT5F8lBXVflTaIY="; + }; buildType = "ament_python"; checkInputs = [ ament-pycodestyle pythonPackages.pytest ]; diff --git a/distros/humble/ament-uncrustify/default.nix b/distros/humble/ament-uncrustify/default.nix index 2ca51de1e0..9f02446845 100644 --- a/distros/humble/ament-uncrustify/default.nix +++ b/distros/humble/ament-uncrustify/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-pycodestyle, pythonPackages, uncrustify-vendor }: buildRosPackage { pname = "ros-humble-ament-uncrustify"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_uncrustify/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "5e1900ba0de9fc763aa1bfe8f92a80e51093b0c85a4db26bde57108009b1eebd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_uncrustify/0.12.5-1"; + sha256 = "sha256-gKY4q7CflGPtrT8N0n7b6Bw98NZ4m2tU1RN98KjoemQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-pycodestyle pythonPackages.pytest ]; diff --git a/distros/humble/ament-vitis/default.nix b/distros/humble/ament-vitis/default.nix index 9e60f51f83..dca9085b06 100644 --- a/distros/humble/ament-vitis/default.nix +++ b/distros/humble/ament-vitis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ament-vitis"; version = "0.10.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_vitis-release/archive/release/humble/ament_vitis/0.10.1-2.tar.gz"; - name = "0.10.1-2.tar.gz"; - sha256 = "7880fe71efecdfbb2a6fb56ab0aa5b26910bbf9a6eebd4f6435b3025a34fca8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_vitis-release"; + rev = "release/humble/ament_vitis/0.10.1-2"; + sha256 = "sha256-Na2vZDmx1yo4NFMDS9mmn1De1NRtjjs953gSAHRCxtc="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-acceleration ament-cmake-core ament-cmake-ros ]; diff --git a/distros/humble/ament-xmllint/default.nix b/distros/humble/ament-xmllint/default.nix index b5c1f91212..61da2c9380 100644 --- a/distros/humble/ament-xmllint/default.nix +++ b/distros/humble/ament-xmllint/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-lint, ament-pep257, libxml2, pythonPackages }: buildRosPackage { pname = "ros-humble-ament-xmllint"; - version = "0.12.4-r1"; + version = "0.12.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/humble/ament_xmllint/0.12.4-1.tar.gz"; - name = "0.12.4-1.tar.gz"; - sha256 = "22a9da3bb7f06fa3a9140fa788524da69766a5bed6ff7b09add4b5b0c6c92a92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/humble/ament_xmllint/0.12.5-1"; + sha256 = "sha256-h7VmadFP8PvpEbLUFKGvQ9Y1ChsT/ypXWi+jrpR0kWU="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/angles/default.nix b/distros/humble/angles/default.nix index 40e1f6e53a..15713de0d5 100644 --- a/distros/humble/angles/default.nix +++ b/distros/humble/angles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-angles"; version = "1.15.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/angles-release/archive/release/humble/angles/1.15.0-1.tar.gz"; - name = "1.15.0-1.tar.gz"; - sha256 = "fb21b4e5062cfbf56918f2ee479ed07d925f2108075f656261078df0eef3c606"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "angles-release"; + rev = "release/humble/angles/1.15.0-1"; + sha256 = "sha256-44NUh6CmR32yzKpcgDPoNtoEV+XCEPCfTx7OL+xUJQ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python python3Packages.setuptools ]; diff --git a/distros/humble/apex-containers/default.nix b/distros/humble/apex-containers/default.nix index 229c82838a..719a48e145 100644 --- a/distros/humble/apex-containers/default.nix +++ b/distros/humble/apex-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-apex-containers"; version = "0.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/apex_containers-release/archive/release/humble/apex_containers/0.0.4-3.tar.gz"; - name = "0.0.4-3.tar.gz"; - sha256 = "0dde2cc8bd79885d0dbe12d4938ae6c660aae2b9deaec525fe06861ba0574729"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apex_containers-release"; + rev = "release/humble/apex_containers/0.0.4-3"; + sha256 = "sha256-01lF2ZodmNGfazVwwxuHKPBMihyBFcKcwU2K6tpJxmk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/humble/apex-test-tools/default.nix b/distros/humble/apex-test-tools/default.nix index 114a9a8fdd..ed8440fb07 100644 --- a/distros/humble/apex-test-tools/default.nix +++ b/distros/humble/apex-test-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-apex-test-tools"; version = "0.0.2-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/apex_test_tools-release/archive/release/humble/apex_test_tools/0.0.2-6.tar.gz"; - name = "0.0.2-6.tar.gz"; - sha256 = "78a7cde3a6e6205b4f0fbb4256c17a0b72b9693042aac6bd7d8ecb17c0b73a2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apex_test_tools-release"; + rev = "release/humble/apex_test_tools/0.0.2-6"; + sha256 = "sha256-vrX5LngYVt0Fxd0td4idUCVPg+j96W7S07zUG/lM8W4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/humble/apriltag-msgs/default.nix b/distros/humble/apriltag-msgs/default.nix new file mode 100644 index 0000000000..83b385e56e --- /dev/null +++ b/distros/humble/apriltag-msgs/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rosidl-default-generators, rosidl-default-runtime, std-msgs }: +buildRosPackage { + pname = "ros-humble-apriltag-msgs"; + version = "2.0.1-r2"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apriltag_msgs-release"; + rev = "release/humble/apriltag_msgs/2.0.1-2"; + sha256 = "sha256-8gmaJqHmANuH5XDGCZ8C29KjCY7QKQ8r2DSpl1jxp20="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake rosidl-default-generators ]; + checkInputs = [ ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ rosidl-default-runtime std-msgs ]; + nativeBuildInputs = [ ament-cmake rosidl-default-generators ]; + + meta = { + description = ''AprilTag message definitions''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/humble/apriltag-ros/default.nix b/distros/humble/apriltag-ros/default.nix new file mode 100644 index 0000000000..d597ad3db6 --- /dev/null +++ b/distros/humble/apriltag-ros/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-clang-format, ament-cmake-cppcheck, ament-lint-auto, apriltag, apriltag-msgs, cv-bridge, eigen, image-transport, rclcpp, rclcpp-components, sensor-msgs, tf2-ros }: +buildRosPackage { + pname = "ros-humble-apriltag-ros"; + version = "3.1.1-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apriltag_ros-release"; + rev = "release/humble/apriltag_ros/3.1.1-1"; + sha256 = "sha256-RqtO6HznMf2OumkP4Zz7aaD0HFwKa18ZRL5iHRH3TmE="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake eigen ]; + checkInputs = [ ament-cmake-clang-format ament-cmake-cppcheck ament-lint-auto ]; + propagatedBuildInputs = [ apriltag apriltag-msgs cv-bridge image-transport rclcpp rclcpp-components sensor-msgs tf2-ros ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''AprilTag detection node''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/humble/apriltag/default.nix b/distros/humble/apriltag/default.nix index a0a585f92c..28c9f35f15 100644 --- a/distros/humble/apriltag/default.nix +++ b/distros/humble/apriltag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-apriltag"; version = "3.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/apriltag-release/archive/release/humble/apriltag/3.2.0-2.tar.gz"; - name = "3.2.0-2.tar.gz"; - sha256 = "fc489bc60d251437c4e25fb49c00dae9883dfbcce466b13ba179a7ba29c09e95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apriltag-release"; + rev = "release/humble/apriltag/3.2.0-2"; + sha256 = "sha256-6kUYVWACrNDZBeDwDanrR3mgspXi5sPGKoy4chT7IrM="; + }; buildType = "cmake"; buildInputs = [ cmake python3Packages.numpy ]; diff --git a/distros/humble/aruco-opencv-msgs/default.nix b/distros/humble/aruco-opencv-msgs/default.nix index 1be1af1ce2..e23d889700 100644 --- a/distros/humble/aruco-opencv-msgs/default.nix +++ b/distros/humble/aruco-opencv-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-aruco-opencv-msgs"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/aruco_opencv-release/archive/release/humble/aruco_opencv_msgs/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "4af7440e8153fbfec3e72ac947c4b36a881050ff73290515eecef76815cd0905"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "aruco_opencv-release"; + rev = "release/humble/aruco_opencv_msgs/2.0.1-1"; + sha256 = "sha256-4slnSvY2edSo4u3wcW5fBMbb6syUoZD9u4L5RT48Ibw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/aruco-opencv/default.nix b/distros/humble/aruco-opencv/default.nix index 526de2ca2c..cd83166df5 100644 --- a/distros/humble/aruco-opencv/default.nix +++ b/distros/humble/aruco-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-aruco-opencv"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/aruco_opencv-release/archive/release/humble/aruco_opencv/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "3852511a4ea6852d279a54a2e4c164ead0e28a3a034f6b7ab7bda09a4e970683"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "aruco_opencv-release"; + rev = "release/humble/aruco_opencv/2.0.1-1"; + sha256 = "sha256-ca3mUsZkgnC8/oExpp5tpDqfM+nUZUkREVXHsWooY5I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/asio-cmake-module/default.nix b/distros/humble/asio-cmake-module/default.nix index 356f87729a..0f05b428af 100644 --- a/distros/humble/asio-cmake-module/default.nix +++ b/distros/humble/asio-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-asio-cmake-module"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/humble/asio_cmake_module/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "c99f1f8e2a27ce9407ae6455f11142cc197994f4b613642d93598c15d67073ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "transport_drivers-release"; + rev = "release/humble/asio_cmake_module/1.2.0-2"; + sha256 = "sha256-S4As/gOIQQTIqYgblUDPs2pjBDmLPz4Ii2/CTMHhRUs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/async-web-server-cpp/default.nix b/distros/humble/async-web-server-cpp/default.nix index f0800085ae..7a8d622fe6 100644 --- a/distros/humble/async-web-server-cpp/default.nix +++ b/distros/humble/async-web-server-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-async-web-server-cpp"; version = "2.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/async_web_server_cpp-release/archive/release/humble/async_web_server_cpp/2.0.0-3.tar.gz"; - name = "2.0.0-3.tar.gz"; - sha256 = "c9f5968c670996bfd9d697b4630791573042044433f5fd9aaef7d8cf280cd60d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "async_web_server_cpp-release"; + rev = "release/humble/async_web_server_cpp/2.0.0-3"; + sha256 = "sha256-bz0je03yD60CjR08T++F1rGD5GhfXZJWAbL6L5rINbo="; + }; buildType = "catkin"; buildInputs = [ ament-cmake-ros openssl ]; diff --git a/distros/humble/automotive-autonomy-msgs/default.nix b/distros/humble/automotive-autonomy-msgs/default.nix index 211be7e479..a8d00c23a3 100644 --- a/distros/humble/automotive-autonomy-msgs/default.nix +++ b/distros/humble/automotive-autonomy-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-automotive-autonomy-msgs"; version = "3.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/automotive_autonomy_msgs-release/archive/release/humble/automotive_autonomy_msgs/3.0.4-3.tar.gz"; - name = "3.0.4-3.tar.gz"; - sha256 = "a8e239376c418f9ebd6372855bac4c168e3ebe93b3159f532071f83e8c0273b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/humble/automotive_autonomy_msgs/3.0.4-3"; + sha256 = "sha256-R/GduU+VD3B9INpzOpa84Bl42xFAtGthn8PEt8iYmpw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/humble/automotive-navigation-msgs/default.nix b/distros/humble/automotive-navigation-msgs/default.nix index fc83fed6eb..64415ce9c1 100644 --- a/distros/humble/automotive-navigation-msgs/default.nix +++ b/distros/humble/automotive-navigation-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-automotive-navigation-msgs"; version = "3.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/automotive_autonomy_msgs-release/archive/release/humble/automotive_navigation_msgs/3.0.4-3.tar.gz"; - name = "3.0.4-3.tar.gz"; - sha256 = "a8b6436ce537a2ede9ba501f8b70bef3be78dbd140244d7ec07dd62a670ea6e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/humble/automotive_navigation_msgs/3.0.4-3"; + sha256 = "sha256-N+QDJUyFWyIto9hqSOYNMPTrVLJR+tIO2J4ExUZ27+0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/humble/automotive-platform-msgs/default.nix b/distros/humble/automotive-platform-msgs/default.nix index 743a434810..ec4648d116 100644 --- a/distros/humble/automotive-platform-msgs/default.nix +++ b/distros/humble/automotive-platform-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-automotive-platform-msgs"; version = "3.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/automotive_autonomy_msgs-release/archive/release/humble/automotive_platform_msgs/3.0.4-3.tar.gz"; - name = "3.0.4-3.tar.gz"; - sha256 = "7c358ae25669a4b51f2f46425be59ee60adfdb5794913ff870a06a257d5a99b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/humble/automotive_platform_msgs/3.0.4-3"; + sha256 = "sha256-HMhXhLS41h9P1STIbuEdhOgxNORj/YJrfDldGKeMKfA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/humble/autoware-auto-msgs/default.nix b/distros/humble/autoware-auto-msgs/default.nix index 90faaf9ef3..ed3292f901 100644 --- a/distros/humble/autoware-auto-msgs/default.nix +++ b/distros/humble/autoware-auto-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-autoware-auto-msgs"; version = "1.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/autoware_auto_msgs-release/archive/release/humble/autoware_auto_msgs/1.0.0-4.tar.gz"; - name = "1.0.0-4.tar.gz"; - sha256 = "39c4a36a653ce67615b44d8a8dcdd1a71de1b1f73582112288bb615a6ad26719"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "autoware_auto_msgs-release"; + rev = "release/humble/autoware_auto_msgs/1.0.0-4"; + sha256 = "sha256-sPwNe2uGjV3WHz+htqZrzm5dUO1JvGJC9xQcn2d+LU0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto rosidl-default-generators ]; diff --git a/distros/humble/avt-vimba-camera/default.nix b/distros/humble/avt-vimba-camera/default.nix index 7e04cdb2df..dfcfeb094e 100644 --- a/distros/humble/avt-vimba-camera/default.nix +++ b/distros/humble/avt-vimba-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-avt-vimba-camera"; version = "2001.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/avt_vimba_camera-release/archive/release/humble/avt_vimba_camera/2001.1.0-3.tar.gz"; - name = "2001.1.0-3.tar.gz"; - sha256 = "a38635ed3d00bdf9bb880034a95d048660804d0462e1d72eae3fecdc661d7056"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "avt_vimba_camera-release"; + rev = "release/humble/avt_vimba_camera/2001.1.0-3"; + sha256 = "sha256-b1YFGg6j0b9K0ewtxAKbcnT1um/8yTIj7XIIbEChDbY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/aws-robomaker-small-warehouse-world/default.nix b/distros/humble/aws-robomaker-small-warehouse-world/default.nix index 13a471f4e7..0bde1d17a1 100644 --- a/distros/humble/aws-robomaker-small-warehouse-world/default.nix +++ b/distros/humble/aws-robomaker-small-warehouse-world/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-aws-robomaker-small-warehouse-world"; version = "1.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/aws_robomaker_small_warehouse_world-release/archive/release/humble/aws_robomaker_small_warehouse_world/1.0.5-1.tar.gz"; - name = "1.0.5-1.tar.gz"; - sha256 = "65dfe041bacd9e53224fef4ea1c98b594c9d6e78e2c88e018b5fca1982292de1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "aws_robomaker_small_warehouse_world-release"; + rev = "release/humble/aws_robomaker_small_warehouse_world/1.0.5-1"; + sha256 = "sha256-bMYgLcTRb5UvNDZS4HmtCbd1SRpRfQypQmT4SJPbONY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/backward-ros/default.nix b/distros/humble/backward-ros/default.nix index 1619e76efc..ad786852ac 100644 --- a/distros/humble/backward-ros/default.nix +++ b/distros/humble/backward-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-backward-ros"; version = "1.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/backward_ros-release/archive/release/humble/backward_ros/1.0.2-3.tar.gz"; - name = "1.0.2-3.tar.gz"; - sha256 = "59886b25866e95f9f140e10c38db103046b0229d0abd60684bc67eb334376d70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "backward_ros-release"; + rev = "release/humble/backward_ros/1.0.2-3"; + sha256 = "sha256-MH1nloz3Qfp5iNsqHTkmAkreWP6K+jyT3Zqn2SJySuU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/bag2-to-image/default.nix b/distros/humble/bag2-to-image/default.nix index f539a54b24..6c837273d2 100644 --- a/distros/humble/bag2-to-image/default.nix +++ b/distros/humble/bag2-to-image/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-bag2-to-image"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bag2_to_image-release/archive/release/humble/bag2_to_image/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "49394a857b402145a03cf4e1e9fc0a2e6edccc9857d0485acf337a0c057fbcca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bag2_to_image-release"; + rev = "release/humble/bag2_to_image/0.1.0-1"; + sha256 = "sha256-D602KBwsYPh+wbNrK2y25DZk1/wPPc2PlZj4ktvPhqI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/behaviortree-cpp-v3/default.nix b/distros/humble/behaviortree-cpp-v3/default.nix index c91c58f36d..bdc87af82d 100644 --- a/distros/humble/behaviortree-cpp-v3/default.nix +++ b/distros/humble/behaviortree-cpp-v3/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-cpp, boost, cppzmq, ncurses, rclcpp, ros-environment }: buildRosPackage { pname = "ros-humble-behaviortree-cpp-v3"; - version = "3.8.0-r1"; + version = "3.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/behaviortree_cpp-release/archive/release/humble/behaviortree_cpp_v3/3.8.0-1.tar.gz"; - name = "3.8.0-1.tar.gz"; - sha256 = "f7bd10548468db4db6421e0637f09cf8a6e480fbc482323efecde32a99999a79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BehaviorTree"; + repo = "behaviortree_cpp_v3-release"; + rev = "release/humble/behaviortree_cpp_v3/3.8.2-1"; + sha256 = "sha256-KuS/C9quRgq4cnqiu7BeZt1GD2vayxHHdnFZtvQBnck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/humble/bno055/default.nix b/distros/humble/bno055/default.nix index f06430c390..829a10ca31 100644 --- a/distros/humble/bno055/default.nix +++ b/distros/humble/bno055/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, python3Packages, pythonPackages, rclpy, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, example-interfaces, python3Packages, pythonPackages, rclpy, std-msgs }: buildRosPackage { pname = "ros-humble-bno055"; - version = "0.2.0-r4"; + version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bno055-release/archive/release/humble/bno055/0.2.0-4.tar.gz"; - name = "0.2.0-4.tar.gz"; - sha256 = "49ac9b669bbbde29f2b80d3a75eaedc36adbe62ac31d954c984e682044f6edb3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bno055-release"; + rev = "release/humble/bno055/0.4.1-1"; + sha256 = "sha256-4B7R/H6YgcMTqW90WunSaQCp7y/KJZpHFGHdpAQH+nY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; - propagatedBuildInputs = [ python3Packages.pyserial rclpy std-msgs ]; + propagatedBuildInputs = [ example-interfaces python3Packages.pyserial rclpy std-msgs ]; meta = { description = ''Bosch BNO055 IMU driver for ROS2''; diff --git a/distros/humble/bond-core/default.nix b/distros/humble/bond-core/default.nix index 63de07c723..2b65eaecc2 100644 --- a/distros/humble/bond-core/default.nix +++ b/distros/humble/bond-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-bond-core"; version = "3.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/humble/bond_core/3.0.2-3.tar.gz"; - name = "3.0.2-3.tar.gz"; - sha256 = "2bb1b178c64e46c3edced0368bb54ec256f1947ffa5748265a0ad0379515b329"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/humble/bond_core/3.0.2-3"; + sha256 = "sha256-wdZEF99LMWE3KRQTzUrtE1JZUt727BQnCwis8jD2NyU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/bond/default.nix b/distros/humble/bond/default.nix index 8fb84da03f..a8c7c051c7 100644 --- a/distros/humble/bond/default.nix +++ b/distros/humble/bond/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-bond"; version = "3.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/humble/bond/3.0.2-3.tar.gz"; - name = "3.0.2-3.tar.gz"; - sha256 = "09410c19e20f66060b3b69deeafeca1c2aefe92a3c65cace2f97856325983caf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/humble/bond/3.0.2-3"; + sha256 = "sha256-N4+IcUgo5TYYAbwzeklsCCFv1OsVKthF396gnTGCrYM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/bondcpp/default.nix b/distros/humble/bondcpp/default.nix index 41b44eb9b1..39937d123a 100644 --- a/distros/humble/bondcpp/default.nix +++ b/distros/humble/bondcpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-bondcpp"; version = "3.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/humble/bondcpp/3.0.2-3.tar.gz"; - name = "3.0.2-3.tar.gz"; - sha256 = "65e77756a2b4492c7d793b06769e5706b29928589f9f99befa5b21d4fa8508b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/humble/bondcpp/3.0.2-3"; + sha256 = "sha256-vN+BWSSgC26THpQn51V6YboLbFTBtuXX7XCU8Kjg9bw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/humble/boost-geometry-util/default.nix b/distros/humble/boost-geometry-util/default.nix index 0c41811943..f7baf236d3 100644 --- a/distros/humble/boost-geometry-util/default.nix +++ b/distros/humble/boost-geometry-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-boost-geometry-util"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/boost_geometry_util-release/archive/release/humble/boost_geometry_util/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "3054977c41c7664c8e4c412abaaf49933b4ce3bf732691fa81e83e60378888a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "boost_geometry_util-release"; + rev = "release/humble/boost_geometry_util/0.0.1-1"; + sha256 = "sha256-5P2YMX4buwUYt7NAF7FiWJguryH/I8GC2y+vIK5KI0w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/humble/bosch-locator-bridge/default.nix b/distros/humble/bosch-locator-bridge/default.nix index aff860fd26..48379a1b6c 100644 --- a/distros/humble/bosch-locator-bridge/default.nix +++ b/distros/humble/bosch-locator-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-bosch-locator-bridge"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/locator_ros_bridge-release/archive/release/humble/bosch_locator_bridge/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "6943a059e8f98294f6edfd2e70e4a31d72b5884bbfe035cbd392934d24b7ae0a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "locator_ros_bridge-release"; + rev = "release/humble/bosch_locator_bridge/2.1.5-1"; + sha256 = "sha256-i7xoWnp2deZwflIM/dWViDKSAe0lck2TbH+3nH9EFTU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/builtin-interfaces/default.nix b/distros/humble/builtin-interfaces/default.nix index 3714d289ee..f595349211 100644 --- a/distros/humble/builtin-interfaces/default.nix +++ b/distros/humble/builtin-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-builtin-interfaces"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/humble/builtin_interfaces/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "6a8740f732b02d53d95e25d7bf48881f4492021b4e69f0ef0558510ef2cb5399"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/humble/builtin_interfaces/1.2.1-1"; + sha256 = "sha256-whOcCMxa6gQJM0o3BZYY9GpEzg7g2svk2+whrmFk8bg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/camera-calibration-parsers/default.nix b/distros/humble/camera-calibration-parsers/default.nix index d5918a71fa..0abe691d8a 100644 --- a/distros/humble/camera-calibration-parsers/default.nix +++ b/distros/humble/camera-calibration-parsers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-camera-calibration-parsers"; version = "3.1.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/humble/camera_calibration_parsers/3.1.5-1.tar.gz"; - name = "3.1.5-1.tar.gz"; - sha256 = "9ee2dd3488180480026f73faba7bd6b481cb7abb690461cfe817c7f47ed879d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/humble/camera_calibration_parsers/3.1.5-1"; + sha256 = "sha256-yvIICXbI6lMSXdocZyEbl74VnqSU/Bu3k9PZZLhPtZQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/camera-calibration/default.nix b/distros/humble/camera-calibration/default.nix index 747a7f750a..f2a9006f3c 100644 --- a/distros/humble/camera-calibration/default.nix +++ b/distros/humble/camera-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-camera-calibration"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/humble/camera_calibration/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "f689effc0b89b8e55c429100b954d3a39122889a30d21b1e74b787e6c8aac96f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/humble/camera_calibration/3.0.0-1"; + sha256 = "sha256-cSMO2gLNmIwhQKjeUA+fsz45P3tdT21ybQcjcW8+TP8="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 python3Packages.requests pythonPackages.pytest ]; diff --git a/distros/humble/camera-info-manager/default.nix b/distros/humble/camera-info-manager/default.nix index c096b6f518..99cdfd33ca 100644 --- a/distros/humble/camera-info-manager/default.nix +++ b/distros/humble/camera-info-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-camera-info-manager"; version = "3.1.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/humble/camera_info_manager/3.1.5-1.tar.gz"; - name = "3.1.5-1.tar.gz"; - sha256 = "9b05e22d64c48e0d4362f2a8e8680dc42d7a348aa9a6f980b937e7e2a3fb571c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/humble/camera_info_manager/3.1.5-1"; + sha256 = "sha256-hDBcARSriRp7p2BNXLypt8dhPu8c5OvsE7hNX1u8WxI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/can-msgs/default.nix b/distros/humble/can-msgs/default.nix index d3a29d692a..eb24353531 100644 --- a/distros/humble/can-msgs/default.nix +++ b/distros/humble/can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-can-msgs"; version = "2.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_canopen-release/archive/release/humble/can_msgs/2.0.0-4.tar.gz"; - name = "2.0.0-4.tar.gz"; - sha256 = "9adbfa5ad2598b31797cc6c9a12054af037c7099dfa75735476cfccf41dec849"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_canopen-release"; + rev = "release/humble/can_msgs/2.0.0-4"; + sha256 = "sha256-9K7mCEEppzWP9ITzFZlJje6JHNIFoBxJ/FXPs+NoX4M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/cartographer-ros-msgs/default.nix b/distros/humble/cartographer-ros-msgs/default.nix index 2829ccd680..2f540e3cdf 100644 --- a/distros/humble/cartographer-ros-msgs/default.nix +++ b/distros/humble/cartographer-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-cartographer-ros-msgs"; version = "2.0.9000-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer_ros-release/archive/release/humble/cartographer_ros_msgs/2.0.9000-2.tar.gz"; - name = "2.0.9000-2.tar.gz"; - sha256 = "3e4e58bdad366d3d87a89964e361f1e9615665f5586110ac325d04d964dbd9e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer_ros-release"; + rev = "release/humble/cartographer_ros_msgs/2.0.9000-2"; + sha256 = "sha256-ANRPJtqGaSasA10po2gdln9H83q4kgEUHIEVJALNgEk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/cartographer-ros/default.nix b/distros/humble/cartographer-ros/default.nix index 6eeb7e78c9..aff480dd56 100644 --- a/distros/humble/cartographer-ros/default.nix +++ b/distros/humble/cartographer-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-cartographer-ros"; version = "2.0.9000-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer_ros-release/archive/release/humble/cartographer_ros/2.0.9000-2.tar.gz"; - name = "2.0.9000-2.tar.gz"; - sha256 = "b6e2e164edc8518b4e0b5d0085004537e44c7ebcd1c5c13065b057431c3797ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer_ros-release"; + rev = "release/humble/cartographer_ros/2.0.9000-2"; + sha256 = "sha256-4vheJuIJolPphYAtKyzlDmyyyP9klyIRg9+/ew1l9sY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake gtest python3Packages.sphinx ]; diff --git a/distros/humble/cartographer-rviz/default.nix b/distros/humble/cartographer-rviz/default.nix index 6e2fc05f2b..ec68d7f2d2 100644 --- a/distros/humble/cartographer-rviz/default.nix +++ b/distros/humble/cartographer-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-cartographer-rviz"; version = "2.0.9000-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer_ros-release/archive/release/humble/cartographer_rviz/2.0.9000-2.tar.gz"; - name = "2.0.9000-2.tar.gz"; - sha256 = "44cdae3209cad289d23c68c52065cfc6f3ac6a4b3642025f50a1e68a0b7cbae1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer_ros-release"; + rev = "release/humble/cartographer_rviz/2.0.9000-2"; + sha256 = "sha256-3RT9v1v/g5rj/7vGiqQI52l/LprLAdj/jH2mYk/ifQc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/cartographer/default.nix b/distros/humble/cartographer/default.nix index 1bc386ed8a..8ed4683364 100644 --- a/distros/humble/cartographer/default.nix +++ b/distros/humble/cartographer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-cartographer"; version = "2.0.9002-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer-release/archive/release/humble/cartographer/2.0.9002-2.tar.gz"; - name = "2.0.9002-2.tar.gz"; - sha256 = "ee74f0e0d86be3b0c946edf63212372e6420861713cce3b79955c2d1eb9c0cca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer-release"; + rev = "release/humble/cartographer/2.0.9002-2"; + sha256 = "sha256-Iaav1ll6a56ZLHPXKEZHko1tjkuQrd0fRGzk3jYp/zs="; + }; buildType = "cmake"; buildInputs = [ cmake git gtest python3Packages.sphinx ]; diff --git a/distros/humble/cascade-lifecycle-msgs/default.nix b/distros/humble/cascade-lifecycle-msgs/default.nix index 810c734cd2..1229da32a0 100644 --- a/distros/humble/cascade-lifecycle-msgs/default.nix +++ b/distros/humble/cascade-lifecycle-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, lifecycle-msgs, rclcpp, rosidl-default-generators }: buildRosPackage { pname = "ros-humble-cascade-lifecycle-msgs"; - version = "1.0.2-r1"; + version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/fmrico/cascade_lifecycle-release/archive/release/humble/cascade_lifecycle_msgs/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "0cdf0631d890e4532fbe613b0d61018ebf841a3f8fac225f43775e899e98ad0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cascade_lifecycle-release"; + rev = "release/humble/cascade_lifecycle_msgs/1.0.2-2"; + sha256 = "sha256-OVaCu/o690HLfNOxf7ASXJH0aCw2DlyHza50rSYK/s4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/chomp-motion-planner/default.nix b/distros/humble/chomp-motion-planner/default.nix index a4bf1d8bd3..aa90e9ef00 100644 --- a/distros/humble/chomp-motion-planner/default.nix +++ b/distros/humble/chomp-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-chomp-motion-planner"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/chomp_motion_planner/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "a4ae7dba7ef85ac7eaa1be70ac5ecc6855fab5df45da9b85cdd62fe9e02ec015"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/chomp_motion_planner/2.5.4-1"; + sha256 = "sha256-pD51bNR7tSIpe8fXt058Sitg6WJ8KjAS2DsUpE6DE4s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/class-loader/default.nix b/distros/humble/class-loader/default.nix index be6c55afbf..8d8fe68de4 100644 --- a/distros/humble/class-loader/default.nix +++ b/distros/humble/class-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-class-loader"; version = "2.2.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/class_loader-release/archive/release/humble/class_loader/2.2.0-3.tar.gz"; - name = "2.2.0-3.tar.gz"; - sha256 = "f2eeb8c47422eb55774fa0d9d1f81450187d26f1f6e3b7a9d34aa1a45c9882fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "class_loader-release"; + rev = "release/humble/class_loader/2.2.0-3"; + sha256 = "sha256-0kZHPHqah+t7yQ+myAaXmOQRUjF7ctFl9iWRWtbrvyw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/humble/color-names/default.nix b/distros/humble/color-names/default.nix index c9e8c08f3f..ffe9382cc8 100644 --- a/distros/humble/color-names/default.nix +++ b/distros/humble/color-names/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-color-names"; version = "0.0.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/color_names-release/archive/release/humble/color_names/0.0.3-3.tar.gz"; - name = "0.0.3-3.tar.gz"; - sha256 = "b64e0c4fc28edcf8ba6bfd37e7f4ba55ea37a9ed20e00b971860b99ef1153d27"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "color_names-release"; + rev = "release/humble/color_names/0.0.3-3"; + sha256 = "sha256-956LQvQPv4QtQBKeDL62YimdLDh1yLGsi9AYgWiBh/k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/common-interfaces/default.nix b/distros/humble/common-interfaces/default.nix index 5123c3a05d..c51fc5a89a 100644 --- a/distros/humble/common-interfaces/default.nix +++ b/distros/humble/common-interfaces/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib-msgs, ament-cmake, ament-lint-auto, ament-lint-common, builtin-interfaces, diagnostic-msgs, geometry-msgs, nav-msgs, sensor-msgs, shape-msgs, std-msgs, std-srvs, stereo-msgs, trajectory-msgs, visualization-msgs }: buildRosPackage { pname = "ros-humble-common-interfaces"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/common_interfaces/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "c87fc42664ff55ab29602d03cfb8df968a2cb97856eb6753d3089ed48f652c9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/common_interfaces/4.2.3-1"; + sha256 = "sha256-f8SVz5QBZpWXHUZt97bWfegkwG6jBF+txszH0zjqEUM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/composition-interfaces/default.nix b/distros/humble/composition-interfaces/default.nix index 7dc551aaac..e867225e73 100644 --- a/distros/humble/composition-interfaces/default.nix +++ b/distros/humble/composition-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-composition-interfaces"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/humble/composition_interfaces/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "53962a2cb15076eb4f4131e02ad0a69d66d13f8f425d956385aad51760c0ad11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/humble/composition_interfaces/1.2.1-1"; + sha256 = "sha256-8OX9nEURTaMKAvWSBcVsg+nrOIVqJlIha4FT+YODnJg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/composition/default.nix b/distros/humble/composition/default.nix index b1ec0e0e3e..3fb316af5a 100644 --- a/distros/humble/composition/default.nix +++ b/distros/humble/composition/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-pytest, ament-lint-auto, ament-lint-common, example-interfaces, launch, launch-ros, launch-testing, launch-testing-ament-cmake, launch-testing-ros, rclcpp, rclcpp-components, rcutils, rmw-implementation-cmake, std-msgs }: buildRosPackage { pname = "ros-humble-composition"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/composition/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "33cce6e20b511a347a417a8aefb90562f1b76fc5430d93986f74c22186f9ee6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/composition/0.20.3-1"; + sha256 = "sha256-IqsFnGH4+w6o9qMInyEuF9pueB40weDl1FtdldksVeY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/compressed-depth-image-transport/default.nix b/distros/humble/compressed-depth-image-transport/default.nix index 96661c0975..57eb9aab50 100644 --- a/distros/humble/compressed-depth-image-transport/default.nix +++ b/distros/humble/compressed-depth-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-compressed-depth-image-transport"; version = "2.5.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/humble/compressed_depth_image_transport/2.5.0-2.tar.gz"; - name = "2.5.0-2.tar.gz"; - sha256 = "c9548afa4ef2958a35440e5b20f579c82afe1b84a35a0d945fabe5d603933cde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/humble/compressed_depth_image_transport/2.5.0-2"; + sha256 = "sha256-GnLVPYtFdN+uGsUROqEyeGzVWDXKCdLje1f7BjloyS0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/compressed-image-transport/default.nix b/distros/humble/compressed-image-transport/default.nix index cd5a435628..22f881948f 100644 --- a/distros/humble/compressed-image-transport/default.nix +++ b/distros/humble/compressed-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-compressed-image-transport"; version = "2.5.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/humble/compressed_image_transport/2.5.0-2.tar.gz"; - name = "2.5.0-2.tar.gz"; - sha256 = "a857e46669a9e2ad3fe4212d20ddf50d01e310cc318b99143714c6aa288fc4a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/humble/compressed_image_transport/2.5.0-2"; + sha256 = "sha256-2j2/3iqdjXqqBW3ImAxqPt/62aJvEdUbSXvhp0T5nw8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/console-bridge-vendor/default.nix b/distros/humble/console-bridge-vendor/default.nix index 1fc0e1c4a0..1b1f479861 100644 --- a/distros/humble/console-bridge-vendor/default.nix +++ b/distros/humble/console-bridge-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, console-bridge, performance-test-fixture }: buildRosPackage { pname = "ros-humble-console-bridge-vendor"; - version = "1.4.0-r2"; + version = "1.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/console_bridge_vendor-release/archive/release/humble/console_bridge_vendor/1.4.0-2.tar.gz"; - name = "1.4.0-2.tar.gz"; - sha256 = "1fffbc5c06fb893a4eabd0e2b59fb049e5b97c6d1c33f8415b97b28271151863"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "console_bridge_vendor-release"; + rev = "release/humble/console_bridge_vendor/1.4.1-1"; + sha256 = "sha256-lgsqEU/ZyaZfte3s7Mz+RKYl2uUUl4DmbGxEih952r8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/control-msgs/default.nix b/distros/humble/control-msgs/default.nix index 3d77d8bfdd..2d616514bf 100644 --- a/distros/humble/control-msgs/default.nix +++ b/distros/humble/control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-control-msgs"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/control_msgs-release/archive/release/humble/control_msgs/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "1784913c05813c0c73b9acba7c84bce8ca58d6e8c4ef2e656b60c57e143a769b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "control_msgs-release"; + rev = "release/humble/control_msgs/4.1.0-1"; + sha256 = "sha256-xpy8ltgcLjZfm9884tBtDHYYZjuyi7LOWdO7m3V1NCA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/control-toolbox/default.nix b/distros/humble/control-toolbox/default.nix index 601c37fcc9..72ffd78c01 100644 --- a/distros/humble/control-toolbox/default.nix +++ b/distros/humble/control-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-control-toolbox"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/control_toolbox-release/archive/release/humble/control_toolbox/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "91ca62115f3aa74e27e4ca88b7d4883d5dacad517e13800c8b21f6a25cbcc136"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "control_toolbox-release"; + rev = "release/humble/control_toolbox/2.1.2-1"; + sha256 = "sha256-e4FTDWkjuTT971m6bkwPhXRtUGbRETznWjX+DtmLPw8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/controller-interface/default.nix b/distros/humble/controller-interface/default.nix index 2045ed4a19..e98c8d0882 100644 --- a/distros/humble/controller-interface/default.nix +++ b/distros/humble/controller-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, hardware-interface, rclcpp-lifecycle, sensor-msgs }: buildRosPackage { pname = "ros-humble-controller-interface"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/controller_interface/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "6012df43306af0440164c2c3ab63355664fddd3ab5c62712f2f8284be549c1ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/controller_interface/2.21.0-1"; + sha256 = "sha256-5VHwLR8fPgRh+kBOzN3UzH7ZNQhrmRmOdUGBAjNHdW8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/controller-manager-msgs/default.nix b/distros/humble/controller-manager-msgs/default.nix index c9b050943e..d50d47a948 100644 --- a/distros/humble/controller-manager-msgs/default.nix +++ b/distros/humble/controller-manager-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, lifecycle-msgs, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-humble-controller-manager-msgs"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/controller_manager_msgs/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "79d13f2e71dc27601e36751c2049f7ce4c821b32860227dc3b34ba99f4974d24"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/controller_manager_msgs/2.21.0-1"; + sha256 = "sha256-6JN44dDRUBX4ctol+ABpJyjW41NhtaijsxX2SwwRceI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/controller-manager/default.nix b/distros/humble/controller-manager/default.nix index 95dd7fc60c..98f64d585e 100644 --- a/distros/humble/controller-manager/default.nix +++ b/distros/humble/controller-manager/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-python, ament-index-cpp, controller-interface, controller-manager-msgs, hardware-interface, launch, launch-ros, pluginlib, rclcpp, rcpputils, realtime-tools, ros2-control-test-assets, ros2param, ros2run }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-python, ament-index-cpp, backward-ros, controller-interface, controller-manager-msgs, hardware-interface, launch, launch-ros, pluginlib, rclcpp, rcpputils, realtime-tools, ros2-control-test-assets, ros2param, ros2run }: buildRosPackage { pname = "ros-humble-controller-manager"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/controller_manager/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "f26d3b3bc123953c2fcf6b5a1dfb4109189fa5d2587d8942ecc1db2339add52a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/controller_manager/2.21.0-1"; + sha256 = "sha256-FqU0V2kW+/nVfFB74T68pldewJlf1q256mF6GKejP34="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; checkInputs = [ ament-cmake-gmock ]; - propagatedBuildInputs = [ ament-index-cpp controller-interface controller-manager-msgs hardware-interface launch launch-ros pluginlib rclcpp rcpputils realtime-tools ros2-control-test-assets ros2param ros2run ]; + propagatedBuildInputs = [ ament-index-cpp backward-ros controller-interface controller-manager-msgs hardware-interface launch launch-ros pluginlib rclcpp rcpputils realtime-tools ros2-control-test-assets ros2param ros2run ]; nativeBuildInputs = [ ament-cmake ament-cmake-python ]; meta = { diff --git a/distros/humble/costmap-queue/default.nix b/distros/humble/costmap-queue/default.nix index 8a2c5183e3..8250e9ad12 100644 --- a/distros/humble/costmap-queue/default.nix +++ b/distros/humble/costmap-queue/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-costmap-queue"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/costmap_queue/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "b09b45fc14f13908ed2d988ead6aaeb4f468b054b54c3e1d30b4d49376165f01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/costmap_queue/1.1.5-1"; + sha256 = "sha256-BBuVZ0hsAsJMW7C5wdi2R29FUDAua8IJCiFc98HIT/E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/cudnn-cmake-module/default.nix b/distros/humble/cudnn-cmake-module/default.nix index 6c8734bc72..74983f302b 100644 --- a/distros/humble/cudnn-cmake-module/default.nix +++ b/distros/humble/cudnn-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-cudnn-cmake-module"; version = "0.0.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cudnn_cmake_module-release/archive/release/humble/cudnn_cmake_module/0.0.1-3.tar.gz"; - name = "0.0.1-3.tar.gz"; - sha256 = "a43dd7f405512974c4bf824296bf6b5cc70e2fb80c3d969c2ab24962be5d2fde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cudnn_cmake_module-release"; + rev = "release/humble/cudnn_cmake_module/0.0.1-3"; + sha256 = "sha256-J6BqQzZzZMC0MVQ5oJCXgXu5fzoPlV+JErISeIuss6I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/cv-bridge/default.nix b/distros/humble/cv-bridge/default.nix index c1e349da6f..2a233ea4cb 100644 --- a/distros/humble/cv-bridge/default.nix +++ b/distros/humble/cv-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-cv-bridge"; version = "3.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/humble/cv_bridge/3.2.1-1.tar.gz"; - name = "3.2.1-1.tar.gz"; - sha256 = "b4ab3dc38c288684a50c67f9fabec562bc9a3df87ca8ed2b479ebd07b28b69bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/humble/cv_bridge/3.2.1-1"; + sha256 = "sha256-hrhmEchLEAyY7EsU0zS2npW3tH7c0nkIHp6Wds1WbyM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python-cmake-module ]; diff --git a/distros/humble/cyclonedds/default.nix b/distros/humble/cyclonedds/default.nix index 96352d7f22..dfc2596c25 100644 --- a/distros/humble/cyclonedds/default.nix +++ b/distros/humble/cyclonedds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-cyclonedds"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cyclonedds-release/archive/release/humble/cyclonedds/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "35afc032b7b7eb01fe4b62d996ebb2d7697d39599ce1860e6e198a0b9a96dc40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cyclonedds-release"; + rev = "release/humble/cyclonedds/0.9.1-1"; + sha256 = "sha256-VGL8btSnRvNHXhGKhLQhNNBYh3iwzyHem8jbirjxbD8="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/dataspeed-can-msg-filters/default.nix b/distros/humble/dataspeed-can-msg-filters/default.nix index 2dd3e2d532..98703e838f 100644 --- a/distros/humble/dataspeed-can-msg-filters/default.nix +++ b/distros/humble/dataspeed-can-msg-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dataspeed-can-msg-filters"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/humble/dataspeed_can_msg_filters/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "c7e15db8e292a8207dedafa7b7ff990a3e12e77561b41625f8961603b67187ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/humble/dataspeed_can_msg_filters/2.0.1-1"; + sha256 = "sha256-dC1Ryzzvx7M9aQYxxBfXB4xFCa9nQHy8dO/Us9z+94c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dataspeed-can-usb/default.nix b/distros/humble/dataspeed-can-usb/default.nix index ce49b90633..12cdbb807c 100644 --- a/distros/humble/dataspeed-can-usb/default.nix +++ b/distros/humble/dataspeed-can-usb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dataspeed-can-usb"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/humble/dataspeed_can_usb/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "c334aa91fe85651e5dca8946159ac45c98804847799f598ac1a4fbd95dd4975d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/humble/dataspeed_can_usb/2.0.1-1"; + sha256 = "sha256-ydTwDeP2cNM8nLY8vHK6lkU+AoPQElN7C3xc7yaOoqc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dataspeed-can/default.nix b/distros/humble/dataspeed-can/default.nix index f11bb64fcf..de746195bd 100644 --- a/distros/humble/dataspeed-can/default.nix +++ b/distros/humble/dataspeed-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dataspeed-can"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/humble/dataspeed_can/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "491b3e350beac36f69d748e8621fea0bd2593f157e8b180f9b424d6d93c528b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/humble/dataspeed_can/2.0.1-1"; + sha256 = "sha256-POBzwny/VrYoGfDkoXI7QH6BcAWKmKJgbN5omfz6JJI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dataspeed-dbw-common/default.nix b/distros/humble/dataspeed-dbw-common/default.nix index 3c308a01cf..c3b87dcce9 100644 --- a/distros/humble/dataspeed-dbw-common/default.nix +++ b/distros/humble/dataspeed-dbw-common/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, rclcpp, ros2-socketcan }: buildRosPackage { pname = "ros-humble-dataspeed-dbw-common"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dataspeed_dbw_common/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "6f2b51f5ee9e6ed31940325b9f5e9b50e7b52768f1f49579ce547cf79f7faaed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dataspeed_dbw_common/2.1.1-1"; + sha256 = "sha256-Z4/KJ3bNlIn2nsZ9lgY14Mmv7rjApkIBwytt83JDNUM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/dataspeed-dbw-gateway/default.nix b/distros/humble/dataspeed-dbw-gateway/default.nix index abee0baa3f..636f20bb97 100644 --- a/distros/humble/dataspeed-dbw-gateway/default.nix +++ b/distros/humble/dataspeed-dbw-gateway/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, dataspeed-dbw-common, dataspeed-dbw-msgs, dbw-fca-msgs, dbw-ford-msgs, dbw-polaris-msgs, diagnostic-msgs, rclcpp, rclcpp-components, rosidl-default-generators, rosidl-default-runtime, sensor-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, dataspeed-dbw-common, dataspeed-dbw-msgs, dbw-fca-msgs, dbw-ford-msgs, dbw-polaris-msgs, diagnostic-msgs, rclcpp, rclcpp-components, ros-environment, rosidl-default-generators, rosidl-default-runtime, sensor-msgs }: buildRosPackage { pname = "ros-humble-dataspeed-dbw-gateway"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dataspeed_dbw_gateway/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "e3ba55b2f45417cea4a2f26ce7d7b8b616b190249faf4970f0bac17698792d05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dataspeed_dbw_gateway/2.1.1-1"; + sha256 = "sha256-Cud1x56Ln+i8WxrBiH7iiQcCBuLKqqolPlYBwNTIRAI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-default-generators ]; checkInputs = [ ament-cmake-gtest ]; - propagatedBuildInputs = [ dataspeed-dbw-common dataspeed-dbw-msgs dbw-fca-msgs dbw-ford-msgs dbw-polaris-msgs diagnostic-msgs rclcpp rclcpp-components rosidl-default-runtime sensor-msgs ]; + propagatedBuildInputs = [ dataspeed-dbw-common dataspeed-dbw-msgs dbw-fca-msgs dbw-ford-msgs dbw-polaris-msgs diagnostic-msgs rclcpp rclcpp-components ros-environment rosidl-default-runtime sensor-msgs ]; nativeBuildInputs = [ ament-cmake-ros ]; meta = { diff --git a/distros/humble/dataspeed-dbw-msgs/default.nix b/distros/humble/dataspeed-dbw-msgs/default.nix index 30490e81ad..fdd012628e 100644 --- a/distros/humble/dataspeed-dbw-msgs/default.nix +++ b/distros/humble/dataspeed-dbw-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-dataspeed-dbw-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dataspeed_dbw_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "e2bcf7dcbd702723a46158414cc845d97de7b9d5d1f9599bf92bee9e9244d6d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dataspeed_dbw_msgs/2.1.1-1"; + sha256 = "sha256-EmrJrkr8c3fvh48e8lWeMKtp5VpKdSAed+Y6bJtD2Lo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/dataspeed-ulc-can/default.nix b/distros/humble/dataspeed-ulc-can/default.nix index 661e21e490..0d08cd3984 100644 --- a/distros/humble/dataspeed-ulc-can/default.nix +++ b/distros/humble/dataspeed-ulc-can/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, can-msgs, dataspeed-dbw-common, dataspeed-ulc-msgs, geometry-msgs, rclcpp, rclpy, ros-testing, std-msgs }: buildRosPackage { pname = "ros-humble-dataspeed-ulc-can"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dataspeed_ulc_can/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "e71fda64b95b74c8fc9f38875ada6203f1fe1e9d954218bfa69cb9389498bd4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dataspeed_ulc_can/2.1.1-1"; + sha256 = "sha256-YKbXPFHFAlOT2shKvtsTqSUNVW4KkioMLDy78iU6h4c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dataspeed-ulc-msgs/default.nix b/distros/humble/dataspeed-ulc-msgs/default.nix index e1eaa75ad4..784c05ba8e 100644 --- a/distros/humble/dataspeed-ulc-msgs/default.nix +++ b/distros/humble/dataspeed-ulc-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-dataspeed-ulc-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dataspeed_ulc_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "d33067c5cda6849443256db93da86949f96ea9899dfe591c3efe5bd7bf2de838"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dataspeed_ulc_msgs/2.1.1-1"; + sha256 = "sha256-q1q8GPl857keZPH/HmJIV3JgP0GqnbP956AmhXkzsMw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/dataspeed-ulc/default.nix b/distros/humble/dataspeed-ulc/default.nix index 9bfd1f42cc..0871cb241f 100644 --- a/distros/humble/dataspeed-ulc/default.nix +++ b/distros/humble/dataspeed-ulc/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dataspeed-ulc-can, dataspeed-ulc-msgs }: buildRosPackage { pname = "ros-humble-dataspeed-ulc"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dataspeed_ulc/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "f4999de01e59802740826963a4dcbbf40260e83a67ef997ca99b25ae9433ed54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dataspeed_ulc/2.1.1-1"; + sha256 = "sha256-zn/9uw/BROfUvJNNAUMcqLYakU/S18/gRpHVXEHOobM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-fca-can/default.nix b/distros/humble/dbw-fca-can/default.nix index fea2701e89..88af8bf367 100644 --- a/distros/humble/dbw-fca-can/default.nix +++ b/distros/humble/dbw-fca-can/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, can-msgs, dataspeed-can-msg-filters, dataspeed-can-usb, dataspeed-dbw-common, dataspeed-dbw-gateway, dataspeed-ulc-can, dbw-fca-description, dbw-fca-msgs, geometry-msgs, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-fca-can"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_fca_can/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "de662693e811d8f18c6b98b775b733db380e5fd58c50b9c97ead112786b779b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_fca_can/2.1.1-1"; + sha256 = "sha256-sUgSSDGe7pAH2iCiYc3ox1WlKqVo3HRPTnef8bGkAdI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake dataspeed-can-msg-filters ]; diff --git a/distros/humble/dbw-fca-description/default.nix b/distros/humble/dbw-fca-description/default.nix index 2bd31486ef..51d287390e 100644 --- a/distros/humble/dbw-fca-description/default.nix +++ b/distros/humble/dbw-fca-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, robot-state-publisher, rviz2, urdf, xacro }: buildRosPackage { pname = "ros-humble-dbw-fca-description"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_fca_description/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "29b11e585dfb21ba9a05cc832744fe68979e51c39cf03ea608d270ec53071029"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_fca_description/2.1.1-1"; + sha256 = "sha256-pVkTzedTAdG5BxGqPOCSw5NRZDW4R2X9jR3IbYoz9Z4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-fca-joystick-demo/default.nix b/distros/humble/dbw-fca-joystick-demo/default.nix index 83bb79a4c9..baeb1db3aa 100644 --- a/distros/humble/dbw-fca-joystick-demo/default.nix +++ b/distros/humble/dbw-fca-joystick-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dataspeed-dbw-common, dbw-fca-can, dbw-fca-msgs, joy, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-fca-joystick-demo"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_fca_joystick_demo/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "8a626393754b22073e53ae5695b103c24add8dc1ffb16655546fb4c12f5813db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_fca_joystick_demo/2.1.1-1"; + sha256 = "sha256-Tgtir6KCKTmvHf7pVZKPXJE2/j3SLojsYXkSaBNF3Io="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-fca-msgs/default.nix b/distros/humble/dbw-fca-msgs/default.nix index 1f11278141..af72aa7970 100644 --- a/distros/humble/dbw-fca-msgs/default.nix +++ b/distros/humble/dbw-fca-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-fca-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_fca_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "d5057da6ca23403e0ac0a93d783715ae5b15ffbc95c210e96f25ed6ace28ea2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_fca_msgs/2.1.1-1"; + sha256 = "sha256-tUpI9V7cQsggGXxV8+lSD+bY7k/Frt2X6x8dakJGRwE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/dbw-fca/default.nix b/distros/humble/dbw-fca/default.nix index 31ad0f4690..996c1083d1 100644 --- a/distros/humble/dbw-fca/default.nix +++ b/distros/humble/dbw-fca/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dbw-fca-can, dbw-fca-description, dbw-fca-joystick-demo, dbw-fca-msgs }: buildRosPackage { pname = "ros-humble-dbw-fca"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_fca/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "d212cb5d9c20577aabcbe401794f1e5cdf1caee9b75ec3ce500d2f20d8bf18d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_fca/2.1.1-1"; + sha256 = "sha256-3Pb93xVeCR2zGquZRGHh7LBQdUOHlOX35cFAWCS5i98="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-ford-can/default.nix b/distros/humble/dbw-ford-can/default.nix index 4aba2e25a3..6692411fcf 100644 --- a/distros/humble/dbw-ford-can/default.nix +++ b/distros/humble/dbw-ford-can/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, can-msgs, dataspeed-can-msg-filters, dataspeed-can-usb, dataspeed-dbw-common, dataspeed-dbw-gateway, dataspeed-ulc-can, dbw-ford-description, dbw-ford-msgs, geometry-msgs, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-ford-can"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_ford_can/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "e1fb590eab2225e3125bdf586914c991b2294918b536e5d632edc4edb33cb06b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_ford_can/2.1.1-1"; + sha256 = "sha256-C5IbpL7xHhCMtAtLBcbL61uTMwjPyHmBBvXJyt2350c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake dataspeed-can-msg-filters ]; diff --git a/distros/humble/dbw-ford-description/default.nix b/distros/humble/dbw-ford-description/default.nix index 75f982fdfa..54e43f1433 100644 --- a/distros/humble/dbw-ford-description/default.nix +++ b/distros/humble/dbw-ford-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, robot-state-publisher, rviz2, urdf, xacro }: buildRosPackage { pname = "ros-humble-dbw-ford-description"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_ford_description/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "7bbf59bd586b2aad4df61086b8ec6cc6982954d9f6053cdd065003ec682ac08b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_ford_description/2.1.1-1"; + sha256 = "sha256-XmjzkZgn0HEcp0Qi+sQM1qcvEPfbJCpGQj+LiSGQjF8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-ford-joystick-demo/default.nix b/distros/humble/dbw-ford-joystick-demo/default.nix index 9982c1362f..b844163072 100644 --- a/distros/humble/dbw-ford-joystick-demo/default.nix +++ b/distros/humble/dbw-ford-joystick-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dataspeed-dbw-common, dbw-ford-can, dbw-ford-msgs, joy, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-ford-joystick-demo"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_ford_joystick_demo/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "d087cad6398ef9abdc553973c020ea1de901e6bf08e95aaa2562782dfcb91636"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_ford_joystick_demo/2.1.1-1"; + sha256 = "sha256-cubNLJrZZrXY24D4Azl1joF0i/EMnM/0PV6wkzX3CiI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-ford-msgs/default.nix b/distros/humble/dbw-ford-msgs/default.nix index 9497e7520e..928ed5585f 100644 --- a/distros/humble/dbw-ford-msgs/default.nix +++ b/distros/humble/dbw-ford-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-ford-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_ford_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "45596095dcf098c1908930ce0c9acf9d4e285b7d24796963fb4d14bc73dfb713"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_ford_msgs/2.1.1-1"; + sha256 = "sha256-6gCcMRdGIz/Zv/+ifl5IMwmEnvwPd8jJDykv/A0TeaA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/dbw-ford/default.nix b/distros/humble/dbw-ford/default.nix index b82c5feae3..088ad2021b 100644 --- a/distros/humble/dbw-ford/default.nix +++ b/distros/humble/dbw-ford/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dbw-ford-can, dbw-ford-description, dbw-ford-joystick-demo, dbw-ford-msgs }: buildRosPackage { pname = "ros-humble-dbw-ford"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_ford/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "bf6ad1f55a924173c15a56d8a3b559a3a0280c2c28acee148e2bc16fc2b67eb5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_ford/2.1.1-1"; + sha256 = "sha256-h6M5hUkAe/dqiRZNYW7X7BCGI6tuDPjZxwGNprFUoyU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-polaris-can/default.nix b/distros/humble/dbw-polaris-can/default.nix index 4caca277a6..06fc7c6f1d 100644 --- a/distros/humble/dbw-polaris-can/default.nix +++ b/distros/humble/dbw-polaris-can/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, can-msgs, dataspeed-can-msg-filters, dataspeed-can-usb, dataspeed-dbw-common, dataspeed-dbw-gateway, dataspeed-ulc-can, dbw-polaris-description, dbw-polaris-msgs, geometry-msgs, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-polaris-can"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_polaris_can/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "e130577ce932683562ce81b3866768bf9f465dd9388f2d8358a62d2be26085a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_polaris_can/2.1.1-1"; + sha256 = "sha256-EAfOUK7UQGYh4S63KnA3DiF5sHXjDdjB9hEbXNocR+g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake dataspeed-can-msg-filters ]; diff --git a/distros/humble/dbw-polaris-description/default.nix b/distros/humble/dbw-polaris-description/default.nix index c8bf28e56b..fb59b75b00 100644 --- a/distros/humble/dbw-polaris-description/default.nix +++ b/distros/humble/dbw-polaris-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, robot-state-publisher, rviz2, urdf, xacro }: buildRosPackage { pname = "ros-humble-dbw-polaris-description"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_polaris_description/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "ce07bc24d948a5164e445affd87eae8d39fed6ab3a8bec834ce61bd6a4b2d941"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_polaris_description/2.1.1-1"; + sha256 = "sha256-idklZI8YJ6EM6ZTyaU0tJCR7PUVfpV/ngHpM8OMu2sA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-polaris-joystick-demo/default.nix b/distros/humble/dbw-polaris-joystick-demo/default.nix index 4f5c1f4b33..e2d89bf2ca 100644 --- a/distros/humble/dbw-polaris-joystick-demo/default.nix +++ b/distros/humble/dbw-polaris-joystick-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dataspeed-dbw-common, dbw-polaris-can, dbw-polaris-msgs, joy, rclcpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-polaris-joystick-demo"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_polaris_joystick_demo/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "3587f96390161860532e7df792c1428532c92f875c98a62ccad00ff3f2ffcc85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_polaris_joystick_demo/2.1.1-1"; + sha256 = "sha256-MXOVGT7yWAGFYPDBEDkXFzxb9/4PY7DjfqGrBoVhxzE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dbw-polaris-msgs/default.nix b/distros/humble/dbw-polaris-msgs/default.nix index 35bc15c168..0c7d165e92 100644 --- a/distros/humble/dbw-polaris-msgs/default.nix +++ b/distros/humble/dbw-polaris-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-dbw-polaris-msgs"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_polaris_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "9c44956a92dc2822cc80c31bb8f18931ae58c02a1703875877b227af66f79f01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_polaris_msgs/2.1.1-1"; + sha256 = "sha256-EAu0sreGxEQ1EZ0WxiXn4KuLY8gpUtO0NqO5byLFmCs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/dbw-polaris/default.nix b/distros/humble/dbw-polaris/default.nix index 6f9e05d5f9..1cb2d004b7 100644 --- a/distros/humble/dbw-polaris/default.nix +++ b/distros/humble/dbw-polaris/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, dbw-polaris-can, dbw-polaris-description, dbw-polaris-joystick-demo, dbw-polaris-msgs }: buildRosPackage { pname = "ros-humble-dbw-polaris"; - version = "2.1.0-r1"; + version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_ros-release/archive/release/humble/dbw_polaris/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "8764a03ace3b965632223fa58803f628fa3b759c207a797816087bbbe5f030e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_ros-release"; + rev = "release/humble/dbw_polaris/2.1.1-1"; + sha256 = "sha256-EgU+0KhZwDHjDIppxSsMKDPTqKqDdCK9CM2LSfCjitY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/demo-nodes-cpp-native/default.nix b/distros/humble/demo-nodes-cpp-native/default.nix index e940acdefa..2eb095abd1 100644 --- a/distros/humble/demo-nodes-cpp-native/default.nix +++ b/distros/humble/demo-nodes-cpp-native/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-pytest, ament-lint-auto, ament-lint-common, launch, launch-testing, launch-testing-ament-cmake, launch-testing-ros, rclcpp, rclcpp-components, rmw-fastrtps-cpp, std-msgs }: buildRosPackage { pname = "ros-humble-demo-nodes-cpp-native"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/demo_nodes_cpp_native/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "24dc9149d2341e0629c8d0dcfc074811eee4107ce03094a4ba2d2908e76b9839"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/demo_nodes_cpp_native/0.20.3-1"; + sha256 = "sha256-gFEn/0Ki5uNJHoju/D1+b4+YerIDl0NkmQBtx/ckSuM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/demo-nodes-cpp/default.nix b/distros/humble/demo-nodes-cpp/default.nix index 9cad1a44d0..bac8ae334f 100644 --- a/distros/humble/demo-nodes-cpp/default.nix +++ b/distros/humble/demo-nodes-cpp/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-pytest, ament-lint-auto, ament-lint-common, example-interfaces, launch, launch-ros, launch-testing, launch-testing-ament-cmake, launch-testing-ros, launch-xml, rclcpp, rclcpp-components, rcutils, rmw, rmw-implementation-cmake, std-msgs }: buildRosPackage { pname = "ros-humble-demo-nodes-cpp"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/demo_nodes_cpp/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "ec7b504a03e0dabfc100a23562565eb41e28a5119a5d86c942bbad69dda5b58e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/demo_nodes_cpp/0.20.3-1"; + sha256 = "sha256-74ZJI92EAEjROhLhTSUBy1pXBqIO8FAG0Z37x7mXlGA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw-implementation-cmake ]; diff --git a/distros/humble/demo-nodes-py/default.nix b/distros/humble/demo-nodes-py/default.nix index 9aef27eb6d..7960ee4039 100644 --- a/distros/humble/demo-nodes-py/default.nix +++ b/distros/humble/demo-nodes-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, example-interfaces, pythonPackages, rclpy, std-msgs }: buildRosPackage { pname = "ros-humble-demo-nodes-py"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/demo_nodes_py/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "15e2be42652587644ca4a7ce33031e17070dbb0e40abe979cc5be2cc2bb33afb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/demo_nodes_py/0.20.3-1"; + sha256 = "sha256-P8R+mr6fanchZUKOFCfkeHkACr2cvhBaNiAduAGB/sE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/depth-image-proc/default.nix b/distros/humble/depth-image-proc/default.nix index ae43d72fc5..d11cd1d1bc 100644 --- a/distros/humble/depth-image-proc/default.nix +++ b/distros/humble/depth-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-depth-image-proc"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/humble/depth_image_proc/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "132c1e189f7efdfa0d861ea2592268e9319930dccd3f4fbf9a42f90d47e51d59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/humble/depth_image_proc/3.0.0-1"; + sha256 = "sha256-hhdPbnpwfVcIU1NQ+ZXHiyOJbbgEl/bQw/Re0ULNDe0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto class-loader ]; diff --git a/distros/humble/depthai-bridge/default.nix b/distros/humble/depthai-bridge/default.nix index 15090e685c..2656564050 100644 --- a/distros/humble/depthai-bridge/default.nix +++ b/distros/humble/depthai-bridge/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, boost, camera-info-manager, cv-bridge, depthai, depthai-ros-msgs, image-transport, opencv, rclcpp, robot-state-publisher, ros-environment, sensor-msgs, std-msgs, stereo-msgs, vision-msgs, xacro }: buildRosPackage { pname = "ros-humble-depthai-bridge"; - version = "2.5.3-r1"; + version = "2.6.1-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/humble/depthai_bridge/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "370db157b07fae810ea63f80e1afa92dafc86a4f2c640b02dd97b1c6f177fb6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/humble/depthai_bridge/2.6.1-1"; + sha256 = "sha256-6oOpmpcQEfVfPW7ERLuhxcA2e+MD1Dw0kwSFELtmcuM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/depthai-examples/default.nix b/distros/humble/depthai-examples/default.nix index 0e83c6b3db..424d150b30 100644 --- a/distros/humble/depthai-examples/default.nix +++ b/distros/humble/depthai-examples/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, camera-info-manager, cv-bridge, depth-image-proc, depthai, depthai-bridge, depthai-ros-msgs, foxglove-msgs, image-transport, opencv, rclcpp, robot-state-publisher, ros-environment, sensor-msgs, std-msgs, stereo-msgs, vision-msgs, xacro }: +{ lib, buildRosPackage, fetchurl, ament-cmake, camera-info-manager, cv-bridge, depth-image-proc, depthai, depthai-bridge, depthai-ros-msgs, foxglove-msgs, image-transport, opencv, rclcpp, robot-state-publisher, ros-environment, rviz-imu-plugin, sensor-msgs, std-msgs, stereo-msgs, vision-msgs, xacro }: buildRosPackage { pname = "ros-humble-depthai-examples"; - version = "2.5.3-r1"; + version = "2.6.1-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/humble/depthai_examples/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "d915d980dee87c69c97523dc9e7a539bf7f5246cfb89c729e37d8503df9d2d41"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/humble/depthai_examples/2.6.1-1"; + sha256 = "sha256-r0GITqHFbG2hlHObvp8EizZsf9iTFN9IEvW8FBgiVx8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; - propagatedBuildInputs = [ camera-info-manager cv-bridge depth-image-proc depthai depthai-bridge depthai-ros-msgs foxglove-msgs image-transport opencv rclcpp robot-state-publisher ros-environment sensor-msgs std-msgs stereo-msgs vision-msgs xacro ]; + propagatedBuildInputs = [ camera-info-manager cv-bridge depth-image-proc depthai depthai-bridge depthai-ros-msgs foxglove-msgs image-transport opencv rclcpp robot-state-publisher ros-environment rviz-imu-plugin sensor-msgs std-msgs stereo-msgs vision-msgs xacro ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/depthai-ros-driver/default.nix b/distros/humble/depthai-ros-driver/default.nix new file mode 100644 index 0000000000..f7a0fd9df9 --- /dev/null +++ b/distros/humble/depthai-ros-driver/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, cv-bridge, depthai, depthai-bridge, diagnostic-msgs, image-pipeline, image-transport, image-transport-plugins, rclcpp, rclcpp-components, sensor-msgs, std-msgs, std-srvs, vision-msgs }: +buildRosPackage { + pname = "ros-humble-depthai-ros-driver"; + version = "2.6.1-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/humble/depthai_ros_driver/2.6.1-1"; + sha256 = "sha256-HZK26yLdNcT3ibQiMAps24HvVD0Mit5v+irQQbbHTHA="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ cv-bridge depthai depthai-bridge diagnostic-msgs image-pipeline image-transport image-transport-plugins rclcpp rclcpp-components sensor-msgs std-msgs std-srvs vision-msgs ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Depthai ROS Monolithic node.''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/humble/depthai-ros-msgs/default.nix b/distros/humble/depthai-ros-msgs/default.nix index 43f9b55758..a7375084c2 100644 --- a/distros/humble/depthai-ros-msgs/default.nix +++ b/distros/humble/depthai-ros-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, geometry-msgs, rclcpp, rosidl-default-generators, sensor-msgs, std-msgs, vision-msgs }: buildRosPackage { pname = "ros-humble-depthai-ros-msgs"; - version = "2.5.3-r1"; + version = "2.6.1-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/humble/depthai_ros_msgs/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "34ac0f32360dd9d1e135c77bca00e6f4925dad9debf71dc474968eb371df3803"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/humble/depthai_ros_msgs/2.6.1-1"; + sha256 = "sha256-FziK5SS3pHD8o+q2eO9xze1NDQM+JqojNLYftv/deOM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/depthai-ros/default.nix b/distros/humble/depthai-ros/default.nix index 8efa6e57e4..83b26a5932 100644 --- a/distros/humble/depthai-ros/default.nix +++ b/distros/humble/depthai-ros/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, depthai, depthai-bridge, depthai-examples, depthai-ros-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, depthai, depthai-bridge, depthai-examples, depthai-ros-driver, depthai-ros-msgs }: buildRosPackage { pname = "ros-humble-depthai-ros"; - version = "2.5.3-r1"; + version = "2.6.1-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/humble/depthai-ros/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "440f463ca84077a479762b389444b9e9d51620ec392fe894c62b9752ba1966de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/humble/depthai-ros/2.6.1-1"; + sha256 = "sha256-d2QGDczG8NkL+mdk8bwwwcrvVW2PfPta6qKM0JHFU8I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; - propagatedBuildInputs = [ depthai depthai-bridge depthai-examples depthai-ros-msgs ]; + propagatedBuildInputs = [ depthai depthai-bridge depthai-examples depthai-ros-driver depthai-ros-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/depthai/default.nix b/distros/humble/depthai/default.nix index 48a47ac70b..8d1e6dcecc 100644 --- a/distros/humble/depthai/default.nix +++ b/distros/humble/depthai/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, libusb1, nlohmann_json, opencv, ros-environment }: buildRosPackage { pname = "ros-humble-depthai"; - version = "2.19.1-r1"; + version = "2.20.1-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-core-release/archive/release/humble/depthai/2.19.1-1.tar.gz"; - name = "2.19.1-1.tar.gz"; - sha256 = "fa76fab7cfc432b13de859ec597a9abf28a3b3be4b766f1493122166648d9ea0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-core-release"; + rev = "release/humble/depthai/2.20.1-1"; + sha256 = "sha256-D6DnHY97UeGjzvx/NpYhNdvl92DNmrtjBeDmttX099E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/humble/depthimage-to-laserscan/default.nix b/distros/humble/depthimage-to-laserscan/default.nix index 60dd264e47..baae5cf6fb 100644 --- a/distros/humble/depthimage-to-laserscan/default.nix +++ b/distros/humble/depthimage-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-depthimage-to-laserscan"; version = "2.5.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/depthimage_to_laserscan-release/archive/release/humble/depthimage_to_laserscan/2.5.0-3.tar.gz"; - name = "2.5.0-3.tar.gz"; - sha256 = "264167c62be2c48e22df9e97e206b3b0fa854b2377b11d54d0cdeb5dfc56bb3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "depthimage_to_laserscan-release"; + rev = "release/humble/depthimage_to_laserscan/2.5.0-3"; + sha256 = "sha256-+JJjxrP2tOPo9ijQrlYZuhH85XbQgrxb4RJIFeNO38Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/desktop-full/default.nix b/distros/humble/desktop-full/default.nix index 05ec66cf9c..61067818fb 100644 --- a/distros/humble/desktop-full/default.nix +++ b/distros/humble/desktop-full/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-desktop-full"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/humble/desktop_full/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "e1a0cff26fd8dd8f0929ad347a894f7cf26e3c4e58693ef64d832ea7be481b95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/humble/desktop_full/0.10.0-1"; + sha256 = "sha256-Fpf8KQVw8ZcNqmf/8VyrlxunQpvxC9fZZHZVUBkM4IU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/desktop/default.nix b/distros/humble/desktop/default.nix index c1c6fd418e..552fffd704 100644 --- a/distros/humble/desktop/default.nix +++ b/distros/humble/desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-desktop"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/humble/desktop/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "f23e7461292916b93a2ee8847d2b359d69b2bcf9ef5dd2f152020ac8ca19c066"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/humble/desktop/0.10.0-1"; + sha256 = "sha256-Oe0Gi0EAbvTGmyy7KyrLQqqS5ZVrp2Tdkdx4F82uVqw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/diagnostic-aggregator/default.nix b/distros/humble/diagnostic-aggregator/default.nix index c91ba7b7c3..178a9163ee 100644 --- a/distros/humble/diagnostic-aggregator/default.nix +++ b/distros/humble/diagnostic-aggregator/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-python, ament-lint-auto, ament-lint-common, diagnostic-msgs, launch-testing-ament-cmake, launch-testing-ros, pluginlib, rclcpp, rclpy, std-msgs }: buildRosPackage { pname = "ros-humble-diagnostic-aggregator"; - version = "3.0.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/humble/diagnostic_aggregator/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "2fecf33067be564781b0efb26e815457a51523c52eeb680725b4e3d77026952d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/humble/diagnostic_aggregator/3.1.0-1"; + sha256 = "sha256-tgB1ass3ILBeOD30sqn6bLM4TdNi0YPM6njMaIEnPyc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python diagnostic-msgs pluginlib rclcpp std-msgs ]; @@ -21,6 +25,6 @@ buildRosPackage { meta = { description = ''diagnostic_aggregator''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/humble/diagnostic-common-diagnostics/default.nix b/distros/humble/diagnostic-common-diagnostics/default.nix new file mode 100644 index 0000000000..07639b097d --- /dev/null +++ b/distros/humble/diagnostic-common-diagnostics/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-lint-cmake, ament-cmake-python, ament-cmake-xmllint, ament-lint-auto, diagnostic-updater, ntp, rclpy }: +buildRosPackage { + pname = "ros-humble-diagnostic-common-diagnostics"; + version = "3.1.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/humble/diagnostic_common_diagnostics/3.1.0-1"; + sha256 = "sha256-nLWY/TpbC4B8BP+/rMnVgvekuvf+rwzC8S972BHNIz0="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ament-cmake-python ]; + checkInputs = [ ament-cmake-lint-cmake ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ diagnostic-updater ntp rclpy ]; + nativeBuildInputs = [ ament-cmake ament-cmake-python ]; + + meta = { + description = ''diagnostic_common_diagnostics''; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/distros/humble/diagnostic-msgs/default.nix b/distros/humble/diagnostic-msgs/default.nix index 4a258947b3..37c65492bd 100644 --- a/distros/humble/diagnostic-msgs/default.nix +++ b/distros/humble/diagnostic-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-diagnostic-msgs"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/diagnostic_msgs/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "07bb3ab3cf90bc86619a15b98c03b0bc8e720ea0252268e98a8ec4fad6a0095c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/diagnostic_msgs/4.2.3-1"; + sha256 = "sha256-I49mOOAqbRkn1mKqKdYkM8WwakkP+HycHcFG5iXTMys="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/diagnostic-updater/default.nix b/distros/humble/diagnostic-updater/default.nix index 604c56eb56..24f020c95e 100644 --- a/distros/humble/diagnostic-updater/default.nix +++ b/distros/humble/diagnostic-updater/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-python, ament-lint-auto, ament-lint-common, diagnostic-msgs, rclcpp, rclcpp-lifecycle, rclpy, std-msgs }: buildRosPackage { pname = "ros-humble-diagnostic-updater"; - version = "3.0.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/humble/diagnostic_updater/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "5d2f40a7d3119f3f4b645e8f51e3c499d3931dafdb5bac3dd19db43f69d7bacf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/humble/diagnostic_updater/3.1.0-1"; + sha256 = "sha256-xTskr5WjExtIqTza+z/AAQgPoX14wp+BL75tTPnSGqI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; @@ -21,6 +25,6 @@ buildRosPackage { meta = { description = ''diagnostic_updater contains tools for easily updating diagnostics. it is commonly used in device drivers to keep track of the status of output topics, device status, etc.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/humble/diagnostics/default.nix b/distros/humble/diagnostics/default.nix new file mode 100644 index 0000000000..2396728f32 --- /dev/null +++ b/distros/humble/diagnostics/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, diagnostic-aggregator, diagnostic-common-diagnostics, diagnostic-updater, self-test }: +buildRosPackage { + pname = "ros-humble-diagnostics"; + version = "3.1.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/humble/diagnostics/3.1.0-1"; + sha256 = "sha256-4EQM94db9bRFnZIWM8lsMXaAp1H8Jmn75Lnh1JnDpSA="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ diagnostic-aggregator diagnostic-common-diagnostics diagnostic-updater self-test ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''diagnostics''; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/distros/humble/diff-drive-controller/default.nix b/distros/humble/diff-drive-controller/default.nix index 6dcd57a300..7e087b1f40 100644 --- a/distros/humble/diff-drive-controller/default.nix +++ b/distros/humble/diff-drive-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-interface, controller-manager, generate-parameter-library, geometry-msgs, hardware-interface, nav-msgs, pluginlib, rclcpp, rclcpp-lifecycle, rcpputils, realtime-tools, ros2-control-test-assets, tf2, tf2-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-interface, controller-manager, generate-parameter-library, geometry-msgs, hardware-interface, nav-msgs, pluginlib, rclcpp, rclcpp-lifecycle, rcpputils, realtime-tools, ros2-control-test-assets, tf2, tf2-msgs }: buildRosPackage { pname = "ros-humble-diff-drive-controller"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/diff_drive_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "a36d4a5f3a1a731d42c4312edcf4f00bee5d6b3c7630b73d2eb3c263bc7d56e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/diff_drive_controller/2.16.0-1"; + sha256 = "sha256-Rgk7ik2/bY0GWWBsMovyVkk8vQBHlPwDZyaksItJGJk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake generate-parameter-library pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ controller-interface geometry-msgs hardware-interface nav-msgs rclcpp rclcpp-lifecycle rcpputils realtime-tools tf2 tf2-msgs ]; + propagatedBuildInputs = [ backward-ros controller-interface geometry-msgs hardware-interface nav-msgs rclcpp rclcpp-lifecycle rcpputils realtime-tools tf2 tf2-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/dolly-follow/default.nix b/distros/humble/dolly-follow/default.nix index db0928a7a1..a56f60c2c2 100644 --- a/distros/humble/dolly-follow/default.nix +++ b/distros/humble/dolly-follow/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dolly-follow"; version = "0.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dolly-release/archive/release/humble/dolly_follow/0.4.0-3.tar.gz"; - name = "0.4.0-3.tar.gz"; - sha256 = "278db5ad8cfaaed64b6efb340ff120953b5ef7f2ffcb92d97ac3d958785de395"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dolly-release"; + rev = "release/humble/dolly_follow/0.4.0-3"; + sha256 = "sha256-Udj2U+dWE5+JIz9GOSB6X4C9y3g/g30Jp3+BTuiiRX0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dolly-gazebo/default.nix b/distros/humble/dolly-gazebo/default.nix index ef422747a8..34293c1d85 100644 --- a/distros/humble/dolly-gazebo/default.nix +++ b/distros/humble/dolly-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dolly-gazebo"; version = "0.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dolly-release/archive/release/humble/dolly_gazebo/0.4.0-3.tar.gz"; - name = "0.4.0-3.tar.gz"; - sha256 = "ba2e5c2490cb07a74a3c7f553f6c6d4205c7393d9e8dddfb4604fb20d87da7c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dolly-release"; + rev = "release/humble/dolly_gazebo/0.4.0-3"; + sha256 = "sha256-sLCbhJjIRzZvq15SlStZjonIvhpPw57fK5vRlQ3689A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dolly-ignition/default.nix b/distros/humble/dolly-ignition/default.nix index 45bb7359ac..9c34bd82ab 100644 --- a/distros/humble/dolly-ignition/default.nix +++ b/distros/humble/dolly-ignition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dolly-ignition"; version = "0.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dolly-release/archive/release/humble/dolly_ignition/0.4.0-3.tar.gz"; - name = "0.4.0-3.tar.gz"; - sha256 = "9b303a602885ce0998b2e53763d4a65f5ea698876ff50bc8f11a642104614283"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dolly-release"; + rev = "release/humble/dolly_ignition/0.4.0-3"; + sha256 = "sha256-BGdsjbemIWS94BjSHjDClK1ui6sM17J0lJlrhfhj/Vg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dolly/default.nix b/distros/humble/dolly/default.nix index 5d595a46f7..160fc73147 100644 --- a/distros/humble/dolly/default.nix +++ b/distros/humble/dolly/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dolly"; version = "0.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dolly-release/archive/release/humble/dolly/0.4.0-3.tar.gz"; - name = "0.4.0-3.tar.gz"; - sha256 = "0f9cd7d78f9b2850716c633df087104af0d62e0872f87d7cc8570e77c5b74d99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dolly-release"; + rev = "release/humble/dolly/0.4.0-3"; + sha256 = "sha256-1ugxemjgNM3QtSsQ64TCZHu8J9gYPS5Qh2s6VRBTiFA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/domain-bridge/default.nix b/distros/humble/domain-bridge/default.nix index 6ee5c06279..78800039e3 100644 --- a/distros/humble/domain-bridge/default.nix +++ b/distros/humble/domain-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-domain-bridge"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/domain_bridge-release/archive/release/humble/domain_bridge/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "736dc2624e03566225d53f7b42fa831051de38256f3d8c5295637f02bcf68625"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "domain_bridge-release"; + rev = "release/humble/domain_bridge/0.5.0-1"; + sha256 = "sha256-eajUFSE7L+45VSlUvbXcvd6RjjdERKimvpFjuXVbCO8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/domain-coordinator/default.nix b/distros/humble/domain-coordinator/default.nix index 18552f198c..985b049d02 100644 --- a/distros/humble/domain-coordinator/default.nix +++ b/distros/humble/domain-coordinator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-domain-coordinator"; version = "0.10.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_ros-release/archive/release/humble/domain_coordinator/0.10.0-3.tar.gz"; - name = "0.10.0-3.tar.gz"; - sha256 = "740bfdb1f618577c9dd97617d9bc20da498b9f8799dd724e3058c2a97a653465"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_ros-release"; + rev = "release/humble/domain_coordinator/0.10.0-3"; + sha256 = "sha256-2Jhr/k/50dDdybVClohkfUC6hF4CvcM9Hb+aaZSwz4I="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/dummy-map-server/default.nix b/distros/humble/dummy-map-server/default.nix index 86b270055f..6b4de21aee 100644 --- a/distros/humble/dummy-map-server/default.nix +++ b/distros/humble/dummy-map-server/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, nav-msgs, rclcpp }: buildRosPackage { pname = "ros-humble-dummy-map-server"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/dummy_map_server/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "cc04b79f98b165477839d3b76ecbcfa578562301619163310794e451e41f3f50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/dummy_map_server/0.20.3-1"; + sha256 = "sha256-NHstirxZ46aT6lc1Fk4OxW3hz3hLgoy6kMSGbau62lI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dummy-robot-bringup/default.nix b/distros/humble/dummy-robot-bringup/default.nix index 4a8f4f9d25..2653fbe62e 100644 --- a/distros/humble/dummy-robot-bringup/default.nix +++ b/distros/humble/dummy-robot-bringup/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-python, ament-lint-auto, ament-lint-common, dummy-map-server, dummy-sensors, launch, launch-ros, robot-state-publisher }: buildRosPackage { pname = "ros-humble-dummy-robot-bringup"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/dummy_robot_bringup/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "ac74ea9afbc4368facfc9f796b291ee19ad05b4629552c1a8755cafeeeafd285"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/dummy_robot_bringup/0.20.3-1"; + sha256 = "sha256-9qJJhnBnGwyrmLjN5a3vIXbYFdF76yKpytqhO032osI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dummy-sensors/default.nix b/distros/humble/dummy-sensors/default.nix index 08809c9364..34463e1d3d 100644 --- a/distros/humble/dummy-sensors/default.nix +++ b/distros/humble/dummy-sensors/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, rclcpp, sensor-msgs }: buildRosPackage { pname = "ros-humble-dummy-sensors"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/dummy_sensors/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "f35c1c379e07cdacd928993c48867920a40874a87b66836644a317cd84e4d86f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/dummy_sensors/0.20.3-1"; + sha256 = "sha256-KfYWM0dmKnX+DFq5zBS13O/QYWPrZTivCBslBUMejzw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dwb-core/default.nix b/distros/humble/dwb-core/default.nix index 6e60aa4eed..a119670986 100644 --- a/distros/humble/dwb-core/default.nix +++ b/distros/humble/dwb-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dwb-core"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/dwb_core/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "8ea0afc837bc9accee4aa2e817c0a73ee835a84e7d68cff8ed5944187f9d0a4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/dwb_core/1.1.5-1"; + sha256 = "sha256-LDWKcL/DD/oWJ+SioEG/+fhEz+ytkXbQqnm8ojFXxgs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav-2d-msgs nav2-common sensor-msgs visualization-msgs ]; diff --git a/distros/humble/dwb-critics/default.nix b/distros/humble/dwb-critics/default.nix index 97a8664188..c2ee5c2aa1 100644 --- a/distros/humble/dwb-critics/default.nix +++ b/distros/humble/dwb-critics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dwb-critics"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/dwb_critics/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "fe374b73895c0521bbe7a42f01918332d9ad0e506f15af64d6e489201af30200"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/dwb_critics/1.1.5-1"; + sha256 = "sha256-iWJWXE1NXOfJqHefoADghdO6rX5UjML2Ij99Y2V1a6U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/dwb-msgs/default.nix b/distros/humble/dwb-msgs/default.nix index cdc273d24e..9101e9ee78 100644 --- a/distros/humble/dwb-msgs/default.nix +++ b/distros/humble/dwb-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dwb-msgs"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/dwb_msgs/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "210f48d7ff36744b67004c14b1fbd27437fb3d9ed1e9ecbf64154ed236bcead6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/dwb_msgs/1.1.5-1"; + sha256 = "sha256-dSMujnvEkkzkuQtkEUb+oOTyjT39QS9LmZv0hsPrAxw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dwb-plugins/default.nix b/distros/humble/dwb-plugins/default.nix index 34475afc75..4c1eeeb69a 100644 --- a/distros/humble/dwb-plugins/default.nix +++ b/distros/humble/dwb-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dwb-plugins"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/dwb_plugins/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "680106bc09a50e96dfd648728280cae6d8158d2ddf41dd7ae3b782594295242e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/dwb_plugins/1.1.5-1"; + sha256 = "sha256-/c+dY1wJkWPiml1tZTlDsCyseFNgOXBYcqGe9HPYy7M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/dynamic-edt-3d/default.nix b/distros/humble/dynamic-edt-3d/default.nix index 8e59d484b6..2aa4d1744d 100644 --- a/distros/humble/dynamic-edt-3d/default.nix +++ b/distros/humble/dynamic-edt-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dynamic-edt-3d"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap-release/archive/release/humble/dynamic_edt_3d/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "7398fc802f3e6eeb62dfe98df24637fdfcf9cdce9aa7a09859a2d16c1778f865"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap-release"; + rev = "release/humble/dynamic_edt_3d/1.9.8-1"; + sha256 = "sha256-522JD7zQBjHhrle/McBU6igMD2aGFVJvyheYkpGEJ3g="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/dynamixel-sdk-custom-interfaces/default.nix b/distros/humble/dynamixel-sdk-custom-interfaces/default.nix index 8ac85956ef..85a616ba57 100644 --- a/distros/humble/dynamixel-sdk-custom-interfaces/default.nix +++ b/distros/humble/dynamixel-sdk-custom-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dynamixel-sdk-custom-interfaces"; version = "3.7.60-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_sdk-release/archive/release/humble/dynamixel_sdk_custom_interfaces/3.7.60-1.tar.gz"; - name = "3.7.60-1.tar.gz"; - sha256 = "75841255d97010335e1c6aaccabef9d292338b6613c6c53c20331c69e1d19e10"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_sdk-release"; + rev = "release/humble/dynamixel_sdk_custom_interfaces/3.7.60-1"; + sha256 = "sha256-0ULRyYvvOb1009hbk089LlDrLoGyLZOEloGTCjs66/8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/dynamixel-sdk-examples/default.nix b/distros/humble/dynamixel-sdk-examples/default.nix index 2e56c3aee3..1f420f8eef 100644 --- a/distros/humble/dynamixel-sdk-examples/default.nix +++ b/distros/humble/dynamixel-sdk-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dynamixel-sdk-examples"; version = "3.7.60-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_sdk-release/archive/release/humble/dynamixel_sdk_examples/3.7.60-1.tar.gz"; - name = "3.7.60-1.tar.gz"; - sha256 = "54c84822e2cd61baec5a091f5e9acd5fbf2014c6878d1903418f3cf74cdebf2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_sdk-release"; + rev = "release/humble/dynamixel_sdk_examples/3.7.60-1"; + sha256 = "sha256-xzAdZhQ+uOP/ggF9IAMTcK5A7hHwXPdjaH0EjRYUD3s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dynamixel-sdk/default.nix b/distros/humble/dynamixel-sdk/default.nix index 391ac27407..c01804fcc7 100644 --- a/distros/humble/dynamixel-sdk/default.nix +++ b/distros/humble/dynamixel-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dynamixel-sdk"; version = "3.7.60-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_sdk-release/archive/release/humble/dynamixel_sdk/3.7.60-1.tar.gz"; - name = "3.7.60-1.tar.gz"; - sha256 = "78df24af4c32789fe1fe7a1ee5f6cf5222de7eae7d110d2404ede8b728bf9537"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_sdk-release"; + rev = "release/humble/dynamixel_sdk/3.7.60-1"; + sha256 = "sha256-2Vx55FIRiJ+4hfohCyZPqu6FNPc09e8LhOzvLCkugDU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dynamixel-workbench-msgs/default.nix b/distros/humble/dynamixel-workbench-msgs/default.nix index 42b52b82af..ded6dceb86 100644 --- a/distros/humble/dynamixel-workbench-msgs/default.nix +++ b/distros/humble/dynamixel-workbench-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dynamixel-workbench-msgs"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench_msgs-release/archive/release/humble/dynamixel_workbench_msgs/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "eb9b0c36bf9594621e8afb7c7fa3218bc1f5069515d8616bb5d8efc9e6663222"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench_msgs-release"; + rev = "release/humble/dynamixel_workbench_msgs/2.0.3-1"; + sha256 = "sha256-NMrVMFxbUmSDCdSRTO6gRJtKsmEeqY4Q5FqkBQCeY3I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/dynamixel-workbench-toolbox/default.nix b/distros/humble/dynamixel-workbench-toolbox/default.nix index 621f4142d3..7b0e5ccb02 100644 --- a/distros/humble/dynamixel-workbench-toolbox/default.nix +++ b/distros/humble/dynamixel-workbench-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dynamixel-workbench-toolbox"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench-release/archive/release/humble/dynamixel_workbench_toolbox/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "15b2872e92f1e716935d0271fbdf935786659c71df9bcad54cee9236a9aa8a6e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench-release"; + rev = "release/humble/dynamixel_workbench_toolbox/2.2.3-1"; + sha256 = "sha256-nOIZ6YHjctUbm0SxTewtbsAXlfG10kknrKhpsVPGR5k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/dynamixel-workbench/default.nix b/distros/humble/dynamixel-workbench/default.nix index 356a16eb2d..6497f39707 100644 --- a/distros/humble/dynamixel-workbench/default.nix +++ b/distros/humble/dynamixel-workbench/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-dynamixel-workbench"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench-release/archive/release/humble/dynamixel_workbench/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "149f8fce05e435676882dc47d4cbfdaa916b7d760cdca327e082a06e066514d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench-release"; + rev = "release/humble/dynamixel_workbench/2.2.3-1"; + sha256 = "sha256-iA1/c6eRcHNi0wnJhwog1K7jH1fKwsqIvSfgCZivKrc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ecl-build/default.nix b/distros/humble/ecl-build/default.nix index 15237a6c52..18a0429a09 100644 --- a/distros/humble/ecl-build/default.nix +++ b/distros/humble/ecl-build/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ecl-build"; version = "1.0.3-r2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/humble/ecl_build/1.0.3-2.tar.gz"; - name = "1.0.3-2.tar.gz"; - sha256 = "aecccb711397a8e3185e57004bc773c78bc4b81b333edfe881c2f2d4b801c87f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/humble/ecl_build/1.0.3-2"; + sha256 = "sha256-ttmcSFmWhB7bERQkup3ucja+EU9tIc4Sb4cVetuSS00="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ecl-license/default.nix b/distros/humble/ecl-license/default.nix index 033ace0bae..d103599bf9 100644 --- a/distros/humble/ecl-license/default.nix +++ b/distros/humble/ecl-license/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ecl-license"; version = "1.0.3-r2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/humble/ecl_license/1.0.3-2.tar.gz"; - name = "1.0.3-2.tar.gz"; - sha256 = "ada441ed7cf511dc55ab117148887dbdbf0bb5365af55382e6e110d78f9e7b9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/humble/ecl_license/1.0.3-2"; + sha256 = "sha256-7IkZyQJw9go1s2je+YLPGemSTMtC8PNA66qCC6akU6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ecl-tools/default.nix b/distros/humble/ecl-tools/default.nix index 2e1c4a1ace..7315f84f97 100644 --- a/distros/humble/ecl-tools/default.nix +++ b/distros/humble/ecl-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ecl-tools"; version = "1.0.3-r2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/humble/ecl_tools/1.0.3-2.tar.gz"; - name = "1.0.3-2.tar.gz"; - sha256 = "4317fe28aadb65633b5898ac9719cfe7728de7568db8c83d2586d9a301c2d563"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/humble/ecl_tools/1.0.3-2"; + sha256 = "sha256-z/lKRKqVLxiSJ9nSnQyQh/Dsk/+USiDw68+Nfg9Fc0U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/effort-controllers/default.nix b/distros/humble/effort-controllers/default.nix index 22a2cd96ef..3dbeb9e4a8 100644 --- a/distros/humble/effort-controllers/default.nix +++ b/distros/humble/effort-controllers/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-manager, forward-command-controller, pluginlib, rclcpp, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-manager, forward-command-controller, pluginlib, rclcpp, ros2-control-test-assets }: buildRosPackage { pname = "ros-humble-effort-controllers"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/effort_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "a7603dc0f608c6d96735ffc61022c769aa5b185a0aae69502d415431d3573cdf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/effort_controllers/2.16.0-1"; + sha256 = "sha256-IEtu4Bq4RPpUkjzbOYGYgEm0ZGOssv2x8lDpz011peA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ forward-command-controller rclcpp ]; + propagatedBuildInputs = [ backward-ros forward-command-controller rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/eigen-stl-containers/default.nix b/distros/humble/eigen-stl-containers/default.nix index e212827920..172d492439 100644 --- a/distros/humble/eigen-stl-containers/default.nix +++ b/distros/humble/eigen-stl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-eigen-stl-containers"; version = "1.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/eigen_stl_containers-release/archive/release/humble/eigen_stl_containers/1.0.0-4.tar.gz"; - name = "1.0.0-4.tar.gz"; - sha256 = "0eba228939d1e39791329139e0d615a182f9fa88f1e972ad56884224b2d23885"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "eigen_stl_containers-release"; + rev = "release/humble/eigen_stl_containers/1.0.0-4"; + sha256 = "sha256-Zjjaom5lCGLMKC33kq6er1Ji54XUj/3hkSIWcBnXI+E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/eigen3-cmake-module/default.nix b/distros/humble/eigen3-cmake-module/default.nix index 906fcc522f..7638fb41a6 100644 --- a/distros/humble/eigen3-cmake-module/default.nix +++ b/distros/humble/eigen3-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-eigen3-cmake-module"; version = "0.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/eigen3_cmake_module-release/archive/release/humble/eigen3_cmake_module/0.1.1-4.tar.gz"; - name = "0.1.1-4.tar.gz"; - sha256 = "eca361d06c42cf4b554e17a2583f248dc85d61a29b6c8f92f7022a2337fbb07b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "eigen3_cmake_module-release"; + rev = "release/humble/eigen3_cmake_module/0.1.1-4"; + sha256 = "sha256-JYv6XaPTqspaLTKHbLNoNYx3ivXCTVAvRO3oNEhhxQ4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/eigenpy/default.nix b/distros/humble/eigenpy/default.nix index 9cac0d46df..38ee649425 100644 --- a/distros/humble/eigenpy/default.nix +++ b/distros/humble/eigenpy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, cmake, doxygen, eigen, git, python3, python3Packages }: buildRosPackage { pname = "ros-humble-eigenpy"; - version = "2.8.1-r1"; + version = "2.9.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/eigenpy-release/archive/release/humble/eigenpy/2.8.1-1.tar.gz"; - name = "2.8.1-1.tar.gz"; - sha256 = "2c103c8c2cfe8e6b4686fe892cdab90041659c2efd22bd14d4f34c1230f5df7c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "eigenpy-release"; + rev = "release/humble/eigenpy/2.9.0-1"; + sha256 = "sha256-tIt6JvjT9sF705Jv/oQmZo41ISoxpAEQ2TRSQCTvTzU="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/humble/example-interfaces/default.nix b/distros/humble/example-interfaces/default.nix index 4eda01a165..e99ed3677b 100644 --- a/distros/humble/example-interfaces/default.nix +++ b/distros/humble/example-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-example-interfaces"; version = "0.9.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/example_interfaces-release/archive/release/humble/example_interfaces/0.9.3-2.tar.gz"; - name = "0.9.3-2.tar.gz"; - sha256 = "b6cd5cd34b4d2768b2d312a4f66fc442139719ada51e4175336cfef028709e85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "example_interfaces-release"; + rev = "release/humble/example_interfaces/0.9.3-2"; + sha256 = "sha256-gXUlSZT2a7gVFcWxxvtf31fEn1FLYvEAVC1agkj8uUA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/examples-rclcpp-async-client/default.nix b/distros/humble/examples-rclcpp-async-client/default.nix index 204a01db0b..0a6086c6f7 100644 --- a/distros/humble/examples-rclcpp-async-client/default.nix +++ b/distros/humble/examples-rclcpp-async-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-async-client"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_async_client/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "96e8f19c8a8b92bfaa42a60a1664cf7a9c8b14fc004a6c66824051a73955c162"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_async_client/0.15.1-1"; + sha256 = "sha256-AbIZOU/3lFFt2Au/mERkfGwdsO6QtrwYz/0UFBp6YB8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-cbg-executor/default.nix b/distros/humble/examples-rclcpp-cbg-executor/default.nix index d1bbfad09d..26549c40f7 100644 --- a/distros/humble/examples-rclcpp-cbg-executor/default.nix +++ b/distros/humble/examples-rclcpp-cbg-executor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-cbg-executor"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_cbg_executor/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "c1dfc968aae3056001cc56a646e68ec89d6dad2903e3c92dab8d53bff8fc8482"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_cbg_executor/0.15.1-1"; + sha256 = "sha256-uZCLXZuMFPvw8m06DCw6rKQ2BRRjssncqnqW/3T+n0I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-minimal-action-client/default.nix b/distros/humble/examples-rclcpp-minimal-action-client/default.nix index c25849863f..24ea15c402 100644 --- a/distros/humble/examples-rclcpp-minimal-action-client/default.nix +++ b/distros/humble/examples-rclcpp-minimal-action-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-minimal-action-client"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_minimal_action_client/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "f8958ab937873bd8064834da5cbd74783f496557d5c3488a0e1ea0f2f37300d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_minimal_action_client/0.15.1-1"; + sha256 = "sha256-1K33DUlzQkmdixBz2I58WPp0kMiw5qXDW1rhJuro6yI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-minimal-action-server/default.nix b/distros/humble/examples-rclcpp-minimal-action-server/default.nix index 627d2c1c1e..abce55473a 100644 --- a/distros/humble/examples-rclcpp-minimal-action-server/default.nix +++ b/distros/humble/examples-rclcpp-minimal-action-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-minimal-action-server"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_minimal_action_server/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "2c8fa1fec9b36c6d53cbf35f3462f590c28143270bc8387b5565e61fb0d5b3f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_minimal_action_server/0.15.1-1"; + sha256 = "sha256-2N9WleFHlPS+0Bv2+5lMpEtlT47mhE3HsIEUgSnKuyE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-minimal-client/default.nix b/distros/humble/examples-rclcpp-minimal-client/default.nix index cf67e53bd9..0d79d7d1df 100644 --- a/distros/humble/examples-rclcpp-minimal-client/default.nix +++ b/distros/humble/examples-rclcpp-minimal-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-minimal-client"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_minimal_client/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "535ff29d2ecd5c04cbf6799e5a2746455afaae94046e02428ab49273c4312b71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_minimal_client/0.15.1-1"; + sha256 = "sha256-+qRk8w2zD3so1trUMmHlEA9l11TyKVUwRDyFVSrsNoQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-minimal-composition/default.nix b/distros/humble/examples-rclcpp-minimal-composition/default.nix index f34dab6fc3..cf88328181 100644 --- a/distros/humble/examples-rclcpp-minimal-composition/default.nix +++ b/distros/humble/examples-rclcpp-minimal-composition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-minimal-composition"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_minimal_composition/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "4f06a2a1726484437fab7188605870ae3213bab37ec75df60906f0430f927f30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_minimal_composition/0.15.1-1"; + sha256 = "sha256-o1SCBTEeYRtlsT5aEyGFFkZ7ayk85DxSWTNjjRUJ0mI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-minimal-publisher/default.nix b/distros/humble/examples-rclcpp-minimal-publisher/default.nix index 64046255dd..49aa52b934 100644 --- a/distros/humble/examples-rclcpp-minimal-publisher/default.nix +++ b/distros/humble/examples-rclcpp-minimal-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-minimal-publisher"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_minimal_publisher/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "94db60d17bdbacc694011fda09958aad41cbecea5bc5773bf72431aff6d48345"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_minimal_publisher/0.15.1-1"; + sha256 = "sha256-XWMmA4rvDJGhv58vxFto6rV0/PUd5KFK2PJbbXDv6KI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-minimal-service/default.nix b/distros/humble/examples-rclcpp-minimal-service/default.nix index c452d38ea0..5cbf88049f 100644 --- a/distros/humble/examples-rclcpp-minimal-service/default.nix +++ b/distros/humble/examples-rclcpp-minimal-service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-minimal-service"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_minimal_service/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "097f96f2eaddab3d5fe34b8d9604ec49521e28707341d9699485ff76c97d5626"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_minimal_service/0.15.1-1"; + sha256 = "sha256-1gGAQiifeizruWs0V57nobz2DQU3K0u7VQX+O/4FBow="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-minimal-subscriber/default.nix b/distros/humble/examples-rclcpp-minimal-subscriber/default.nix index 7c60f84082..b0ded86f42 100644 --- a/distros/humble/examples-rclcpp-minimal-subscriber/default.nix +++ b/distros/humble/examples-rclcpp-minimal-subscriber/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-minimal-subscriber"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_minimal_subscriber/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "ade2413d7ba7b7f850047be47af5ff05133928358eb278d9bc75ce9c8bbd8fe2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_minimal_subscriber/0.15.1-1"; + sha256 = "sha256-43+VciZV6RElh7fB0SoDXcYK4RklS89qFNcIcXdpe4o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-minimal-timer/default.nix b/distros/humble/examples-rclcpp-minimal-timer/default.nix index 9dd4f8defa..c06560afd4 100644 --- a/distros/humble/examples-rclcpp-minimal-timer/default.nix +++ b/distros/humble/examples-rclcpp-minimal-timer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-minimal-timer"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_minimal_timer/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "4c1b5104a0e7a51ec3f396c5edb01e94c6304b88d0f88ec0c48a684c1c5c3533"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_minimal_timer/0.15.1-1"; + sha256 = "sha256-ufS1rxnFy8jTjbhTgKXvTkB/C8brMdziZKlIo0be7vM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-multithreaded-executor/default.nix b/distros/humble/examples-rclcpp-multithreaded-executor/default.nix index cdafb75d38..ed9ade36f6 100644 --- a/distros/humble/examples-rclcpp-multithreaded-executor/default.nix +++ b/distros/humble/examples-rclcpp-multithreaded-executor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-multithreaded-executor"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_multithreaded_executor/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "164fa840b1db4a30980433c94a4a468441c0213c07806027ef3900747fdb9725"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_multithreaded_executor/0.15.1-1"; + sha256 = "sha256-/HCYKdhhUv9wMyD+SD4Xf1l9HPnh9QI9HK/acQmnQQc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclcpp-wait-set/default.nix b/distros/humble/examples-rclcpp-wait-set/default.nix index e957c95a7c..cd71db7b51 100644 --- a/distros/humble/examples-rclcpp-wait-set/default.nix +++ b/distros/humble/examples-rclcpp-wait-set/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclcpp-wait-set"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclcpp_wait_set/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "0e088de926b40717d0c2dbed352183ea3c023947146d1659f5341ba36905fb46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclcpp_wait_set/0.15.1-1"; + sha256 = "sha256-c4ualUWpbMN/geOevA3dKG3J1Goydt3xWn5lmyQptSU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/examples-rclpy-executors/default.nix b/distros/humble/examples-rclpy-executors/default.nix index ad3cd38ba7..b72422c6aa 100644 --- a/distros/humble/examples-rclpy-executors/default.nix +++ b/distros/humble/examples-rclpy-executors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-executors"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_executors/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "a65b0be8abe0f770b24f47bb28ab5f185f7b5a48db8037806b56e5944f551a78"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_executors/0.15.1-1"; + sha256 = "sha256-c3+Z3zOQFBBpdN7d7VkZSef+OEUJVQiTL3/r75dTHzo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-rclpy-guard-conditions/default.nix b/distros/humble/examples-rclpy-guard-conditions/default.nix index 113c055cf1..31701bd477 100644 --- a/distros/humble/examples-rclpy-guard-conditions/default.nix +++ b/distros/humble/examples-rclpy-guard-conditions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-guard-conditions"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_guard_conditions/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "f6d0d58b4dd6f7bec82bb19430bc0aa184dd2c9f8d45f9fe0290540e6a595daf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_guard_conditions/0.15.1-1"; + sha256 = "sha256-HEAm7jj9mLIwutmfaBtaW8q9ScDEshtr56iwDSQtST4="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-rclpy-minimal-action-client/default.nix b/distros/humble/examples-rclpy-minimal-action-client/default.nix index dabbef228e..df83ca0ade 100644 --- a/distros/humble/examples-rclpy-minimal-action-client/default.nix +++ b/distros/humble/examples-rclpy-minimal-action-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-minimal-action-client"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_minimal_action_client/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "4868882ae72f76f4bfede6ccca79b7011e3d7f4b56110ca57fecf66555fcf2f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_minimal_action_client/0.15.1-1"; + sha256 = "sha256-EnGYa7GWFVZRv6a06fvGVwKFXIu8cxs0eRnhiQSfkJA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-rclpy-minimal-action-server/default.nix b/distros/humble/examples-rclpy-minimal-action-server/default.nix index c8b2654697..f8c7b4b4dc 100644 --- a/distros/humble/examples-rclpy-minimal-action-server/default.nix +++ b/distros/humble/examples-rclpy-minimal-action-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-minimal-action-server"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_minimal_action_server/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "fc30e95fcb858116f888e39fbf09f369b64b303fb0444bcd0dbd0d915a614840"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_minimal_action_server/0.15.1-1"; + sha256 = "sha256-nmZPPxYe9WszxbVdbnzY8JkhBCmmyte61JYxEjAzD0g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-rclpy-minimal-client/default.nix b/distros/humble/examples-rclpy-minimal-client/default.nix index 07d29f8f6a..28d3d5336d 100644 --- a/distros/humble/examples-rclpy-minimal-client/default.nix +++ b/distros/humble/examples-rclpy-minimal-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-minimal-client"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_minimal_client/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "d6d2944c4b38b15f2d90506b5f88106c0157cc5569ec03cab217c6e7f8a833ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_minimal_client/0.15.1-1"; + sha256 = "sha256-pNuCHAxV7g6ZHtpGJtV9xl5sJmt5eipr8/ldibqTtuA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-rclpy-minimal-publisher/default.nix b/distros/humble/examples-rclpy-minimal-publisher/default.nix index 2fde36971b..4ddb1ff5f9 100644 --- a/distros/humble/examples-rclpy-minimal-publisher/default.nix +++ b/distros/humble/examples-rclpy-minimal-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-minimal-publisher"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_minimal_publisher/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "c46e281cfc1340197f440f0f7db6455ed921ae8499830c7e94f209b4f336c433"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_minimal_publisher/0.15.1-1"; + sha256 = "sha256-2L9B0HycSn1GBSSs6yFXZtxv0pqBzs98s/9BCKJrSsY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-rclpy-minimal-service/default.nix b/distros/humble/examples-rclpy-minimal-service/default.nix index 3c23d439e2..535d10581e 100644 --- a/distros/humble/examples-rclpy-minimal-service/default.nix +++ b/distros/humble/examples-rclpy-minimal-service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-minimal-service"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_minimal_service/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "c169cd515788386ad3fd45e3e4f20f619531fd36b2ae4c8aaa6aa287f7d74bef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_minimal_service/0.15.1-1"; + sha256 = "sha256-EMFgwy2RVJZbHjByr4JorSf+f4V3Vp+4EoIxeAApLOE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-rclpy-minimal-subscriber/default.nix b/distros/humble/examples-rclpy-minimal-subscriber/default.nix index 6dcd7a83cb..614e35e0cf 100644 --- a/distros/humble/examples-rclpy-minimal-subscriber/default.nix +++ b/distros/humble/examples-rclpy-minimal-subscriber/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-minimal-subscriber"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_minimal_subscriber/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "8fbf6183d06e13ee0238db759624676739c77dac226b17c8991bf18c517f69d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_minimal_subscriber/0.15.1-1"; + sha256 = "sha256-Ig6/EQ9N6xBgTBnjR/68+jDiqJalyHOIlwvl/lTpXzg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-rclpy-pointcloud-publisher/default.nix b/distros/humble/examples-rclpy-pointcloud-publisher/default.nix index 60c4c4575f..a0bce63b19 100644 --- a/distros/humble/examples-rclpy-pointcloud-publisher/default.nix +++ b/distros/humble/examples-rclpy-pointcloud-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-examples-rclpy-pointcloud-publisher"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/examples_rclpy_pointcloud_publisher/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "f105c56892a928d70e00ead663c8255adcd0ebd37593387b0a2ec571b3cc650b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/examples_rclpy_pointcloud_publisher/0.15.1-1"; + sha256 = "sha256-yDfHzS6cjHXFaBoVDoAsdpQTnVppoDcNKZ04Jny1e20="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/examples-tf2-py/default.nix b/distros/humble/examples-tf2-py/default.nix index 7e328f1dd5..8cb4cc39fe 100644 --- a/distros/humble/examples-tf2-py/default.nix +++ b/distros/humble/examples-tf2-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, launch-ros, pythonPackages, tf2-ros-py }: buildRosPackage { pname = "ros-humble-examples-tf2-py"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/examples_tf2_py/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "aaa981a3b81619da469513f79c976995ee605714978709771e8a8288735276ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/examples_tf2_py/0.25.2-1"; + sha256 = "sha256-5l49BpscoMa5xhAbDjTmSh0hmlYSwJcC+6PQZX+B/Tg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/fastcdr/default.nix b/distros/humble/fastcdr/default.nix index d8706fd197..74b1b8a1dd 100644 --- a/distros/humble/fastcdr/default.nix +++ b/distros/humble/fastcdr/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-fastcdr"; version = "1.0.24-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fastcdr-release/archive/release/humble/fastcdr/1.0.24-2.tar.gz"; - name = "1.0.24-2.tar.gz"; - sha256 = "b8dd46ba2874b8b42b60d16b0e73a72f092b2f5923512dcc8a746f3c30955a08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fastcdr-release"; + rev = "release/humble/fastcdr/1.0.24-2"; + sha256 = "sha256-c3xN1mu7qNZyR0MBb923pa0a69z/QGvWtYRN6aJtDq4="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/fastrtps-cmake-module/default.nix b/distros/humble/fastrtps-cmake-module/default.nix index 1200424564..394a445d9f 100644 --- a/distros/humble/fastrtps-cmake-module/default.nix +++ b/distros/humble/fastrtps-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-fastrtps-cmake-module"; version = "2.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/humble/fastrtps_cmake_module/2.2.0-2.tar.gz"; - name = "2.2.0-2.tar.gz"; - sha256 = "67b27cf23415494ed271615dc43e0b46871e80f6ca9ed69e341d6117cfe6abf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/humble/fastrtps_cmake_module/2.2.0-2"; + sha256 = "sha256-2gYVjGl9MeHIzokaw4fki8sEhJwXmZnAo1hHFtj/SQs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/fastrtps/default.nix b/distros/humble/fastrtps/default.nix index b4f28311f2..47311f9add 100644 --- a/distros/humble/fastrtps/default.nix +++ b/distros/humble/fastrtps/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, asio, cmake, fastcdr, foonathan-memory-vendor, openssl, python3, tinyxml-2 }: buildRosPackage { pname = "ros-humble-fastrtps"; - version = "2.6.3-r1"; + version = "2.6.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fastrtps-release/archive/release/humble/fastrtps/2.6.3-1.tar.gz"; - name = "2.6.3-1.tar.gz"; - sha256 = "a1ac96637ddbaf1a1d6b3c0aac2e1d3058f760e5a9ec93c2cee630694ad4d527"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fastrtps-release"; + rev = "release/humble/fastrtps/2.6.4-1"; + sha256 = "sha256-d66rBlKO9f/v5XiOVKBPCxbbwF184FYcBGmxzz8aKQ4="; + }; buildType = "cmake"; buildInputs = [ asio cmake ]; diff --git a/distros/humble/filters/default.nix b/distros/humble/filters/default.nix index 2b7a1f1476..7b9cba1699 100644 --- a/distros/humble/filters/default.nix +++ b/distros/humble/filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-filters"; version = "2.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/filters-release/archive/release/humble/filters/2.1.0-3.tar.gz"; - name = "2.1.0-3.tar.gz"; - sha256 = "d41d74f12174f27e383ffd54adad4e985fcc669f9cc04025d42df9b8742ac42b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "filters-release"; + rev = "release/humble/filters/2.1.0-3"; + sha256 = "sha256-Re52fPUttgC8YnZIBEC84USVr2a80IwbqJd14I2klNc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/find-object-2d/default.nix b/distros/humble/find-object-2d/default.nix index 52386ca4fc..af0a5ab58c 100644 --- a/distros/humble/find-object-2d/default.nix +++ b/distros/humble/find-object-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-find-object-2d"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/introlab/find_object_2d-release/archive/release/humble/find_object_2d/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "01e262c4209580ebb7b339b6b2f9333e592eb8dd1b00fb0881eae099eda14bc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "find_object_2d-release"; + rev = "release/humble/find_object_2d/0.7.0-1"; + sha256 = "sha256-KtLe1v52K9gb/p4t0Yqdkc99Hgi67wNcFpmguOilOnA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/humble/fluent-rviz/default.nix b/distros/humble/fluent-rviz/default.nix index 51d2093f4f..1956483775 100644 --- a/distros/humble/fluent-rviz/default.nix +++ b/distros/humble/fluent-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-fluent-rviz"; version = "0.0.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fluent_rviz-release/archive/release/humble/fluent_rviz/0.0.3-2.tar.gz"; - name = "0.0.3-2.tar.gz"; - sha256 = "79ccc7501cd98044007c166be8ba13ddeb1f13214b2c47de059dbb2500d87aa9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fluent_rviz-release"; + rev = "release/humble/fluent_rviz/0.0.3-2"; + sha256 = "sha256-/LmzIiGEHhv+jlon28dyJAjyB233kvyupBzUS01rdjA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/fmi-adapter-examples/default.nix b/distros/humble/fmi-adapter-examples/default.nix index 782a650aec..09b686a1a3 100644 --- a/distros/humble/fmi-adapter-examples/default.nix +++ b/distros/humble/fmi-adapter-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-fmi-adapter-examples"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmi_adapter-release/archive/release/humble/fmi_adapter_examples/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "df4eba1bb04e39feb92bfb457968f5c78b3781704e7da4c4cef1af7761c24c52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmi_adapter-release"; + rev = "release/humble/fmi_adapter_examples/2.1.1-1"; + sha256 = "sha256-R5kjXvGqUx+ux+q1zgh54sd5aNSXWSJ1edV01iOh5Fc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/fmi-adapter/default.nix b/distros/humble/fmi-adapter/default.nix index 9950010829..dbd94f6fc4 100644 --- a/distros/humble/fmi-adapter/default.nix +++ b/distros/humble/fmi-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-fmi-adapter"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmi_adapter-release/archive/release/humble/fmi_adapter/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "42a48eed795ffaa2801020f0f0733d05e33ef239db917be37945136eb289fb8d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmi_adapter-release"; + rev = "release/humble/fmi_adapter/2.1.1-1"; + sha256 = "sha256-pC2a5q3fbSAGFRlotIahHSzRm+tJOBSAjho9Q70/otU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake fmilibrary-vendor ]; diff --git a/distros/humble/fmilibrary-vendor/default.nix b/distros/humble/fmilibrary-vendor/default.nix index 9d0e75035e..a9bc4375bd 100644 --- a/distros/humble/fmilibrary-vendor/default.nix +++ b/distros/humble/fmilibrary-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-fmilibrary-vendor"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmilibrary_vendor-release/archive/release/humble/fmilibrary_vendor/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "0bc5d037129c0b35b6758ee235a046fc1b64838a0e6e89b83f0510475a83bf71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmilibrary_vendor-release"; + rev = "release/humble/fmilibrary_vendor/1.0.1-1"; + sha256 = "sha256-RwFS1j6Bue1ac96cXWL4i1A+KcMFWctqGRc0ZGeTR70="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/fogros2-examples/default.nix b/distros/humble/fogros2-examples/default.nix index 2233a4473e..b73b9c0caa 100644 --- a/distros/humble/fogros2-examples/default.nix +++ b/distros/humble/fogros2-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-fogros2-examples"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fogros2-release/archive/release/humble/fogros2_examples/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "de71035ee00fb2c2b280815d8b277cbb1d61a09be05d638ff8eba42243c7ac21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fogros2-release"; + rev = "release/humble/fogros2_examples/0.1.7-1"; + sha256 = "sha256-Q88Rh23VRS6EUyEY8/Bjj9Ov9QZTCl3Hd5zEGY1uIUk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/fogros2/default.nix b/distros/humble/fogros2/default.nix index c15de05a43..8a162a6a77 100644 --- a/distros/humble/fogros2/default.nix +++ b/distros/humble/fogros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-fogros2"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fogros2-release/archive/release/humble/fogros2/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "c6f46647d20ce31a0745eb585811fc3cc5b04df97ad94554d63f2498f2994789"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fogros2-release"; + rev = "release/humble/fogros2/0.1.7-1"; + sha256 = "sha256-8WRsRqu8vU//YKjO6e6Rp8jC8DfGUddnsr4Gj8wAqeA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/foonathan-memory-vendor/default.nix b/distros/humble/foonathan-memory-vendor/default.nix index 4e1f404cc1..84c48595fc 100644 --- a/distros/humble/foonathan-memory-vendor/default.nix +++ b/distros/humble/foonathan-memory-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-foonathan-memory-vendor"; version = "1.2.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foonathan_memory_vendor-release/archive/release/humble/foonathan_memory_vendor/1.2.0-3.tar.gz"; - name = "1.2.0-3.tar.gz"; - sha256 = "d2a91cc8925b407621806b5c885ca558972838c52ba57c0cd6dbc6e3870ac8bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foonathan_memory_vendor-release"; + rev = "release/humble/foonathan_memory_vendor/1.2.0-3"; + sha256 = "sha256-0DgqmgXZ9PpV/sf51//kHGZGB6L/VNySZf+o8dWcCE4="; + }; buildType = "cmake"; buildInputs = [ git ]; diff --git a/distros/humble/force-torque-sensor-broadcaster/default.nix b/distros/humble/force-torque-sensor-broadcaster/default.nix index e7fde34f04..61cdc131af 100644 --- a/distros/humble/force-torque-sensor-broadcaster/default.nix +++ b/distros/humble/force-torque-sensor-broadcaster/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-interface, controller-manager, generate-parameter-library, geometry-msgs, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-interface, controller-manager, generate-parameter-library, geometry-msgs, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets }: buildRosPackage { pname = "ros-humble-force-torque-sensor-broadcaster"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/force_torque_sensor_broadcaster/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "be8b20bb400b500f3e4d0d0ff8d8fd2d334e9c329e8a3d528288d4d965748f46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/force_torque_sensor_broadcaster/2.16.0-1"; + sha256 = "sha256-si3Ec8YgZ6s1V4/1MQEeqdOnKo/FnA8Vay17ZTzorkU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock controller-manager hardware-interface ros2-control-test-assets ]; - propagatedBuildInputs = [ controller-interface generate-parameter-library geometry-msgs hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools ]; + propagatedBuildInputs = [ backward-ros controller-interface generate-parameter-library geometry-msgs hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/foros-examples/default.nix b/distros/humble/foros-examples/default.nix index 23816d2cc0..d2ffc85020 100644 --- a/distros/humble/foros-examples/default.nix +++ b/distros/humble/foros-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-foros-examples"; version = "0.4.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foros-release/archive/release/humble/foros_examples/0.4.1-2.tar.gz"; - name = "0.4.1-2.tar.gz"; - sha256 = "69b5eba18238cf6b4156b0179d841eb11bbb8a0e9484a7af8ac9419b12e3d380"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foros-release"; + rev = "release/humble/foros_examples/0.4.1-2"; + sha256 = "sha256-wLenaUPYkbTfpUgwP8XyuWRNs7BK+w8XocDjCmIAEZo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/foros-inspector/default.nix b/distros/humble/foros-inspector/default.nix index 3384b307cf..65a1157def 100644 --- a/distros/humble/foros-inspector/default.nix +++ b/distros/humble/foros-inspector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-foros-inspector"; version = "0.4.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foros-release/archive/release/humble/foros_inspector/0.4.1-2.tar.gz"; - name = "0.4.1-2.tar.gz"; - sha256 = "affa1521d17e45682a11a66e4abdd0bf6edb6aecefda5a5fdf7d5e74d923e2b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foros-release"; + rev = "release/humble/foros_inspector/0.4.1-2"; + sha256 = "sha256-WfePxLQcvtxpQxBIDPXuPTGMb87E/ySncvdid1KfFFk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/foros-msgs/default.nix b/distros/humble/foros-msgs/default.nix index df7bf174d3..fdf441401f 100644 --- a/distros/humble/foros-msgs/default.nix +++ b/distros/humble/foros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-foros-msgs"; version = "0.4.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foros-release/archive/release/humble/foros_msgs/0.4.1-2.tar.gz"; - name = "0.4.1-2.tar.gz"; - sha256 = "c24867bfbfeff57df397e773f49bf24d89f882d9f7163990bce78c7e11aa9140"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foros-release"; + rev = "release/humble/foros_msgs/0.4.1-2"; + sha256 = "sha256-2BfM+m3iK91wzWpNIBa4jXvgTI/2J8uCslc7wc8omzs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/foros/default.nix b/distros/humble/foros/default.nix index 7dd9d1dde0..ef06ebdaed 100644 --- a/distros/humble/foros/default.nix +++ b/distros/humble/foros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-foros"; version = "0.4.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foros-release/archive/release/humble/foros/0.4.1-2.tar.gz"; - name = "0.4.1-2.tar.gz"; - sha256 = "95889bbf2fa021efe446815a26ac02a63dfd366a0c168952c4345ab50df7928b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foros-release"; + rev = "release/humble/foros/0.4.1-2"; + sha256 = "sha256-3MdLSjVHhSt+I/aMjeUl177ZcPCBGL84NQFFCx4YlP4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/forward-command-controller/default.nix b/distros/humble/forward-command-controller/default.nix index c35ed9dd43..748c26fa0d 100644 --- a/distros/humble/forward-command-controller/default.nix +++ b/distros/humble/forward-command-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, std-msgs }: buildRosPackage { pname = "ros-humble-forward-command-controller"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/forward_command_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "a64e8f1bec33f22945ca2a65e438389c694b194fca782fcd5e4a21150f44b611"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/forward_command_controller/2.16.0-1"; + sha256 = "sha256-tvYASz+qNQNS9SJgXoZeOkFSZO6Axch1TReJF7MBQSQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ controller-interface generate-parameter-library hardware-interface rclcpp rclcpp-lifecycle realtime-tools std-msgs ]; + propagatedBuildInputs = [ backward-ros controller-interface generate-parameter-library hardware-interface rclcpp rclcpp-lifecycle realtime-tools std-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/four-wheel-steering-msgs/default.nix b/distros/humble/four-wheel-steering-msgs/default.nix index 0ba9493f66..4bb1de0bb1 100644 --- a/distros/humble/four-wheel-steering-msgs/default.nix +++ b/distros/humble/four-wheel-steering-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-four-wheel-steering-msgs"; version = "2.0.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/four_wheel_steering_msgs-release/archive/release/humble/four_wheel_steering_msgs/2.0.1-3.tar.gz"; - name = "2.0.1-3.tar.gz"; - sha256 = "9786c709dc4f48e7fa8dd96576890512a5353793af5ffbfd468a3b810f7bc440"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "four_wheel_steering_msgs-release"; + rev = "release/humble/four_wheel_steering_msgs/2.0.1-3"; + sha256 = "sha256-lESkZ6d2jUSfCCCB5KsV8gJwBTO0EG7O4/LInYggSzc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/foxglove-bridge/default.nix b/distros/humble/foxglove-bridge/default.nix index aa0cc5210c..d23756c783 100644 --- a/distros/humble/foxglove-bridge/default.nix +++ b/distros/humble/foxglove-bridge/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-cpp, ament-lint-auto, asio, nlohmann_json, openssl, rclcpp, rclcpp-components, ros-environment, rosgraph-msgs, std-msgs, websocketpp }: buildRosPackage { pname = "ros-humble-foxglove-bridge"; - version = "0.2.2-r1"; + version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foxglove_bridge-release/archive/release/humble/foxglove_bridge/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "f24594342f96c3d9cb39c9b3b672c6ef3e41e29169ac9303dd2ee7f071a94e2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foxglove_bridge-release"; + rev = "release/humble/foxglove_bridge/0.3.0-1"; + sha256 = "sha256-wRnMOoLOn6E7TrYny2wfwmQuOqnYt2T/ru+L/9ua1Tk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake asio nlohmann_json ros-environment websocketpp ]; diff --git a/distros/humble/foxglove-msgs/default.nix b/distros/humble/foxglove-msgs/default.nix index 020cd38543..ad9c12af96 100644 --- a/distros/humble/foxglove-msgs/default.nix +++ b/distros/humble/foxglove-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-foxglove-msgs"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_foxglove_msgs-release/archive/release/humble/foxglove_msgs/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "a852888a228df145fb9bc69ced01987b66d2525fe5cfd76a1746fb7db7452dde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_foxglove_msgs-release"; + rev = "release/humble/foxglove_msgs/2.1.1-1"; + sha256 = "sha256-WVd87BSDwF+o7s/HMSXhpwvIBHYpp6J263sCn635ILE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/humble/gazebo-dev/default.nix b/distros/humble/gazebo-dev/default.nix index c2e94cd8b2..abdf904aa5 100644 --- a/distros/humble/gazebo-dev/default.nix +++ b/distros/humble/gazebo-dev/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gazebo-dev"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/humble/gazebo_dev/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "b88bb4ca62bab49d30260b178c01b46dd9cfcfea1684a12ec691dbaec33c0ade"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/humble/gazebo_dev/3.7.0-1"; + sha256 = "sha256-mrueslrQTjk6YEdaHeKosgUwED/y28Lamkk7Xu2FW8Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gazebo-msgs/default.nix b/distros/humble/gazebo-msgs/default.nix index 5153676d16..97f8dcf220 100644 --- a/distros/humble/gazebo-msgs/default.nix +++ b/distros/humble/gazebo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gazebo-msgs"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/humble/gazebo_msgs/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "43f032d5771c8fd3d5f68ca9fe7f31377f60e22b801b8703fd8d5e6b5b41b6f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/humble/gazebo_msgs/3.7.0-1"; + sha256 = "sha256-UEKtnD23be8+FhZoXcZ5WNX/ki81mNNmoreVf2LEcHM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/gazebo-plugins/default.nix b/distros/humble/gazebo-plugins/default.nix index c0dfa5fa73..48dd66e500 100644 --- a/distros/humble/gazebo-plugins/default.nix +++ b/distros/humble/gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gazebo-plugins"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/humble/gazebo_plugins/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "726072c2dd5544400795096c4b5de8acb2bfd5c1f570a3d87bea6403032fd417"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/humble/gazebo_plugins/3.7.0-1"; + sha256 = "sha256-WIdWb0AYx07PFWwH/o1Du5im1crwunrAhf50PZV8cZQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gazebo-ros-pkgs/default.nix b/distros/humble/gazebo-ros-pkgs/default.nix index 1ed5bab0cc..c5ed69c5b0 100644 --- a/distros/humble/gazebo-ros-pkgs/default.nix +++ b/distros/humble/gazebo-ros-pkgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gazebo-ros-pkgs"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/humble/gazebo_ros_pkgs/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "84581e2c7e3cafef31fcd0f2cee1d81c5ecb43534d53b6a7a363dfe9c93da3bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/humble/gazebo_ros_pkgs/3.7.0-1"; + sha256 = "sha256-FXZ3pJ6bNIk5o2Om5C+LOP3dCWr3gXPqxUDI4J9GV20="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gazebo-ros/default.nix b/distros/humble/gazebo-ros/default.nix index 7f8b391199..047c9b041f 100644 --- a/distros/humble/gazebo-ros/default.nix +++ b/distros/humble/gazebo-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gazebo-ros"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/humble/gazebo_ros/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "23a08d7e0590603b0908f9aa4687f7f21d8eab72c30c93a491fb92835f3f7bdb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/humble/gazebo_ros/3.7.0-1"; + sha256 = "sha256-UNmsqu6Ze0LnEV7B9vv751AnDxri5MEcMDx7AAiBwOE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gazebo-ros2-control-demos/default.nix b/distros/humble/gazebo-ros2-control-demos/default.nix index 4346703e78..697be6c219 100644 --- a/distros/humble/gazebo-ros2-control-demos/default.nix +++ b/distros/humble/gazebo-ros2-control-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gazebo-ros2-control-demos"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros2_control-release/archive/release/humble/gazebo_ros2_control_demos/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "ee4189b08b3bbf24b09afd12260d7c66ca02967d81f4d7fd53aa40e1a73e8bad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros2_control-release"; + rev = "release/humble/gazebo_ros2_control_demos/0.4.0-1"; + sha256 = "sha256-N66XjJXAFTi24DK1d2+l4U0IwZXUUmOKyGgcnUDCLxo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rclcpp-action ]; diff --git a/distros/humble/gazebo-ros2-control/default.nix b/distros/humble/gazebo-ros2-control/default.nix index 51e23ec11a..898d49e105 100644 --- a/distros/humble/gazebo-ros2-control/default.nix +++ b/distros/humble/gazebo-ros2-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gazebo-ros2-control"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros2_control-release/archive/release/humble/gazebo_ros2_control/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "b549f9311a704006adf5ce23688fa1cf13850284ed19ea87f8a143af57ac8858"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros2_control-release"; + rev = "release/humble/gazebo_ros2_control/0.4.0-1"; + sha256 = "sha256-4bTTtCPCI2854uVTenPCW7gxBZdQvsp/LCdfu0Q5eiw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gc-spl-2022/default.nix b/distros/humble/gc-spl-2022/default.nix index fdd58fedf6..334e0767fd 100644 --- a/distros/humble/gc-spl-2022/default.nix +++ b/distros/humble/gc-spl-2022/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gc-spl-2022"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/humble/gc_spl_2022/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "00e8107a6ea051aa197d838b816025b39e139496b2d1934f94b71b5654e6d53c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/humble/gc_spl_2022/2.0.0-1"; + sha256 = "sha256-WJEWam3jL3t9xgn3f7eIUburrxGfpG/yAowrZZyzb94="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/generate-parameter-library-example/default.nix b/distros/humble/generate-parameter-library-example/default.nix index c49fc16db8..93fe6cbac6 100644 --- a/distros/humble/generate-parameter-library-example/default.nix +++ b/distros/humble/generate-parameter-library-example/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-generate-parameter-library-example"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/generate_parameter_library-release/archive/release/humble/generate_parameter_library_example/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "2126f9ab30ce1856ad465ca112d9c58af3108f679b64d157360bd26881125afb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "generate_parameter_library-release"; + rev = "release/humble/generate_parameter_library_example/0.3.0-1"; + sha256 = "sha256-hH6ARQmZWvProM7nvmi+RWSycC93HYWVrMbULnw6AyA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/generate-parameter-library-py/default.nix b/distros/humble/generate-parameter-library-py/default.nix index 255e814c99..330fc0ac80 100644 --- a/distros/humble/generate-parameter-library-py/default.nix +++ b/distros/humble/generate-parameter-library-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-generate-parameter-library-py"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/generate_parameter_library-release/archive/release/humble/generate_parameter_library_py/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "97f208d77c12c7d6b061f786901e023ec90de8a06b61fbc9edea7cea76407f98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "generate_parameter_library-release"; + rev = "release/humble/generate_parameter_library_py/0.3.0-1"; + sha256 = "sha256-5bTniyP8on8ZMXyGUkFKS2AT7IyI8yGgeOnw8WflxMM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright pythonPackages.pytest ]; diff --git a/distros/humble/generate-parameter-library/default.nix b/distros/humble/generate-parameter-library/default.nix index 15df1da0c3..ed63db0296 100644 --- a/distros/humble/generate-parameter-library/default.nix +++ b/distros/humble/generate-parameter-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-generate-parameter-library"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/generate_parameter_library-release/archive/release/humble/generate_parameter_library/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "37b3eb2c34b600416eb0a1965f7a3c9197327e7ec4089a60beab743782b221f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "generate_parameter_library-release"; + rev = "release/humble/generate_parameter_library/0.3.0-1"; + sha256 = "sha256-roGeZanzoZNM9V5/iae41ikNVpsMi924g9fPD48wflw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/generated.nix b/distros/humble/generated.nix index 5031df6169..810b834b09 100644 --- a/distros/humble/generated.nix +++ b/distros/humble/generated.nix @@ -160,6 +160,10 @@ self: super: { apriltag = self.callPackage ./apriltag {}; + apriltag-msgs = self.callPackage ./apriltag-msgs {}; + + apriltag-ros = self.callPackage ./apriltag-ros {}; + aruco-opencv = self.callPackage ./aruco-opencv {}; aruco-opencv-msgs = self.callPackage ./aruco-opencv-msgs {}; @@ -318,6 +322,8 @@ self: super: { depthai-examples = self.callPackage ./depthai-examples {}; + depthai-ros-driver = self.callPackage ./depthai-ros-driver {}; + depthai-ros-msgs = self.callPackage ./depthai-ros-msgs {}; depthimage-to-laserscan = self.callPackage ./depthimage-to-laserscan {}; @@ -328,10 +334,14 @@ self: super: { diagnostic-aggregator = self.callPackage ./diagnostic-aggregator {}; + diagnostic-common-diagnostics = self.callPackage ./diagnostic-common-diagnostics {}; + diagnostic-msgs = self.callPackage ./diagnostic-msgs {}; diagnostic-updater = self.callPackage ./diagnostic-updater {}; + diagnostics = self.callPackage ./diagnostics {}; + diff-drive-controller = self.callPackage ./diff-drive-controller {}; dolly = self.callPackage ./dolly {}; @@ -624,8 +634,30 @@ self: super: { io-context = self.callPackage ./io-context {}; + irobot-create-common-bringup = self.callPackage ./irobot-create-common-bringup {}; + + irobot-create-control = self.callPackage ./irobot-create-control {}; + + irobot-create-description = self.callPackage ./irobot-create-description {}; + + irobot-create-gazebo-bringup = self.callPackage ./irobot-create-gazebo-bringup {}; + + irobot-create-gazebo-plugins = self.callPackage ./irobot-create-gazebo-plugins {}; + + irobot-create-gazebo-sim = self.callPackage ./irobot-create-gazebo-sim {}; + + irobot-create-ignition-bringup = self.callPackage ./irobot-create-ignition-bringup {}; + + irobot-create-ignition-sim = self.callPackage ./irobot-create-ignition-sim {}; + + irobot-create-ignition-toolbox = self.callPackage ./irobot-create-ignition-toolbox {}; + irobot-create-msgs = self.callPackage ./irobot-create-msgs {}; + irobot-create-nodes = self.callPackage ./irobot-create-nodes {}; + + irobot-create-toolbox = self.callPackage ./irobot-create-toolbox {}; + joint-limits = self.callPackage ./joint-limits {}; joint-state-broadcaster = self.callPackage ./joint-state-broadcaster {}; @@ -642,6 +674,8 @@ self: super: { joy-teleop = self.callPackage ./joy-teleop {}; + joy-tester = self.callPackage ./joy-tester {}; + kdl-parser = self.callPackage ./kdl-parser {}; key-teleop = self.callPackage ./key-teleop {}; @@ -760,6 +794,12 @@ self: super: { map-msgs = self.callPackage ./map-msgs {}; + mapviz = self.callPackage ./mapviz {}; + + mapviz-interfaces = self.callPackage ./mapviz-interfaces {}; + + mapviz-plugins = self.callPackage ./mapviz-plugins {}; + marti-can-msgs = self.callPackage ./marti-can-msgs {}; marti-common-msgs = self.callPackage ./marti-common-msgs {}; @@ -812,6 +852,8 @@ self: super: { mimick-vendor = self.callPackage ./mimick-vendor {}; + mod = self.callPackage ./mod {}; + mouse-teleop = self.callPackage ./mouse-teleop {}; moveit = self.callPackage ./moveit {}; @@ -904,6 +946,8 @@ self: super: { mrt-cmake-modules = self.callPackage ./mrt-cmake-modules {}; + multires-image = self.callPackage ./multires-image {}; + mvsim = self.callPackage ./mvsim {}; nao-button-sim = self.callPackage ./nao-button-sim {}; @@ -1162,6 +1206,8 @@ self: super: { position-controllers = self.callPackage ./position-controllers {}; + py-trees = self.callPackage ./py-trees {}; + pybind11-json-vendor = self.callPackage ./pybind11-json-vendor {}; pybind11-vendor = self.callPackage ./pybind11-vendor {}; @@ -1198,6 +1244,10 @@ self: super: { random-numbers = self.callPackage ./random-numbers {}; + raspimouse = self.callPackage ./raspimouse {}; + + raspimouse-msgs = self.callPackage ./raspimouse-msgs {}; + rc-common-msgs = self.callPackage ./rc-common-msgs {}; rc-dynamics-api = self.callPackage ./rc-dynamics-api {}; @@ -1646,6 +1696,8 @@ self: super: { rt-manipulators-examples = self.callPackage ./rt-manipulators-examples {}; + rt-usb-9axisimu-driver = self.callPackage ./rt-usb-9axisimu-driver {}; + rtabmap-ros = self.callPackage ./rtabmap-ros {}; rtcm-msgs = self.callPackage ./rtcm-msgs {}; @@ -1728,64 +1780,6 @@ self: super: { soccer-marker-generation = self.callPackage ./soccer-marker-generation {}; - soccer-object-msgs = self.callPackage ./soccer-object-msgs {}; - - soccer-vision-2d-msgs = self.callPackage ./soccer-vision-2d-msgs {}; - - soccer-vision-3d-msgs = self.callPackage ./soccer-vision-3d-msgs {}; - - soccer-vision-attribute-msgs = self.callPackage ./soccer-vision-attribute-msgs {}; - - sol-vendor = self.callPackage ./sol-vendor {}; - - sophus = self.callPackage ./sophus {}; - - spacenav = self.callPackage ./spacenav {}; - - spdlog-vendor = self.callPackage ./spdlog-vendor {}; - - splsm-7 = self.callPackage ./splsm-7 {}; - - splsm-7-conversion = self.callPackage ./splsm-7-conversion {}; - - sqlite3-vendor = self.callPackage ./sqlite3-vendor {}; - - srdfdom = self.callPackage ./srdfdom {}; - - sros2 = self.callPackage ./sros2 {}; - - sros2-cmake = self.callPackage ./sros2-cmake {}; - - statistics-msgs = self.callPackage ./statistics-msgs {}; - - std-msgs = self.callPackage ./std-msgs {}; - - std-srvs = self.callPackage ./std-srvs {}; - - stereo-image-proc = self.callPackage ./stereo-image-proc {}; - - stereo-msgs = self.callPackage ./stereo-msgs {}; - - stubborn-buddies = self.callPackage ./stubborn-buddies {}; - - stubborn-buddies-msgs = self.callPackage ./stubborn-buddies-msgs {}; - - swri-console = self.callPackage ./swri-console {}; - - swri-console-util = self.callPackage ./swri-console-util {}; - - swri-dbw-interface = self.callPackage ./swri-dbw-interface {}; - - swri-geometry-util = self.callPackage ./swri-geometry-util {}; - - swri-image-util = self.callPackage ./swri-image-util {}; - - swri-math-util = self.callPackage ./swri-math-util {}; - - swri-opencv-util = self.callPackage ./swri-opencv-util {}; - - swri-prefix-tools = self.callPackage ./swri-prefix-tools {}; - swri-roscpp = self.callPackage ./swri-roscpp {}; swri-route-util = self.callPackage ./swri-route-util {}; @@ -1868,6 +1862,8 @@ self: super: { tiago-simulation = self.callPackage ./tiago-simulation {}; + tile-map = self.callPackage ./tile-map {}; + tinyxml2-vendor = self.callPackage ./tinyxml2-vendor {}; tinyxml-vendor = self.callPackage ./tinyxml-vendor {}; diff --git a/distros/humble/geodesy/default.nix b/distros/humble/geodesy/default.nix index 6e78e255a9..ec86283049 100644 --- a/distros/humble/geodesy/default.nix +++ b/distros/humble/geodesy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-geodesy"; version = "1.0.4-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geographic_info-release/archive/release/humble/geodesy/1.0.4-6.tar.gz"; - name = "1.0.4-6.tar.gz"; - sha256 = "0027a5288b902da09cf9354cc9464bc27c8f1c350568adbe122b2ff92b275eec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geographic_info-release"; + rev = "release/humble/geodesy/1.0.4-6"; + sha256 = "sha256-Mzm8AWuKEp7IOCpF3+LvcThDlbjh5/5D9ftJVe7R1AA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.catkin-pkg ]; diff --git a/distros/humble/geographic-info/default.nix b/distros/humble/geographic-info/default.nix index f71a6ce9c6..2d6f3d2629 100644 --- a/distros/humble/geographic-info/default.nix +++ b/distros/humble/geographic-info/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-geographic-info"; version = "1.0.4-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geographic_info-release/archive/release/humble/geographic_info/1.0.4-6.tar.gz"; - name = "1.0.4-6.tar.gz"; - sha256 = "32b9ce827d3ee4eb5a961173e738ad614f4077231909db44c6af8dcc308dfbb5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geographic_info-release"; + rev = "release/humble/geographic_info/1.0.4-6"; + sha256 = "sha256-Fem5FLsZ+lxPuX8NgnKK7k543+bE3uOlVAPQ/5sMLJM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/geographic-msgs/default.nix b/distros/humble/geographic-msgs/default.nix index e039f1e6c0..09a4d84eea 100644 --- a/distros/humble/geographic-msgs/default.nix +++ b/distros/humble/geographic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-geographic-msgs"; version = "1.0.4-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geographic_info-release/archive/release/humble/geographic_msgs/1.0.4-6.tar.gz"; - name = "1.0.4-6.tar.gz"; - sha256 = "0c20ce1e1f3407176c30ad54843dfe1e583ebb684b7d0a27e2f08f84379d4584"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geographic_info-release"; + rev = "release/humble/geographic_msgs/1.0.4-6"; + sha256 = "sha256-hbbW+QtNX3HdOdRx5JgV/D7VzcaZoXAPuiFiOWfvpQI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/geometric-shapes/default.nix b/distros/humble/geometric-shapes/default.nix index 66d1e70435..96f534b9e5 100644 --- a/distros/humble/geometric-shapes/default.nix +++ b/distros/humble/geometric-shapes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-geometric-shapes"; version = "2.1.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometric_shapes-release/archive/release/humble/geometric_shapes/2.1.3-2.tar.gz"; - name = "2.1.3-2.tar.gz"; - sha256 = "25172d5ceb7679807cbe7d058de4967456e6aa76d1b3c21c500f8e70f0bcc2b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometric_shapes-release"; + rev = "release/humble/geometric_shapes/2.1.3-2"; + sha256 = "sha256-Z8bt1wMFIfgQRfYat6fCd9hEKtS2qf8Wzbz+0hA+xzo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config rosidl-default-generators ]; diff --git a/distros/humble/geometry-msgs/default.nix b/distros/humble/geometry-msgs/default.nix index 177ddc4946..3db84b310f 100644 --- a/distros/humble/geometry-msgs/default.nix +++ b/distros/humble/geometry-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-geometry-msgs"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/geometry_msgs/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "f73bf0ef9d2f6e807597b672734c3721ae42a082f590327a168e4d16362cf700"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/geometry_msgs/4.2.3-1"; + sha256 = "sha256-2WHqwqk1FScwGEoOGbs3BL3Ah+CDHJe2QeUO91frxZA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/geometry-tutorials/default.nix b/distros/humble/geometry-tutorials/default.nix index 883113ee91..06fc8f9f14 100644 --- a/distros/humble/geometry-tutorials/default.nix +++ b/distros/humble/geometry-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-geometry-tutorials"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/humble/geometry_tutorials/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "09423fd05f389e83e2a31289ae39b4488e83e08d7a523259ad3f3eb0b5ab3b0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/humble/geometry_tutorials/0.3.6-1"; + sha256 = "sha256-Cy6+rG9fkARM6Pr7xFDRN/CEObs8kkLsxj+qr4W2h0U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/geometry2/default.nix b/distros/humble/geometry2/default.nix index 30f68054da..c263c35015 100644 --- a/distros/humble/geometry2/default.nix +++ b/distros/humble/geometry2/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, tf2, tf2-bullet, tf2-eigen, tf2-eigen-kdl, tf2-geometry-msgs, tf2-kdl, tf2-msgs, tf2-py, tf2-ros, tf2-sensor-msgs, tf2-tools }: buildRosPackage { pname = "ros-humble-geometry2"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/geometry2/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "031e401773b7d82114e09caed4172e0a496acdf3e0a1eeeccc136e9e7d9c71ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/geometry2/0.25.2-1"; + sha256 = "sha256-jflCr3YXIrvYZX1wHl38jAfmmQu07h41JFWk65HPFww="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gmock-vendor/default.nix b/distros/humble/gmock-vendor/default.nix index b6ef078c34..be7971bf1d 100644 --- a/distros/humble/gmock-vendor/default.nix +++ b/distros/humble/gmock-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gmock-vendor"; version = "1.10.9004-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/googletest-release/archive/release/humble/gmock_vendor/1.10.9004-4.tar.gz"; - name = "1.10.9004-4.tar.gz"; - sha256 = "efe60aaf74a6119bea8bacd12ca53ec5d4f4b7fb1e2e21f5785071385afed28a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "googletest-release"; + rev = "release/humble/gmock_vendor/1.10.9004-4"; + sha256 = "sha256-9a2mzifX5WZ65XB00MXj/2Sx29pzlnH/SsUHvRc/n8g="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/google-benchmark-vendor/default.nix b/distros/humble/google-benchmark-vendor/default.nix index 2f4c126304..cfbef168c9 100644 --- a/distros/humble/google-benchmark-vendor/default.nix +++ b/distros/humble/google-benchmark-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-google-benchmark-vendor"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/google_benchmark_vendor-release/archive/release/humble/google_benchmark_vendor/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "ebd71b641bbcec01396c4e495525eb8c2ccd92580fe6ce2a14d82dc50d714c4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "google_benchmark_vendor-release"; + rev = "release/humble/google_benchmark_vendor/0.1.1-2"; + sha256 = "sha256-0L1i3Z594mEyQiWmnU4WfZLb2sITSJePw2tmAd3lf+Y="; + }; buildType = "cmake"; buildInputs = [ cmake git ]; diff --git a/distros/humble/gps-msgs/default.nix b/distros/humble/gps-msgs/default.nix index 9c62b6812d..ae11161b19 100644 --- a/distros/humble/gps-msgs/default.nix +++ b/distros/humble/gps-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gps-msgs"; version = "1.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gps_umd-release/archive/release/humble/gps_msgs/1.0.4-3.tar.gz"; - name = "1.0.4-3.tar.gz"; - sha256 = "bcce01651a30418e7f437ae36a93d0f6347424b6999f4e2d51e7fa3db4054971"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gps_umd-release"; + rev = "release/humble/gps_msgs/1.0.4-3"; + sha256 = "sha256-iltmQJlA5iAtRPGIepzY6Z6F2X/oCZDgMJGqGC1NNDQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/gps-tools/default.nix b/distros/humble/gps-tools/default.nix index df7e330b05..a0b11dbd89 100644 --- a/distros/humble/gps-tools/default.nix +++ b/distros/humble/gps-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gps-tools"; version = "1.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gps_umd-release/archive/release/humble/gps_tools/1.0.4-3.tar.gz"; - name = "1.0.4-3.tar.gz"; - sha256 = "a9d8bb04a110b17816be4445d94ede897536b8c80012ed6916f09eda5a30a493"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gps_umd-release"; + rev = "release/humble/gps_tools/1.0.4-3"; + sha256 = "sha256-a5M/+7i+icLvBEIote2loEZnOP3/xdJ1+xo8RteS8Xg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/gps-umd/default.nix b/distros/humble/gps-umd/default.nix index f0a5302bdf..2ea847bf53 100644 --- a/distros/humble/gps-umd/default.nix +++ b/distros/humble/gps-umd/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gps-umd"; version = "1.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gps_umd-release/archive/release/humble/gps_umd/1.0.4-3.tar.gz"; - name = "1.0.4-3.tar.gz"; - sha256 = "d7ead7500f944ad1964110540571ef5220b12a8f8c3b0ff21e5899798b6e8e7e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gps_umd-release"; + rev = "release/humble/gps_umd/1.0.4-3"; + sha256 = "sha256-Pxfv1FZznAbN+lK9n7uoMEItczKj//qS+sjed3Xte4s="; + }; buildType = "catkin"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gpsd-client/default.nix b/distros/humble/gpsd-client/default.nix index 5b5f20353a..e20f915bc2 100644 --- a/distros/humble/gpsd-client/default.nix +++ b/distros/humble/gpsd-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gpsd-client"; version = "1.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gps_umd-release/archive/release/humble/gpsd_client/1.0.4-3.tar.gz"; - name = "1.0.4-3.tar.gz"; - sha256 = "d6e86a3dfca6590300e385348b7bee223cb4482ed75c23121d54fede32a6d6cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gps_umd-release"; + rev = "release/humble/gpsd_client/1.0.4-3"; + sha256 = "sha256-P4dlJySWrBf26c3Bmchjgh5ln3A6p76PsN3uGpwh9L0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/graph-msgs/default.nix b/distros/humble/graph-msgs/default.nix index 0531523876..e213484505 100644 --- a/distros/humble/graph-msgs/default.nix +++ b/distros/humble/graph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-graph-msgs"; version = "0.2.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/graph_msgs-release/archive/release/humble/graph_msgs/0.2.0-3.tar.gz"; - name = "0.2.0-3.tar.gz"; - sha256 = "b715949f2f7db997521cac9fd8f61da7fc53fccf8e6c4394150fe0d41acac447"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "graph_msgs-release"; + rev = "release/humble/graph_msgs/0.2.0-3"; + sha256 = "sha256-Zs/vEflqm3Ft6PVC5rmE7JAj2pPFja8QAhBxSsH93dg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/grasping-msgs/default.nix b/distros/humble/grasping-msgs/default.nix index 11061c4e21..d17bb20f16 100644 --- a/distros/humble/grasping-msgs/default.nix +++ b/distros/humble/grasping-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grasping-msgs"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/grasping_msgs-ros2-gbp/archive/release/humble/grasping_msgs/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "d1782b7c1cd993b36a2a6615c9b79db45608f80c017deabdc313cdfeb9d8da14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "grasping_msgs-ros2-gbp"; + rev = "release/humble/grasping_msgs/0.4.0-1"; + sha256 = "sha256-7jkZuQAfwrBxZtca5lsT7W9diA/c+snR1FHkf4JjZoM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/grbl-msgs/default.nix b/distros/humble/grbl-msgs/default.nix index c874aa44f1..b1947f3746 100644 --- a/distros/humble/grbl-msgs/default.nix +++ b/distros/humble/grbl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grbl-msgs"; version = "0.0.2-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grbl_msgs-release/archive/release/humble/grbl_msgs/0.0.2-6.tar.gz"; - name = "0.0.2-6.tar.gz"; - sha256 = "7c1fc987a65ff3e66dd2e32d122afb2ea02a91be07ab189d1a3c0baf6d7e6b10"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grbl_msgs-release"; + rev = "release/humble/grbl_msgs/0.0.2-6"; + sha256 = "sha256-cjvc4arr+Z92IcwzqZryuU4FC2MY+FNpA+6JBe0dhiE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/grbl-ros/default.nix b/distros/humble/grbl-ros/default.nix index 16229fc172..ce3ad66a25 100644 --- a/distros/humble/grbl-ros/default.nix +++ b/distros/humble/grbl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grbl-ros"; version = "0.0.16-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grbl_ros-release/archive/release/humble/grbl_ros/0.0.16-4.tar.gz"; - name = "0.0.16-4.tar.gz"; - sha256 = "f9d11fea7c4cb74b031680f22e26c343703413aad26220231ce1373edfd508fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grbl_ros-release"; + rev = "release/humble/grbl_ros/0.0.16-4"; + sha256 = "sha256-F1t2vcBH6JU+xByKp5lu3SCks+qWKp4ztQ5WkL6N+rI="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.pyserial ]; diff --git a/distros/humble/grid-map-cmake-helpers/default.nix b/distros/humble/grid-map-cmake-helpers/default.nix index 6cc6241234..20af62d59b 100644 --- a/distros/humble/grid-map-cmake-helpers/default.nix +++ b/distros/humble/grid-map-cmake-helpers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-cmake-helpers"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_cmake_helpers/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "bfb04f052926d584c05b994400ec8c827703c00183abfc847d9baa907be6b654"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_cmake_helpers/2.0.0-1"; + sha256 = "sha256-LjphUxeZf8+o/84nll1opLo1LAylfOeaIe2HCwIf2jQ="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/grid-map-core/default.nix b/distros/humble/grid-map-core/default.nix index c1ab0c80dc..9441469ff8 100644 --- a/distros/humble/grid-map-core/default.nix +++ b/distros/humble/grid-map-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-core"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_core/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "d8311b7c7917abdb65b1e2e779a1430f118fdec2214890128c622da7d3111907"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_core/2.0.0-1"; + sha256 = "sha256-yTXyiyf/+xFeG+AzH7seDiCeMtlXiRKvaA4Z3Ewgi9g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-costmap-2d/default.nix b/distros/humble/grid-map-costmap-2d/default.nix index 0a000dc938..c50b13d2f9 100644 --- a/distros/humble/grid-map-costmap-2d/default.nix +++ b/distros/humble/grid-map-costmap-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-costmap-2d"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_costmap_2d/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "f50942c89f88c00c1c7b23b832ac682fee617579b9ba6353c160fdb487ce25c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_costmap_2d/2.0.0-1"; + sha256 = "sha256-OPRvprjYEWWeTe6Af3vvYKTs6kPDe8bVg45wS6nGmrk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-cv/default.nix b/distros/humble/grid-map-cv/default.nix index 7ab8845639..88d9465aae 100644 --- a/distros/humble/grid-map-cv/default.nix +++ b/distros/humble/grid-map-cv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-cv"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_cv/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "0b68881fddfc6cf4ef8be3ab9f18517bc63e7be5cab255cbd86674b8fb5b138c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_cv/2.0.0-1"; + sha256 = "sha256-NnSg1dMyvqKLJ8oiYWFH2X54sL8YmHGD47D67jXsr24="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-demos/default.nix b/distros/humble/grid-map-demos/default.nix index 4448569610..07858d2d7b 100644 --- a/distros/humble/grid-map-demos/default.nix +++ b/distros/humble/grid-map-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-demos"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_demos/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "58fc005c21ca0ea2e3f9fa9acde5e8a86169a30d36adf80e3f24bf217e1f2c54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_demos/2.0.0-1"; + sha256 = "sha256-q7fWY+Cu8mF2OcTaZsHYHgPQa7qmLOQDDVULNI45itw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-filters/default.nix b/distros/humble/grid-map-filters/default.nix index d2e1b16ef7..093329a640 100644 --- a/distros/humble/grid-map-filters/default.nix +++ b/distros/humble/grid-map-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-filters"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_filters/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "c9f2f148d9efc90f463a58dcd1cc20efc4ac062ca877734f4dd1942ae4582a6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_filters/2.0.0-1"; + sha256 = "sha256-mbBzPfgfLKp1Bm8HXCZ012tMsPZzm05OBQ25VgDch0g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-loader/default.nix b/distros/humble/grid-map-loader/default.nix index 165d03af2a..d4da3ec450 100644 --- a/distros/humble/grid-map-loader/default.nix +++ b/distros/humble/grid-map-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-loader"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_loader/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "427e583bcd15485777a2879b11433b46c25332677aeabb5ee91a633e8a59e9bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_loader/2.0.0-1"; + sha256 = "sha256-LgqxKIlXgMo7GShi1/RuKfNIv32YSu24pfUvWthrIFg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-msgs/default.nix b/distros/humble/grid-map-msgs/default.nix index 4def19aa5e..b9ed39ffec 100644 --- a/distros/humble/grid-map-msgs/default.nix +++ b/distros/humble/grid-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-msgs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_msgs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "8846489b6d6eb511b56e6af5a9b9a08aea8c78cd792fd68863e39aa5c47d0ad9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_msgs/2.0.0-1"; + sha256 = "sha256-fpsw2xpzmjxdKqI3mrBxlBtiR8L3fYXMJw3/vTXncXo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-octomap/default.nix b/distros/humble/grid-map-octomap/default.nix index 565d073b59..a02799734f 100644 --- a/distros/humble/grid-map-octomap/default.nix +++ b/distros/humble/grid-map-octomap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-octomap"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_octomap/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "cbc1311405113c47b1e13a6e850ed1960892cc951935af96cbcf9347179ab939"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_octomap/2.0.0-1"; + sha256 = "sha256-Io326xBR0PlgXK5Kj/l3wJ/YfzvHx6/G1sL1wDijWOE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-pcl/default.nix b/distros/humble/grid-map-pcl/default.nix index 79d2374b90..840edfaa87 100644 --- a/distros/humble/grid-map-pcl/default.nix +++ b/distros/humble/grid-map-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-pcl"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_pcl/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "93f82c20260da38e7be18b51c551a8b00ec169fb3d6bb12a4d22bf3e4e822a99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_pcl/2.0.0-1"; + sha256 = "sha256-3bmXo+fjh7m96ZWDZm9cgjIdbiZvlwX5lA/itxg/hik="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-ros/default.nix b/distros/humble/grid-map-ros/default.nix index fa299c6355..56403ee41e 100644 --- a/distros/humble/grid-map-ros/default.nix +++ b/distros/humble/grid-map-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-ros"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_ros/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "42a9acb6751c02d1935385fdf39a049d79c7e3bb825d015a689685f336d07118"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_ros/2.0.0-1"; + sha256 = "sha256-EQuFCSnqnJciX9sdWnJPnw8K7/GGjMZP1zX1CUti3t8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-rviz-plugin/default.nix b/distros/humble/grid-map-rviz-plugin/default.nix index d29c3ca1ce..4c176fa749 100644 --- a/distros/humble/grid-map-rviz-plugin/default.nix +++ b/distros/humble/grid-map-rviz-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-rviz-plugin"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_rviz_plugin/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "17af45b1b914d5e415282b1b3f98d0359ecf0395ca1a9c8675aaf7952517c006"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_rviz_plugin/2.0.0-1"; + sha256 = "sha256-vAcgkfrBK0Nr72F9CrSWsA3a9L+z1mYsyTNPySTSbNs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-sdf/default.nix b/distros/humble/grid-map-sdf/default.nix index 2a5f723c39..1f33b4b9b4 100644 --- a/distros/humble/grid-map-sdf/default.nix +++ b/distros/humble/grid-map-sdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-sdf"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_sdf/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "19f37d4d5c2077644ada70d64815f93994655410761621a7729058044a7e66e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_sdf/2.0.0-1"; + sha256 = "sha256-82MTHWQOoxPauktwbwzrp/Rw8nc/kGgLG5jUevQQAF0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map-visualization/default.nix b/distros/humble/grid-map-visualization/default.nix index 65da4593b6..26c8cfca2e 100644 --- a/distros/humble/grid-map-visualization/default.nix +++ b/distros/humble/grid-map-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map-visualization"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map_visualization/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "fb90009df535ca7342f5ae144d1fcbc9c5fb4c6797e30fb8c08c4e0478c93af2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map_visualization/2.0.0-1"; + sha256 = "sha256-iA2W/pWsMO8IDkTe2rTqNNlgg3U+2Pw8X3796L9WhRw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake grid-map-cmake-helpers ]; diff --git a/distros/humble/grid-map/default.nix b/distros/humble/grid-map/default.nix index 0a33cae6f5..5c49b9342b 100644 --- a/distros/humble/grid-map/default.nix +++ b/distros/humble/grid-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-grid-map"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grid_map-release/archive/release/humble/grid_map/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "e6f006a23a8ca2eef5011e1950b1382b6463368a8af71198f96cc695284be3d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grid_map-release"; + rev = "release/humble/grid_map/2.0.0-1"; + sha256 = "sha256-etdEiwlr/Oed2WodG3C12icwbPJ13cyTxUbKIF4MkNk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gripper-controllers/default.nix b/distros/humble/gripper-controllers/default.nix index fb06997d40..c3acd967f5 100644 --- a/distros/humble/gripper-controllers/default.nix +++ b/distros/humble/gripper-controllers/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, control-msgs, control-toolbox, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-action, realtime-tools, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, control-msgs, control-toolbox, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-action, realtime-tools, ros2-control-test-assets }: buildRosPackage { pname = "ros-humble-gripper-controllers"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/gripper_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "79f7158a10ba2c33a7c3d100aad366e091417d9b41a91ddbefd35c907bbbc825"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/gripper_controllers/2.16.0-1"; + sha256 = "sha256-IOKqEOIZoWUgouLQkLXZRUv1AHqoOBv8LA4LhygBBz8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ control-msgs control-toolbox controller-interface generate-parameter-library hardware-interface rclcpp rclcpp-action realtime-tools ]; + propagatedBuildInputs = [ backward-ros control-msgs control-toolbox controller-interface generate-parameter-library hardware-interface rclcpp rclcpp-action realtime-tools ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/gscam/default.nix b/distros/humble/gscam/default.nix index a2e7e3b1c1..07819f0ac5 100644 --- a/distros/humble/gscam/default.nix +++ b/distros/humble/gscam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gscam"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gscam-release/archive/release/humble/gscam/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "98ee381e66ca35a2b2b3aa69299e1895641a8115a2c13a3e5a74f58167f7e810"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gscam-release"; + rev = "release/humble/gscam/2.0.2-1"; + sha256 = "sha256-CKQzdZxZ6OZeWkirhmcrfJhb0hNN0vSimKIRHSUDT3k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/gtest-vendor/default.nix b/distros/humble/gtest-vendor/default.nix index 38b0b63f76..8b6ee9af28 100644 --- a/distros/humble/gtest-vendor/default.nix +++ b/distros/humble/gtest-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-gtest-vendor"; version = "1.10.9004-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/googletest-release/archive/release/humble/gtest_vendor/1.10.9004-4.tar.gz"; - name = "1.10.9004-4.tar.gz"; - sha256 = "ae16d684d1edfd58c42d6ae250d16d07c888c789a601ab56bb964d23f90990c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "googletest-release"; + rev = "release/humble/gtest_vendor/1.10.9004-4"; + sha256 = "sha256-u2gx0IqMkxU6eLi5phF25OuU1T4HZuCuIhQBi48RXYM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/hardware-interface/default.nix b/distros/humble/hardware-interface/default.nix index 4a8d31cb3c..7621b9253c 100644 --- a/distros/humble/hardware-interface/default.nix +++ b/distros/humble/hardware-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, control-msgs, lifecycle-msgs, pluginlib, rclcpp-lifecycle, rcpputils, rcutils, ros2-control-test-assets, tinyxml2-vendor }: buildRosPackage { pname = "ros-humble-hardware-interface"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/hardware_interface/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "58d1e81966c4630472e9a5fc7ea16ec408536ff810f57c1b7664ddb7c90c21a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/hardware_interface/2.21.0-1"; + sha256 = "sha256-6Op1L96RIGprC7kKzlyVvUNopxKmaTjqZOhRQhGeulU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/hash-library-vendor/default.nix b/distros/humble/hash-library-vendor/default.nix index 07d94b6439..9aaa4dda3e 100644 --- a/distros/humble/hash-library-vendor/default.nix +++ b/distros/humble/hash-library-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-hash-library-vendor"; version = "0.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/hash_library_vendor-release/archive/release/humble/hash_library_vendor/0.1.1-3.tar.gz"; - name = "0.1.1-3.tar.gz"; - sha256 = "6e0a615306326e75f24543d49d3602770e8d3b2e71e9a55e68d33e21e4646c6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "hash_library_vendor-release"; + rev = "release/humble/hash_library_vendor/0.1.1-3"; + sha256 = "sha256-/aXRAfmumq2WRfhcS24fzeg13YY+hDi9NQYpVUQNR6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto git ]; diff --git a/distros/humble/hey5-description/default.nix b/distros/humble/hey5-description/default.nix index 969e6b75a9..e7d643b2cd 100644 --- a/distros/humble/hey5-description/default.nix +++ b/distros/humble/hey5-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-hey5-description"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/hey5_description-release/archive/release/humble/hey5_description/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "8aa1a9ddef46f5b3e25e4447ffec02cacedc89b1efe0f15a175945d131929846"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "hey5_description-release"; + rev = "release/humble/hey5_description/3.0.2-1"; + sha256 = "sha256-p0BTEE4n2qNbAvmcaKEfpnOGbNTcU4s7T8NfbNuIr+A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/hls-lfcd-lds-driver/default.nix b/distros/humble/hls-lfcd-lds-driver/default.nix index a203095085..f6c7a5a5a3 100644 --- a/distros/humble/hls-lfcd-lds-driver/default.nix +++ b/distros/humble/hls-lfcd-lds-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-hls-lfcd-lds-driver"; version = "2.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/hls_lfcd_lds_driver-release/archive/release/humble/hls_lfcd_lds_driver/2.0.4-3.tar.gz"; - name = "2.0.4-3.tar.gz"; - sha256 = "4ccdcb3e3af90bcc365752b031aa9ae6770ecd63fbd56320a1a9accdc63fd779"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "hls_lfcd_lds_driver-release"; + rev = "release/humble/hls_lfcd_lds_driver/2.0.4-3"; + sha256 = "sha256-gFslT2HGpW6SzRM8frU8D/gistcJDw02YkcZTXZcfa8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/hpp-fcl/default.nix b/distros/humble/hpp-fcl/default.nix index 007acb9ba9..7d90fdec45 100644 --- a/distros/humble/hpp-fcl/default.nix +++ b/distros/humble/hpp-fcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-hpp-fcl"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/hpp_fcl-release/archive/release/humble/hpp-fcl/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "4bb0dba653f59122623445b11a2c09cc6e96b63d21a570f6767be7ea665ae3d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "hpp_fcl-release"; + rev = "release/humble/hpp-fcl/2.2.0-1"; + sha256 = "sha256-qhSLoE/vV0hK4gPpF9GMI7r2l3o7uqNhQaSr+y00MiU="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git python3Packages.lxml ]; diff --git a/distros/humble/iceoryx-binding-c/default.nix b/distros/humble/iceoryx-binding-c/default.nix index 407f984377..0840d58ec7 100644 --- a/distros/humble/iceoryx-binding-c/default.nix +++ b/distros/humble/iceoryx-binding-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-iceoryx-binding-c"; version = "2.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/iceoryx-release/archive/release/humble/iceoryx_binding_c/2.0.2-3.tar.gz"; - name = "2.0.2-3.tar.gz"; - sha256 = "4e56fa33acbb34cdc6b41369154a889b06d0abf38d7dca0d84f414a36dfa967c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "iceoryx-release"; + rev = "release/humble/iceoryx_binding_c/2.0.2-3"; + sha256 = "sha256-bYKtG1mrp/9TmmCt2BRAtbAsvOY5zYMpTKhZNuniXcg="; + }; buildType = "cmake"; buildInputs = [ cmake iceoryx-hoofs iceoryx-posh ]; diff --git a/distros/humble/iceoryx-hoofs/default.nix b/distros/humble/iceoryx-hoofs/default.nix index b8a5da09cb..e01281149a 100644 --- a/distros/humble/iceoryx-hoofs/default.nix +++ b/distros/humble/iceoryx-hoofs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-iceoryx-hoofs"; version = "2.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/iceoryx-release/archive/release/humble/iceoryx_hoofs/2.0.2-3.tar.gz"; - name = "2.0.2-3.tar.gz"; - sha256 = "5bf45b5391d460f0c9895ef39cbe49f12390a16eaee26a70c2ca2d13b3a99722"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "iceoryx-release"; + rev = "release/humble/iceoryx_hoofs/2.0.2-3"; + sha256 = "sha256-Rp1PfAjOoTn1F97oI/pkwePNPqZ2GOmbh/M5RwIgHvU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/iceoryx-posh/default.nix b/distros/humble/iceoryx-posh/default.nix index e5e70ee1fa..e84203b8bb 100644 --- a/distros/humble/iceoryx-posh/default.nix +++ b/distros/humble/iceoryx-posh/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-iceoryx-posh"; version = "2.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/iceoryx-release/archive/release/humble/iceoryx_posh/2.0.2-3.tar.gz"; - name = "2.0.2-3.tar.gz"; - sha256 = "1325910bea9a03a885b33e489953eaae89098461b5d0114662c02ea7d582b146"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "iceoryx-release"; + rev = "release/humble/iceoryx_posh/2.0.2-3"; + sha256 = "sha256-P4HeIkdRap//axiH0seXCvNf5vCYpd2eImkztWl275M="; + }; buildType = "cmake"; buildInputs = [ cmake git ]; diff --git a/distros/humble/ifm3d-core/default.nix b/distros/humble/ifm3d-core/default.nix index b5032657f5..a0dea7955f 100644 --- a/distros/humble/ifm3d-core/default.nix +++ b/distros/humble/ifm3d-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ifm3d-core"; version = "0.18.0-r7"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ifm3d-release/archive/release/humble/ifm3d_core/0.18.0-7.tar.gz"; - name = "0.18.0-7.tar.gz"; - sha256 = "2e79cc115e1aaa9ef85f827a421a320df50492e43b661b5e24a430448d87735e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ifm3d-release"; + rev = "release/humble/ifm3d_core/0.18.0-7"; + sha256 = "sha256-uR93fGa2he8/x1p8bZM2xobrFhbm7cnUGAw341qYlOE="; + }; buildType = "cmake"; buildInputs = [ boost cmake ]; diff --git a/distros/humble/ignition-cmake2-vendor/default.nix b/distros/humble/ignition-cmake2-vendor/default.nix index 44d9e981aa..0ffbfeba38 100644 --- a/distros/humble/ignition-cmake2-vendor/default.nix +++ b/distros/humble/ignition-cmake2-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ignition-cmake2-vendor"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ignition_cmake2_vendor-release/archive/release/humble/ignition_cmake2_vendor/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "dcb1ce243048b84ce324cd1eacd6af6fc767d53068f2fa2fe472eb8e08cdbb8f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ignition_cmake2_vendor-release"; + rev = "release/humble/ignition_cmake2_vendor/0.0.2-2"; + sha256 = "sha256-bZxidfrsqkCbbKbqdgbiC7SuwHBPMfR+/87ZeJpKzZY="; + }; buildType = "cmake"; buildInputs = [ ament-cmake-test cmake doxygen git ]; diff --git a/distros/humble/ignition-math6-vendor/default.nix b/distros/humble/ignition-math6-vendor/default.nix index 57249eb79e..24c7d8d8e7 100644 --- a/distros/humble/ignition-math6-vendor/default.nix +++ b/distros/humble/ignition-math6-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ignition-math6-vendor"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ignition_math6_vendor-release/archive/release/humble/ignition_math6_vendor/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "fec674061b7a8feda3bdadf48c9ce762ba2170b39660f9cb763da882425167be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ignition_math6_vendor-release"; + rev = "release/humble/ignition_math6_vendor/0.0.2-2"; + sha256 = "sha256-HR32tjvnD5KaVPw4YWj43yrNsA3PGhuwcALJlBciHYQ="; + }; buildType = "cmake"; buildInputs = [ ament-cmake-test cmake eigen git ]; diff --git a/distros/humble/image-common/default.nix b/distros/humble/image-common/default.nix index 641d6d8d1d..5dcf712724 100644 --- a/distros/humble/image-common/default.nix +++ b/distros/humble/image-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-common"; version = "3.1.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/humble/image_common/3.1.5-1.tar.gz"; - name = "3.1.5-1.tar.gz"; - sha256 = "8546964936eef73a71f6279a6f11b5e672af35175c4e41e6a866b02f58a400db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/humble/image_common/3.1.5-1"; + sha256 = "sha256-m0ZyetBDourFXXxspBc96gdKXBEfV8mJuB/J0h9Bwrs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/image-geometry/default.nix b/distros/humble/image-geometry/default.nix index aa9844c1d1..6bdf479c89 100644 --- a/distros/humble/image-geometry/default.nix +++ b/distros/humble/image-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-geometry"; version = "3.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/humble/image_geometry/3.2.1-1.tar.gz"; - name = "3.2.1-1.tar.gz"; - sha256 = "545b5079bdf078356317f792df74d77f1df099e4f07ffb7ddaf64ae93beef657"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/humble/image_geometry/3.2.1-1"; + sha256 = "sha256-OwPrbVcjCDo2FPbEA8PWpw0R8+f26IVqWu2ntyi3ImU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros ]; diff --git a/distros/humble/image-pipeline/default.nix b/distros/humble/image-pipeline/default.nix index c28683ec0c..16b6d66d99 100644 --- a/distros/humble/image-pipeline/default.nix +++ b/distros/humble/image-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-pipeline"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/humble/image_pipeline/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "f8b6b2fe3194f8b027e9cb851da0040d77a415cc3731a8e1b3393465cf5eb5c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/humble/image_pipeline/3.0.0-1"; + sha256 = "sha256-/2kJQaeVvq1PGR/HVK6sb080D1sEKmR5rQ/XEKOGOmo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/image-proc/default.nix b/distros/humble/image-proc/default.nix index 9577d8c958..8f22fd50e1 100644 --- a/distros/humble/image-proc/default.nix +++ b/distros/humble/image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-proc"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/humble/image_proc/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "74df095fcc9194aa98f2b834a2209161235c8a06e372ff2568a99ab8f5378c59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/humble/image_proc/3.0.0-1"; + sha256 = "sha256-zy2tmKGOUsBmxkBiyooaxKISzFlbEqmBM5Gn3VDv1QE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/image-publisher/default.nix b/distros/humble/image-publisher/default.nix index 91046906ed..ae879bd296 100644 --- a/distros/humble/image-publisher/default.nix +++ b/distros/humble/image-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-publisher"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/humble/image_publisher/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "f1144b58705ed2bb24ccae0e2d592cb963e82e8d43d0e5de9aa97e9b8b0943b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/humble/image_publisher/3.0.0-1"; + sha256 = "sha256-0t1nxC5kT6wIj+N9B/ONHOLOp0RheSGhPP5JRJYV1W8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/image-rotate/default.nix b/distros/humble/image-rotate/default.nix index 9a66da4a3f..fed7199849 100644 --- a/distros/humble/image-rotate/default.nix +++ b/distros/humble/image-rotate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-rotate"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/humble/image_rotate/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "6214995c1ab31affd72133d721b125d0132a6e117f8dca82b8303ba5f0efc924"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/humble/image_rotate/3.0.0-1"; + sha256 = "sha256-a5QdOhkvCPVFIZZ7kACoR0qbzcfZuRP05LSKdxJNNZE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto class-loader ]; diff --git a/distros/humble/image-tools/default.nix b/distros/humble/image-tools/default.nix index 67609bbaae..95b43a23da 100644 --- a/distros/humble/image-tools/default.nix +++ b/distros/humble/image-tools/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-pytest, ament-lint-auto, ament-lint-common, launch, launch-ros, launch-testing, launch-testing-ament-cmake, launch-testing-ros, opencv, rclcpp, rclcpp-components, rmw-implementation-cmake, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-image-tools"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/image_tools/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "4ac015aef074f2d00778229a741f9b1ec3ebaaa6eabeb0432986af8b9fe2f2b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/image_tools/0.20.3-1"; + sha256 = "sha256-OK3pEFNrAK8UJHNJFdb7vR3hCI99uAckBG2p9D4cKgU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/image-transport-plugins/default.nix b/distros/humble/image-transport-plugins/default.nix index 83baaa45a3..f70198d817 100644 --- a/distros/humble/image-transport-plugins/default.nix +++ b/distros/humble/image-transport-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-transport-plugins"; version = "2.5.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/humble/image_transport_plugins/2.5.0-2.tar.gz"; - name = "2.5.0-2.tar.gz"; - sha256 = "ceafb2f3053f0dbb8680362a9e1a7179be7e985017b2dca9621ac43394dc3669"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/humble/image_transport_plugins/2.5.0-2"; + sha256 = "sha256-lFJmHWX6ss3+zXlfmeyPZBjH3obQXESnyL5IDy0ono4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/image-transport/default.nix b/distros/humble/image-transport/default.nix index 8de3931364..58e2a7145e 100644 --- a/distros/humble/image-transport/default.nix +++ b/distros/humble/image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-transport"; version = "3.1.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/humble/image_transport/3.1.5-1.tar.gz"; - name = "3.1.5-1.tar.gz"; - sha256 = "658ccd667e3617fbbf1fa72966ed741f83faf8ee2d946d8436c4bb4d25ea4f85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/humble/image_transport/3.1.5-1"; + sha256 = "sha256-0OG+WbQa92N+GNgdCmQ8auGzufG259yhTelPB5PLyEk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/image-view/default.nix b/distros/humble/image-view/default.nix index 120eaf0cde..dccaea16a5 100644 --- a/distros/humble/image-view/default.nix +++ b/distros/humble/image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-image-view"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/humble/image_view/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "4bbbe7dc4b7f79f04a6b2587dce463870d059857b26069e1122a6b8178ec4c00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/humble/image_view/3.0.0-1"; + sha256 = "sha256-LVHPH4fwaY9eTa8cHc2upu5lApSBaueFWKMEKf1nick="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/imu-complementary-filter/default.nix b/distros/humble/imu-complementary-filter/default.nix index 8882b06e99..eaa7a2b9ec 100644 --- a/distros/humble/imu-complementary-filter/default.nix +++ b/distros/humble/imu-complementary-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-imu-complementary-filter"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/humble/imu_complementary_filter/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "5f4e6d1b85ea858d49a5d22aa1a0782b71776735a5cb243912032aab24a25da6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/humble/imu_complementary_filter/2.1.3-1"; + sha256 = "sha256-wuAsf255PYh35JCpP4czKRL9rKu2pxO/i4NOMSETePc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake geometry-msgs message-filters rclcpp sensor-msgs std-msgs tf2 tf2-ros ]; diff --git a/distros/humble/imu-filter-madgwick/default.nix b/distros/humble/imu-filter-madgwick/default.nix index 9046aff4fc..9af420ef21 100644 --- a/distros/humble/imu-filter-madgwick/default.nix +++ b/distros/humble/imu-filter-madgwick/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-imu-filter-madgwick"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/humble/imu_filter_madgwick/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "1a21cfef13b16dfbab3f2e6d4a46a7a805b15f09f1e7a9521d093a4e303b9c86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/humble/imu_filter_madgwick/2.1.3-1"; + sha256 = "sha256-w1yVzPSVadsRmFRs1oZ8HEZ6DXYiezID3dunE9J6VUY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/imu-sensor-broadcaster/default.nix b/distros/humble/imu-sensor-broadcaster/default.nix index bc40c2d532..354c12632b 100644 --- a/distros/humble/imu-sensor-broadcaster/default.nix +++ b/distros/humble/imu-sensor-broadcaster/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, sensor-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, backward-ros, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, sensor-msgs }: buildRosPackage { pname = "ros-humble-imu-sensor-broadcaster"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/imu_sensor_broadcaster/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "ba4edd8aa4be7b2a1cc4b96ca8e9b038741f9c034e13217145392e92d240ef3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/imu_sensor_broadcaster/2.16.0-1"; + sha256 = "sha256-+Oy2BTF5GDKP1ajVaBEdVzY6QXIZcxkNfS9y2nFHsJg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock ament-lint-auto ament-lint-common controller-manager hardware-interface ros2-control-test-assets ]; - propagatedBuildInputs = [ controller-interface generate-parameter-library hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools sensor-msgs ]; + propagatedBuildInputs = [ backward-ros controller-interface generate-parameter-library hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools sensor-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/imu-tools/default.nix b/distros/humble/imu-tools/default.nix index 7c4e428868..81fd912310 100644 --- a/distros/humble/imu-tools/default.nix +++ b/distros/humble/imu-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-imu-tools"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/humble/imu_tools/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "171fcbc9363e5fc4c5299cdecd0902344cf886a8c4e674199cb7261c2d3fe2a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/humble/imu_tools/2.1.3-1"; + sha256 = "sha256-+i6Cvdit5GQDlcCdOUAFdg6ESROTgWjJQ1IqxGC94Ug="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/interactive-markers/default.nix b/distros/humble/interactive-markers/default.nix index 2cbf125874..a4391dbb63 100644 --- a/distros/humble/interactive-markers/default.nix +++ b/distros/humble/interactive-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-interactive-markers"; version = "2.3.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/interactive_markers-release/archive/release/humble/interactive_markers/2.3.2-2.tar.gz"; - name = "2.3.2-2.tar.gz"; - sha256 = "eda1dae4ff2339615b0951e5c45a5118823da5a2c3d3f149670bc7f524aa0d7c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "interactive_markers-release"; + rev = "release/humble/interactive_markers/2.3.2-2"; + sha256 = "sha256-AOue7aI9DAZ4GHtHtOAPRcV7DJ0zvONib2v2n+DIggY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/intra-process-demo/default.nix b/distros/humble/intra-process-demo/default.nix index 23c8946159..2d26afdfa2 100644 --- a/distros/humble/intra-process-demo/default.nix +++ b/distros/humble/intra-process-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-pytest, ament-lint-auto, ament-lint-common, launch, launch-testing, launch-testing-ament-cmake, opencv, rclcpp, rmw-implementation-cmake, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-intra-process-demo"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/intra_process_demo/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "3eea4b23f644cfdddd35b0a7753e1f54216256635a2cd72dc34442fc0370df8d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/intra_process_demo/0.20.3-1"; + sha256 = "sha256-gAi2xTx88k2h6sawR7FLrIOGXULSJrMOZpfEMNPSfLM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake std-msgs ]; diff --git a/distros/humble/io-context/default.nix b/distros/humble/io-context/default.nix index f2570acda8..588540d149 100644 --- a/distros/humble/io-context/default.nix +++ b/distros/humble/io-context/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-io-context"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/humble/io_context/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "ded83fa80d974c77cba3adb4bba9dff0c3f64b2f69282532e45fe90772802855"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "transport_drivers-release"; + rev = "release/humble/io_context/1.2.0-2"; + sha256 = "sha256-RINF/bmOZEexBa8eMAkn2J1r1NOrze8SI3fx1t/ywak="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/humble/irobot-create-common-bringup/default.nix b/distros/humble/irobot-create-common-bringup/default.nix new file mode 100644 index 0000000000..5622a9d238 --- /dev/null +++ b/distros/humble/irobot-create-common-bringup/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, irobot-create-control, irobot-create-description, irobot-create-nodes, joint-state-publisher, robot-state-publisher, ros2launch, rviz2, urdf, xacro }: +buildRosPackage { + pname = "ros-humble-irobot-create-common-bringup"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_common_bringup/2.0.0-1"; + sha256 = "sha256-cXiAWzqMKEiY7mpw2+ZGGBbT4mc41rVjbXBNnph6FCc="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-cppcheck ament-cmake-cpplint ament-cmake-flake8 ament-cmake-lint-cmake ament-cmake-pep257 ament-cmake-uncrustify ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ irobot-create-control irobot-create-description irobot-create-nodes joint-state-publisher robot-state-publisher ros2launch rviz2 urdf xacro ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Provides common launch and configuration scripts for a simulated iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-control/default.nix b/distros/humble/irobot-create-control/default.nix new file mode 100644 index 0000000000..f5cad34777 --- /dev/null +++ b/distros/humble/irobot-create-control/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-xmllint, ament-lint-auto, joint-state-broadcaster, ros2-controllers, ros2launch, rsl }: +buildRosPackage { + pname = "ros-humble-irobot-create-control"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_control/2.0.0-1"; + sha256 = "sha256-VNCt9gNmPF0wbncLFTuSWGmWQU2L2RS49mgI8SRN2dI="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-flake8 ament-cmake-lint-cmake ament-cmake-pep257 ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ joint-state-broadcaster ros2-controllers ros2launch rsl ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Provides the diff-drive controller for the iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-description/default.nix b/distros/humble/irobot-create-description/default.nix new file mode 100644 index 0000000000..3ea70ef8f6 --- /dev/null +++ b/distros/humble/irobot-create-description/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-lint-cmake, ament-lint-auto, urdf }: +buildRosPackage { + pname = "ros-humble-irobot-create-description"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_description/2.0.0-1"; + sha256 = "sha256-N1IuQGAP1ccnHYsKdTjOnI96/mebbiCINaIRslS6oAA="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-lint-cmake ament-lint-auto ]; + propagatedBuildInputs = [ urdf ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Provides the model description for the iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-gazebo-bringup/default.nix b/distros/humble/irobot-create-gazebo-bringup/default.nix new file mode 100644 index 0000000000..65f46f71f0 --- /dev/null +++ b/distros/humble/irobot-create-gazebo-bringup/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, gazebo-plugins, gazebo-ros, gazebo-ros2-control, irobot-create-common-bringup, irobot-create-description, irobot-create-gazebo-plugins, ros2launch }: +buildRosPackage { + pname = "ros-humble-irobot-create-gazebo-bringup"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_gazebo_bringup/2.0.0-1"; + sha256 = "sha256-wxmGDvcKpQVtWtMWZWS1bFl0Y0AxI9FqzgcTW9i0s20="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-cppcheck ament-cmake-cpplint ament-cmake-flake8 ament-cmake-lint-cmake ament-cmake-pep257 ament-cmake-uncrustify ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ gazebo-plugins gazebo-ros gazebo-ros2-control irobot-create-common-bringup irobot-create-description irobot-create-gazebo-plugins ros2launch ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Provides launch and configuration scripts for a Gazebo simulated iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-gazebo-plugins/default.nix b/distros/humble/irobot-create-gazebo-plugins/default.nix new file mode 100644 index 0000000000..4f5f2595c2 --- /dev/null +++ b/distros/humble/irobot-create-gazebo-plugins/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, gazebo-dev, gazebo-ros, geometry-msgs, irobot-create-msgs, irobot-create-toolbox, rclcpp, sensor-msgs }: +buildRosPackage { + pname = "ros-humble-irobot-create-gazebo-plugins"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_gazebo_plugins/2.0.0-1"; + sha256 = "sha256-7FVjS/G9v3CLAIHkK9zX7OO8RKGdA+pYxXC5mR0FXas="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-cppcheck ament-cmake-cpplint ament-cmake-flake8 ament-cmake-lint-cmake ament-cmake-pep257 ament-cmake-uncrustify ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ gazebo-dev gazebo-ros geometry-msgs irobot-create-msgs irobot-create-toolbox rclcpp sensor-msgs ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Provides the Gazebo plugins for the iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-gazebo-sim/default.nix b/distros/humble/irobot-create-gazebo-sim/default.nix new file mode 100644 index 0000000000..66cb8e6558 --- /dev/null +++ b/distros/humble/irobot-create-gazebo-sim/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, irobot-create-gazebo-bringup, irobot-create-gazebo-plugins }: +buildRosPackage { + pname = "ros-humble-irobot-create-gazebo-sim"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_gazebo_sim/2.0.0-1"; + sha256 = "sha256-6T6rG2fCQdTkQYjJGdaTFneoFS+tvAd8d4eLiPoaIEw="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ irobot-create-gazebo-bringup irobot-create-gazebo-plugins ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Metapackage for the iRobot(R) Create(R) 3 robot Gazebo simulatorGazebo simulation stack.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-ignition-bringup/default.nix b/distros/humble/irobot-create-ignition-bringup/default.nix new file mode 100644 index 0000000000..f45c9ae2a8 --- /dev/null +++ b/distros/humble/irobot-create-ignition-bringup/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, geometry-msgs, irobot-create-common-bringup, irobot-create-description, irobot-create-ignition-plugins, irobot-create-ignition-toolbox, irobot-create-msgs, ros-ign-bridge, ros-ign-gazebo, ros-ign-interfaces, std-msgs }: +buildRosPackage { + pname = "ros-humble-irobot-create-ignition-bringup"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_ignition_bringup/2.0.0-1"; + sha256 = "sha256-Xq4QQI1xIGF/dAMCpCoO1+MeyMmIessOIyg3aYrNVJw="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-cppcheck ament-cmake-cpplint ament-cmake-flake8 ament-cmake-lint-cmake ament-cmake-pep257 ament-cmake-uncrustify ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ geometry-msgs irobot-create-common-bringup irobot-create-description irobot-create-ignition-plugins irobot-create-ignition-toolbox irobot-create-msgs ros-ign-bridge ros-ign-gazebo ros-ign-interfaces std-msgs ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Provides launch and configuration scripts for a Ignition simulated iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-ignition-sim/default.nix b/distros/humble/irobot-create-ignition-sim/default.nix new file mode 100644 index 0000000000..fbcc6c418d --- /dev/null +++ b/distros/humble/irobot-create-ignition-sim/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, irobot-create-ignition-bringup, irobot-create-ignition-plugins, irobot-create-ignition-toolbox }: +buildRosPackage { + pname = "ros-humble-irobot-create-ignition-sim"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_ignition_sim/2.0.0-1"; + sha256 = "sha256-C10ai8XZDnxw2BZcvof/U3M2rgHBRUwLZW3usOly47Q="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ irobot-create-ignition-bringup irobot-create-ignition-plugins irobot-create-ignition-toolbox ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Metapackage for the iRobot(R) Create(R) 3 robot Ignition simulator''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-ignition-toolbox/default.nix b/distros/humble/irobot-create-ignition-toolbox/default.nix new file mode 100644 index 0000000000..b2129b539e --- /dev/null +++ b/distros/humble/irobot-create-ignition-toolbox/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, control-msgs, irobot-create-msgs, irobot-create-toolbox, nav-msgs, rclcpp, rclcpp-action, rcutils, ros-ign-interfaces, sensor-msgs, std-msgs, tf2, tf2-geometry-msgs }: +buildRosPackage { + pname = "ros-humble-irobot-create-ignition-toolbox"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_ignition_toolbox/2.0.0-1"; + sha256 = "sha256-EfVWFR5jdYCDchu1iMac1FQtEhAEj2HTG3rQ689KT8w="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-cppcheck ament-cmake-cpplint ament-cmake-flake8 ament-cmake-lint-cmake ament-cmake-pep257 ament-cmake-uncrustify ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ control-msgs irobot-create-msgs irobot-create-toolbox nav-msgs rclcpp rclcpp-action rcutils ros-ign-interfaces sensor-msgs std-msgs tf2 tf2-geometry-msgs ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Nodes and tools for simulating in Ignition iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-msgs/default.nix b/distros/humble/irobot-create-msgs/default.nix index 5b99779f59..be2b706db4 100644 --- a/distros/humble/irobot-create-msgs/default.nix +++ b/distros/humble/irobot-create-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-irobot-create-msgs"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/irobot_create_msgs-release/archive/release/humble/irobot_create_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "a14e251aadd0d4df4aba40fa39bb9b352e88394c6d9f9b2a1ffd40c2ea098a1b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "irobot_create_msgs-release"; + rev = "release/humble/irobot_create_msgs/2.1.0-1"; + sha256 = "sha256-PR6lexKHVIKf1ekKgeKoIhj871YNUAWV7d8dh5tKY+8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/irobot-create-nodes/default.nix b/distros/humble/irobot-create-nodes/default.nix new file mode 100644 index 0000000000..cf9e8ea006 --- /dev/null +++ b/distros/humble/irobot-create-nodes/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, angles, boost, control-msgs, geometry-msgs, irobot-create-msgs, irobot-create-toolbox, nav-msgs, rclcpp, rclcpp-action, rclcpp-components, sensor-msgs, tf2, tf2-geometry-msgs, tf2-ros }: +buildRosPackage { + pname = "ros-humble-irobot-create-nodes"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_nodes/2.0.0-1"; + sha256 = "sha256-pqECeygWh5B1sA/jty1e7NCaXJLQilRxRSr8+pYeIJE="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-cppcheck ament-cmake-cpplint ament-cmake-flake8 ament-cmake-lint-cmake ament-cmake-pep257 ament-cmake-uncrustify ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ angles boost control-msgs geometry-msgs irobot-create-msgs irobot-create-toolbox nav-msgs rclcpp rclcpp-action rclcpp-components sensor-msgs tf2 tf2-geometry-msgs tf2-ros ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''ROS 2 Nodes for the simulated iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/irobot-create-toolbox/default.nix b/distros/humble/irobot-create-toolbox/default.nix new file mode 100644 index 0000000000..ee82f73df3 --- /dev/null +++ b/distros/humble/irobot-create-toolbox/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-flake8, ament-cmake-lint-cmake, ament-cmake-pep257, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, ignition, rclcpp }: +buildRosPackage { + pname = "ros-humble-irobot-create-toolbox"; + version = "2.0.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "create3_sim-release"; + rev = "release/humble/irobot_create_toolbox/2.0.0-1"; + sha256 = "sha256-2wOUtrIRNHs4yh+ZkkubJN1jz/HtKglBvobB/GieEfI="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-cppcheck ament-cmake-cpplint ament-cmake-flake8 ament-cmake-lint-cmake ament-cmake-pep257 ament-cmake-uncrustify ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ ignition.math6 rclcpp ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Components and helpers for the iRobot(R) Create(R) 3 Educational Robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/joint-limits/default.nix b/distros/humble/joint-limits/default.nix index 23aa48b334..8be5fa6593 100644 --- a/distros/humble/joint-limits/default.nix +++ b/distros/humble/joint-limits/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, launch-testing-ament-cmake, rclcpp, rclcpp-lifecycle }: buildRosPackage { pname = "ros-humble-joint-limits"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/joint_limits/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "7a1c4160451ed30837d1486a95369179914825ef8173b4efdd651dc2937ce6e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/joint_limits/2.21.0-1"; + sha256 = "sha256-j7Hbsq6IeIQDIPjbluF0QXJSx7MwsZUZlIJOEVJvVOA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/joint-state-broadcaster/default.nix b/distros/humble/joint-state-broadcaster/default.nix index 9a639300c1..5e76fc3552 100644 --- a/distros/humble/joint-state-broadcaster/default.nix +++ b/distros/humble/joint-state-broadcaster/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, control-msgs, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, rcutils, realtime-tools, ros2-control-test-assets, sensor-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, control-msgs, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, rcutils, realtime-tools, ros2-control-test-assets, sensor-msgs }: buildRosPackage { pname = "ros-humble-joint-state-broadcaster"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/joint_state_broadcaster/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "43a1142b94ab9b79814f2bb46ceae4bdc5aaebd44718f7dfc24009231c53c7ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/joint_state_broadcaster/2.16.0-1"; + sha256 = "sha256-rhg7qtdCAQ7ShOL7jmYNhJEIWg00K5M4MNy/c06f9Os="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock controller-manager rclcpp ros2-control-test-assets ]; - propagatedBuildInputs = [ control-msgs controller-interface generate-parameter-library hardware-interface pluginlib rclcpp-lifecycle rcutils realtime-tools sensor-msgs ]; + propagatedBuildInputs = [ backward-ros control-msgs controller-interface generate-parameter-library hardware-interface pluginlib rclcpp-lifecycle rcutils realtime-tools sensor-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/joint-state-publisher-gui/default.nix b/distros/humble/joint-state-publisher-gui/default.nix index 877920dbc9..47606d39f6 100644 --- a/distros/humble/joint-state-publisher-gui/default.nix +++ b/distros/humble/joint-state-publisher-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-joint-state-publisher-gui"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joint_state_publisher-release/archive/release/humble/joint_state_publisher_gui/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "63ced7d5e798e6ff8b3b61093cedbe80bd929c6ba2134a116681585cd92d03d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/humble/joint_state_publisher_gui/2.3.0-1"; + sha256 = "sha256-UgpMKR1spc/YH/Bs30Gifn/Ov9lC+cuHmXgs+d4a7I8="; + }; buildType = "ament_python"; propagatedBuildInputs = [ joint-state-publisher python-qt-binding rclpy ]; diff --git a/distros/humble/joint-state-publisher/default.nix b/distros/humble/joint-state-publisher/default.nix index df12954615..cb943ac38c 100644 --- a/distros/humble/joint-state-publisher/default.nix +++ b/distros/humble/joint-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-joint-state-publisher"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joint_state_publisher-release/archive/release/humble/joint_state_publisher/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "f07ad473af6619aaafbdc59348da557ed6498cfbdb9a26e65a1987dbcbb270ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/humble/joint_state_publisher/2.3.0-1"; + sha256 = "sha256-JA4xQ4bvMon+tXWHg/JOBSFOkDPo6TGZcqjsZn08hyk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-xmllint launch-testing launch-testing-ros pythonPackages.pytest ros2topic ]; diff --git a/distros/humble/joint-trajectory-controller/default.nix b/distros/humble/joint-trajectory-controller/default.nix index 8416041337..ddd62b441e 100644 --- a/distros/humble/joint-trajectory-controller/default.nix +++ b/distros/humble/joint-trajectory-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, angles, control-msgs, control-toolbox, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, trajectory-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, angles, backward-ros, control-msgs, control-toolbox, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, trajectory-msgs }: buildRosPackage { pname = "ros-humble-joint-trajectory-controller"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/joint_trajectory_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "f5f6f32b27b12999c5a6c42ff28f60ca20fbc2f84be0ed5eb8f6f86a390b2ab2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/joint_trajectory_controller/2.16.0-1"; + sha256 = "sha256-ENoA1nBu8q+N5Wzgatr9Gs4DOuImkRrC9WYqSdVTPpw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ angles control-msgs control-toolbox controller-interface generate-parameter-library hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools trajectory-msgs ]; + propagatedBuildInputs = [ angles backward-ros control-msgs control-toolbox controller-interface generate-parameter-library hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools trajectory-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/joy-linux/default.nix b/distros/humble/joy-linux/default.nix index b8e6a497fb..d0e4639da2 100644 --- a/distros/humble/joy-linux/default.nix +++ b/distros/humble/joy-linux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-joy-linux"; version = "3.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/humble/joy_linux/3.1.0-3.tar.gz"; - name = "3.1.0-3.tar.gz"; - sha256 = "db3542c66747f1d33c2d9aedea8b1008f875c056a6a51ca2528559b20b1af6dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/humble/joy_linux/3.1.0-3"; + sha256 = "sha256-Ud7B/decJ0vqf/8LrcWatgTku5IS5sZ34MW8VWp23vE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/joy-teleop/default.nix b/distros/humble/joy-teleop/default.nix index 3b70bf9d44..d59e6a08ff 100644 --- a/distros/humble/joy-teleop/default.nix +++ b/distros/humble/joy-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-joy-teleop"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/humble/joy_teleop/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "b9233987ea2b9fa1bdfb2f589f8d56899000981e1dbc9d20e8e45d8ec4490bb0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/humble/joy_teleop/1.3.0-1"; + sha256 = "sha256-pOO81abXuYpWTZZ3XcPdFNVRBA04FYijCK3alScPZJ8="; + }; buildType = "ament_python"; checkInputs = [ action-tutorials-interfaces ament-copyright ament-flake8 ament-pep257 ament-xmllint example-interfaces geometry-msgs launch-ros launch-testing std-msgs std-srvs test-msgs ]; diff --git a/distros/humble/joy-tester/default.nix b/distros/humble/joy-tester/default.nix new file mode 100644 index 0000000000..079fd9151a --- /dev/null +++ b/distros/humble/joy-tester/default.nix @@ -0,0 +1,28 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, python3Packages, pythonPackages, rclpy, sensor-msgs }: +buildRosPackage { + pname = "ros-humble-joy-tester"; + version = "0.0.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joy_tester-release"; + rev = "release/humble/joy_tester/0.0.2-1"; + sha256 = "sha256-4aFhMjPuS3BCh6fHb0WNYkfy1WWLeNrxlXiK8vs/zGI="; + }; + + buildType = "ament_python"; + checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; + propagatedBuildInputs = [ python3Packages.tkinter rclpy sensor-msgs ]; + + meta = { + description = ''Simple GUI tool for testing joysticks/gamepads''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/humble/joy/default.nix b/distros/humble/joy/default.nix index 0bddab6dfb..77158f41be 100644 --- a/distros/humble/joy/default.nix +++ b/distros/humble/joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-joy"; version = "3.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/humble/joy/3.1.0-3.tar.gz"; - name = "3.1.0-3.tar.gz"; - sha256 = "5dd57a85d2d77fddd44f438a90552e9e1fea066a051a90abaaed9606434ddf5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/humble/joy/3.1.0-3"; + sha256 = "sha256-LVq01bvfmA7TdJQjbrFwa17MdoQoTZj+fMTxjgRHsHY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/kdl-parser/default.nix b/distros/humble/kdl-parser/default.nix index 7ceed93870..e56dfcb76c 100644 --- a/distros/humble/kdl-parser/default.nix +++ b/distros/humble/kdl-parser/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-ros, ament-lint-auto, ament-lint-common, orocos-kdl-vendor, urdf, urdfdom-headers }: +{ lib, buildRosPackage, fetchurl, ament-cmake-ros, ament-lint-auto, ament-lint-common, orocos-kdl-vendor, rcutils, urdf, urdfdom-headers }: buildRosPackage { pname = "ros-humble-kdl-parser"; - version = "2.6.3-r1"; + version = "2.6.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kdl_parser-release/archive/release/humble/kdl_parser/2.6.3-1.tar.gz"; - name = "2.6.3-1.tar.gz"; - sha256 = "d87acdd7d4ad38d2525bfec1f7e0a91f558e8a97d7f4aa915899e46e47ae23ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kdl_parser-release"; + rev = "release/humble/kdl_parser/2.6.4-1"; + sha256 = "sha256-JlyZxZY3C7AYQawxE/f0lwcAO0a15WccwufPv76ONOY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; checkInputs = [ ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ orocos-kdl-vendor urdf urdfdom-headers ]; + propagatedBuildInputs = [ orocos-kdl-vendor rcutils urdf urdfdom-headers ]; nativeBuildInputs = [ ament-cmake-ros ]; meta = { diff --git a/distros/humble/key-teleop/default.nix b/distros/humble/key-teleop/default.nix index fa121d20c5..5cf1a00687 100644 --- a/distros/humble/key-teleop/default.nix +++ b/distros/humble/key-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-key-teleop"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/humble/key_teleop/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "b8fcb0ebebb9fecbf53027d8faff575aea30d8e8a955207e7792b9c5da8ba7cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/humble/key_teleop/1.3.0-1"; + sha256 = "sha256-87yL4CShLr4rcnlMktKgwgbI5fQEz2pKnQ2f50LTssY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/keyboard-handler/default.nix b/distros/humble/keyboard-handler/default.nix index e0ced2092e..4fa1a141db 100644 --- a/distros/humble/keyboard-handler/default.nix +++ b/distros/humble/keyboard-handler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-keyboard-handler"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/keyboard_handler-release/archive/release/humble/keyboard_handler/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "37785dce342482068575a9d9c39960ab1711df0262f2cdd2d8e0b0872f182faf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "keyboard_handler-release"; + rev = "release/humble/keyboard_handler/0.0.5-1"; + sha256 = "sha256-YkqOrcqMX8vmBZm2llfopDtrE75rah4TxGZCAiDfWpo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/kinematics-interface-kdl/default.nix b/distros/humble/kinematics-interface-kdl/default.nix index b320464ead..736a626849 100644 --- a/distros/humble/kinematics-interface-kdl/default.nix +++ b/distros/humble/kinematics-interface-kdl/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, eigen, eigen3-cmake-module, kdl-parser, kinematics-interface, pluginlib, ros2-control-test-assets, tf2-eigen-kdl }: buildRosPackage { pname = "ros-humble-kinematics-interface-kdl"; - version = "0.0.2-r1"; + version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kinematics_interface-release/archive/release/humble/kinematics_interface_kdl/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "ddda66a26f596a21a5e69eb291eef52b95df950ff0cd9f5572dcb3880a4c9804"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kinematics_interface-release"; + rev = "release/humble/kinematics_interface_kdl/0.1.0-1"; + sha256 = "sha256-OHSv8OF89XULb0+wSU5CtNaQikTKlPlZlu/wAEGOpzU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen3-cmake-module ]; diff --git a/distros/humble/kinematics-interface/default.nix b/distros/humble/kinematics-interface/default.nix index a1d64e9f11..c2f3513a1d 100644 --- a/distros/humble/kinematics-interface/default.nix +++ b/distros/humble/kinematics-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, eigen, rclcpp-lifecycle }: buildRosPackage { pname = "ros-humble-kinematics-interface"; - version = "0.0.2-r1"; + version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kinematics_interface-release/archive/release/humble/kinematics_interface/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "deed39ef1f407630336ace5f361a6ccdea49de31986c0852b28a93da3f556f14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kinematics_interface-release"; + rev = "release/humble/kinematics_interface/0.1.0-1"; + sha256 = "sha256-9qrp7FLhxFV4gNsXGUO8kXohokXrTjEDviCg9LXDwNk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/kobuki-ros-interfaces/default.nix b/distros/humble/kobuki-ros-interfaces/default.nix index 738ab003d3..4e22589975 100644 --- a/distros/humble/kobuki-ros-interfaces/default.nix +++ b/distros/humble/kobuki-ros-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-kobuki-ros-interfaces"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kobuki_ros_interfaces-release/archive/release/humble/kobuki_ros_interfaces/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "1ec057fc3c140f9d27ef9f04162be2adf22252b856d8398e76737c0e8cd0a17f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kobuki_ros_interfaces-release"; + rev = "release/humble/kobuki_ros_interfaces/1.0.0-1"; + sha256 = "sha256-svbQG6e1o4u1HncdcNcx55XoYK99I02G7CxL2jvBZhs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/kobuki-velocity-smoother/default.nix b/distros/humble/kobuki-velocity-smoother/default.nix index 5c116b3250..1a7fbd51ea 100644 --- a/distros/humble/kobuki-velocity-smoother/default.nix +++ b/distros/humble/kobuki-velocity-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-kobuki-velocity-smoother"; version = "0.15.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kobuki_velocity_smoother-release/archive/release/humble/kobuki_velocity_smoother/0.15.0-1.tar.gz"; - name = "0.15.0-1.tar.gz"; - sha256 = "d067c03d40f137ff4ab5ecbe6864ef77a6a4319bb0bb404b8a60d2ec4603d5f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kobuki_velocity_smoother-release"; + rev = "release/humble/kobuki_velocity_smoother/0.15.0-1"; + sha256 = "sha256-kZmyem+NJit8xtwuRz5Zx8AkdojVm7/pxgSOR63CkcM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/humble/lanelet2-core/default.nix b/distros/humble/lanelet2-core/default.nix index aa783db2df..3cafd6f8bf 100644 --- a/distros/humble/lanelet2-core/default.nix +++ b/distros/humble/lanelet2-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-core"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_core/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "48c33d8e8a36faa4a55d71621db961f2a33d11162845625bd15f22dbae8f889e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_core/1.1.1-4"; + sha256 = "sha256-NpBQJ/brNiWnlLzVj16s4Xq257hkZ+PCNAudtWfEkks="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2-examples/default.nix b/distros/humble/lanelet2-examples/default.nix index b4dda3b3a1..15030472c1 100644 --- a/distros/humble/lanelet2-examples/default.nix +++ b/distros/humble/lanelet2-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-examples"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_examples/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "d958bf772affd4c54734708031fd75f985cc2b2ad4c721c4a56b5fa5e3ce7f0a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_examples/1.1.1-4"; + sha256 = "sha256-r9Uj64Lgu/hODrKwkACMfUdwdOk9wBWovMNWD5KjTvM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2-io/default.nix b/distros/humble/lanelet2-io/default.nix index 6fec8f96ee..b09b31862f 100644 --- a/distros/humble/lanelet2-io/default.nix +++ b/distros/humble/lanelet2-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-io"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_io/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "717ca75300a49c108fb3110d2d847cecf7f6ab9387bb591b370d7aed31ebfc7f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_io/1.1.1-4"; + sha256 = "sha256-mW8p1j9qBuv8wPpmUu1kWNNJb7+pngf70mRvO8NciSc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2-maps/default.nix b/distros/humble/lanelet2-maps/default.nix index a9718b71da..9c5487e20d 100644 --- a/distros/humble/lanelet2-maps/default.nix +++ b/distros/humble/lanelet2-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-maps"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_maps/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "217dd5f1e7eb3ca0770f89510fc2c238a6b627b9d2e084de45ed2cec1c13b3e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_maps/1.1.1-4"; + sha256 = "sha256-iDbAH06Tpfjgf4La3huKzwojpdvk7EPzGsU65+td7z8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2-projection/default.nix b/distros/humble/lanelet2-projection/default.nix index 985a91b280..8eb82cda12 100644 --- a/distros/humble/lanelet2-projection/default.nix +++ b/distros/humble/lanelet2-projection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-projection"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_projection/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "9e6583d04f4c276e2dc6f36345ddb11209fdb79ecb5239f0d5e066d75ece7304"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_projection/1.1.1-4"; + sha256 = "sha256-g7mKXEdhoZS5qv8iio+6QG27tM/nleTmGWeaw66I+bU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2-python/default.nix b/distros/humble/lanelet2-python/default.nix index f5fc49e5b2..a69248252f 100644 --- a/distros/humble/lanelet2-python/default.nix +++ b/distros/humble/lanelet2-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-python"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_python/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "bb7952552b9866bbe20a3f09b6d7f7955d2bbfd47b26dcb74183feb21ff8c02e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_python/1.1.1-4"; + sha256 = "sha256-SfwKuO3PAhugfhidN7+7VHGaegF4UPhoRdhpJ3xjBIo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2-routing/default.nix b/distros/humble/lanelet2-routing/default.nix index e007cb6619..2de14db9fe 100644 --- a/distros/humble/lanelet2-routing/default.nix +++ b/distros/humble/lanelet2-routing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-routing"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_routing/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "c8ebf8e08380f6f5ac41ac629d429e80a4071b3228c92914fc348134dd396b6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_routing/1.1.1-4"; + sha256 = "sha256-bcQwF0woqvqfOeIO7haHyco3dmf6CNAotcyEVFPHkGk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2-traffic-rules/default.nix b/distros/humble/lanelet2-traffic-rules/default.nix index 119e18954f..239130c78f 100644 --- a/distros/humble/lanelet2-traffic-rules/default.nix +++ b/distros/humble/lanelet2-traffic-rules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-traffic-rules"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_traffic_rules/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "ffbaf785eb5919e0ff8a320f528e1651e501d2b0704f89eb0187df59024755ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_traffic_rules/1.1.1-4"; + sha256 = "sha256-f8lvg45yjWovjMCmp3Pdmr6KFejBnczY67qkvP5uFWw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2-validation/default.nix b/distros/humble/lanelet2-validation/default.nix index d0acad8f4f..5a0edf76d3 100644 --- a/distros/humble/lanelet2-validation/default.nix +++ b/distros/humble/lanelet2-validation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2-validation"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2_validation/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "9dcabc5eca74709f6d0b2fa937bb43594521e1fd53e0f2f6fd1b1f8131f17a44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2_validation/1.1.1-4"; + sha256 = "sha256-BjMp2DLjsi33ViCZSemJ1kXsu/o4W8xgoAIgna6cX5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/lanelet2/default.nix b/distros/humble/lanelet2/default.nix index 6b5ea4a3d1..55f2ad5de7 100644 --- a/distros/humble/lanelet2/default.nix +++ b/distros/humble/lanelet2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lanelet2"; version = "1.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/humble/lanelet2/1.1.1-4.tar.gz"; - name = "1.1.1-4.tar.gz"; - sha256 = "e0fc9baab4bf09a96009680329201b4114e9710395ee3d98340914b28cf6ab75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/humble/lanelet2/1.1.1-4"; + sha256 = "sha256-xW2nmdxh/bfs+AVc/+WN+rgfRzsuy9u8TH7w21x7g90="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ros-environment ]; diff --git a/distros/humble/laser-filters/default.nix b/distros/humble/laser-filters/default.nix index 0791b42469..76277767b9 100644 --- a/distros/humble/laser-filters/default.nix +++ b/distros/humble/laser-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-laser-filters"; version = "2.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/laser_filters-release/archive/release/humble/laser_filters/2.0.5-1.tar.gz"; - name = "2.0.5-1.tar.gz"; - sha256 = "b677f72e44342dced3edfe486eacacb56af7c111037bc5e9327135c67ebf25d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "laser_filters-release"; + rev = "release/humble/laser_filters/2.0.5-1"; + sha256 = "sha256-Ce8KbDAKhfJUqoSJZczGprJMyAeUW6KMPE3XrtaevoE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/laser-geometry/default.nix b/distros/humble/laser-geometry/default.nix index 151de217ac..43cd399d0a 100644 --- a/distros/humble/laser-geometry/default.nix +++ b/distros/humble/laser-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-laser-geometry"; version = "2.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/laser_geometry-release/archive/release/humble/laser_geometry/2.4.0-2.tar.gz"; - name = "2.4.0-2.tar.gz"; - sha256 = "783a8c014d0cc2b4e2a94261e19a864937ed5f61bab02e98df49af09202d4691"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "laser_geometry-release"; + rev = "release/humble/laser_geometry/2.4.0-2"; + sha256 = "sha256-JH57bYK6eAzaANWyYK8v9l9W6MJBFNpKxSrjaFfmPDA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/laser-proc/default.nix b/distros/humble/laser-proc/default.nix index a065113efc..fbf47019a0 100644 --- a/distros/humble/laser-proc/default.nix +++ b/distros/humble/laser-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-laser-proc"; version = "1.0.2-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/laser_proc-release/archive/release/humble/laser_proc/1.0.2-5.tar.gz"; - name = "1.0.2-5.tar.gz"; - sha256 = "7de5503f77ce15b5c9bfad7ed79a06fbcb02407f9c94e8dbc3863589acdfa395"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "laser_proc-release"; + rev = "release/humble/laser_proc/1.0.2-5"; + sha256 = "sha256-h2lPjaJimCF/20eVEH3+ZS7CDqoML9voXq2B0x32NSY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/launch-pal/default.nix b/distros/humble/launch-pal/default.nix index eb20f6aada..d47bff49c7 100644 --- a/distros/humble/launch-pal/default.nix +++ b/distros/humble/launch-pal/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-launch-pal"; version = "0.0.6-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/launch_pal-release/archive/release/humble/launch_pal/0.0.6-1.tar.gz"; - name = "0.0.6-1.tar.gz"; - sha256 = "d656b3c0dccfa66635a99631daeda073ace0ee90a975171766b28eb0df01941f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "launch_pal-release"; + rev = "release/humble/launch_pal/0.0.6-1"; + sha256 = "sha256-e2Yu6U2SOd0HuhcED4mybymwCdoCRKrZaLdne5dRw7A="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/launch-param-builder/default.nix b/distros/humble/launch-param-builder/default.nix index 3acc35bd4f..b04682ff9b 100644 --- a/distros/humble/launch-param-builder/default.nix +++ b/distros/humble/launch-param-builder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-launch-param-builder"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_param_builder-release/archive/release/humble/launch_param_builder/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "0da920fde3039254d060f300cf7c357b8f20f82a012b657f5f974641d2729f4d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_param_builder-release"; + rev = "release/humble/launch_param_builder/0.1.1-1"; + sha256 = "sha256-5wzPO7Vg6sA7heEmRxiLcDbilS5YyieLi8fBrtcJe/g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright pythonPackages.pytest ]; diff --git a/distros/humble/launch-pytest/default.nix b/distros/humble/launch-pytest/default.nix index 35de66b7b2..fbd3dbff97 100644 --- a/distros/humble/launch-pytest/default.nix +++ b/distros/humble/launch-pytest/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, launch, launch-testing, osrf-pycommon, pythonPackages }: buildRosPackage { pname = "ros-humble-launch-pytest"; - version = "1.0.3-r1"; + version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/humble/launch_pytest/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "b9388a634611f8a8f48d42479e828d193d2ebf4b80cac9a2f7de0a41465dbd88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/humble/launch_pytest/1.0.4-1"; + sha256 = "sha256-IuidwoEOtYeJP5LusYq8+UZazY1Ie+I3difggRbLlho="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch ]; diff --git a/distros/humble/launch-ros/default.nix b/distros/humble/launch-ros/default.nix index 238c695288..25964c6f94 100644 --- a/distros/humble/launch-ros/default.nix +++ b/distros/humble/launch-ros/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, composition-interfaces, launch, lifecycle-msgs, osrf-pycommon, python3Packages, pythonPackages, rclpy }: buildRosPackage { pname = "ros-humble-launch-ros"; - version = "0.19.3-r1"; + version = "0.19.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/humble/launch_ros/0.19.3-1.tar.gz"; - name = "0.19.3-1.tar.gz"; - sha256 = "b33fec9608b3fe6e834552aca24d17654e3ff9d088ec8cb6eef0e3c435f2987e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/humble/launch_ros/0.19.4-1"; + sha256 = "sha256-DYRL9AGrHGReNLbYT9ALwz5QyXEn1AXuLxKWZISfeXM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/launch-system-modes/default.nix b/distros/humble/launch-system-modes/default.nix index ba73514942..ac4db6b11b 100644 --- a/distros/humble/launch-system-modes/default.nix +++ b/distros/humble/launch-system-modes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-launch-system-modes"; version = "0.9.0-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/system_modes-release/archive/release/humble/launch_system_modes/0.9.0-6.tar.gz"; - name = "0.9.0-6.tar.gz"; - sha256 = "a2b13c940f3041b27a096c921a5d8bf88b399a2a2f0102848eaa942d44b959aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "system_modes-release"; + rev = "release/humble/launch_system_modes/0.9.0-6"; + sha256 = "sha256-igv7EQutLOf+qcExGB554hDDTuFxB1P9COvQUY2izGA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/launch-testing-ament-cmake/default.nix b/distros/humble/launch-testing-ament-cmake/default.nix index 9f25ed6224..aad2dfe239 100644 --- a/distros/humble/launch-testing-ament-cmake/default.nix +++ b/distros/humble/launch-testing-ament-cmake/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-copyright, ament-cmake-test, launch-testing, python-cmake-module }: buildRosPackage { pname = "ros-humble-launch-testing-ament-cmake"; - version = "1.0.3-r1"; + version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/humble/launch_testing_ament_cmake/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "7b495812abea0138f895590bade846a9f096c9c5feac6d78c51bd2dd8cbed3e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/humble/launch_testing_ament_cmake/1.0.4-1"; + sha256 = "sha256-rtTExJiPHcyJ4Uo4f3KSzJtCLGw+8UC0zxRg8zMurTI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/launch-testing-examples/default.nix b/distros/humble/launch-testing-examples/default.nix index c9eff3d140..6873634c8e 100644 --- a/distros/humble/launch-testing-examples/default.nix +++ b/distros/humble/launch-testing-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-launch-testing-examples"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/humble/launch_testing_examples/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "76ec4b6913e2080b9adde1497f8ec286edc8b0bb9272d303553d8be93a32337d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/humble/launch_testing_examples/0.15.1-1"; + sha256 = "sha256-p3vlS69VFPZsIW9Vr5LxkDfjQsnNjdxp4r+C/dgpj0c="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 demo-nodes-cpp launch launch-ros launch-testing launch-testing-ros pythonPackages.pytest rclpy ros2bag rosbag2-transport std-msgs ]; diff --git a/distros/humble/launch-testing-ros/default.nix b/distros/humble/launch-testing-ros/default.nix index c8b97eeced..626fbf8efe 100644 --- a/distros/humble/launch-testing-ros/default.nix +++ b/distros/humble/launch-testing-ros/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, launch-ros, launch-testing, pythonPackages, rclpy, std-msgs }: buildRosPackage { pname = "ros-humble-launch-testing-ros"; - version = "0.19.3-r1"; + version = "0.19.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/humble/launch_testing_ros/0.19.3-1.tar.gz"; - name = "0.19.3-1.tar.gz"; - sha256 = "a21e1f3de3f037a98fd26b38c6dd5483f2e56c61460f111c650a10260a1351cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/humble/launch_testing_ros/0.19.4-1"; + sha256 = "sha256-c593XcHABvuTAaTZwg9vsSOf4PzeChivzTNJ34E2eYI="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest std-msgs ]; diff --git a/distros/humble/launch-testing/default.nix b/distros/humble/launch-testing/default.nix index 3d6f1ec761..47cb339713 100644 --- a/distros/humble/launch-testing/default.nix +++ b/distros/humble/launch-testing/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, launch, launch-xml, launch-yaml, osrf-pycommon, pythonPackages }: buildRosPackage { pname = "ros-humble-launch-testing"; - version = "1.0.3-r1"; + version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/humble/launch_testing/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "99e816363f656020fdde4f25f0712a509e6eb714755b1a884ca09f94d6c54e01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/humble/launch_testing/1.0.4-1"; + sha256 = "sha256-RvGM53lv3/7iOhiVHOn8pEQ6vqkgoUESBsujBItDzhs="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch ]; diff --git a/distros/humble/launch-xml/default.nix b/distros/humble/launch-xml/default.nix index 9950c7d6a3..b46cea16a4 100644 --- a/distros/humble/launch-xml/default.nix +++ b/distros/humble/launch-xml/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, launch, pythonPackages }: buildRosPackage { pname = "ros-humble-launch-xml"; - version = "1.0.3-r1"; + version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/humble/launch_xml/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "5baba27ea288d559f65a39ab56c4c48383ecc9159414a6222d6803011bf1e6df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/humble/launch_xml/1.0.4-1"; + sha256 = "sha256-w+ejKOfLHDoC7kDLEMC8vodRlqNYjs2N/WC1pP8mH4w="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/launch-yaml/default.nix b/distros/humble/launch-yaml/default.nix index 7290e310e1..c45caeb28b 100644 --- a/distros/humble/launch-yaml/default.nix +++ b/distros/humble/launch-yaml/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, launch, pythonPackages }: buildRosPackage { pname = "ros-humble-launch-yaml"; - version = "1.0.3-r1"; + version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/humble/launch_yaml/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "694acd8cf2fe4d3f45a369c3deb780fd938ba15e26d3ad8e116449b2a64abcaa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/humble/launch_yaml/1.0.4-1"; + sha256 = "sha256-kET6sYCW1W4pxlXmmTO0/qMuO6V3Z4V+ah/ndkOGmBQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/launch/default.nix b/distros/humble/launch/default.nix index 8297bf205a..a54dc3ab5c 100644 --- a/distros/humble/launch/default.nix +++ b/distros/humble/launch/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, osrf-pycommon, python3Packages, pythonPackages }: buildRosPackage { pname = "ros-humble-launch"; - version = "1.0.3-r1"; + version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/humble/launch/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "f7ba4d4206725e8f47c51863b0cab9fe5d839fdffea1e7d3184add544c87c558"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/humble/launch/1.0.4-1"; + sha256 = "sha256-tI4pwebTpp6kSB33hk+D/RBmMByv9EbhTU/B+El0Tlw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/leo-bringup/default.nix b/distros/humble/leo-bringup/default.nix index 462a518079..3c3c5bf563 100644 --- a/distros/humble/leo-bringup/default.nix +++ b/distros/humble/leo-bringup/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, image-proc, leo-description, leo-fw, robot-state-publisher, rosapi, rosbridge-server, sensor-msgs, v4l2-camera, xacro }: buildRosPackage { pname = "ros-humble-leo-bringup"; - version = "1.2.1-r1"; + version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_robot-release/archive/release/humble/leo_bringup/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "bd8435ced84926f83669db9c567a5ded8be43fd1701860efa560617737b1a593"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_robot-release"; + rev = "release/humble/leo_bringup/1.3.0-1"; + sha256 = "sha256-vmrWA/EPZOCWoQ7Q4HEn8XK/zZkthaDpV5X5MUrlaRs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/leo-description/default.nix b/distros/humble/leo-description/default.nix index bdbd9f346e..ccd4ec6424 100644 --- a/distros/humble/leo-description/default.nix +++ b/distros/humble/leo-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-leo-description"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_common-release/archive/release/humble/leo_description/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "a4b45eef10ddb7d7d1143c12fb9c3e596c52d0602e8a3e768a376a0b2c1908e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_common-release"; + rev = "release/humble/leo_description/1.1.0-1"; + sha256 = "sha256-+VNYse18mCzzr+FyLA3pGmXiLpN3DQCp+t7DwaAxkK4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/leo-desktop/default.nix b/distros/humble/leo-desktop/default.nix index 9e12b4f431..53946ba0c9 100644 --- a/distros/humble/leo-desktop/default.nix +++ b/distros/humble/leo-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-leo-desktop"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_desktop-release/archive/release/humble/leo_desktop/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "f73f5a7c14f8afb76de815112fe99b98b35c63dcd3d6b70f6ca302f2e49d18a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_desktop-release"; + rev = "release/humble/leo_desktop/1.1.0-1"; + sha256 = "sha256-YVpdlrpasTNSWYO4smQTr6VvaFBfuTFQn1snucaRQmw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/leo-fw/default.nix b/distros/humble/leo-fw/default.nix index 4e0bd16fb8..a6aee7bbde 100644 --- a/distros/humble/leo-fw/default.nix +++ b/distros/humble/leo-fw/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, ament-index-python, geometry-msgs, leo-msgs, libyamlcpp, nav-msgs, python3Packages, rclcpp, rclcpp-components, rclpy, sensor-msgs, std-msgs, std-srvs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, ament-index-python, geometry-msgs, leo-msgs, libyamlcpp, nav-msgs, python3Packages, rclcpp, rclcpp-components, rclpy, ros2cli, sensor-msgs, std-msgs, std-srvs }: buildRosPackage { pname = "ros-humble-leo-fw"; - version = "1.2.1-r1"; + version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_robot-release/archive/release/humble/leo_fw/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "4b6230313b3a3b76e7aa92b197ad5fd47c8749faf735ef1977fa71fbb7c5a041"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_robot-release"; + rev = "release/humble/leo_fw/1.3.0-1"; + sha256 = "sha256-OUJUAWl53wcj6jZaIIPzRxHqv0O3BUCTXf9/+4+YEK8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python libyamlcpp ]; - propagatedBuildInputs = [ ament-index-python geometry-msgs leo-msgs nav-msgs python3Packages.dbus-python python3Packages.pyyaml python3Packages.whichcraft rclcpp rclcpp-components rclpy sensor-msgs std-msgs std-srvs ]; + propagatedBuildInputs = [ ament-index-python geometry-msgs leo-msgs nav-msgs python3Packages.dbus-python python3Packages.pyyaml python3Packages.whichcraft rclcpp rclcpp-components rclpy ros2cli sensor-msgs std-msgs std-srvs ]; nativeBuildInputs = [ ament-cmake ament-cmake-python ]; meta = { diff --git a/distros/humble/leo-msgs/default.nix b/distros/humble/leo-msgs/default.nix index 8f11ee4333..2792f94483 100644 --- a/distros/humble/leo-msgs/default.nix +++ b/distros/humble/leo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-leo-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_common-release/archive/release/humble/leo_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "4f1718b81a99294a2cdb5d87e20778ebdfc5e3a0de0c6c2d606c0ddbcb3aef76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_common-release"; + rev = "release/humble/leo_msgs/1.1.0-1"; + sha256 = "sha256-boOryphikqMMf8uP/1Xmin2asRfNUBPWsu6qmbsoOqQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/leo-robot/default.nix b/distros/humble/leo-robot/default.nix index 03ad76130d..fbc9ce8e67 100644 --- a/distros/humble/leo-robot/default.nix +++ b/distros/humble/leo-robot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, leo, leo-bringup, leo-fw }: buildRosPackage { pname = "ros-humble-leo-robot"; - version = "1.2.1-r1"; + version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_robot-release/archive/release/humble/leo_robot/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "cee1b44d5eee9cc531dc9ce98d75520c805e260d6e601804dad9e26158799760"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_robot-release"; + rev = "release/humble/leo_robot/1.3.0-1"; + sha256 = "sha256-zl/ezi59HnOq6OeqCYGjGekvdtwtc8SGGLxqp8lbKdM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/leo-teleop/default.nix b/distros/humble/leo-teleop/default.nix index 51908fc8c0..e448ec00a3 100644 --- a/distros/humble/leo-teleop/default.nix +++ b/distros/humble/leo-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-leo-teleop"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_common-release/archive/release/humble/leo_teleop/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "9c63228ed8a09142afd99c87a1923b779f710abd7a54104455f56a51662cc815"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_common-release"; + rev = "release/humble/leo_teleop/1.1.0-1"; + sha256 = "sha256-b+43cpCbYIO6jZvix2hLEbOH6RocS5OU2T9INwE/BBk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/leo-viz/default.nix b/distros/humble/leo-viz/default.nix index acc2c5185c..667df2c5aa 100644 --- a/distros/humble/leo-viz/default.nix +++ b/distros/humble/leo-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-leo-viz"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_desktop-release/archive/release/humble/leo_viz/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "f5a0663bc309b7414c4471de723d1c16d9d3b8665f85cf1c45428d667787c8a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_desktop-release"; + rev = "release/humble/leo_viz/1.1.0-1"; + sha256 = "sha256-2C7i0bQByR/kwoYKjelPz/+sMAaGyjgSeW0YtgMa8a8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/leo/default.nix b/distros/humble/leo/default.nix index 14cc4d65e3..dda9ee9dcc 100644 --- a/distros/humble/leo/default.nix +++ b/distros/humble/leo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-leo"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/leo_common-release/archive/release/humble/leo/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "900d6a07067d946020a317f32cb3db8dbb039f0ffa0d403df75d26bbd1dabe26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "leo_common-release"; + rev = "release/humble/leo/1.1.0-1"; + sha256 = "sha256-WJCkGR4qkb8TRdBFlNCutulapd/7necmCkVaJlztRuI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/lgsvl-msgs/default.nix b/distros/humble/lgsvl-msgs/default.nix index c020e2b472..eb31421140 100644 --- a/distros/humble/lgsvl-msgs/default.nix +++ b/distros/humble/lgsvl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lgsvl-msgs"; version = "0.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lgsvl_msgs-release/archive/release/humble/lgsvl_msgs/0.0.4-3.tar.gz"; - name = "0.0.4-3.tar.gz"; - sha256 = "0cacb1bdf9448391eafbe75a1076838f44c83e6676180b7ad82bdfe700097e87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lgsvl_msgs-release"; + rev = "release/humble/lgsvl_msgs/0.0.4-3"; + sha256 = "sha256-Pd5TP0wLuUr0/m+WvLpkvURpB0d0hbik3SOPkifg8YU="; + }; buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; diff --git a/distros/humble/libcurl-vendor/default.nix b/distros/humble/libcurl-vendor/default.nix index 8aca818a61..4180576f6c 100644 --- a/distros/humble/libcurl-vendor/default.nix +++ b/distros/humble/libcurl-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, curl, file, pkg-config }: buildRosPackage { pname = "ros-humble-libcurl-vendor"; - version = "3.1.0-r2"; + version = "3.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/resource_retriever-release/archive/release/humble/libcurl_vendor/3.1.0-2.tar.gz"; - name = "3.1.0-2.tar.gz"; - sha256 = "f9e630d70bf23cb9d439fc1e4e13585aa2597845db73c2757ca88fd8c9a58dc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "resource_retriever-release"; + rev = "release/humble/libcurl_vendor/3.1.1-1"; + sha256 = "sha256-WD5lMiO/i8a9EVdER73DJVBBqnTr/n9bdO9tWpxKLEw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake file ]; diff --git a/distros/humble/libg2o/default.nix b/distros/humble/libg2o/default.nix index c683fdbc6d..06b6193d70 100644 --- a/distros/humble/libg2o/default.nix +++ b/distros/humble/libg2o/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-libg2o"; version = "2020.5.29-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libg2o-release/archive/release/humble/libg2o/2020.5.29-4.tar.gz"; - name = "2020.5.29-4.tar.gz"; - sha256 = "2ac3e2b85a05c4c9c0e4526523290c5041a9145568496d5989417e7f71f9cb46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libg2o-release"; + rev = "release/humble/libg2o/2020.5.29-4"; + sha256 = "sha256-BJM6q6oL4EdI4Kiv89+V1kr0uXZhGNKBULGxexQn/6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/libmavconn/default.nix b/distros/humble/libmavconn/default.nix index fc7383a133..35d316a82b 100644 --- a/distros/humble/libmavconn/default.nix +++ b/distros/humble/libmavconn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-libmavconn"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavros-release/archive/release/humble/libmavconn/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "7afeb5ca2b226fed4c25e501dec94308d756d5508907203e838a5a18de9933ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavros-release"; + rev = "release/humble/libmavconn/2.4.0-1"; + sha256 = "sha256-zQQtWJ7KocYWlfkpJ0fdoVomUNd//KTIlPYMu2y/f00="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.empy ]; diff --git a/distros/humble/libnabo/default.nix b/distros/humble/libnabo/default.nix index 955ae2fc8a..481d316e0f 100644 --- a/distros/humble/libnabo/default.nix +++ b/distros/humble/libnabo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-libnabo"; version = "1.0.7-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libnabo-release/archive/release/humble/libnabo/1.0.7-3.tar.gz"; - name = "1.0.7-3.tar.gz"; - sha256 = "158ee7511366ea52d4ad0cc4fbbdc7140a79eb999db1d28b325bb77196770b03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libnabo-release"; + rev = "release/humble/libnabo/1.0.7-3"; + sha256 = "sha256-Mgrzbissrz6FpDhNnycTc06xxw2+MpwzohUg4wBKVmI="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/libphidget22/default.nix b/distros/humble/libphidget22/default.nix index 9ade4b0c28..c9a3095322 100644 --- a/distros/humble/libphidget22/default.nix +++ b/distros/humble/libphidget22/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-libphidget22"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/libphidget22/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "8f676833f8eb943e0d10f48e855f3d66efd038e9c769f96eca3bb578a440650e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/libphidget22/2.3.0-2"; + sha256 = "sha256-GSe+j+FQUqkURPbpdDRFr6ehzfbsb+viTisUcqVZs4g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/libpointmatcher/default.nix b/distros/humble/libpointmatcher/default.nix index 0e38188e6b..96655789db 100644 --- a/distros/humble/libpointmatcher/default.nix +++ b/distros/humble/libpointmatcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-libpointmatcher"; version = "1.3.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libpointmatcher-release/archive/release/humble/libpointmatcher/1.3.1-3.tar.gz"; - name = "1.3.1-3.tar.gz"; - sha256 = "2b62f5d7134ec1460128f820665f8435f3b8cabc4a9139a6cd1bdb61f89e4be7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libpointmatcher-release"; + rev = "release/humble/libpointmatcher/1.3.1-3"; + sha256 = "sha256-kz4xW5jFlA5Or5PIY32iQ2JsKrbswAT7Lag8SQx/5dQ="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/librealsense2/default.nix b/distros/humble/librealsense2/default.nix index 63fb72b03f..4b78ccaaf7 100644 --- a/distros/humble/librealsense2/default.nix +++ b/distros/humble/librealsense2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-librealsense2"; version = "2.51.1-r2"; - src = fetchurl { - url = "https://github.com/IntelRealSense/librealsense2-release/archive/release/humble/librealsense2/2.51.1-2.tar.gz"; - name = "2.51.1-2.tar.gz"; - sha256 = "32dc72f786c742dd110357cda1d3fb8b60841a53fe63b3aba4d9560f025494c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "librealsense2-release"; + rev = "release/humble/librealsense2/2.51.1-2"; + sha256 = "sha256-wRFSEPm6tsO1aEo2W4EUHDrvtTr43mvtQNqxjsrp7CM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake libusb1 openssl pkg-config udev ]; diff --git a/distros/humble/libstatistics-collector/default.nix b/distros/humble/libstatistics-collector/default.nix index 23a125eeb8..20992ca815 100644 --- a/distros/humble/libstatistics-collector/default.nix +++ b/distros/humble/libstatistics-collector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-libstatistics-collector"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libstatistics_collector-release/archive/release/humble/libstatistics_collector/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "35a479038ae72965f42de6fbba4efca96a77521bb682cd85a373ad7f6958e09c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libstatistics_collector-release"; + rev = "release/humble/libstatistics_collector/1.3.0-1"; + sha256 = "sha256-7rsbCpc1gL9m6OOY7ZX2TWx77NS6j3IKDyoHF9zL2T8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros rosidl-default-generators ]; diff --git a/distros/humble/libyaml-vendor/default.nix b/distros/humble/libyaml-vendor/default.nix index b88213466e..54a8e87b4d 100644 --- a/distros/humble/libyaml-vendor/default.nix +++ b/distros/humble/libyaml-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-libyaml-vendor"; version = "1.2.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libyaml_vendor-release/archive/release/humble/libyaml_vendor/1.2.2-2.tar.gz"; - name = "1.2.2-2.tar.gz"; - sha256 = "88e26943a185155364dba8847dfa9130fe52e5ba9f55b942ff8473773e9523fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libyaml_vendor-release"; + rev = "release/humble/libyaml_vendor/1.2.2-2"; + sha256 = "sha256-T5lFkF1emYzuuMStlx2KaxQi3nBCsnHhEmB9UBs1FDI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/lifecycle-msgs/default.nix b/distros/humble/lifecycle-msgs/default.nix index 2c48940a14..062dba417b 100644 --- a/distros/humble/lifecycle-msgs/default.nix +++ b/distros/humble/lifecycle-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lifecycle-msgs"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/humble/lifecycle_msgs/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "c351b99f0e26fb70b42457dc53b626bfbc208eb662ab497a4eb7061b82d04731"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/humble/lifecycle_msgs/1.2.1-1"; + sha256 = "sha256-u7czveUlC+HRblf+Pny1l9E7tZlapOXHc4qokMqRXrc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/lifecycle-py/default.nix b/distros/humble/lifecycle-py/default.nix index b13126c521..34f2eeec74 100644 --- a/distros/humble/lifecycle-py/default.nix +++ b/distros/humble/lifecycle-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-lint-auto, ament-lint-common, lifecycle, lifecycle-msgs, rclpy, ros-testing, std-msgs }: buildRosPackage { pname = "ros-humble-lifecycle-py"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/lifecycle_py/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "0d9ab61e94a6a6218e2759d9522f47f16707eabd842440889d3cff5a05756191"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/lifecycle_py/0.20.3-1"; + sha256 = "sha256-qK8g2+B8AeB9dD6rgJnDw6v/+dxfm17xjO0AOJfLOPQ="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common lifecycle ros-testing ]; diff --git a/distros/humble/lifecycle/default.nix b/distros/humble/lifecycle/default.nix index 52aa903ea2..69fb0163e0 100644 --- a/distros/humble/lifecycle/default.nix +++ b/distros/humble/lifecycle/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, lifecycle-msgs, rclcpp-lifecycle, ros-testing, std-msgs }: buildRosPackage { pname = "ros-humble-lifecycle"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/lifecycle/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "f07d3a60cf616c69451eba2f3ca396d5a28327fd567a8c61531425c9e6ef6df2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/lifecycle/0.20.3-1"; + sha256 = "sha256-8dnzIFiuY3S82Ha4MzSKNEJmYWzcO9uaQXK/W902gPs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/logging-demo/default.nix b/distros/humble/logging-demo/default.nix index e50bf2cb69..27706c3f66 100644 --- a/distros/humble/logging-demo/default.nix +++ b/distros/humble/logging-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-pytest, ament-lint-auto, ament-lint-common, launch, launch-testing, launch-testing-ament-cmake, launch-testing-ros, rclcpp, rclcpp-components, rcutils, rmw-implementation-cmake, rosidl-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-logging-demo"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/logging_demo/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "2cb879b0ffefe7698b62cdae7a324252165c83678d142d7a98b45917747dbf5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/logging_demo/0.20.3-1"; + sha256 = "sha256-EgLepCfAbGA0stkRjzhxekP5iEft5dZZWySUNsoshRU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-cmake rosidl-default-generators ]; diff --git a/distros/humble/lsc-ros2-driver/default.nix b/distros/humble/lsc-ros2-driver/default.nix index 9ec84a042d..70d5085026 100644 --- a/distros/humble/lsc-ros2-driver/default.nix +++ b/distros/humble/lsc-ros2-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lsc-ros2-driver"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/AutonicsLiDAR-release/lsc_ros2_driver-release/archive/release/humble/lsc_ros2_driver/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "1c59950825906d29f11e58275fabd6bd399d22dc2d609a46381143864d4ac872"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AutonicsLiDAR-release"; + repo = "lsc_ros2_driver-release"; + rev = "release/humble/lsc_ros2_driver/1.0.0-2"; + sha256 = "sha256-YhMew+QHLeT6uE6uwB1IcCwYfF0l0eFXUw5PDso0JtY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/lusb/default.nix b/distros/humble/lusb/default.nix index 7b98330be3..7979e4ba25 100644 --- a/distros/humble/lusb/default.nix +++ b/distros/humble/lusb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-lusb"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/lusb-release/archive/release/humble/lusb/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "df060eb9a667ff2162d9a3baf1d8f4311540d7b8d121f56ebb74e392a1a11638"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "lusb-release"; + rev = "release/humble/lusb/2.0.1-1"; + sha256 = "sha256-YBKQ/Or1xZDZ9J/UFs2hk4TFSkAP332CH1FfsuKbcXE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/humble/magic-enum/default.nix b/distros/humble/magic-enum/default.nix index ae15b561bc..8ff3a0e7c6 100644 --- a/distros/humble/magic-enum/default.nix +++ b/distros/humble/magic-enum/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-magic-enum"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/nobleo/magic_enum-release/archive/release/humble/magic_enum/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "1a9b5fdd097bba70f0c5ecebcaba35227e41f4066b51bca197f41ad9e974e45c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "magic_enum-release"; + rev = "release/humble/magic_enum/0.8.2-1"; + sha256 = "sha256-6XoJ7gjgFAQsS2v094KvA9UxRZYvV1PNlBRcbQ/5Z8c="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/map-msgs/default.nix b/distros/humble/map-msgs/default.nix index b6c3057414..544ff397b3 100644 --- a/distros/humble/map-msgs/default.nix +++ b/distros/humble/map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-map-msgs"; version = "2.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/navigation_msgs-release/archive/release/humble/map_msgs/2.1.0-3.tar.gz"; - name = "2.1.0-3.tar.gz"; - sha256 = "bea46ad2b1e2e137b542936df8465739de77a72ed7d0eb9a8c5afdf17e509ca5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "navigation_msgs-release"; + rev = "release/humble/map_msgs/2.1.0-3"; + sha256 = "sha256-cSeyqhHbFCEKh+19DvBtK0jHQGhHk3P6eAgwkY7+Bls="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/mapviz-interfaces/default.nix b/distros/humble/mapviz-interfaces/default.nix new file mode 100644 index 0000000000..f08af74bdf --- /dev/null +++ b/distros/humble/mapviz-interfaces/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, builtin-interfaces, marti-common-msgs, rosidl-default-generators, rosidl-default-runtime }: +buildRosPackage { + pname = "ros-humble-mapviz-interfaces"; + version = "2.2.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mapviz-release"; + rev = "release/humble/mapviz_interfaces/2.2.0-1"; + sha256 = "sha256-gw36lLF/MGJyPChAz2I97MjOcQdSnb/7/L6Msg9wZaw="; + }; + + buildType = "ament_cmake"; + buildInputs = [ builtin-interfaces marti-common-msgs rosidl-default-generators ]; + propagatedBuildInputs = [ rosidl-default-runtime ]; + nativeBuildInputs = [ rosidl-default-generators ]; + + meta = { + description = ''ROS interfaces used by Mapviz''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/mapviz-plugins/default.nix b/distros/humble/mapviz-plugins/default.nix new file mode 100644 index 0000000000..ad5d73e5a9 --- /dev/null +++ b/distros/humble/mapviz-plugins/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-index-cpp, cv-bridge, gps-msgs, image-transport, map-msgs, mapviz, marti-common-msgs, marti-nav-msgs, marti-sensor-msgs, marti-visualization-msgs, nav-msgs, pluginlib, qt5, rclcpp, rclcpp-action, sensor-msgs, std-msgs, stereo-msgs, swri-image-util, swri-math-util, swri-route-util, swri-transform-util, tf2, visualization-msgs }: +buildRosPackage { + pname = "ros-humble-mapviz-plugins"; + version = "2.2.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mapviz-release"; + rev = "release/humble/mapviz_plugins/2.2.0-1"; + sha256 = "sha256-SZpeFsWOQQbYrmkwQ40273ywZ7p1pOl55nRFgcvpuOY="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ ament-index-cpp cv-bridge gps-msgs image-transport map-msgs mapviz marti-common-msgs marti-nav-msgs marti-sensor-msgs marti-visualization-msgs nav-msgs pluginlib qt5.qtbase rclcpp rclcpp-action sensor-msgs std-msgs stereo-msgs swri-image-util swri-math-util swri-route-util swri-transform-util tf2 visualization-msgs ]; + nativeBuildInputs = [ ament-cmake qt5.qtbase ]; + + meta = { + description = ''Common plugins for the Mapviz visualization tool''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/mapviz/default.nix b/distros/humble/mapviz/default.nix new file mode 100644 index 0000000000..b5980e1901 --- /dev/null +++ b/distros/humble/mapviz/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, cv-bridge, freeglut, geometry-msgs, glew, image-transport, launch-xml, libyamlcpp, mapviz-interfaces, marti-common-msgs, pkg-config, pluginlib, qt5, rclcpp, rqt-gui, rqt-gui-cpp, std-srvs, swri-math-util, swri-transform-util, tf2, tf2-geometry-msgs, tf2-ros, xorg }: +buildRosPackage { + pname = "ros-humble-mapviz"; + version = "2.2.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mapviz-release"; + rev = "release/humble/mapviz/2.2.0-1"; + sha256 = "sha256-IJhlcVytsrYM4kb7uCFThqtV6b6qcd28FcAriVzBUKE="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake pkg-config ]; + propagatedBuildInputs = [ cv-bridge freeglut geometry-msgs glew image-transport launch-xml libyamlcpp mapviz-interfaces marti-common-msgs pluginlib qt5.qtbase rclcpp rqt-gui rqt-gui-cpp std-srvs swri-math-util swri-transform-util tf2 tf2-geometry-msgs tf2-ros xorg.libXi xorg.libXmu ]; + nativeBuildInputs = [ ament-cmake pkg-config qt5.qtbase ]; + + meta = { + description = ''mapviz''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/marti-can-msgs/default.nix b/distros/humble/marti-can-msgs/default.nix index ac6a6049c4..1ffc8a5b3b 100644 --- a/distros/humble/marti-can-msgs/default.nix +++ b/distros/humble/marti-can-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-marti-can-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_can_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "31ec6605d3c646369a4da4f64c4f04aaea51d83f0ce46f45bef98eb1b5d4eab4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_can_msgs/1.4.0-2"; + sha256 = "sha256-gq62fgHvxOhXDr3ktGnPyOmD8892lDQhBSsiqogWxEg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marti-common-msgs/default.nix b/distros/humble/marti-common-msgs/default.nix index cf362d6714..cbb3e7dcae 100644 --- a/distros/humble/marti-common-msgs/default.nix +++ b/distros/humble/marti-common-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-marti-common-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_common_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "c454c4198c3780167ed58228e1c7444f97b0c96620a8964d9a44bdd54996726a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_common_msgs/1.4.0-2"; + sha256 = "sha256-3vmY4+8do2OkHEV6Vz9bMcXI817qf9gvYyP0w9LEOhE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marti-dbw-msgs/default.nix b/distros/humble/marti-dbw-msgs/default.nix index 07071ff474..5251d0f4bb 100644 --- a/distros/humble/marti-dbw-msgs/default.nix +++ b/distros/humble/marti-dbw-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-marti-dbw-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_dbw_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "16bdc61b4b067c8349920d8933753e79fa54463d49c75bf8d99982e7c705123a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_dbw_msgs/1.4.0-2"; + sha256 = "sha256-E5Pa0lWlB/4ioL1q0T3M2WTvgnOTe0+9d8OpGef1jAY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marti-introspection-msgs/default.nix b/distros/humble/marti-introspection-msgs/default.nix index ff613c7528..c2a0a67009 100644 --- a/distros/humble/marti-introspection-msgs/default.nix +++ b/distros/humble/marti-introspection-msgs/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime }: +{ lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-marti-introspection-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_introspection_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "3167cbc8b9b9e58f6e6479e94ffaa9fb351fb0375ba0ee8a406ca24bcdb99ee7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_introspection_msgs/1.4.0-2"; + sha256 = "sha256-cTQ9mW5Pf9ZoQe9T5Rbq/KSJ+XEnzSIn4S4RGjBQ9cQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; - propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime ]; + propagatedBuildInputs = [ rosidl-default-runtime std-msgs ]; nativeBuildInputs = [ ament-cmake rosidl-default-generators ]; meta = { diff --git a/distros/humble/marti-nav-msgs/default.nix b/distros/humble/marti-nav-msgs/default.nix index cc73baa897..4809b1fd94 100644 --- a/distros/humble/marti-nav-msgs/default.nix +++ b/distros/humble/marti-nav-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, geographic-msgs, geometry-msgs, marti-common-msgs, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-marti-nav-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_nav_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "6120cc79fdb2e35eb5fa9e7f33be473c4ae3dc17ea37918579072cb6fcec1e4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_nav_msgs/1.4.0-2"; + sha256 = "sha256-fdH2Srkyq36OapORm/JkyC4OwJ3yQlDb8KlxVUSHtTM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marti-perception-msgs/default.nix b/distros/humble/marti-perception-msgs/default.nix index 490928de6c..720b372953 100644 --- a/distros/humble/marti-perception-msgs/default.nix +++ b/distros/humble/marti-perception-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-marti-perception-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_perception_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "5cf395cdc03721bd64c2fcf724888022960f78257330b1aa96b980b9af4b81c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_perception_msgs/1.4.0-2"; + sha256 = "sha256-m9f9qFdpWRyuknZQp8KZ8WgkgA5KtyHdvLqGYcySeBw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marti-sensor-msgs/default.nix b/distros/humble/marti-sensor-msgs/default.nix index fe49ec8a08..05b5270c74 100644 --- a/distros/humble/marti-sensor-msgs/default.nix +++ b/distros/humble/marti-sensor-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, geometry-msgs, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-humble-marti-sensor-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_sensor_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "8b75ceaa48d147e3b464d6fb95463b6ba08d580d8eb4322d0c23bb6cfeef5a82"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_sensor_msgs/1.4.0-2"; + sha256 = "sha256-6QTzEv+TddJDeBHXMRNuY6J5Eje9dFQwRDw/i6/lrvo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marti-status-msgs/default.nix b/distros/humble/marti-status-msgs/default.nix index d9674a7f59..3f4166b143 100644 --- a/distros/humble/marti-status-msgs/default.nix +++ b/distros/humble/marti-status-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-marti-status-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_status_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "5a44c863e723cf291baecd7aea7adbdce545c553b1001ae54834844aa4accd20"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_status_msgs/1.4.0-2"; + sha256 = "sha256-TbNJmHUCkvVhbBmcwKqGNVcExyWQbiApYf91ADmdqjg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marti-visualization-msgs/default.nix b/distros/humble/marti-visualization-msgs/default.nix index c48a09cacd..75301dc629 100644 --- a/distros/humble/marti-visualization-msgs/default.nix +++ b/distros/humble/marti-visualization-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, sensor-msgs }: buildRosPackage { pname = "ros-humble-marti-visualization-msgs"; - version = "1.3.0-r3"; + version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/humble/marti_visualization_msgs/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "b11084c9d151f9533bc87ed4c765d92dbae49192898930cc5ea9f3ea2f94cad9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/humble/marti_visualization_msgs/1.4.0-2"; + sha256 = "sha256-976pwQH6K8jCCIwhRVNjaX1BNDGSuYIcNX0QgRpBd68="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marvelmind-ros2-msgs/default.nix b/distros/humble/marvelmind-ros2-msgs/default.nix index 1e8e496747..be5763b622 100644 --- a/distros/humble/marvelmind-ros2-msgs/default.nix +++ b/distros/humble/marvelmind-ros2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-marvelmind-ros2-msgs"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/MarvelmindRobotics/marvelmind_ros2_msgs_release/archive/release/humble/marvelmind_ros2_msgs/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "0c0fd3f728b00a79ecc089b18f80b5bbd5d4ceb4bc3d96827121d15f70665517"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarvelmindRobotics"; + repo = "marvelmind_ros2_msgs_release"; + rev = "release/humble/marvelmind_ros2_msgs/1.0.2-1"; + sha256 = "sha256-Ge2JCHAh80HBI0fCpNFjg9fJhcotvDi2auvD+pPFzig="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/marvelmind-ros2/default.nix b/distros/humble/marvelmind-ros2/default.nix index 5536f5144e..9d03b3cf48 100644 --- a/distros/humble/marvelmind-ros2/default.nix +++ b/distros/humble/marvelmind-ros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-marvelmind-ros2"; version = "1.0.3-r5"; - src = fetchurl { - url = "https://github.com/MarvelmindRobotics/marvelmind_ros2_release_repo/archive/release/humble/marvelmind_ros2/1.0.3-5.tar.gz"; - name = "1.0.3-5.tar.gz"; - sha256 = "62437699aa5171e2f0db1bf10db01ddc0629db768e4e4eb8f4946200cd638088"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarvelmindRobotics"; + repo = "marvelmind_ros2_release_repo"; + rev = "release/humble/marvelmind_ros2/1.0.3-5"; + sha256 = "sha256-y3ZRvRsPpSKa+ONhSFIzX4WMfAGM/ovH9duWiEKTk0I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/mavlink/default.nix b/distros/humble/mavlink/default.nix index 46a3a0c6c4..c8b3aaf540 100644 --- a/distros/humble/mavlink/default.nix +++ b/distros/humble/mavlink/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-mavlink"; version = "2022.12.30-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavlink-gbp-release/archive/release/humble/mavlink/2022.12.30-1.tar.gz"; - name = "2022.12.30-1.tar.gz"; - sha256 = "d2d3eefa190474d211155b79ea380bcc147acd5bcbc5fb76230501727898f49f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavlink-gbp-release"; + rev = "release/humble/mavlink/2022.12.30-1"; + sha256 = "sha256-weCXfCMFBO/hfDHDLJs1Pc7lXxkWPFu9Ug1E0j4bbQI="; + }; buildType = "cmake"; buildInputs = [ ament-cmake cmake python3 python3Packages.future python3Packages.lxml ros-environment ]; diff --git a/distros/humble/mavros-extras/default.nix b/distros/humble/mavros-extras/default.nix index 82bdff6404..8696013365 100644 --- a/distros/humble/mavros-extras/default.nix +++ b/distros/humble/mavros-extras/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-mavros-extras"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavros-release/archive/release/humble/mavros_extras/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "b473a8d91490cb1faff663c9dd2f1ba4cf94a4269db6c2b89b02cda82ad0613a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavros-release"; + rev = "release/humble/mavros_extras/2.4.0-1"; + sha256 = "sha256-PtIYTIYjcVKAIS0pP0hq1LdX+rB++3XRmqDHaZif8jM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python angles ]; diff --git a/distros/humble/mavros-msgs/default.nix b/distros/humble/mavros-msgs/default.nix index 1374f13d78..5d99477e9b 100644 --- a/distros/humble/mavros-msgs/default.nix +++ b/distros/humble/mavros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-mavros-msgs"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavros-release/archive/release/humble/mavros_msgs/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "40eaf44ba45ec10371db04a638952ade019cfda12a1e78f1c26afc9d631766dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavros-release"; + rev = "release/humble/mavros_msgs/2.4.0-1"; + sha256 = "sha256-wDx+TrJOa9Fy2q/W1rGM/YvHumOu3oiWQgQroVg0H1A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/mavros/default.nix b/distros/humble/mavros/default.nix index c6420c4a40..55435fb0c2 100644 --- a/distros/humble/mavros/default.nix +++ b/distros/humble/mavros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-mavros"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavros-release/archive/release/humble/mavros/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "88fbffb80a779bb9bf3d19057fabe92901c9a6c6ae4b102f70a391ddbc8f026b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavros-release"; + rev = "release/humble/mavros/2.4.0-1"; + sha256 = "sha256-vNoFZgoW95lOa0ryKo2cAkU20W/qQoNLgqDkdPSoV3k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python angles ]; diff --git a/distros/humble/mcap-vendor/default.nix b/distros/humble/mcap-vendor/default.nix index b566f52da8..a7dfb5c8d4 100644 --- a/distros/humble/mcap-vendor/default.nix +++ b/distros/humble/mcap-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, git, zstd-vendor }: buildRosPackage { pname = "ros-humble-mcap-vendor"; - version = "0.6.0-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/humble/mcap_vendor/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "8836f2fce201ba25c1a35303631b8aa38754392750ee1dd4832525f1ea62eb00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/mcap_vendor/0.15.4-2"; + sha256 = "sha256-DqVTrQlVGivOFM9UrzR5uwnDRtD+4ZLTh/t3gtg6UDA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/menge-vendor/default.nix b/distros/humble/menge-vendor/default.nix index 786bf0d0f0..0130890b81 100644 --- a/distros/humble/menge-vendor/default.nix +++ b/distros/humble/menge-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-menge-vendor"; version = "1.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/menge_vendor-release/archive/release/humble/menge_vendor/1.0.0-4.tar.gz"; - name = "1.0.0-4.tar.gz"; - sha256 = "95fceaf5a214d236fb7d1f46761cf4a512689e5737d4a5a85aedcf6073702220"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "menge_vendor-release"; + rev = "release/humble/menge_vendor/1.0.0-4"; + sha256 = "sha256-pwDvm+FUMHbvtumRly3aV2QEDQ0UxPN8GlgjCe8TOZE="; + }; buildType = "catkin"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/humble/message-filters/default.nix b/distros/humble/message-filters/default.nix index 76068490b3..66fa758bf1 100644 --- a/distros/humble/message-filters/default.nix +++ b/distros/humble/message-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-message-filters"; version = "4.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_message_filters-release/archive/release/humble/message_filters/4.3.2-1.tar.gz"; - name = "4.3.2-1.tar.gz"; - sha256 = "a741780b7aff3cab204e82c1fe6a13cd366ba6d6936b96c8f6ae6e921fdba3ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_message_filters-release"; + rev = "release/humble/message_filters/4.3.2-1"; + sha256 = "sha256-Vm4bLP2o9eFmF2OwHfOyZrJJ6gHG81nHMUx2HIbtuEo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros python-cmake-module ]; diff --git a/distros/humble/micro-ros-diagnostic-bridge/default.nix b/distros/humble/micro-ros-diagnostic-bridge/default.nix index d771b295a0..c097ea7152 100644 --- a/distros/humble/micro-ros-diagnostic-bridge/default.nix +++ b/distros/humble/micro-ros-diagnostic-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-micro-ros-diagnostic-bridge"; version = "0.3.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_diagnostics-release/archive/release/humble/micro_ros_diagnostic_bridge/0.3.0-4.tar.gz"; - name = "0.3.0-4.tar.gz"; - sha256 = "3201e5a54cd365d9f1f591cd40f96a04ee5aaf5fe6123a0aa5b8581651a0eb67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_diagnostics-release"; + rev = "release/humble/micro_ros_diagnostic_bridge/0.3.0-4"; + sha256 = "sha256-mBsQdSKOPVQJVBc/FxvaxH5NOtAJy3M+bYciq7eHg+c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/micro-ros-diagnostic-msgs/default.nix b/distros/humble/micro-ros-diagnostic-msgs/default.nix index 7fa2123adf..897fb084ec 100644 --- a/distros/humble/micro-ros-diagnostic-msgs/default.nix +++ b/distros/humble/micro-ros-diagnostic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-micro-ros-diagnostic-msgs"; version = "0.3.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_diagnostics-release/archive/release/humble/micro_ros_diagnostic_msgs/0.3.0-4.tar.gz"; - name = "0.3.0-4.tar.gz"; - sha256 = "9760926dee6e72f892a7650a4d4faed9b1b3882d5d09bc892fd85a04f74862f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_diagnostics-release"; + rev = "release/humble/micro_ros_diagnostic_msgs/0.3.0-4"; + sha256 = "sha256-SzsjLMKb42ISN6YTe6pUsmSDS9aBoczr3ayWBkrJAgU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/micro-ros-msgs/default.nix b/distros/humble/micro-ros-msgs/default.nix index 0f99e5d9a2..d273aaac73 100644 --- a/distros/humble/micro-ros-msgs/default.nix +++ b/distros/humble/micro-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-micro-ros-msgs"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_msgs-release/archive/release/humble/micro_ros_msgs/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "49cdc5a739a613584c15e44d4d9ceb8669b7991af3be8a5672565725310417a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_msgs-release"; + rev = "release/humble/micro_ros_msgs/1.0.0-3"; + sha256 = "sha256-kuDv7e3C0BCXolx6ePv0TLEpK9E3OfLGFAh0K/9Wb8o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/microstrain-inertial-driver/default.nix b/distros/humble/microstrain-inertial-driver/default.nix index 3fd8300148..fd85e2b8f5 100644 --- a/distros/humble/microstrain-inertial-driver/default.nix +++ b/distros/humble/microstrain-inertial-driver/default.nix @@ -2,22 +2,26 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cpplint, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, jq, lifecycle-msgs, mavros-msgs, microstrain-inertial-msgs, nav-msgs, nmea-msgs, rclcpp-lifecycle, ros-environment, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: +{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cpplint, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, git, jq, lifecycle-msgs, mavros-msgs, microstrain-inertial-msgs, nav-msgs, nmea-msgs, rclcpp-lifecycle, ros-environment, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-humble-microstrain-inertial-driver"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/humble/microstrain_inertial_driver/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "dc76b008e9c19860cb9d783b7eff5409f1933e6c5647c86fa254e264ea4f2026"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/humble/microstrain_inertial_driver/3.0.0-1"; + sha256 = "sha256-OZKIsgqemRajXQ1xpFsAA9AitmFdk7DwZlaJMsTxJDI="; + }; buildType = "ament_cmake"; - buildInputs = [ curl jq ros-environment rosidl-default-generators ]; + buildInputs = [ curl git jq ros-environment rosidl-default-generators ]; checkInputs = [ ament-cmake-gtest ament-cpplint ]; propagatedBuildInputs = [ diagnostic-aggregator diagnostic-updater geometry-msgs lifecycle-msgs mavros-msgs microstrain-inertial-msgs nav-msgs nmea-msgs rclcpp-lifecycle rosidl-default-runtime sensor-msgs std-msgs std-srvs tf2 tf2-geometry-msgs tf2-ros ]; - nativeBuildInputs = [ rosidl-default-generators ]; + nativeBuildInputs = [ git rosidl-default-generators ]; meta = { description = ''The ros_mscl package provides a driver for the LORD/Microstrain inertial products.''; diff --git a/distros/humble/microstrain-inertial-examples/default.nix b/distros/humble/microstrain-inertial-examples/default.nix index 2e6c7ff37a..2baa91bfa5 100644 --- a/distros/humble/microstrain-inertial-examples/default.nix +++ b/distros/humble/microstrain-inertial-examples/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, microstrain-inertial-msgs, rclcpp, rclcpp-components, rclpy, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-microstrain-inertial-examples"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/humble/microstrain_inertial_examples/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "d5f2dcebdb657352f83942e0b4c8754c0626e9853bca2333d95ff757d54b8551"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/humble/microstrain_inertial_examples/3.0.0-1"; + sha256 = "sha256-YzEuGLkXcxn35LDW2RzWaTtuyLA2lDz3vzbROI3D8zA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/microstrain-inertial-msgs/default.nix b/distros/humble/microstrain-inertial-msgs/default.nix index 0991eb8c53..515caddf38 100644 --- a/distros/humble/microstrain-inertial-msgs/default.nix +++ b/distros/humble/microstrain-inertial-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, geometry-msgs, rosidl-default-generators, std-msgs }: buildRosPackage { pname = "ros-humble-microstrain-inertial-msgs"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/humble/microstrain_inertial_msgs/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "0518c6d01925f661711abbdfe984935a0a7e71e1955ed695fd27b3b12ed93a57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/humble/microstrain_inertial_msgs/3.0.0-1"; + sha256 = "sha256-b6iL7dD696BbltyHrGXGYyBrO04x+0iHvwhuSwBLRJw="; + }; buildType = "ament_cmake"; buildInputs = [ rosidl-default-generators ]; diff --git a/distros/humble/microstrain-inertial-rqt/default.nix b/distros/humble/microstrain-inertial-rqt/default.nix index aed6b08fbb..da9ee8054b 100644 --- a/distros/humble/microstrain-inertial-rqt/default.nix +++ b/distros/humble/microstrain-inertial-rqt/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, geometry-msgs, microstrain-inertial-msgs, nav-msgs, rclpy, rqt-gui, rqt-gui-py, std-msgs }: buildRosPackage { pname = "ros-humble-microstrain-inertial-rqt"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/humble/microstrain_inertial_rqt/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "fbd79a61100f44dd30452843c38428ca66d257e89f4a575442ee0b143c70aa9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/humble/microstrain_inertial_rqt/3.0.0-1"; + sha256 = "sha256-OvjYgtHC/5jU2RV8qNvN+c5ZV0rVScf1u1LaJwLt8BM="; + }; buildType = "ament_python"; propagatedBuildInputs = [ geometry-msgs microstrain-inertial-msgs nav-msgs rclpy rqt-gui rqt-gui-py std-msgs ]; diff --git a/distros/humble/mimick-vendor/default.nix b/distros/humble/mimick-vendor/default.nix index a26441f938..f64830d74a 100644 --- a/distros/humble/mimick-vendor/default.nix +++ b/distros/humble/mimick-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-mimick-vendor"; version = "0.2.8-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mimick_vendor-release/archive/release/humble/mimick_vendor/0.2.8-2.tar.gz"; - name = "0.2.8-2.tar.gz"; - sha256 = "e0158915d5577742060cd50071180827639d8b7bdf7caa2aaa78b5c4e59cc568"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mimick_vendor-release"; + rev = "release/humble/mimick_vendor/0.2.8-2"; + sha256 = "sha256-sbNAgZZ3wA7YkE29bq92nb4sQVmKXyHozHQdf4kutK4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/mod/default.nix b/distros/humble/mod/default.nix new file mode 100644 index 0000000000..312e54da69 --- /dev/null +++ b/distros/humble/mod/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, boost, eigen, ompl }: +buildRosPackage { + pname = "ros-humble-mod"; + version = "1.1.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OrebroUniversity"; + repo = "mod-release"; + rev = "release/humble/mod/1.1.0-1"; + sha256 = "sha256-P49k8TsFrO7C5WEsf13L8xfzhcuhVHpLhHpS0zSN3eg="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ boost eigen ompl ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Maps of Dynamics Package''; + license = with lib.licenses; [ lgpl3Only ]; + }; +} diff --git a/distros/humble/mouse-teleop/default.nix b/distros/humble/mouse-teleop/default.nix index 3f6a147baa..4978e70876 100644 --- a/distros/humble/mouse-teleop/default.nix +++ b/distros/humble/mouse-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-mouse-teleop"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/humble/mouse_teleop/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "1c2fcbd526d9c6329ec2e987be1a9258d3ccbe5460c40a36076e734d7aae6e50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/humble/mouse_teleop/1.3.0-1"; + sha256 = "sha256-e7Z2ycDQ6c5iskftouMX5osIQ17YJ6aS1Jn6tEPTs3w="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint ]; diff --git a/distros/humble/moveit-chomp-optimizer-adapter/default.nix b/distros/humble/moveit-chomp-optimizer-adapter/default.nix index 5a10621fb6..796ec2fc68 100644 --- a/distros/humble/moveit-chomp-optimizer-adapter/default.nix +++ b/distros/humble/moveit-chomp-optimizer-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-chomp-optimizer-adapter"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_chomp_optimizer_adapter/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "bc93e6c7778a72bce58b8c3f13cef641e45a788bc27bc16f5fe82b0e342b3193"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_chomp_optimizer_adapter/2.5.4-1"; + sha256 = "sha256-QPvOih+eC6NrQqpdKbM2K4JXfISgnWcY7N8mU2xXTd4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-common/default.nix b/distros/humble/moveit-common/default.nix index 0430df9d8d..d12e34e9d7 100644 --- a/distros/humble/moveit-common/default.nix +++ b/distros/humble/moveit-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-common"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_common/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "4e63d0220029b381c1a09d359d091a4e57e40e1b1f2c97aa070c4a2c00300477"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_common/2.5.4-1"; + sha256 = "sha256-smzfViKNV6O0ANKWEx02phAgpgKBHR4VShKxQQTjeZc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-configs-utils/default.nix b/distros/humble/moveit-configs-utils/default.nix index bc8af70f2d..b370d1d840 100644 --- a/distros/humble/moveit-configs-utils/default.nix +++ b/distros/humble/moveit-configs-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-configs-utils"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_configs_utils/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "e26e6f3a938be0a632d52f1830767abb0be532a88271615b4bb23d24c1f0b0ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_configs_utils/2.5.4-1"; + sha256 = "sha256-zOWPWcZopiSH9o1RX2atkcDyxF4BUhRUNy1VCWmCyPQ="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/moveit-core/default.nix b/distros/humble/moveit-core/default.nix index 0158e6e0b8..507b29b899 100644 --- a/distros/humble/moveit-core/default.nix +++ b/distros/humble/moveit-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-core"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_core/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "7b8381cc6d4cba4443e6fd0571ca97a5b99cb645c596c24b85c6e67177628934"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_core/2.5.4-1"; + sha256 = "sha256-CKoaunSo3ioeFlWh8MuWdBUy4VOQjbTTMbI1rja1U2A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/humble/moveit-hybrid-planning/default.nix b/distros/humble/moveit-hybrid-planning/default.nix index 447e259c0d..eab504f8ae 100644 --- a/distros/humble/moveit-hybrid-planning/default.nix +++ b/distros/humble/moveit-hybrid-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-hybrid-planning"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_hybrid_planning/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "487676782c81593f10e1009bc1269f6b7f6218f79c8521ba1bb42cbbe763fdf7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_hybrid_planning/2.5.4-1"; + sha256 = "sha256-jiCT+UgnZl4IY6KFalllVkvjVziUBi8cDZioyPkQZ+c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-kinematics/default.nix b/distros/humble/moveit-kinematics/default.nix index eb36dca4ac..606aad5e71 100644 --- a/distros/humble/moveit-kinematics/default.nix +++ b/distros/humble/moveit-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-kinematics"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_kinematics/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "c14f4e622da0226c849e59d43a8cc50c33b76d3ff0ce7c21f5149addb270c75a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_kinematics/2.5.4-1"; + sha256 = "sha256-tM9CDPbZvn0+OdeC9leI5eN85Rb8rFeiE1639+bb6vQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-msgs/default.nix b/distros/humble/moveit-msgs/default.nix index 5679958e37..a942e28b95 100644 --- a/distros/humble/moveit-msgs/default.nix +++ b/distros/humble/moveit-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-msgs"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_msgs-release/archive/release/humble/moveit_msgs/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "21b726427c912502976eeb44a81e415a6cfba075b289cd9cbd161bb263b906a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_msgs-release"; + rev = "release/humble/moveit_msgs/2.2.1-1"; + sha256 = "sha256-j2kN0/aZXgqQgw3wkRghueiY+X/URho8qm57Ze8n1y0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/moveit-planners-chomp/default.nix b/distros/humble/moveit-planners-chomp/default.nix index 04c5843132..28f635bc86 100644 --- a/distros/humble/moveit-planners-chomp/default.nix +++ b/distros/humble/moveit-planners-chomp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-planners-chomp"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_planners_chomp/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "f2ba3a2cb8410639477485ff222b1c471c0e2b7dd4e53f581c7c79dae9ef67c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_planners_chomp/2.5.4-1"; + sha256 = "sha256-6/u08sRiK6X1S22VPthAWaaWJpYY0Y+k+cxdUvHnhgc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-planners-ompl/default.nix b/distros/humble/moveit-planners-ompl/default.nix index 24b332ce38..eca01944dd 100644 --- a/distros/humble/moveit-planners-ompl/default.nix +++ b/distros/humble/moveit-planners-ompl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-planners-ompl"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_planners_ompl/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "aa5b679b1198fe4924bf51a12db0d87fea39152915d5c1af8f1e9259564573eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_planners_ompl/2.5.4-1"; + sha256 = "sha256-mlO7nucY/KUv/wytPoYA4pdjvrZrqeGEQTc+T5NziY0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen3-cmake-module ]; diff --git a/distros/humble/moveit-planners/default.nix b/distros/humble/moveit-planners/default.nix index 2fe8bd0e91..d1d9813bc4 100644 --- a/distros/humble/moveit-planners/default.nix +++ b/distros/humble/moveit-planners/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-planners"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_planners/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "342c063471efabe1937c7f59e734c6135df256d44edd24a1ef1fa017a8925587"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_planners/2.5.4-1"; + sha256 = "sha256-xdXwYgEhXsLZAXiYbILdE0QbJ76cUvpuhZmOC1uVvLM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-plugins/default.nix b/distros/humble/moveit-plugins/default.nix index 1f38fe1b27..efbf5e61ad 100644 --- a/distros/humble/moveit-plugins/default.nix +++ b/distros/humble/moveit-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-plugins"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_plugins/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "6a546bd233b1740083372fcc59c90071f8db41da67aacdd6975e72d228458982"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_plugins/2.5.4-1"; + sha256 = "sha256-gwqZXmhBTsIV2RE1vzUyljvy1DxbnYpvnWAv8oFZMdA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources-fanuc-description/default.nix b/distros/humble/moveit-resources-fanuc-description/default.nix index 401da15f9a..7363784f99 100644 --- a/distros/humble/moveit-resources-fanuc-description/default.nix +++ b/distros/humble/moveit-resources-fanuc-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-fanuc-description"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/humble/moveit_resources_fanuc_description/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "8a4cb78d5e11e83c10aab085cb4d29bd40661c4acd002ccf370b8f6ec4a4051a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/humble/moveit_resources_fanuc_description/2.0.6-1"; + sha256 = "sha256-hGTrUYAikxOi8egxDimAoqOcoKHW8F0RW1t6vuYewIA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources-fanuc-moveit-config/default.nix b/distros/humble/moveit-resources-fanuc-moveit-config/default.nix index 0b5c4493e6..e91481e4bc 100644 --- a/distros/humble/moveit-resources-fanuc-moveit-config/default.nix +++ b/distros/humble/moveit-resources-fanuc-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-fanuc-moveit-config"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/humble/moveit_resources_fanuc_moveit_config/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "90c0fa7a63c84f2058a11ada4a09396ede328d13143c1668197e0fd341e28e4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/humble/moveit_resources_fanuc_moveit_config/2.0.6-1"; + sha256 = "sha256-cJ3DCFtICWq9luUEgd9v2OoVJXMLFgFmrFeLKU6C69s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources-panda-description/default.nix b/distros/humble/moveit-resources-panda-description/default.nix index 35d5212842..6517fa7914 100644 --- a/distros/humble/moveit-resources-panda-description/default.nix +++ b/distros/humble/moveit-resources-panda-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-panda-description"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/humble/moveit_resources_panda_description/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "861423d0c6b90275e98ccb51cfadaed56abe997b42942cc1c636307ea8a52034"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/humble/moveit_resources_panda_description/2.0.6-1"; + sha256 = "sha256-9T8wcYBgF1ulNpNXqhBZxswjqvzNOtlDJsno0T83VJ0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources-panda-moveit-config/default.nix b/distros/humble/moveit-resources-panda-moveit-config/default.nix index 71c9fa35ad..772c7bb3ce 100644 --- a/distros/humble/moveit-resources-panda-moveit-config/default.nix +++ b/distros/humble/moveit-resources-panda-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-panda-moveit-config"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/humble/moveit_resources_panda_moveit_config/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "099ee845ec5a0e783ad0d6d47ddb08fd29bbfd580c6f44707d7c5b7d673b33a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/humble/moveit_resources_panda_moveit_config/2.0.6-1"; + sha256 = "sha256-0DZTez3C9HxtsOUf/t1s/Xm7uoqkXISmy3O6zBVXq3Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources-pr2-description/default.nix b/distros/humble/moveit-resources-pr2-description/default.nix index 78b42991a1..cce4fcbbd1 100644 --- a/distros/humble/moveit-resources-pr2-description/default.nix +++ b/distros/humble/moveit-resources-pr2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-pr2-description"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/humble/moveit_resources_pr2_description/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "6aceda0debfdfaff5560094dbcd7f8fbcb54dc7541f94a3459f58157d02164f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/humble/moveit_resources_pr2_description/2.0.6-1"; + sha256 = "sha256-kZjnvlnHY5J6SQdLGAteN6dfi19Sb8JVRlYa5yrrDFs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix b/distros/humble/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix index 4575ecb17c..48491eb4c5 100644 --- a/distros/humble/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix +++ b/distros/humble/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-prbt-ikfast-manipulator-plugin"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_resources_prbt_ikfast_manipulator_plugin/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "817bcc70f37624f259e33ae1fac33f72bfbcb51ddf4aa55241a3ecec1b608425"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_resources_prbt_ikfast_manipulator_plugin/2.5.4-1"; + sha256 = "sha256-brSCaNkhEsBeivLfm5Vr/nWthGnd29yjlPoxCMKC77Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake tf2-eigen tf2-eigen-kdl ]; diff --git a/distros/humble/moveit-resources-prbt-moveit-config/default.nix b/distros/humble/moveit-resources-prbt-moveit-config/default.nix index 26b8ec0978..1582c83f98 100644 --- a/distros/humble/moveit-resources-prbt-moveit-config/default.nix +++ b/distros/humble/moveit-resources-prbt-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-prbt-moveit-config"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_resources_prbt_moveit_config/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "dc41757555736eb9bad37751d7bd74ce7f4d2c26b9ac7e7a1b9075447d8fb574"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_resources_prbt_moveit_config/2.5.4-1"; + sha256 = "sha256-DrWCZmP2iUf4OsPVhK3R3D5UV/NUQsYYU6BX18FHGKw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources-prbt-pg70-support/default.nix b/distros/humble/moveit-resources-prbt-pg70-support/default.nix index 29bc54b3d1..c840527fa8 100644 --- a/distros/humble/moveit-resources-prbt-pg70-support/default.nix +++ b/distros/humble/moveit-resources-prbt-pg70-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-prbt-pg70-support"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_resources_prbt_pg70_support/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "6cddc50396824bff772407e67307e29ec48d4aab68f088013fdbf264e48b55fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_resources_prbt_pg70_support/2.5.4-1"; + sha256 = "sha256-oz/+gaPPNicYLjolAAsM/5XLb22ngCm0A7CpkoLG9Bg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources-prbt-support/default.nix b/distros/humble/moveit-resources-prbt-support/default.nix index cd348826a0..db3f570e82 100644 --- a/distros/humble/moveit-resources-prbt-support/default.nix +++ b/distros/humble/moveit-resources-prbt-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources-prbt-support"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_resources_prbt_support/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "cf43a55288e7af0a87ec1248e44cec9bf6abaf51bd7b397b8dfbf0beea30e772"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_resources_prbt_support/2.5.4-1"; + sha256 = "sha256-jFE9bIFBv9q2LfYaOTGYwP8DkmKiOzpR2xn1CcOltOM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-resources/default.nix b/distros/humble/moveit-resources/default.nix index a35f6b3bc8..74357e5d1b 100644 --- a/distros/humble/moveit-resources/default.nix +++ b/distros/humble/moveit-resources/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-resources"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/humble/moveit_resources/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "aa1965f41cef5f77bef6064e569d41cfb266e29e016acacfe8521c7f8b468019"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/humble/moveit_resources/2.0.6-1"; + sha256 = "sha256-6SeNklZ6FV3leAPoweE7scYHip2GWoiT6Wl6A5NywNI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-ros-benchmarks/default.nix b/distros/humble/moveit-ros-benchmarks/default.nix index e5b576b58c..77f9619091 100644 --- a/distros/humble/moveit-ros-benchmarks/default.nix +++ b/distros/humble/moveit-ros-benchmarks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-benchmarks"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_benchmarks/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "09625f3e5817569b1cd85917196652be91ff98621ed34bac205291a82d9a24f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_benchmarks/2.5.4-1"; + sha256 = "sha256-euBDQpmGkrtWrfn+9uvwEPnkR+NSu19KVY9WWteeaU0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-core ]; diff --git a/distros/humble/moveit-ros-control-interface/default.nix b/distros/humble/moveit-ros-control-interface/default.nix index a2b5fd8154..d688c2a4a0 100644 --- a/distros/humble/moveit-ros-control-interface/default.nix +++ b/distros/humble/moveit-ros-control-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-control-interface"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_control_interface/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "f215fcf281b345f83f74919eaa4f977265b0fc79963da349e0450a2e3b5b22c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_control_interface/2.5.4-1"; + sha256 = "sha256-0CKC5/pT2h3w7o9JUmF9KyULH8+VTFEKRKqxxe5qwhU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-ros-move-group/default.nix b/distros/humble/moveit-ros-move-group/default.nix index 6f96ab10ce..03eda72f80 100644 --- a/distros/humble/moveit-ros-move-group/default.nix +++ b/distros/humble/moveit-ros-move-group/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-move-group"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_move_group/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "39db31a7e30e1a80d746ff60531af45a5b1c20344dfbe4ec5f67273017ec68c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_move_group/2.5.4-1"; + sha256 = "sha256-7wiNSD5+RVcLEs/uGLgdoQe32JpwQcFleqvs7EoaVkE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-ros-occupancy-map-monitor/default.nix b/distros/humble/moveit-ros-occupancy-map-monitor/default.nix index 0688068947..e10faf5973 100644 --- a/distros/humble/moveit-ros-occupancy-map-monitor/default.nix +++ b/distros/humble/moveit-ros-occupancy-map-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-occupancy-map-monitor"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_occupancy_map_monitor/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "23e7c980c26ea8aada8df4ad7d9414982c0ec51c28332bb9f7463403fc26923e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_occupancy_map_monitor/2.5.4-1"; + sha256 = "sha256-Ag3/rrjjIB+eWTVwJVmZIoArny5qV5lSh4eSf0EOeY4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-ros-perception/default.nix b/distros/humble/moveit-ros-perception/default.nix index 383c675984..f74082316a 100644 --- a/distros/humble/moveit-ros-perception/default.nix +++ b/distros/humble/moveit-ros-perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-perception"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_perception/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "156fa8b5eadace41233c93284d21ce12df2268de4800dcfdd8b561c43f041601"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_perception/2.5.4-1"; + sha256 = "sha256-qwKkeJum37af3XUC+aPOpdcer2gock2JZXgfZOd2nJI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/humble/moveit-ros-planning-interface/default.nix b/distros/humble/moveit-ros-planning-interface/default.nix index 2748fbf30e..d5b7eddf59 100644 --- a/distros/humble/moveit-ros-planning-interface/default.nix +++ b/distros/humble/moveit-ros-planning-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-planning-interface"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_planning_interface/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "8ddac69d8995ab51b17699a6911dd9f40e4a568f1226a89e5066222217b1de8a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_planning_interface/2.5.4-1"; + sha256 = "sha256-c9ihrMc2Okb8h712erQ5zzJCIWLgJThncif6ZMdHVxQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen eigen3-cmake-module ]; diff --git a/distros/humble/moveit-ros-planning/default.nix b/distros/humble/moveit-ros-planning/default.nix index bf704b2781..8c6a81bae2 100644 --- a/distros/humble/moveit-ros-planning/default.nix +++ b/distros/humble/moveit-ros-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-planning"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_planning/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "6191d9ae4028264b3c4bf08afe542bea38ca80130b7ba33d0a3a8a6c8361dd1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_planning/2.5.4-1"; + sha256 = "sha256-1GJsJh3fjZVB1kAPBF4xonOZL+g1qc4AhIpeUWAHYKQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-ros-robot-interaction/default.nix b/distros/humble/moveit-ros-robot-interaction/default.nix index 01e2cc2093..1d4c200ee6 100644 --- a/distros/humble/moveit-ros-robot-interaction/default.nix +++ b/distros/humble/moveit-ros-robot-interaction/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-robot-interaction"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_robot_interaction/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "51c690f15b2b0ea9d1623fc3e8c49bdffe348f233abae5e6667717f3f43098a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_robot_interaction/2.5.4-1"; + sha256 = "sha256-z1cWLDOCm0WSywwNuucvePPhVljioDtPUynV2b3lSpk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-ros-visualization/default.nix b/distros/humble/moveit-ros-visualization/default.nix index c4b8d612dc..7ac418864e 100644 --- a/distros/humble/moveit-ros-visualization/default.nix +++ b/distros/humble/moveit-ros-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-visualization"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_visualization/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "9b99d2a6942431a44b4212669da686266de659f12fdc79ca9b8ac2e7a7e37054"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_visualization/2.5.4-1"; + sha256 = "sha256-YbTYnvFkXlXsosNKQQ2A7jVxSPjataFByjyhKv+FNCs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake class-loader eigen pkg-config qt5.qtbase ]; diff --git a/distros/humble/moveit-ros-warehouse/default.nix b/distros/humble/moveit-ros-warehouse/default.nix index f2442889e1..c4483858f6 100644 --- a/distros/humble/moveit-ros-warehouse/default.nix +++ b/distros/humble/moveit-ros-warehouse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros-warehouse"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros_warehouse/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "aba17c05868ccf8e59c736b3b67a89e24a924d0048680dd62749eb19f9f875eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros_warehouse/2.5.4-1"; + sha256 = "sha256-Ud/H02PEaKw2mxwrjpKECwj/fY/ukALANVqWZ9UG4Nw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-ros/default.nix b/distros/humble/moveit-ros/default.nix index 96f48127b6..0f3bc9c752 100644 --- a/distros/humble/moveit-ros/default.nix +++ b/distros/humble/moveit-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-ros"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_ros/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "c9130953382833021a46cca7b099dbd17ee5dfffd75aeb3b0c2ac70b2bdd6954"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_ros/2.5.4-1"; + sha256 = "sha256-SVLs5DZxL2/nvIorhJVvk7odl0zAQBPwhT4P/QfACkI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-runtime/default.nix b/distros/humble/moveit-runtime/default.nix index c9e2370d88..689c15e7f9 100644 --- a/distros/humble/moveit-runtime/default.nix +++ b/distros/humble/moveit-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-runtime"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_runtime/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "9732a5b3a254d89398f1da2774aa0e51a9682460f67fb7d3ea0572a4e69237cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_runtime/2.5.4-1"; + sha256 = "sha256-YWtkEUbWIXLhunMOeO2xG3MCgNtFDjrIYcNiNRupaOw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-servo/default.nix b/distros/humble/moveit-servo/default.nix index 678ec31c14..cb2e9ddc9f 100644 --- a/distros/humble/moveit-servo/default.nix +++ b/distros/humble/moveit-servo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-servo"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_servo/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "17c1cdd5fd109409ff273715238b217d4bf3cc4c50ce43597a3ef2b2be3b1fee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_servo/2.5.4-1"; + sha256 = "sha256-UHEx2GzvJ+J5/f9aeXBAAMLpxR03Aeiqf+ZB/JLuAcU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-setup-app-plugins/default.nix b/distros/humble/moveit-setup-app-plugins/default.nix index cb270fbef3..de9417bfca 100644 --- a/distros/humble/moveit-setup-app-plugins/default.nix +++ b/distros/humble/moveit-setup-app-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-setup-app-plugins"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_setup_app_plugins/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "5931a2a00799054a75ffa18457bad05fb5840b161045e4bf8b61cefc173095b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_setup_app_plugins/2.5.4-1"; + sha256 = "sha256-+dPoDN5k96lphFvFkzleflk3+43yRSpZ9oeWx+26nZQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-setup-assistant/default.nix b/distros/humble/moveit-setup-assistant/default.nix index 1be6fb43eb..ab37346db9 100644 --- a/distros/humble/moveit-setup-assistant/default.nix +++ b/distros/humble/moveit-setup-assistant/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-setup-assistant"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_setup_assistant/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "1e871c66920a28b23b96bbf75f687476019f1204e41e8c53f3e2d7df2e416a12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_setup_assistant/2.5.4-1"; + sha256 = "sha256-4UniZIJ4+GZLG1wKawudyy/0a3u5CjuVlUN6JPuNUJ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-setup-controllers/default.nix b/distros/humble/moveit-setup-controllers/default.nix index 60a61edbea..28e1cbacf5 100644 --- a/distros/humble/moveit-setup-controllers/default.nix +++ b/distros/humble/moveit-setup-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-setup-controllers"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_setup_controllers/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "c311611f974dce1e6405d44196e271cb47f127da8f19ab92318424bd8d84b8fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_setup_controllers/2.5.4-1"; + sha256 = "sha256-A4zhhek6J9UMpEGJ86tfY64XubVfaESrcgyUPEI4238="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-setup-core-plugins/default.nix b/distros/humble/moveit-setup-core-plugins/default.nix index 81b82a1de6..78b5637d3a 100644 --- a/distros/humble/moveit-setup-core-plugins/default.nix +++ b/distros/humble/moveit-setup-core-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-setup-core-plugins"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_setup_core_plugins/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "3f25c69c9737022727e1074dd717046458d555810e7f89db4b81ea8537e5adc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_setup_core_plugins/2.5.4-1"; + sha256 = "sha256-yD98uIWTOeyohX6wxmdyhqsPbZNVxSxxnYF2W9IevPA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-setup-framework/default.nix b/distros/humble/moveit-setup-framework/default.nix index 13d8445c31..a16f7cdae2 100644 --- a/distros/humble/moveit-setup-framework/default.nix +++ b/distros/humble/moveit-setup-framework/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-setup-framework"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_setup_framework/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "dad0785da53e0e4537b07dd49a9bf33d56e044f38200331b8dc97b760ae3c064"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_setup_framework/2.5.4-1"; + sha256 = "sha256-WzE0V+LnAQwG/t4/Zpyssopu/EqC1IoHktRzIF12rPQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-setup-srdf-plugins/default.nix b/distros/humble/moveit-setup-srdf-plugins/default.nix index 0e20667e23..9b5662ede2 100644 --- a/distros/humble/moveit-setup-srdf-plugins/default.nix +++ b/distros/humble/moveit-setup-srdf-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-setup-srdf-plugins"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_setup_srdf_plugins/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "b9f9abf660c183aa427342ce7c22e052a2efd06d22c241c47ebad22a440a4a0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_setup_srdf_plugins/2.5.4-1"; + sha256 = "sha256-h7j3RH443HJE8donExvKFyO5K9PVS8RuG36NKvxc2cw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-simple-controller-manager/default.nix b/distros/humble/moveit-simple-controller-manager/default.nix index c4ca5d0daa..d383276391 100644 --- a/distros/humble/moveit-simple-controller-manager/default.nix +++ b/distros/humble/moveit-simple-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-simple-controller-manager"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit_simple_controller_manager/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "ae6e6c39c7ee9741a4b44152ad8d1e14bf789d14df47455195c3bb881dda7889"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit_simple_controller_manager/2.5.4-1"; + sha256 = "sha256-wzSTh2uM4KZMmSnWWLdvxqqTDAnt0TfIGhKPYpT92xA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit-visual-tools/default.nix b/distros/humble/moveit-visual-tools/default.nix index 3431e53029..80383cbba9 100644 --- a/distros/humble/moveit-visual-tools/default.nix +++ b/distros/humble/moveit-visual-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit-visual-tools"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_visual_tools-release/archive/release/humble/moveit_visual_tools/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "d0684935949157d40acbd7f24b91ac6d230925b3d996b998428aaa71f95f006a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_visual_tools-release"; + rev = "release/humble/moveit_visual_tools/4.1.0-1"; + sha256 = "sha256-OsgJs0kV7m3GzRlDL1x8i5hG03piwA+9f+Mbpx+dOmw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/moveit/default.nix b/distros/humble/moveit/default.nix index 3c39c1ce1c..181809c32f 100644 --- a/distros/humble/moveit/default.nix +++ b/distros/humble/moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-moveit"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/moveit/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "ee0fdf5afcae1d95cc79f98eba19931214107dd69ad899ffae036aef8e517b33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/moveit/2.5.4-1"; + sha256 = "sha256-XNm780i8qWgkLEnnxNG4EZowJTtR1MxQFS2UBGzN0h4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/mrpt-msgs/default.nix b/distros/humble/mrpt-msgs/default.nix index e47e7a2629..8843f119b1 100644 --- a/distros/humble/mrpt-msgs/default.nix +++ b/distros/humble/mrpt-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-mrpt-msgs"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mrpt_msgs-release/archive/release/humble/mrpt_msgs/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "2212ce3dea3407855e05d7c4f1b405abe5a245850796abc01b926d8db4f084d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mrpt_msgs-release"; + rev = "release/humble/mrpt_msgs/0.4.4-1"; + sha256 = "sha256-FSw//54G9jpJoibViHkmDUI+/IqcjDC67ZxH4JOk4qk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/humble/mrt-cmake-modules/default.nix b/distros/humble/mrt-cmake-modules/default.nix index e28aafc072..ec54eb8eb9 100644 --- a/distros/humble/mrt-cmake-modules/default.nix +++ b/distros/humble/mrt-cmake-modules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-mrt-cmake-modules"; version = "1.0.9-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mrt_cmake_modules-release/archive/release/humble/mrt_cmake_modules/1.0.9-3.tar.gz"; - name = "1.0.9-3.tar.gz"; - sha256 = "67fae5d9e5a4cb31235807dba74b4c061bde0e2deab633339c121f18638076fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mrt_cmake_modules-release"; + rev = "release/humble/mrt_cmake_modules/1.0.9-3"; + sha256 = "sha256-PCqR+osiiGlHN0JWW6C/bhSD9H7GuzuQ4Lo8fExnOk0="; + }; buildType = "catkin"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/multires-image/default.nix b/distros/humble/multires-image/default.nix new file mode 100644 index 0000000000..f7e8c7d06a --- /dev/null +++ b/distros/humble/multires-image/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, cv-bridge, geometry-msgs, gps-msgs, mapviz, pluginlib, qt5, rclcpp, rclpy, swri-math-util, swri-transform-util, tf2 }: +buildRosPackage { + pname = "ros-humble-multires-image"; + version = "2.2.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mapviz-release"; + rev = "release/humble/multires_image/2.2.0-1"; + sha256 = "sha256-UWbiR9Yi4OVCQvGBHOE+Fj3qAbvA18AA/epPr0smy3A="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ cv-bridge geometry-msgs gps-msgs mapviz pluginlib qt5.qtbase rclcpp rclpy swri-math-util swri-transform-util tf2 ]; + nativeBuildInputs = [ ament-cmake qt5.qtbase ]; + + meta = { + description = ''multires_image''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/mvsim/default.nix b/distros/humble/mvsim/default.nix index 2ac55e3f94..017716483b 100644 --- a/distros/humble/mvsim/default.nix +++ b/distros/humble/mvsim/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-xmllint, ament-lint-auto, ament-lint-common, boost, box2d, cmake, cppzmq, mrpt2, nav-msgs, protobuf, python3, pythonPackages, ros-environment, ros2launch, sensor-msgs, tf2, tf2-geometry-msgs, visualization-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-xmllint, ament-lint-auto, ament-lint-common, boost, box2d, cmake, cppzmq, mrpt2, nav-msgs, protobuf, python3, python3Packages, pythonPackages, ros-environment, ros2launch, sensor-msgs, tf2, tf2-geometry-msgs, unzip, visualization-msgs, wget }: buildRosPackage { pname = "ros-humble-mvsim"; - version = "0.4.3-r1"; + version = "0.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mvsim-release/archive/release/humble/mvsim/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "4b5b4fab39f43a2643cb24779c5a15d5a1994b7ed53e3f2d0df1906054f06a74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mvsim-release"; + rev = "release/humble/mvsim/0.5.1-2"; + sha256 = "sha256-E8duQNKx1R8uGZ3o3G3NSvLjxkRqwZDi+O2Moy0u38k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest ament-cmake-xmllint cmake ros-environment ]; checkInputs = [ ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ boost box2d cppzmq mrpt2 nav-msgs protobuf python3 pythonPackages.pybind11 ros2launch sensor-msgs tf2 tf2-geometry-msgs visualization-msgs ]; + propagatedBuildInputs = [ boost box2d cppzmq mrpt2 nav-msgs protobuf python3 python3Packages.protobuf pythonPackages.pybind11 ros2launch sensor-msgs tf2 tf2-geometry-msgs unzip visualization-msgs wget ]; nativeBuildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest cmake ]; meta = { diff --git a/distros/humble/nao-button-sim/default.nix b/distros/humble/nao-button-sim/default.nix index 5ccf4a732e..eb96609c2f 100644 --- a/distros/humble/nao-button-sim/default.nix +++ b/distros/humble/nao-button-sim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nao-button-sim"; version = "0.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nao_button_sim-release/archive/release/humble/nao_button_sim/0.1.1-4.tar.gz"; - name = "0.1.1-4.tar.gz"; - sha256 = "9bc9e8864b6cc26cb6cab39180f3a4becc38902e72cfe3f2da735d610c058f12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nao_button_sim-release"; + rev = "release/humble/nao_button_sim/0.1.1-4"; + sha256 = "sha256-kSAZ/BDlwmj/kpJek7GBfiEO1RBUa8Lmld+ZbxmlAX0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/nao-command-msgs/default.nix b/distros/humble/nao-command-msgs/default.nix index 20022caa2d..09cb292928 100644 --- a/distros/humble/nao-command-msgs/default.nix +++ b/distros/humble/nao-command-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nao-command-msgs"; version = "0.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nao_interfaces-release/archive/release/humble/nao_command_msgs/0.0.4-3.tar.gz"; - name = "0.0.4-3.tar.gz"; - sha256 = "9baeb177ecf4771ef4ed70b74947f0a2c2cf9be0824a7d6a0e166b7cd19b881d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nao_interfaces-release"; + rev = "release/humble/nao_command_msgs/0.0.4-3"; + sha256 = "sha256-c5MI9xmqIM6a6lV86cpezLUwbxtIfICdZYHA39QMhiw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/nao-lola/default.nix b/distros/humble/nao-lola/default.nix index a46066de93..7572f69d9d 100644 --- a/distros/humble/nao-lola/default.nix +++ b/distros/humble/nao-lola/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nao-lola"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nao_lola-release/archive/release/humble/nao_lola/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "efe25b61711696e649f69f3012a7c047646c8d6f95c03dfdc3b333093a7b5aa9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nao_lola-release"; + rev = "release/humble/nao_lola/0.1.0-1"; + sha256 = "sha256-QrVYzmnxF5Xm4vVkGJwowRn5uJsVvmO8m+GxUm2/mGM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nao-sensor-msgs/default.nix b/distros/humble/nao-sensor-msgs/default.nix index 064d193ee9..b28fad9169 100644 --- a/distros/humble/nao-sensor-msgs/default.nix +++ b/distros/humble/nao-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nao-sensor-msgs"; version = "0.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nao_interfaces-release/archive/release/humble/nao_sensor_msgs/0.0.4-3.tar.gz"; - name = "0.0.4-3.tar.gz"; - sha256 = "3ec45e64f06cb53c754ad728194f38889901cdb7732bd68ac210ec60bf825491"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nao_interfaces-release"; + rev = "release/humble/nao_sensor_msgs/0.0.4-3"; + sha256 = "sha256-ZUHpXdRXtKXTlh+vFBMwE8bIfT9g/5YI9Z/XDh7MvS0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/nav-2d-msgs/default.nix b/distros/humble/nav-2d-msgs/default.nix index 7963870e38..ec07e4c0bd 100644 --- a/distros/humble/nav-2d-msgs/default.nix +++ b/distros/humble/nav-2d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav-2d-msgs"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav_2d_msgs/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "41eca5c77c649f439452fb3ba4c05f96153e8d0264ac391cc1976198811a043b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav_2d_msgs/1.1.5-1"; + sha256 = "sha256-+yKF03xOQtHvHSaRRksEcDVDl6el1lhjvYi/UYj2/nE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav-2d-utils/default.nix b/distros/humble/nav-2d-utils/default.nix index bc039b84d8..4d9d4fdb51 100644 --- a/distros/humble/nav-2d-utils/default.nix +++ b/distros/humble/nav-2d-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav-2d-utils"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav_2d_utils/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "35ca1a7a839e128257b8ce382c5a7c929f20376418c2d7b0e5d8fb0908cd5276"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav_2d_utils/1.1.5-1"; + sha256 = "sha256-kUpdrI2YDtSem9wdTrZby2M8znXbeWbdsD0xMNw7rdc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav-msgs/default.nix b/distros/humble/nav-msgs/default.nix index 687ce4f90e..1db90c2470 100644 --- a/distros/humble/nav-msgs/default.nix +++ b/distros/humble/nav-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-nav-msgs"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/nav_msgs/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "0604b5e75b4ed680be9fbfb8c32a72192c8615b2c7313f59cfc5a4715185dc3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/nav_msgs/4.2.3-1"; + sha256 = "sha256-mYfx9tmiwE+rdYoUHuhWCgeWJBDssHG40N7TEJ6fqMg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/nav2-amcl/default.nix b/distros/humble/nav2-amcl/default.nix index 234835912f..04eb6b2917 100644 --- a/distros/humble/nav2-amcl/default.nix +++ b/distros/humble/nav2-amcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-amcl"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_amcl/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "f16a607334b1695fcc282515249f2828de908258bacc8a23a59f44d7b5a51c18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_amcl/1.1.5-1"; + sha256 = "sha256-R7x4uc6DJoKoa/EcngTIMEPowqNSby3MuCDUGbR+G14="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-behavior-tree/default.nix b/distros/humble/nav2-behavior-tree/default.nix index b69cd7a5e8..94a3537f5b 100644 --- a/distros/humble/nav2-behavior-tree/default.nix +++ b/distros/humble/nav2-behavior-tree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-behavior-tree"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_behavior_tree/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "c2986ed6fa48dbd02dd70ad001e7cd3579a3c068078f1c068a1602a0a8ecea37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_behavior_tree/1.1.5-1"; + sha256 = "sha256-mkZbc80ribWjiUGEmPZbyIV7o8J4bEn55gAPvrX1gqk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-behaviors/default.nix b/distros/humble/nav2-behaviors/default.nix index 5d6b6acb58..778189d36e 100644 --- a/distros/humble/nav2-behaviors/default.nix +++ b/distros/humble/nav2-behaviors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-behaviors"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_behaviors/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "06fe07b579c024fb48df9ec3ff9e9a0eda152d4dbead5876adaaf2d4fadb0be5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_behaviors/1.1.5-1"; + sha256 = "sha256-O7sM+hluHI1SMfQNSXTfDywkZ1Nw1qEiHes/f647iQ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common tf2 tf2-geometry-msgs ]; diff --git a/distros/humble/nav2-bringup/default.nix b/distros/humble/nav2-bringup/default.nix index ccbcd35d14..4674530324 100644 --- a/distros/humble/nav2-bringup/default.nix +++ b/distros/humble/nav2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-bringup"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_bringup/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "8315cac6e0cc954380ae624319af2aa4911d302d0b906f680e564d7f41b63ee3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_bringup/1.1.5-1"; + sha256 = "sha256-WCrTOyFvorIdCqsSpCQgxzrYicR2kQvYmGrrc0l7bxE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-bt-navigator/default.nix b/distros/humble/nav2-bt-navigator/default.nix index 8390f936e3..a9d33d377f 100644 --- a/distros/humble/nav2-bt-navigator/default.nix +++ b/distros/humble/nav2-bt-navigator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-bt-navigator"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_bt_navigator/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "7d0c52e42f479887d16db5804c5abc3c368ac6eef260704385f22b47582d5853"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_bt_navigator/1.1.5-1"; + sha256 = "sha256-lROd/zr7VS1FuGarOYI32v1d0wS7go/27fRTUU6yjRM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common std-srvs ]; diff --git a/distros/humble/nav2-collision-monitor/default.nix b/distros/humble/nav2-collision-monitor/default.nix index f291cffb64..25ff61fe37 100644 --- a/distros/humble/nav2-collision-monitor/default.nix +++ b/distros/humble/nav2-collision-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-collision-monitor"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_collision_monitor/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "3548346facef75358c1785f603a70bd4945366a72a5139ee42173391882ffe06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_collision_monitor/1.1.5-1"; + sha256 = "sha256-fbeKziOP5UoA0xj50wgo1YLkA+kDHYGLEVdOcQPWdxE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-common/default.nix b/distros/humble/nav2-common/default.nix index b54d3220c7..b94fd3be8d 100644 --- a/distros/humble/nav2-common/default.nix +++ b/distros/humble/nav2-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-common"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_common/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "83d3eabb3a74097a00e4e941ced6b3f675aa9941d16b327dc99e17055f865eda"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_common/1.1.5-1"; + sha256 = "sha256-s+0a12rLxZcfZrmMZ92naReCoPaU1BbDQK8IeFeqJzA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/humble/nav2-constrained-smoother/default.nix b/distros/humble/nav2-constrained-smoother/default.nix index 6b86d817aa..4ef11bb37f 100644 --- a/distros/humble/nav2-constrained-smoother/default.nix +++ b/distros/humble/nav2-constrained-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-constrained-smoother"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_constrained_smoother/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "ddb50159309a65553c47ec1798aee8276b9ef38692e69965f5e55b2681d56a32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_constrained_smoother/1.1.5-1"; + sha256 = "sha256-VSb4XsRganX0rzvKiUkPWGHfN6meFP7aYc0hvmKdL9Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-controller/default.nix b/distros/humble/nav2-controller/default.nix index d8298f0c10..67321606f0 100644 --- a/distros/humble/nav2-controller/default.nix +++ b/distros/humble/nav2-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-controller"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_controller/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "24599a3e992519fbf4ad5cac8eafb1f0c3273bc5e1f27d5004cc7bfed1714f3c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_controller/1.1.5-1"; + sha256 = "sha256-p8HguVQOXBMbYJDkrksQad1jjUcAHYAPxVV95+Q0H9I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-core/default.nix b/distros/humble/nav2-core/default.nix index 83f53ccc94..d79b6f101f 100644 --- a/distros/humble/nav2-core/default.nix +++ b/distros/humble/nav2-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-core"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_core/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "d2d3e894b55d374825f60cfe0999961dae4d0a1b8119b6edf3fd6194a78564bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_core/1.1.5-1"; + sha256 = "sha256-OgGz4nIiGOIWxSTVXDhtxsy+wy3+XNWagnpcrxlgNXg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-costmap-2d/default.nix b/distros/humble/nav2-costmap-2d/default.nix index bf6c54a133..421127c09d 100644 --- a/distros/humble/nav2-costmap-2d/default.nix +++ b/distros/humble/nav2-costmap-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-costmap-2d"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_costmap_2d/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "d542d7c32bcd9eb322cdb3bbcdbaac36f72559d0f19a5c2014316b42fcdf4f74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_costmap_2d/1.1.5-1"; + sha256 = "sha256-oXL4kuLBV9GuK1+9RboPtXi5rCZDLuWGHVakkNXz1fM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-dwb-controller/default.nix b/distros/humble/nav2-dwb-controller/default.nix index fc07110969..9d77c99d70 100644 --- a/distros/humble/nav2-dwb-controller/default.nix +++ b/distros/humble/nav2-dwb-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-dwb-controller"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_dwb_controller/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "1414b9d923d95bdc6257e5b1ac0ac8045e3fd01fa639cd854f18fc0c0591c2db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_dwb_controller/1.1.5-1"; + sha256 = "sha256-nh++wAIFST48TWtPMDJkFvAL3oIhZ2EFLLd5mIoYhSs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-lifecycle-manager/default.nix b/distros/humble/nav2-lifecycle-manager/default.nix index 37a4ba7852..69734d59ff 100644 --- a/distros/humble/nav2-lifecycle-manager/default.nix +++ b/distros/humble/nav2-lifecycle-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-lifecycle-manager"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_lifecycle_manager/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "7483d9abf05c8f2c71e07143344185c2389053cca69fc7242caf3c520abb7733"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_lifecycle_manager/1.1.5-1"; + sha256 = "sha256-njkY0ialLLVX259XGCz+/VWW4shFCKQkCpGOrzxNr/s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-map-server/default.nix b/distros/humble/nav2-map-server/default.nix index 06da054ffb..4a2e4dc8e4 100644 --- a/distros/humble/nav2-map-server/default.nix +++ b/distros/humble/nav2-map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-map-server"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_map_server/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "5e558e20d3c76aeaa9e8e8d378cc0fbf38f25d9564ae029042175903625ac860"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_map_server/1.1.5-1"; + sha256 = "sha256-coXUvX3MHEAgRfd4FrVURyxu1HADQYexSwy9GQS6dCA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-msgs/default.nix b/distros/humble/nav2-msgs/default.nix index 19fd54d52a..acf932648e 100644 --- a/distros/humble/nav2-msgs/default.nix +++ b/distros/humble/nav2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-msgs"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_msgs/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "b00f969550e4f70b2e6748d3eea16c94d8c1600668baa79f38c7238db9275b0f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_msgs/1.1.5-1"; + sha256 = "sha256-oAwKTRy96N27cs2/MjbKOkM83bgt/Yu9qhzJTQ7hxqg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-navfn-planner/default.nix b/distros/humble/nav2-navfn-planner/default.nix index a1b2b38db2..358c679803 100644 --- a/distros/humble/nav2-navfn-planner/default.nix +++ b/distros/humble/nav2-navfn-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-navfn-planner"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_navfn_planner/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "236f623671f916ba5e775ead8cffc0905db1d2f88f6ba46c8a3f4c244434a911"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_navfn_planner/1.1.5-1"; + sha256 = "sha256-uwvpZ+/WlziHn1CUXY3mGLO/gp1BelHZ/djo1liIyZg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-planner/default.nix b/distros/humble/nav2-planner/default.nix index e0b10d59b9..5b0b9d7b66 100644 --- a/distros/humble/nav2-planner/default.nix +++ b/distros/humble/nav2-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-planner"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_planner/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "c0e9e637b9f246a8a773fdf3fca47d54cbd37d6fee200b37b26ddc5442546c44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_planner/1.1.5-1"; + sha256 = "sha256-5ivzsOzsZeY7EYX4KN1LtZuILeUrHC/EG5wJvr/hYJo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-regulated-pure-pursuit-controller/default.nix b/distros/humble/nav2-regulated-pure-pursuit-controller/default.nix index 195823d589..161faecd8d 100644 --- a/distros/humble/nav2-regulated-pure-pursuit-controller/default.nix +++ b/distros/humble/nav2-regulated-pure-pursuit-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-regulated-pure-pursuit-controller"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_regulated_pure_pursuit_controller/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "49f4168270be88e43e539977dad48c5a9d3eb244d93071d2ea438931532085b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_regulated_pure_pursuit_controller/1.1.5-1"; + sha256 = "sha256-bqKOOCBD9hOf3YRy1rqlaTcb4rh0YHCvBeCsXdhcCak="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-rotation-shim-controller/default.nix b/distros/humble/nav2-rotation-shim-controller/default.nix index 2474858b54..fafeaf497e 100644 --- a/distros/humble/nav2-rotation-shim-controller/default.nix +++ b/distros/humble/nav2-rotation-shim-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-rotation-shim-controller"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_rotation_shim_controller/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "12841ba5ceb4300bc0b78f5c84142c6b0e7d797b7ab4d7bbdd397d7c884ce6aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_rotation_shim_controller/1.1.5-1"; + sha256 = "sha256-Qn5rh4BuWSYIqRMQWJ4c21aMoTGEfnJ+Y/heZAXIu04="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-rviz-plugins/default.nix b/distros/humble/nav2-rviz-plugins/default.nix index 19dc9e2b04..2792673d2e 100644 --- a/distros/humble/nav2-rviz-plugins/default.nix +++ b/distros/humble/nav2-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-rviz-plugins"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_rviz_plugins/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "4222c3b016c2850235a5d4f5dcdac8ef54ff5211902786c6f88d900af3b0592b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_rviz_plugins/1.1.5-1"; + sha256 = "sha256-hAK2H1a+Exj4L0Z+HCZk1zwkWur2BBqkJDEGCpHtG0c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-simple-commander/default.nix b/distros/humble/nav2-simple-commander/default.nix index 0cd76a56cf..c6f7ffa46e 100644 --- a/distros/humble/nav2-simple-commander/default.nix +++ b/distros/humble/nav2-simple-commander/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-simple-commander"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_simple_commander/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "5ee6a210d442ed1d8a3a3b86274b4048f57c934077d0cb3fd01726638fc41c33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_simple_commander/1.1.5-1"; + sha256 = "sha256-pvdtjQAh7db4Jc8b93XYMBSOkxSZKIAmZrsf02O671Y="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/nav2-smac-planner/default.nix b/distros/humble/nav2-smac-planner/default.nix index 00d8bcc13f..3e0813476d 100644 --- a/distros/humble/nav2-smac-planner/default.nix +++ b/distros/humble/nav2-smac-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-smac-planner"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_smac_planner/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "03d3beb0de5a0bf9578c4c79ce04bab6fe6de7b31693591ee66dae8b51a401b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_smac_planner/1.1.5-1"; + sha256 = "sha256-AypDjwAhl5eS0rKPVIf0VM+BfXZLcC38WggTb8kwR9o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-smoother/default.nix b/distros/humble/nav2-smoother/default.nix index 7ebab9c334..019e33024e 100644 --- a/distros/humble/nav2-smoother/default.nix +++ b/distros/humble/nav2-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-smoother"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_smoother/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "a4c3235be5d73eefa648a211c8e70e0e50eab78aff54ae3fcecf89d48a131760"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_smoother/1.1.5-1"; + sha256 = "sha256-gSo9sXGYyc81yZLSuLxkcmCVkcw1EMs32n5Uwp2iwyU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-system-tests/default.nix b/distros/humble/nav2-system-tests/default.nix index 57bef66321..81f77d7e90 100644 --- a/distros/humble/nav2-system-tests/default.nix +++ b/distros/humble/nav2-system-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-system-tests"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_system_tests/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "aa1046a3e4a0c619ac28ed92463a44cb0f96d8d634418039e62c1457d94f2176"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_system_tests/1.1.5-1"; + sha256 = "sha256-q4U1W7bp+T9T4I5OaGqmSU1cbRml6XFka5ONu5cONJc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-theta-star-planner/default.nix b/distros/humble/nav2-theta-star-planner/default.nix index 4f40cc3d6f..c415f74541 100644 --- a/distros/humble/nav2-theta-star-planner/default.nix +++ b/distros/humble/nav2-theta-star-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-theta-star-planner"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_theta_star_planner/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "5d0b8aa66414e5ce7102b47947030dccb4635651d798b097248a2a36f3654052"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_theta_star_planner/1.1.5-1"; + sha256 = "sha256-yUYAEAkP0PkLIyEUzamqi0XwujthLDMpYU70nd5r+NA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-util/default.nix b/distros/humble/nav2-util/default.nix index 4c6b1d7d1a..ebb11615df 100644 --- a/distros/humble/nav2-util/default.nix +++ b/distros/humble/nav2-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-util"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_util/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "ec8fe44ba13406456dab463ba23d5b1c5356d45a804f87d86b36695c72cdb267"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_util/1.1.5-1"; + sha256 = "sha256-8UQ7Y7etYnG0Dgx7eDMWUwSVU7+uWU0uB+j3ELShZ3s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nav2-velocity-smoother/default.nix b/distros/humble/nav2-velocity-smoother/default.nix index 1d99fdb8f4..03ea4fa0ec 100644 --- a/distros/humble/nav2-velocity-smoother/default.nix +++ b/distros/humble/nav2-velocity-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-velocity-smoother"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_velocity_smoother/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "2ebbcd9ff0c4d242d5b20fae5f9d92fcc925d782ea49bda17236a9cc331d149b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_velocity_smoother/1.1.5-1"; + sha256 = "sha256-QDEhW7N52Cm8gzkCT+SPekTsyqB0hha6XZFIFo3FwYw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-voxel-grid/default.nix b/distros/humble/nav2-voxel-grid/default.nix index fe77d04a70..50d2dce12a 100644 --- a/distros/humble/nav2-voxel-grid/default.nix +++ b/distros/humble/nav2-voxel-grid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-voxel-grid"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_voxel_grid/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "0bde1df4767895d73d5141593fb07309ed768cb5540f960c70b8158d871c5c4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_voxel_grid/1.1.5-1"; + sha256 = "sha256-vkFK2iZAo3WGSW/Hjn2bAP2kkCNds0aUH6ef3OZcKfA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake nav2-common ]; diff --git a/distros/humble/nav2-waypoint-follower/default.nix b/distros/humble/nav2-waypoint-follower/default.nix index b3e265bf86..00c7fd8b43 100644 --- a/distros/humble/nav2-waypoint-follower/default.nix +++ b/distros/humble/nav2-waypoint-follower/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nav2-waypoint-follower"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/nav2_waypoint_follower/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "43bd3b77aee0a33e74b8cd1c89ab45a2068e5f8cfc7a93285f653374a01e3e48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/nav2_waypoint_follower/1.1.5-1"; + sha256 = "sha256-xBFG1tzWTFgMJotMeUHiKQeCQhRWFOfXbd2LIbx0Gs4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/navigation2/default.nix b/distros/humble/navigation2/default.nix index 0450882f01..ed4ab2d6a2 100644 --- a/distros/humble/navigation2/default.nix +++ b/distros/humble/navigation2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-navigation2"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/navigation2-release/archive/release/humble/navigation2/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "72667e3215f1b51a557f6e9b2c520ac2f27fd4865c5ec1904f38554512a1e7cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "navigation2-release"; + rev = "release/humble/navigation2/1.1.5-1"; + sha256 = "sha256-UUMG8PWTqSQIHO7VY2pKjWndjwoo/ozQWPRSeXmhOt8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/neo-simulation2/default.nix b/distros/humble/neo-simulation2/default.nix index 0349af6b84..efaa2762b9 100644 --- a/distros/humble/neo-simulation2/default.nix +++ b/distros/humble/neo-simulation2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-neo-simulation2"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/neo_simulation2-release/archive/release/humble/neo_simulation2/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "fba9c54be52a71f5f3ebdc8fd739a5736e0ad27be1f0191d9f5878d5512b43fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "neo_simulation2-release"; + rev = "release/humble/neo_simulation2/1.0.0-3"; + sha256 = "sha256-AEgFzFZfgKi6yp6aeHAETABt5PXW2Ugz993IleDbO9k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nerian-stereo/default.nix b/distros/humble/nerian-stereo/default.nix index 020b2626e0..acd5d9d329 100644 --- a/distros/humble/nerian-stereo/default.nix +++ b/distros/humble/nerian-stereo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, cv-bridge, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, stereo-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-humble-nerian-stereo"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/nerian-vision/nerian_stereo_ros2-release/archive/release/humble/nerian_stereo/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "52fe766f6f1a4802a71645820e77e2e536840498ebb64acf2086af3a94de2e2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nerian-vision"; + repo = "nerian_stereo_ros2-release"; + rev = "release/humble/nerian_stereo/1.2.0-1"; + sha256 = "sha256-g3DwZQvBB2lnrA6Zau42PedqeWI1d3VHSTXOVkJdFEo="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/nlohmann-json-schema-validator-vendor/default.nix b/distros/humble/nlohmann-json-schema-validator-vendor/default.nix index 174ec62097..537dcefe99 100644 --- a/distros/humble/nlohmann-json-schema-validator-vendor/default.nix +++ b/distros/humble/nlohmann-json-schema-validator-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nlohmann-json-schema-validator-vendor"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nlohmann_json_schema_validator_vendor-release/archive/release/humble/nlohmann_json_schema_validator_vendor/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "15f4b9a4a23dcb4cf4d9f48b0f84f2c53b337e64229e526cc500a16d1373d0e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nlohmann_json_schema_validator_vendor-release"; + rev = "release/humble/nlohmann_json_schema_validator_vendor/0.2.4-1"; + sha256 = "sha256-4IFPjmJ77/9j47gU2b0HRDdNiJ0TiHlUInxSXC/tI90="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/nmea-hardware-interface/default.nix b/distros/humble/nmea-hardware-interface/default.nix index 2b79b8864d..df9f677b3c 100644 --- a/distros/humble/nmea-hardware-interface/default.nix +++ b/distros/humble/nmea-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nmea-hardware-interface"; version = "0.0.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nmea_hardware_interface-release/archive/release/humble/nmea_hardware_interface/0.0.1-3.tar.gz"; - name = "0.0.1-3.tar.gz"; - sha256 = "e58f920809c4c3ae2c51be48cb18e71b3f7e03d36e6f95d7452358b979235456"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nmea_hardware_interface-release"; + rev = "release/humble/nmea_hardware_interface/0.0.1-3"; + sha256 = "sha256-YibMQpu2E/mEdOx3OB8wbxnUVH/AukvJlND3wu5+oeE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/nmea-msgs/default.nix b/distros/humble/nmea-msgs/default.nix index 1d713d5700..9819df6141 100644 --- a/distros/humble/nmea-msgs/default.nix +++ b/distros/humble/nmea-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nmea-msgs"; version = "2.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nmea_msgs-release/archive/release/humble/nmea_msgs/2.0.0-4.tar.gz"; - name = "2.0.0-4.tar.gz"; - sha256 = "9a8dc7fc1b0e2e132b40f9b0f38019df02666907793aa3e64273913706757965"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nmea_msgs-release"; + rev = "release/humble/nmea_msgs/2.0.0-4"; + sha256 = "sha256-bswqgESVo01rxSNhUMSl4dZwBC88WoKlS55Dn0U5CQc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/nodl-python/default.nix b/distros/humble/nodl-python/default.nix index 50dfaf3937..344c38c160 100644 --- a/distros/humble/nodl-python/default.nix +++ b/distros/humble/nodl-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nodl-python"; version = "0.3.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nodl-release/archive/release/humble/nodl_python/0.3.1-3.tar.gz"; - name = "0.3.1-3.tar.gz"; - sha256 = "28cc84ae1693342eae59a7d0bbad72c4dcce03b1dd2e4474fe3a597c76798bbd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nodl-release"; + rev = "release/humble/nodl_python/0.3.1-3"; + sha256 = "sha256-rHEAtKnNTsXSB1UGfZYRfy3DQXrnGFWNntTfJyxEymc="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-lint-auto ament-lint-common ament-mypy python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/humble/nodl-to-policy/default.nix b/distros/humble/nodl-to-policy/default.nix index 297a5a336a..faf9b3a8a0 100644 --- a/distros/humble/nodl-to-policy/default.nix +++ b/distros/humble/nodl-to-policy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-nodl-to-policy"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nodl_to_policy-release/archive/release/humble/nodl_to_policy/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "ef142075c1fc652466ec1265c312d791169a832f5287a39513df272ce58b1967"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nodl_to_policy-release"; + rev = "release/humble/nodl_to_policy/1.0.0-3"; + sha256 = "sha256-e3+aKkyGXpBFCwulLKU8Tv8PSYEtqUTsp6iL1bE5W9g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-lint-auto ament-mypy ament-pep257 ament-pycodestyle python3Packages.pytest-mock pythonPackages.pytest ros-testing test-msgs ]; diff --git a/distros/humble/novatel-gps-driver/default.nix b/distros/humble/novatel-gps-driver/default.nix index 4cff89e43f..1663798c3d 100644 --- a/distros/humble/novatel-gps-driver/default.nix +++ b/distros/humble/novatel-gps-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-novatel-gps-driver"; version = "4.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/novatel_gps_driver-release/archive/release/humble/novatel_gps_driver/4.1.1-2.tar.gz"; - name = "4.1.1-2.tar.gz"; - sha256 = "78d486865936a2f02e99fa9fea1bb0c39243ee9677bfd6021907f7cee4e21bbb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/humble/novatel_gps_driver/4.1.1-2"; + sha256 = "sha256-AUZEO2ov3eB720LIor9+ee/pLsuPGzt1SAWlGqGalnU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/novatel-gps-msgs/default.nix b/distros/humble/novatel-gps-msgs/default.nix index e3e9c2ac97..8247c03d1b 100644 --- a/distros/humble/novatel-gps-msgs/default.nix +++ b/distros/humble/novatel-gps-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-novatel-gps-msgs"; version = "4.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/novatel_gps_driver-release/archive/release/humble/novatel_gps_msgs/4.1.1-2.tar.gz"; - name = "4.1.1-2.tar.gz"; - sha256 = "a114c62a2cf518dba63512014612730d8ac13d936f6e43ab243d6f442b9f8fe6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/humble/novatel_gps_msgs/4.1.1-2"; + sha256 = "sha256-m46G0xJJOb+WmCE3ngzX6N/Vuj9P1OU+dKjQdt/QsvM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/ntpd-driver/default.nix b/distros/humble/ntpd-driver/default.nix index 79c378eb92..2311830c6f 100644 --- a/distros/humble/ntpd-driver/default.nix +++ b/distros/humble/ntpd-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ntpd-driver"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ntpd_driver-release/archive/release/humble/ntpd_driver/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "78785bac0c28b57cd11f050e4235974983d7a5df0b2913d92931f765d2714a86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ntpd_driver-release"; + rev = "release/humble/ntpd_driver/2.2.0-1"; + sha256 = "sha256-Y3hISLK0EHzcJD4MrfgxDdmYH+cpgQTjbH3DCmbd0VE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ntrip-client/default.nix b/distros/humble/ntrip-client/default.nix index ebe503001a..3015b7edfa 100644 --- a/distros/humble/ntrip-client/default.nix +++ b/distros/humble/ntrip-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ntrip-client"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ntrip_client-release/archive/release/humble/ntrip_client/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "7516989ca6c25bdc5db576845a4156554a32076b2ca71f0455e22502eedd2232"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ntrip_client-release"; + rev = "release/humble/ntrip_client/1.2.0-1"; + sha256 = "sha256-D2B2lApA/XdsUVc6tMvHaZBKPMxKG+1deA3REcfJSS8="; + }; buildType = "ament_python"; propagatedBuildInputs = [ mavros-msgs nmea-msgs rclpy std-msgs ]; diff --git a/distros/humble/object-recognition-msgs/default.nix b/distros/humble/object-recognition-msgs/default.nix index 3c4ae5e260..24c9064d16 100644 --- a/distros/humble/object-recognition-msgs/default.nix +++ b/distros/humble/object-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-object-recognition-msgs"; version = "2.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/object_recognition_msgs-release/archive/release/humble/object_recognition_msgs/2.0.0-3.tar.gz"; - name = "2.0.0-3.tar.gz"; - sha256 = "f9c2a34911446d60f060b81e793fedb99a5791d80f14f3863a014eb91a7e2f4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "object_recognition_msgs-release"; + rev = "release/humble/object_recognition_msgs/2.0.0-3"; + sha256 = "sha256-51GLrMSSWkdlTz5SBW9ImQilU5Rojo8emRiwZZtZtS0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/octomap-mapping/default.nix b/distros/humble/octomap-mapping/default.nix index 9c1656cfcc..e1e1ac241e 100644 --- a/distros/humble/octomap-mapping/default.nix +++ b/distros/humble/octomap-mapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-octomap-mapping"; version = "2.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_mapping-release/archive/release/humble/octomap_mapping/2.0.0-3.tar.gz"; - name = "2.0.0-3.tar.gz"; - sha256 = "c44827557d29542056b2f954cba76aae3e16b23dae9a9c1f01741055f61f8b3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_mapping-release"; + rev = "release/humble/octomap_mapping/2.0.0-3"; + sha256 = "sha256-8X4kZ4yCTELXt6wgdUt0ftR0Nn+TvtK9cMWDMgapEhM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/octomap-msgs/default.nix b/distros/humble/octomap-msgs/default.nix index d9cc77e2ed..e082288f96 100644 --- a/distros/humble/octomap-msgs/default.nix +++ b/distros/humble/octomap-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-octomap-msgs"; version = "2.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_msgs-release/archive/release/humble/octomap_msgs/2.0.0-3.tar.gz"; - name = "2.0.0-3.tar.gz"; - sha256 = "5173b15d1768128786b3e6b15450c73940aa440a849501d5d50b8a9edcf9a6f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_msgs-release"; + rev = "release/humble/octomap_msgs/2.0.0-3"; + sha256 = "sha256-97tbZTVcZMc2CB2JAW6gn0/ABahvBbfiC3jpHDIJJ6I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/octomap-ros/default.nix b/distros/humble/octomap-ros/default.nix index 25558a694d..35b85bb57d 100644 --- a/distros/humble/octomap-ros/default.nix +++ b/distros/humble/octomap-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-octomap-ros"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_ros-release/archive/release/humble/octomap_ros/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "7e1fdde257ada64db03b0df8031c3e41d79b88c345ba525b48911025482fd675"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_ros-release"; + rev = "release/humble/octomap_ros/0.4.3-1"; + sha256 = "sha256-RD+gwS31k6UPEKegLdv6kSOha4ju5W2T5EwCpMkZ5Lc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/octomap-rviz-plugins/default.nix b/distros/humble/octomap-rviz-plugins/default.nix index 7ce5365a90..100f7202a4 100644 --- a/distros/humble/octomap-rviz-plugins/default.nix +++ b/distros/humble/octomap-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-octomap-rviz-plugins"; version = "2.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_rviz_plugins-release/archive/release/humble/octomap_rviz_plugins/2.0.0-3.tar.gz"; - name = "2.0.0-3.tar.gz"; - sha256 = "67553f3fe4c44b8d418c2284b3ef1cff8b09a53ceb0e36fb4127498ce5a2e49c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_rviz_plugins-release"; + rev = "release/humble/octomap_rviz_plugins/2.0.0-3"; + sha256 = "sha256-M9xdQSP9dc1bw2Jkn7tJ506Ah5/lABFrjFf03Ot8828="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/octomap-server/default.nix b/distros/humble/octomap-server/default.nix index 05c3cc3b63..900d61b349 100644 --- a/distros/humble/octomap-server/default.nix +++ b/distros/humble/octomap-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-octomap-server"; version = "2.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_mapping-release/archive/release/humble/octomap_server/2.0.0-3.tar.gz"; - name = "2.0.0-3.tar.gz"; - sha256 = "37a7c28805bc15eabedf1ee47035d83080c65f108d6f5f61afd152356013409b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_mapping-release"; + rev = "release/humble/octomap_server/2.0.0-3"; + sha256 = "sha256-Uh6hgimLc8sgK2A6cuJWe0IPqZeR6ljm1xQoNRwe9ck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/octomap/default.nix b/distros/humble/octomap/default.nix index eaf880e86d..26783d6252 100644 --- a/distros/humble/octomap/default.nix +++ b/distros/humble/octomap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-octomap"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap-release/archive/release/humble/octomap/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "ceb658a17bb47e6ef6fabeafd178e7658e5547e345d0bac6004940bfdd0cbc9d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap-release"; + rev = "release/humble/octomap/1.9.8-1"; + sha256 = "sha256-1C49qDf+5BFNi34JzrSFN0B0kNfv1MBTmcdT/hEjkKI="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/octovis/default.nix b/distros/humble/octovis/default.nix index 34ae95de98..932d233607 100644 --- a/distros/humble/octovis/default.nix +++ b/distros/humble/octovis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-octovis"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap-release/archive/release/humble/octovis/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "0fc7d234141ccfe21aeeecfa1c9863f1c52f0b38301865edf7562061689051e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap-release"; + rev = "release/humble/octovis/1.9.8-1"; + sha256 = "sha256-B3o5qIG2TXL7n4EG8EOfFE/k4yEj6kdYAtRPXbUfB6s="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/ompl/default.nix b/distros/humble/ompl/default.nix index 38c26e8573..3016f55c63 100644 --- a/distros/humble/ompl/default.nix +++ b/distros/humble/ompl/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, cmake, eigen, flann, ode, pkg-config }: buildRosPackage { pname = "ros-humble-ompl"; - version = "1.5.2-r1"; + version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ompl-release/archive/release/humble/ompl/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "d0464ab7df4d083205f181c2d7a6916a47f749bcdb962fb7b3d9ea82475845ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ompl-release"; + rev = "release/humble/ompl/1.6.0-1"; + sha256 = "sha256-Dst2FtQsK0+EzvSm7GEESWOU8QfMPzhSNNYEIlTNfc0="; + }; buildType = "cmake"; buildInputs = [ cmake pkg-config ]; diff --git a/distros/humble/orocos-kdl-vendor/default.nix b/distros/humble/orocos-kdl-vendor/default.nix index 9cfa0b0fa0..b017f2653c 100644 --- a/distros/humble/orocos-kdl-vendor/default.nix +++ b/distros/humble/orocos-kdl-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, eigen, eigen3-cmake-module, git, orocos-kdl }: buildRosPackage { pname = "ros-humble-orocos-kdl-vendor"; - version = "0.2.4-r1"; + version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/orocos_kdl_vendor-release/archive/release/humble/orocos_kdl_vendor/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "b6f80dd7f0b4e02e878b171c1316b74676d3f6a3be9366c448ad9ba87e81d86f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "orocos_kdl_vendor-release"; + rev = "release/humble/orocos_kdl_vendor/0.2.5-1"; + sha256 = "sha256-vEX/5/Q4uhjraExgZ6Rn5FVy5clSoLJ7GlirhXzeAr4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/osqp-vendor/default.nix b/distros/humble/osqp-vendor/default.nix index 1a48de08f3..78e9036cae 100644 --- a/distros/humble/osqp-vendor/default.nix +++ b/distros/humble/osqp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-osqp-vendor"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osqp_vendor-release/archive/release/humble/osqp_vendor/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "78feb7e49d3652763bef72c686e2dc1df3f046aa21b1c23d34cd6c57ab7b8d01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osqp_vendor-release"; + rev = "release/humble/osqp_vendor/0.2.0-1"; + sha256 = "sha256-I6jhthmRppj6fiDd1M+bbW8W/bsR5/0ur5UWcf4/ZGQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ros-environment ]; diff --git a/distros/humble/osrf-pycommon/default.nix b/distros/humble/osrf-pycommon/default.nix index 681a9d69b1..cb71beea5c 100644 --- a/distros/humble/osrf-pycommon/default.nix +++ b/distros/humble/osrf-pycommon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-osrf-pycommon"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osrf_pycommon-release/archive/release/humble/osrf_pycommon/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "99b61b77be91e9aa5bee393befcf4c9b5a21f5bed075b7b399880fbeb9d0412d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osrf_pycommon-release"; + rev = "release/humble/osrf_pycommon/2.0.2-2"; + sha256 = "sha256-kVQSBsFUCtISe18IP7gpVCUslVT+OpJa7fQbSaENw1Y="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.importlib-metadata ]; diff --git a/distros/humble/osrf-testing-tools-cpp/default.nix b/distros/humble/osrf-testing-tools-cpp/default.nix index c1ccf7bf08..617580bc2b 100644 --- a/distros/humble/osrf-testing-tools-cpp/default.nix +++ b/distros/humble/osrf-testing-tools-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-osrf-testing-tools-cpp"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osrf_testing_tools_cpp-release/archive/release/humble/osrf_testing_tools_cpp/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "cf31473654d3e6e5e29d64354d01ff36375d1f8f7f5a084c5f95cd7e84da93f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osrf_testing_tools_cpp-release"; + rev = "release/humble/osrf_testing_tools_cpp/1.5.2-1"; + sha256 = "sha256-du4lfHqdmHOrL+pPJsvjMzkstRUrj//VqIabWR6SP2Y="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/ouster-msgs/default.nix b/distros/humble/ouster-msgs/default.nix index 80fc78819c..3a631ab0bd 100644 --- a/distros/humble/ouster-msgs/default.nix +++ b/distros/humble/ouster-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ouster-msgs"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_ouster_drivers-release/archive/release/humble/ouster_msgs/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "2acc1982c15fbceab282e8e9aeed024b811fd38316e23316918479a6cbbe65e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_ouster_drivers-release"; + rev = "release/humble/ouster_msgs/0.4.1-1"; + sha256 = "sha256-3qpjUFSE0WEq3HoBFiCxaCCGGg6xfZ4VoQcfTCNUagQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ouxt-common/default.nix b/distros/humble/ouxt-common/default.nix index 5b70bc8c35..b2df88668d 100644 --- a/distros/humble/ouxt-common/default.nix +++ b/distros/humble/ouxt-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ouxt-common"; version = "0.0.8-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ouxt_common-release/archive/release/humble/ouxt_common/0.0.8-3.tar.gz"; - name = "0.0.8-3.tar.gz"; - sha256 = "497c4f174b05f677ff1b7b9ea355e8855942666c1b6beafe31bae7a814284d22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ouxt_common-release"; + rev = "release/humble/ouxt_common/0.0.8-3"; + sha256 = "sha256-4nyGy7HVcpb5Cb/zBa9+kz8o7aXZyGqY2Fdy17Xd9ZY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ouxt-lint-common/default.nix b/distros/humble/ouxt-lint-common/default.nix index 5c04a2540c..267f1f615b 100644 --- a/distros/humble/ouxt-lint-common/default.nix +++ b/distros/humble/ouxt-lint-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ouxt-lint-common"; version = "0.0.8-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ouxt_common-release/archive/release/humble/ouxt_lint_common/0.0.8-3.tar.gz"; - name = "0.0.8-3.tar.gz"; - sha256 = "ced95f1aba172a1045e13e6b22a4c1f2bc3e43ab664ea42f1766f299d02fa45a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ouxt_common-release"; + rev = "release/humble/ouxt_lint_common/0.0.8-3"; + sha256 = "sha256-CzvbzrJWL16B2/c63ryLS008hT4dSu50P4AhU+lsHpQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pal-gazebo-worlds/default.nix b/distros/humble/pal-gazebo-worlds/default.nix index 7fa739c10b..3b9a5802c7 100644 --- a/distros/humble/pal-gazebo-worlds/default.nix +++ b/distros/humble/pal-gazebo-worlds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pal-gazebo-worlds"; version = "3.0.3-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_gazebo_worlds-ros2-release/archive/release/humble/pal_gazebo_worlds/3.0.3-1.tar.gz"; - name = "3.0.3-1.tar.gz"; - sha256 = "27876eadb9a4d50273044acea117f814785f8052fdeef2d402e697abf23f4e9d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_gazebo_worlds-ros2-release"; + rev = "release/humble/pal_gazebo_worlds/3.0.3-1"; + sha256 = "sha256-zF3W5u5qvvxz1muT76EW12Os2lD6ND4m38SllkuEvq8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/humble/pal-gripper-controller-configuration/default.nix b/distros/humble/pal-gripper-controller-configuration/default.nix index 487374f65a..402b420573 100644 --- a/distros/humble/pal-gripper-controller-configuration/default.nix +++ b/distros/humble/pal-gripper-controller-configuration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pal-gripper-controller-configuration"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_gripper-release/archive/release/humble/pal_gripper_controller_configuration/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "6145d044628ea3f1f3139f7b2b4a5dc9030669ef1ed5d8d945985ef149d55ddd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_gripper-release"; + rev = "release/humble/pal_gripper_controller_configuration/3.0.1-1"; + sha256 = "sha256-gMlc/+AIWErNZK/B0zS8vFstArdW/tobPKCKKREGuug="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/pal-gripper-description/default.nix b/distros/humble/pal-gripper-description/default.nix index 2f5f27aff6..99bff04006 100644 --- a/distros/humble/pal-gripper-description/default.nix +++ b/distros/humble/pal-gripper-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pal-gripper-description"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_gripper-release/archive/release/humble/pal_gripper_description/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "49fdd60b0383874024f24f56219cab4f2b6966c33c3dc5609f22d335495f72b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_gripper-release"; + rev = "release/humble/pal_gripper_description/3.0.1-1"; + sha256 = "sha256-QQvfn20URGeApHDNyeK8BpYVpoFhwNQQRG/FQqvEEiY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/pal-gripper/default.nix b/distros/humble/pal-gripper/default.nix index 46c27634ab..b4891a3bff 100644 --- a/distros/humble/pal-gripper/default.nix +++ b/distros/humble/pal-gripper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pal-gripper"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_gripper-release/archive/release/humble/pal_gripper/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "d10ed88b621cc35211d5ff899de08e9678930ba82fb4f5c5a8b92a3f0be245d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_gripper-release"; + rev = "release/humble/pal_gripper/3.0.1-1"; + sha256 = "sha256-qxn0Pwpu7Ef5ty+3nYma0i+tUYjvULkzADL7eSX4wqE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pal-statistics-msgs/default.nix b/distros/humble/pal-statistics-msgs/default.nix index 92a256483b..8442fc1678 100644 --- a/distros/humble/pal-statistics-msgs/default.nix +++ b/distros/humble/pal-statistics-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pal-statistics-msgs"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_statistics-release/archive/release/humble/pal_statistics_msgs/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "b937f1bb1421b7398ae7ec381b667ad740196e675964e925d6c92a59ff0307c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_statistics-release"; + rev = "release/humble/pal_statistics_msgs/2.1.3-1"; + sha256 = "sha256-IqJpPrYKZlv1lypCXtoJgtyKlWPN9uNJBS1RRMCxBgg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/pal-statistics/default.nix b/distros/humble/pal-statistics/default.nix index 1244756bae..b267a4e83c 100644 --- a/distros/humble/pal-statistics/default.nix +++ b/distros/humble/pal-statistics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pal-statistics"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_statistics-release/archive/release/humble/pal_statistics/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "7a744e36c0e3010028c986fec1ad1f6b5f50dbc2dcc58ae26008dfa510aff267"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_statistics-release"; + rev = "release/humble/pal_statistics/2.1.3-1"; + sha256 = "sha256-mkOWsUa6v2DuDZCpdZ4DiN1tsR4XH1Ip3RyqYmVTf5s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/parameter-traits/default.nix b/distros/humble/parameter-traits/default.nix index a32b569df0..3a14a9fa15 100644 --- a/distros/humble/parameter-traits/default.nix +++ b/distros/humble/parameter-traits/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-parameter-traits"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/generate_parameter_library-release/archive/release/humble/parameter_traits/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "ddb901166129636f9a5cef183270f5795ce9d3e3439c475d9aaca461b56e8bce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "generate_parameter_library-release"; + rev = "release/humble/parameter_traits/0.3.0-1"; + sha256 = "sha256-CE7WX8x5Ilik/BADGqMSQOBYcG2ZakWdUKs7Ergu22g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pcl-conversions/default.nix b/distros/humble/pcl-conversions/default.nix index e361f76977..3080df6111 100644 --- a/distros/humble/pcl-conversions/default.nix +++ b/distros/humble/pcl-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pcl-conversions"; version = "2.4.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/humble/pcl_conversions/2.4.0-4.tar.gz"; - name = "2.4.0-4.tar.gz"; - sha256 = "69090c3db0acb73c9ec168210d8e561fa6819e0aefdbfabd6a1cdb91445dbaa0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/humble/pcl_conversions/2.4.0-4"; + sha256 = "sha256-Yhd4nTb/B3ZWVpZk/WiJMPIqeR7Bp/yWryUXWUuz0bU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pcl-msgs/default.nix b/distros/humble/pcl-msgs/default.nix index ef4c3acf9b..f827ee0a02 100644 --- a/distros/humble/pcl-msgs/default.nix +++ b/distros/humble/pcl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pcl-msgs"; version = "1.0.0-r7"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pcl_msgs-release/archive/release/humble/pcl_msgs/1.0.0-7.tar.gz"; - name = "1.0.0-7.tar.gz"; - sha256 = "5510338bcc3a5a0eebb0790e0d4352901b7a7c01018bc66614cedc8885b793ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pcl_msgs-release"; + rev = "release/humble/pcl_msgs/1.0.0-7"; + sha256 = "sha256-YdspDlpwU8CIVBKEa3kLCnDsR3MsuehC9zuvXtAnt4w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/pcl-ros/default.nix b/distros/humble/pcl-ros/default.nix index 371d3b5da5..7d2cf07c72 100644 --- a/distros/humble/pcl-ros/default.nix +++ b/distros/humble/pcl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pcl-ros"; version = "2.4.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/humble/pcl_ros/2.4.0-4.tar.gz"; - name = "2.4.0-4.tar.gz"; - sha256 = "1bf600634be4e90bf828217c936e395e2369f9c9e2dd0272013c6d82e200de82"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/humble/pcl_ros/2.4.0-4"; + sha256 = "sha256-y37VynRX0MmG+KHoNnewCb8S6U4+GBY8nETGRMq+pY8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pendulum-control/default.nix b/distros/humble/pendulum-control/default.nix index 276e622a5d..54c5a6f373 100644 --- a/distros/humble/pendulum-control/default.nix +++ b/distros/humble/pendulum-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-pytest, ament-lint-auto, ament-lint-common, launch, launch-testing, launch-testing-ament-cmake, launch-testing-ros, pendulum-msgs, rclcpp, rmw-implementation-cmake, ros2run, rttest, tlsf-cpp }: buildRosPackage { pname = "ros-humble-pendulum-control"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/pendulum_control/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "3e3bc4c7d88bb666f007bb8f2f2bdc262d12c10092a7a93988ae5767ccdb3dca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/pendulum_control/0.20.3-1"; + sha256 = "sha256-IqRaSbLfc1Ai+tlt1T/TaAheyVeKYTbZGUVh/4fktTI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pendulum-msgs/default.nix b/distros/humble/pendulum-msgs/default.nix index 0b66eee0af..55b1d066fa 100644 --- a/distros/humble/pendulum-msgs/default.nix +++ b/distros/humble/pendulum-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-humble-pendulum-msgs"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/pendulum_msgs/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "e3d60c0ca93463b6adbb6187ad11c9fea51f6b88a07846a3c73ed2fddbbdc193"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/pendulum_msgs/0.20.3-1"; + sha256 = "sha256-Cy7MHwVyZHQOVkJ8PGJshgOeoDGPxUz7qiWbDExaEH0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/perception-pcl/default.nix b/distros/humble/perception-pcl/default.nix index f56e40895a..438b88da72 100644 --- a/distros/humble/perception-pcl/default.nix +++ b/distros/humble/perception-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-perception-pcl"; version = "2.4.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/humble/perception_pcl/2.4.0-4.tar.gz"; - name = "2.4.0-4.tar.gz"; - sha256 = "d7510dd5106185979c591097ff990c2604c6b581ded57f6b4fbdb4c34cb1691e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/humble/perception_pcl/2.4.0-4"; + sha256 = "sha256-vaelynEY5Nl6dBCMHgjnRIcRRl4Em53DNQIvwfmo36A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/perception/default.nix b/distros/humble/perception/default.nix index 7d35aeb796..dd13469e63 100644 --- a/distros/humble/perception/default.nix +++ b/distros/humble/perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-perception"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/humble/perception/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "641fde58239df20dcad99c4f13b7c8c888d92cfe77d1cbc2a2bacbc33c72f5ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/humble/perception/0.10.0-1"; + sha256 = "sha256-c9lGVLwPCuMSbgiHggs37sSu7II5YKdn0ruTBwk2wMs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/performance-test-fixture/default.nix b/distros/humble/performance-test-fixture/default.nix index 528f381f7d..76dba938bc 100644 --- a/distros/humble/performance-test-fixture/default.nix +++ b/distros/humble/performance-test-fixture/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-performance-test-fixture"; version = "0.0.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/performance_test_fixture-release/archive/release/humble/performance_test_fixture/0.0.9-1.tar.gz"; - name = "0.0.9-1.tar.gz"; - sha256 = "ea1d573bd815dd78bfeade5ea6c7665cd7a3ce7d6f2c531c8f61abe0baf3db86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "performance_test_fixture-release"; + rev = "release/humble/performance_test_fixture/0.0.9-1"; + sha256 = "sha256-AGkyb6QjietsUExtcqvwhnGy5Sd2EFBT8JkBAd4rb4o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ament-cmake-export-dependencies ament-cmake-export-targets ament-cmake-test ]; diff --git a/distros/humble/performance-test/default.nix b/distros/humble/performance-test/default.nix index 9b63b09e55..a158f5ac1a 100644 --- a/distros/humble/performance-test/default.nix +++ b/distros/humble/performance-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-performance-test"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/performance_test-release/archive/release/humble/performance_test/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "c2c82361579b9a02dea39bc4d3b589c0ed055bacf12b701e291e4629d96f7585"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "performance_test-release"; + rev = "release/humble/performance_test/1.2.1-1"; + sha256 = "sha256-u4mAwbA+JRMXmY53Z0E6Uz7BQJcVZkDovcmnVCK1KxU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake osrf-testing-tools-cpp rosidl-default-generators ]; diff --git a/distros/humble/phidgets-accelerometer/default.nix b/distros/humble/phidgets-accelerometer/default.nix index 32eb39efbe..a99aa393e9 100644 --- a/distros/humble/phidgets-accelerometer/default.nix +++ b/distros/humble/phidgets-accelerometer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-accelerometer"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_accelerometer/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "a993ebe59b2fecddd4d51838e04581521df39b7c6ae42893304d3b3bdbc0e0bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_accelerometer/2.3.0-2"; + sha256 = "sha256-ZZ38MAd5LLwpkOcc0xySyAADOtKfbo1UhCbo3xHUHf4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-analog-inputs/default.nix b/distros/humble/phidgets-analog-inputs/default.nix index a77179ffd8..da0138d1e4 100644 --- a/distros/humble/phidgets-analog-inputs/default.nix +++ b/distros/humble/phidgets-analog-inputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-analog-inputs"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_analog_inputs/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "ef305f9fc70c54c487ae6d4f7b29c692e9610234f0e2d3fb64eae3801332408a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_analog_inputs/2.3.0-2"; + sha256 = "sha256-gL8HOdwoDA0GqMihsxhlj6gh6+u81FDWe5OHmNjkpWE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-api/default.nix b/distros/humble/phidgets-api/default.nix index 0cb7f96172..6df943ec17 100644 --- a/distros/humble/phidgets-api/default.nix +++ b/distros/humble/phidgets-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-api"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_api/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "4a64b2808e00f7e9872841d81d9edbfa363af1cde4ec16450b66bacd1109833f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_api/2.3.0-2"; + sha256 = "sha256-9pXa6lWke+ucR8zTxpZjlQfMeJWONZYZUvmjBQIqLZM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-digital-inputs/default.nix b/distros/humble/phidgets-digital-inputs/default.nix index cddc07d61f..36d2ceabb6 100644 --- a/distros/humble/phidgets-digital-inputs/default.nix +++ b/distros/humble/phidgets-digital-inputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-digital-inputs"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_digital_inputs/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "377677f4275a2da2426f875f1ec25a0c1abd2db856fd38c512f33a60c327a7d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_digital_inputs/2.3.0-2"; + sha256 = "sha256-e4bvL+yTdSX8se9BLUOEEjUGo21Yyz6MSg7BhPOc7Aw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-digital-outputs/default.nix b/distros/humble/phidgets-digital-outputs/default.nix index a71bf6030a..0ac773cbad 100644 --- a/distros/humble/phidgets-digital-outputs/default.nix +++ b/distros/humble/phidgets-digital-outputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-digital-outputs"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_digital_outputs/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "2f5d4c17773ee35d0cf8305b185aabc95b9854539ba2ac42f053116fcdc96c5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_digital_outputs/2.3.0-2"; + sha256 = "sha256-zOFyZkgcW26GCITyhA5OlHtMEp2iOOtVV3tVFdq6fNg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-drivers/default.nix b/distros/humble/phidgets-drivers/default.nix index 7d7e660081..664b53e830 100644 --- a/distros/humble/phidgets-drivers/default.nix +++ b/distros/humble/phidgets-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-drivers"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_drivers/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "90026bb5a5cbc8a1746c323258f373055692f75102476a8b874ef341bebcc034"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_drivers/2.3.0-2"; + sha256 = "sha256-e7a4VL3O/iO56J1ltHQdTNbdIM7PUNt7vA8k8mrxb/M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/phidgets-gyroscope/default.nix b/distros/humble/phidgets-gyroscope/default.nix index ade1816bcb..c336690632 100644 --- a/distros/humble/phidgets-gyroscope/default.nix +++ b/distros/humble/phidgets-gyroscope/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-gyroscope"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_gyroscope/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "ae3573895f9b1630f8751c8807a97375bdac03d6bea42a648c19c3460965c1c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_gyroscope/2.3.0-2"; + sha256 = "sha256-+mhlfdRHl7101Ao2qYW3ogNPpHsjeInSXyYSx1915bs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-high-speed-encoder/default.nix b/distros/humble/phidgets-high-speed-encoder/default.nix index c529efc50f..591f88dc0a 100644 --- a/distros/humble/phidgets-high-speed-encoder/default.nix +++ b/distros/humble/phidgets-high-speed-encoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-high-speed-encoder"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_high_speed_encoder/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "cda8a49048dd23efc99de0bbeb33919268f154e267288404698c33c03045827e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_high_speed_encoder/2.3.0-2"; + sha256 = "sha256-dsxanJZdDiTWtlSUgDzXZWvzc6uCFf/qVV7s5zyF+ys="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-ik/default.nix b/distros/humble/phidgets-ik/default.nix index 55a7f30f0d..9d0e67f862 100644 --- a/distros/humble/phidgets-ik/default.nix +++ b/distros/humble/phidgets-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-ik"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_ik/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "0a0cf18f71d2c3eb7443db70cd9d0021112eab9995d743153e840099360efd93"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_ik/2.3.0-2"; + sha256 = "sha256-xV9s5q10/6CJKEdpCngj3LGli0cIFUgZLgHAdqUjgpY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/phidgets-magnetometer/default.nix b/distros/humble/phidgets-magnetometer/default.nix index 9e0864bcc2..f86ade4c84 100644 --- a/distros/humble/phidgets-magnetometer/default.nix +++ b/distros/humble/phidgets-magnetometer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-magnetometer"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_magnetometer/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "6dee3ea4367ad546c09c45d96873ea4439ed714dfb944065ec777197231c599f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_magnetometer/2.3.0-2"; + sha256 = "sha256-YG+rzCkh8JuJ+3squICUuWd97KP/uZQ7JW9+r/teKow="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-motors/default.nix b/distros/humble/phidgets-motors/default.nix index fc02b3ae82..e6e4f0c161 100644 --- a/distros/humble/phidgets-motors/default.nix +++ b/distros/humble/phidgets-motors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-motors"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_motors/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "f8005b7cd51dbf63de1341c96ff83526b89580554f7b5b21dcfb77210351de62"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_motors/2.3.0-2"; + sha256 = "sha256-CJ15pEIC0w/oEqLyGVnrQZqm/k6hjHTUfobsw9vaRcA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-msgs/default.nix b/distros/humble/phidgets-msgs/default.nix index 13ff561373..916d5549df 100644 --- a/distros/humble/phidgets-msgs/default.nix +++ b/distros/humble/phidgets-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-msgs"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_msgs/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "4960322e69279dd84d25873bc580c08e202c8bd6948bc10e4dfdb2a178afd8e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_msgs/2.3.0-2"; + sha256 = "sha256-KdyLUx65wdwbkUEqtpBamPz4Si2mVRADGNH0G8756dg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/phidgets-spatial/default.nix b/distros/humble/phidgets-spatial/default.nix index e99b3208b7..66998d856e 100644 --- a/distros/humble/phidgets-spatial/default.nix +++ b/distros/humble/phidgets-spatial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-spatial"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_spatial/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "e8ef67620eafb764fdd5f9ea36734bb386acda5c751ee11dba8d5891a09244e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_spatial/2.3.0-2"; + sha256 = "sha256-Kp1BaQKjpaOh8SZWo/h8mLTA4ZfYszHCYd0vY8xqtNI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/phidgets-temperature/default.nix b/distros/humble/phidgets-temperature/default.nix index 3748073fda..db6727ce69 100644 --- a/distros/humble/phidgets-temperature/default.nix +++ b/distros/humble/phidgets-temperature/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-phidgets-temperature"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/humble/phidgets_temperature/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "a915cf2693ea8f60fd8c6b6623f4f93482ba51bc3d9d0f272b7f78752a0f4dfd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/humble/phidgets_temperature/2.3.0-2"; + sha256 = "sha256-ysJlA4vNbW2mfoCNFXJTIwEJO0N44VHIUqHeOAi0BL0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/picknik-ament-copyright/default.nix b/distros/humble/picknik-ament-copyright/default.nix index b916bbf8b7..0f7adc6319 100644 --- a/distros/humble/picknik-ament-copyright/default.nix +++ b/distros/humble/picknik-ament-copyright/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-picknik-ament-copyright"; version = "0.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/picknik_ament_copyright-release/archive/release/humble/picknik_ament_copyright/0.0.2-3.tar.gz"; - name = "0.0.2-3.tar.gz"; - sha256 = "e76e4c6abe5f1595846a406356531b74fb495e190afc16ed26742dd4600c58d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "picknik_ament_copyright-release"; + rev = "release/humble/picknik_ament_copyright/0.0.2-3"; + sha256 = "sha256-zw0URrOQbcL7fo+BgOUHgI0yqf0DDRVGnOOxbJmog48="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/pilz-industrial-motion-planner-testutils/default.nix b/distros/humble/pilz-industrial-motion-planner-testutils/default.nix index 275a7869ff..6b273c10fb 100644 --- a/distros/humble/pilz-industrial-motion-planner-testutils/default.nix +++ b/distros/humble/pilz-industrial-motion-planner-testutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pilz-industrial-motion-planner-testutils"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/pilz_industrial_motion_planner_testutils/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "02539071e04afd0b8dd3e493563a6dd4553e58f35041b2c01ad1fd54ac618f01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/pilz_industrial_motion_planner_testutils/2.5.4-1"; + sha256 = "sha256-IJf0OXhnM2CvM+WeS2vp1C30AkNVNUi+fGdEMtYqccE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake tf2-eigen ]; diff --git a/distros/humble/pilz-industrial-motion-planner/default.nix b/distros/humble/pilz-industrial-motion-planner/default.nix index dd3e4d753e..6ecdef2f96 100644 --- a/distros/humble/pilz-industrial-motion-planner/default.nix +++ b/distros/humble/pilz-industrial-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pilz-industrial-motion-planner"; version = "2.5.4-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/humble/pilz_industrial_motion_planner/2.5.4-1.tar.gz"; - name = "2.5.4-1.tar.gz"; - sha256 = "1ec8f83454a995d83a3a808e974e805ca784650afe437728008e298eefd458a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/humble/pilz_industrial_motion_planner/2.5.4-1"; + sha256 = "sha256-+s+rzUyqubbz4NFOdFloZ13NJ7NrvLJE0dK0EOsU9rI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pinocchio/default.nix b/distros/humble/pinocchio/default.nix index 9903b51e26..094464ef7d 100644 --- a/distros/humble/pinocchio/default.nix +++ b/distros/humble/pinocchio/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, clang, cmake, doxygen, eigen, eigenpy, git, hpp-fcl, python3, python3Packages, urdfdom }: buildRosPackage { pname = "ros-humble-pinocchio"; - version = "2.6.12-r1"; + version = "2.6.14-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pinocchio-release/archive/release/humble/pinocchio/2.6.12-1.tar.gz"; - name = "2.6.12-1.tar.gz"; - sha256 = "60895ad18c9fd75085963ec4c0f3571311c922b0ace8cece0ee7d7d8fb868af8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pinocchio-release"; + rev = "release/humble/pinocchio/2.6.14-3"; + sha256 = "sha256-yft9ln4QMfdrybyACplCLY0BOPgaxeaDns6DkO7Q4b0="; + }; buildType = "cmake"; buildInputs = [ clang cmake doxygen git ]; diff --git a/distros/humble/plansys2-bringup/default.nix b/distros/humble/plansys2-bringup/default.nix index 19393c1c63..0dfd7436d4 100644 --- a/distros/humble/plansys2-bringup/default.nix +++ b/distros/humble/plansys2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-bringup"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_bringup/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "32170ab857b2071dad4dcd809df81f2ebd5235ddf4effa4d7cdfc6cce56ed6e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_bringup/2.0.9-1"; + sha256 = "sha256-5hVfPvDp3pt2R1doTcMc0xzU+6Adu1YC11LszhntZGA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-bt-actions/default.nix b/distros/humble/plansys2-bt-actions/default.nix index a0a8332cfc..6f6bd8ea32 100644 --- a/distros/humble/plansys2-bt-actions/default.nix +++ b/distros/humble/plansys2-bt-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-bt-actions"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_bt_actions/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "fe1fb5738032954183cfff057cfa7b666fcd82d743d5132e5cf311e6bfbbbb69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_bt_actions/2.0.9-1"; + sha256 = "sha256-sxx9toerSZCE/jtNwb63cMJHROjAiCAKUi6N377rDdo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-core/default.nix b/distros/humble/plansys2-core/default.nix index 40415136e9..ff088cac52 100644 --- a/distros/humble/plansys2-core/default.nix +++ b/distros/humble/plansys2-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-core"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_core/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "fbe5b993e5bc29baae502543f7a9c3771bf458ba2522b3c4856725959f07b34c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_core/2.0.9-1"; + sha256 = "sha256-oy9zs0MjcQ6svbFOZgZNi7HHX5YbMy9PC0TikcBITtM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-domain-expert/default.nix b/distros/humble/plansys2-domain-expert/default.nix index 4b1237ac08..96c3f7d38c 100644 --- a/distros/humble/plansys2-domain-expert/default.nix +++ b/distros/humble/plansys2-domain-expert/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-domain-expert"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_domain_expert/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "22283f3daa19eabb6b4010c9c78ca187f5330582d954aa946481397bdd1fd6a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_domain_expert/2.0.9-1"; + sha256 = "sha256-3hFJ0/KeAou4FCpsxO5jeiissA+fPNGMbGhQGGWuoLE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-executor/default.nix b/distros/humble/plansys2-executor/default.nix index 29051f9c72..60ca3c4ab8 100644 --- a/distros/humble/plansys2-executor/default.nix +++ b/distros/humble/plansys2-executor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-executor"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_executor/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "3a3c0f072210f99de58c42f50f7ff118975de45994e7bbd041efec13030a687f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_executor/2.0.9-1"; + sha256 = "sha256-PIXGUS56KSxVL/xAf8PCwz4A+UAK3BawEWcU5UM3A3s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-lifecycle-manager/default.nix b/distros/humble/plansys2-lifecycle-manager/default.nix index cec88e5650..fd12a4d909 100644 --- a/distros/humble/plansys2-lifecycle-manager/default.nix +++ b/distros/humble/plansys2-lifecycle-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-lifecycle-manager"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_lifecycle_manager/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "21a0300aa3e4d1384c94de6e648f41da578c86e2cc4208ed5d37b583f82299a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_lifecycle_manager/2.0.9-1"; + sha256 = "sha256-iFKlj4o36CrEDrkvpL1zGUSMIQMu53oC3ea34NGHeX4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-msgs/default.nix b/distros/humble/plansys2-msgs/default.nix index 9fd8c8aacb..b10b6e2d61 100644 --- a/distros/humble/plansys2-msgs/default.nix +++ b/distros/humble/plansys2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-msgs"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_msgs/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "ef76e8857f55adc6c0a9ddd2b4fc2be364c6bd0cba7b425463db530460618a64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_msgs/2.0.9-1"; + sha256 = "sha256-hknUk8JuraiESL3Xgo8iGU7fJnIp64LcXoAhwW2e1IY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-pddl-parser/default.nix b/distros/humble/plansys2-pddl-parser/default.nix index a2fd6762b8..8b87de6483 100644 --- a/distros/humble/plansys2-pddl-parser/default.nix +++ b/distros/humble/plansys2-pddl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-pddl-parser"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_pddl_parser/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "1267fa667dae732ae36a8ffbae96a94fad768143a2f650f049dc34ae601dde32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_pddl_parser/2.0.9-1"; + sha256 = "sha256-WSbBpX07RJIpUVgHbCi2stYDooxVmNKDmt2qHg3LBaQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-planner/default.nix b/distros/humble/plansys2-planner/default.nix index 218368fa39..3228e60e4d 100644 --- a/distros/humble/plansys2-planner/default.nix +++ b/distros/humble/plansys2-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-planner"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_planner/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "9679a922f17c3822e00f0f82937ae263eb3a6592447f85cf3be2386331e381c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_planner/2.0.9-1"; + sha256 = "sha256-/MFdbCG+U9shPC5/IipaM6Cn44x4PvsuaLcthGMA/1w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-popf-plan-solver/default.nix b/distros/humble/plansys2-popf-plan-solver/default.nix index b92c504fee..bd6c03e0ab 100644 --- a/distros/humble/plansys2-popf-plan-solver/default.nix +++ b/distros/humble/plansys2-popf-plan-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-popf-plan-solver"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_popf_plan_solver/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "f78c8cf57f4f6b58bba9fe65189ec71c484a368d0740c163750501f480999fc0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_popf_plan_solver/2.0.9-1"; + sha256 = "sha256-JNKrxUKjBX0T0F/FWBwomH8ZHSyZfCvo8iz3OTJ0nYw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-problem-expert/default.nix b/distros/humble/plansys2-problem-expert/default.nix index 499ad32e87..1e759c0e8d 100644 --- a/distros/humble/plansys2-problem-expert/default.nix +++ b/distros/humble/plansys2-problem-expert/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-problem-expert"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_problem_expert/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "10a58835eb024f566955955712d8d1a8cf8e538ec6f74a1800d92d3f7ba6bda5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_problem_expert/2.0.9-1"; + sha256 = "sha256-wqWvaR8zT85jowKvU6lzFURs4sSO9UUup/bePFu6/vA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-terminal/default.nix b/distros/humble/plansys2-terminal/default.nix index e10d870c22..864b9efa60 100644 --- a/distros/humble/plansys2-terminal/default.nix +++ b/distros/humble/plansys2-terminal/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-terminal"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_terminal/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "14c15bb200de3fce3c8c70862c9792243b03562fe48fb74bcd8172f40f2f32b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_terminal/2.0.9-1"; + sha256 = "sha256-7doouNzL80UICDY7j2Ly9WNyaY3Zk2VU9Pp/FGT6CoE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plansys2-tools/default.nix b/distros/humble/plansys2-tools/default.nix index affececdaf..994d9eb5a4 100644 --- a/distros/humble/plansys2-tools/default.nix +++ b/distros/humble/plansys2-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plansys2-tools"; version = "2.0.9-r1"; - src = fetchurl { - url = "https://github.com/IntelligentRoboticsLabs/ros2_planning_system-release/archive/release/humble/plansys2_tools/2.0.9-1.tar.gz"; - name = "2.0.9-1.tar.gz"; - sha256 = "88d195db8b6e90a1c6f39abe91829f3ea8a731f73ff8a0d0f48fb8c8b7b6fc87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelligentRoboticsLabs"; + repo = "ros2_planning_system-release"; + rev = "release/humble/plansys2_tools/2.0.9-1"; + sha256 = "sha256-1gwS2hf03VDOkmr6FhQ5m9Xqn+FpDwdzKMlhwC7vNZg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/humble/plotjuggler-msgs/default.nix b/distros/humble/plotjuggler-msgs/default.nix index 5d130e3aae..5621590cf3 100644 --- a/distros/humble/plotjuggler-msgs/default.nix +++ b/distros/humble/plotjuggler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plotjuggler-msgs"; version = "0.2.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/plotjuggler_msgs-release/archive/release/humble/plotjuggler_msgs/0.2.3-3.tar.gz"; - name = "0.2.3-3.tar.gz"; - sha256 = "16dfb632d8a0b7a03987cc581ffe9d05213c45e30c056f2676db1b17f502c51f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "plotjuggler_msgs-release"; + rev = "release/humble/plotjuggler_msgs/0.2.3-3"; + sha256 = "sha256-Lu4ZRsDpvbS2QzbjWOL23H8lsKRSTPGe6MgiCaUedO4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/plotjuggler-ros/default.nix b/distros/humble/plotjuggler-ros/default.nix index fc440394b4..1e59bdde7a 100644 --- a/distros/humble/plotjuggler-ros/default.nix +++ b/distros/humble/plotjuggler-ros/default.nix @@ -5,13 +5,17 @@ { 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-humble-plotjuggler-ros"; - version = "1.5.1-r3"; + version = "1.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/plotjuggler-ros-plugins-release/archive/release/humble/plotjuggler_ros/1.5.1-3.tar.gz"; - name = "1.5.1-3.tar.gz"; - sha256 = "12e2d2ff4df721386ed1417ffad4a2028c697cd22f125c99d59a55b8ed805ca9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "plotjuggler-ros-plugins-release"; + rev = "release/humble/plotjuggler_ros/1.7.3-1"; + sha256 = "sha256-ezW6pVV11yzVp0y9eUSZIfFE1fAwKKjrS5UJmxxLC7k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/plotjuggler/default.nix b/distros/humble/plotjuggler/default.nix index e369ade9f8..ca02a49dae 100644 --- a/distros/humble/plotjuggler/default.nix +++ b/distros/humble/plotjuggler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-plotjuggler"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/plotjuggler-release/archive/release/humble/plotjuggler/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "bcc9232806caaa4729171b1243bb4d7aa7568e29ccc37fc5606e87f772902747"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "plotjuggler-release"; + rev = "release/humble/plotjuggler/3.5.1-1"; + sha256 = "sha256-WvQEM88AESCxr0oJp3yxWyWMX6zgR+M/kyrONmGt7N4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pluginlib/default.nix b/distros/humble/pluginlib/default.nix index 054987105c..d7be4b79ee 100644 --- a/distros/humble/pluginlib/default.nix +++ b/distros/humble/pluginlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pluginlib"; version = "5.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pluginlib-release/archive/release/humble/pluginlib/5.1.0-3.tar.gz"; - name = "5.1.0-3.tar.gz"; - sha256 = "b03d391bb6459dc4304ace2b2ebba87a0e085e6f15790be4a63b0f9108291488"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pluginlib-release"; + rev = "release/humble/pluginlib/5.1.0-3"; + sha256 = "sha256-txbFscz7qeuMKOxpw/C+ELr9fl7vIE695EM5tzcJ9xM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pmb2-2dnav/default.nix b/distros/humble/pmb2-2dnav/default.nix index 59d341b7e9..dd592bad5c 100644 --- a/distros/humble/pmb2-2dnav/default.nix +++ b/distros/humble/pmb2-2dnav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-2dnav"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_navigation-gbp/archive/release/humble/pmb2_2dnav/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "f6d8beefed00991c12a63493632a060ac1e5f201f4eb4ea3f6ac9cf21407518d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_navigation-gbp"; + rev = "release/humble/pmb2_2dnav/4.0.0-1"; + sha256 = "sha256-kfzme4BoieQLGNG+sya/uB9ApnxGlehICLE6c6tFMVI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/pmb2-bringup/default.nix b/distros/humble/pmb2-bringup/default.nix index 580e3a7e38..2cdb8f2bb8 100644 --- a/distros/humble/pmb2-bringup/default.nix +++ b/distros/humble/pmb2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-bringup"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_robot-gbp/archive/release/humble/pmb2_bringup/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "0dab720e96e8df92fa588b989eed6630cfad035333108392d58138c39ad2d152"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_robot-gbp"; + rev = "release/humble/pmb2_bringup/4.0.5-1"; + sha256 = "sha256-GkS4BVmjN5+Y55CF8ZycebgOo19SKVOxBtCK0Ca/PzM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/pmb2-controller-configuration/default.nix b/distros/humble/pmb2-controller-configuration/default.nix index f7b6814f89..ef9173fc05 100644 --- a/distros/humble/pmb2-controller-configuration/default.nix +++ b/distros/humble/pmb2-controller-configuration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-controller-configuration"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_robot-gbp/archive/release/humble/pmb2_controller_configuration/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "401859c2d2111bc79cdcb1d971b0320896d36fd5ef183f265f742246dcffa51e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_robot-gbp"; + rev = "release/humble/pmb2_controller_configuration/4.0.5-1"; + sha256 = "sha256-G6VpRUTCHyxDFBNLuSojL4ItZTpm3J04yZRIWIdIF5Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/pmb2-description/default.nix b/distros/humble/pmb2-description/default.nix index 82d24a06b7..cd814cc3d2 100644 --- a/distros/humble/pmb2-description/default.nix +++ b/distros/humble/pmb2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-description"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_robot-gbp/archive/release/humble/pmb2_description/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "c1cb5bdeed8f9802c748191934a15db4cb1f5f76c7ac288d84a57e2ca0d52ec9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_robot-gbp"; + rev = "release/humble/pmb2_description/4.0.5-1"; + sha256 = "sha256-xxd30Jex9Y/NoNe3pCp7ya9SSm3ncOpO7jnGKWPDDjQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ament-cmake-python ]; diff --git a/distros/humble/pmb2-gazebo/default.nix b/distros/humble/pmb2-gazebo/default.nix index 3eb7dc602e..d3370268e4 100644 --- a/distros/humble/pmb2-gazebo/default.nix +++ b/distros/humble/pmb2-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-gazebo"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_simulation-release/archive/release/humble/pmb2_gazebo/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "2290312e81004e766d6e5ea6f077529573487e3ddcdbb7e13d70d888561ff16a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_simulation-release"; + rev = "release/humble/pmb2_gazebo/4.0.1-1"; + sha256 = "sha256-6Ec/e6dY/KIVGx+FxfHXJ883FTevfVmn2dPW1/QQ/0A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/pmb2-maps/default.nix b/distros/humble/pmb2-maps/default.nix index 52a1c44091..f699d722e4 100644 --- a/distros/humble/pmb2-maps/default.nix +++ b/distros/humble/pmb2-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-maps"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_navigation-gbp/archive/release/humble/pmb2_maps/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "5283001e4b86d5c4301c5605284b8456dbdea6e8b6bee5ebbe1e5be76e112b0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_navigation-gbp"; + rev = "release/humble/pmb2_maps/4.0.0-1"; + sha256 = "sha256-vqf86xYhKcKU0h/74UhP6cS1UYmQZLUezAxIZLKEAHw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/pmb2-navigation/default.nix b/distros/humble/pmb2-navigation/default.nix index 7abaf570bc..01f348cef2 100644 --- a/distros/humble/pmb2-navigation/default.nix +++ b/distros/humble/pmb2-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-navigation"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_navigation-gbp/archive/release/humble/pmb2_navigation/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "2b1b5c4af40c39cda2be525406bf2d481df3cc4b72d03a1a9206db042970d478"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_navigation-gbp"; + rev = "release/humble/pmb2_navigation/4.0.0-1"; + sha256 = "sha256-L0pw9APBXHKaNF3ICTN/NecTcJJ8bc5EGScFARSTOZY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/pmb2-robot/default.nix b/distros/humble/pmb2-robot/default.nix index cee5cce9eb..f1cea5d0a4 100644 --- a/distros/humble/pmb2-robot/default.nix +++ b/distros/humble/pmb2-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-robot"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_robot-gbp/archive/release/humble/pmb2_robot/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "bb9558926a34cacddc03c6258a9e852959294bfb4251c35138e8eeaaffdcf2e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_robot-gbp"; + rev = "release/humble/pmb2_robot/4.0.5-1"; + sha256 = "sha256-fetIZKfU6EYFAECn/Dr2N9UYOgsZkbhezSbTDNHsGUc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pmb2-simulation/default.nix b/distros/humble/pmb2-simulation/default.nix index 56eb07fc93..6ffb6364db 100644 --- a/distros/humble/pmb2-simulation/default.nix +++ b/distros/humble/pmb2-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pmb2-simulation"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pmb2_simulation-release/archive/release/humble/pmb2_simulation/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "24325125b77e410e23f8a7c0f2c9d85c4fe10cbdfa42bf57b05996e37e5165fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pmb2_simulation-release"; + rev = "release/humble/pmb2_simulation/4.0.1-1"; + sha256 = "sha256-jrzwoX9AYiQJtCbWd37ymF3v6T1qMqD9JWesoSYgm7I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/point-cloud-msg-wrapper/default.nix b/distros/humble/point-cloud-msg-wrapper/default.nix index e5aa21467e..b14deed05d 100644 --- a/distros/humble/point-cloud-msg-wrapper/default.nix +++ b/distros/humble/point-cloud-msg-wrapper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-point-cloud-msg-wrapper"; version = "1.0.7-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/point_cloud_msg_wrapper-release/archive/release/humble/point_cloud_msg_wrapper/1.0.7-3.tar.gz"; - name = "1.0.7-3.tar.gz"; - sha256 = "71bb7c1fb11d01afceb6500137678ed6330d29a43c14db3efd50274f62b5a313"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "point_cloud_msg_wrapper-release"; + rev = "release/humble/point_cloud_msg_wrapper/1.0.7-3"; + sha256 = "sha256-LiHXg+Jj7fMDItxqFAz8F5On1mitqVf18p4luIzXtWk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/humble/pointcloud-to-laserscan/default.nix b/distros/humble/pointcloud-to-laserscan/default.nix index 9a30b65a4e..04db557f4c 100644 --- a/distros/humble/pointcloud-to-laserscan/default.nix +++ b/distros/humble/pointcloud-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pointcloud-to-laserscan"; version = "2.0.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pointcloud_to_laserscan-release/archive/release/humble/pointcloud_to_laserscan/2.0.1-3.tar.gz"; - name = "2.0.1-3.tar.gz"; - sha256 = "a526861a57797d39714dc33e5a25705343cfd52316b39748d54abfa8d984022a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pointcloud_to_laserscan-release"; + rev = "release/humble/pointcloud_to_laserscan/2.0.1-3"; + sha256 = "sha256-JPlIFeKS6DMGh6xSWvg9EPxL1diI2e9udRprTb9LzZE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/pose-cov-ops/default.nix b/distros/humble/pose-cov-ops/default.nix index 0cd9367afa..5035b11e5d 100644 --- a/distros/humble/pose-cov-ops/default.nix +++ b/distros/humble/pose-cov-ops/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pose-cov-ops"; version = "0.3.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pose_cov_ops-release/archive/release/humble/pose_cov_ops/0.3.8-1.tar.gz"; - name = "0.3.8-1.tar.gz"; - sha256 = "d49d54650d5d1fd528d06cc5d386ed661aa8a26f40fdc9c65d4b30fb1568b039"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pose_cov_ops-release"; + rev = "release/humble/pose_cov_ops/0.3.8-1"; + sha256 = "sha256-PedCn7b0uRpfsVpaUyJ5yPWogpyzEvsBI6xR2g6O7RE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest ament-cmake-xmllint cmake ros-environment ]; diff --git a/distros/humble/position-controllers/default.nix b/distros/humble/position-controllers/default.nix index eafd8462c6..9aa5d60b28 100644 --- a/distros/humble/position-controllers/default.nix +++ b/distros/humble/position-controllers/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-manager, forward-command-controller, pluginlib, rclcpp, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-manager, forward-command-controller, pluginlib, rclcpp, ros2-control-test-assets }: buildRosPackage { pname = "ros-humble-position-controllers"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/position_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "3624b66794bd247a74d1f5ae37b41811caed76ff617d8cd9ea096baa28331813"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/position_controllers/2.16.0-1"; + sha256 = "sha256-tJumiecXQoJA8eR2wlntzpnzJ+lDhSmdAFPoaID4xms="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ forward-command-controller rclcpp ]; + propagatedBuildInputs = [ backward-ros forward-command-controller rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/py-trees/default.nix b/distros/humble/py-trees/default.nix new file mode 100644 index 0000000000..8edf7d3f1e --- /dev/null +++ b/distros/humble/py-trees/default.nix @@ -0,0 +1,28 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, python3Packages }: +buildRosPackage { + pname = "ros-humble-py-trees"; + version = "2.2.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees-release"; + rev = "release/humble/py_trees/2.2.0-1"; + sha256 = "sha256-5Po1oiS1NRwPX0JXdhyjXm/hPuhYKv/Jjh3v1V2XiKY="; + }; + + buildType = "ament_python"; + buildInputs = [ python3Packages.setuptools ]; + propagatedBuildInputs = [ python3Packages.pydot ]; + + meta = { + description = ''Pythonic implementation of behaviour trees.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/pybind11-json-vendor/default.nix b/distros/humble/pybind11-json-vendor/default.nix index de8c4fe542..86897979d1 100644 --- a/distros/humble/pybind11-json-vendor/default.nix +++ b/distros/humble/pybind11-json-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pybind11-json-vendor"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pybind11_json_vendor-release/archive/release/humble/pybind11_json_vendor/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "96bf74cbf7120fcc4b0ac6839b87eb9b27ff83903bd6f17ab64257b0906fce55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pybind11_json_vendor-release"; + rev = "release/humble/pybind11_json_vendor/0.2.2-1"; + sha256 = "sha256-qoFKeo7jfb52fZdwNmBZ4HguVJdKPPh2ULzBGHZFPJ0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/pybind11-vendor/default.nix b/distros/humble/pybind11-vendor/default.nix index 02567c2f8f..f85cd42e6d 100644 --- a/distros/humble/pybind11-vendor/default.nix +++ b/distros/humble/pybind11-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-pybind11-vendor"; version = "2.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pybind11_vendor-release/archive/release/humble/pybind11_vendor/2.4.2-1.tar.gz"; - name = "2.4.2-1.tar.gz"; - sha256 = "c923d9e62f43639301a6f5551f18eabe9eb09301f9d658f6e891f4b6b5ca95af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pybind11_vendor-release"; + rev = "release/humble/pybind11_vendor/2.4.2-1"; + sha256 = "sha256-cT3uRbcmI/lPhd01+fp3uBdAtMhNu4rZB9UMmr+g5z4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/python-cmake-module/default.nix b/distros/humble/python-cmake-module/default.nix index 64bd580d82..2fb7759ee4 100644 --- a/distros/humble/python-cmake-module/default.nix +++ b/distros/humble/python-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-python-cmake-module"; version = "0.10.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/python_cmake_module-release/archive/release/humble/python_cmake_module/0.10.0-2.tar.gz"; - name = "0.10.0-2.tar.gz"; - sha256 = "fdd5599d222a9ec0a6fa6c4e71e8bce394acf2e0b965bc97fec2c11fc1facc85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "python_cmake_module-release"; + rev = "release/humble/python_cmake_module/0.10.0-2"; + sha256 = "sha256-q4W1DWKOd7QWWbr0OQrkiC+TBZptN74ufvEGNY/qtN8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/python-orocos-kdl-vendor/default.nix b/distros/humble/python-orocos-kdl-vendor/default.nix index 87a04a685c..40ed6078fd 100644 --- a/distros/humble/python-orocos-kdl-vendor/default.nix +++ b/distros/humble/python-orocos-kdl-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, ament-lint-auto, ament-lint-common, orocos-kdl-vendor, pybind11-vendor, python-cmake-module, python3Packages }: buildRosPackage { pname = "ros-humble-python-orocos-kdl-vendor"; - version = "0.2.4-r1"; + version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/orocos_kdl_vendor-release/archive/release/humble/python_orocos_kdl_vendor/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "3bc6441df756cf500e9568f59647b06bea610f0afaf1d64c584e1aa540efd773"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "orocos_kdl_vendor-release"; + rev = "release/humble/python_orocos_kdl_vendor/0.2.5-1"; + sha256 = "sha256-PYtcHErPdFtIDbcz/XX1DVOn5Yj/mMaj0D4vmUFqkKA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python python-cmake-module ]; diff --git a/distros/humble/python-qt-binding/default.nix b/distros/humble/python-qt-binding/default.nix index 288f8013fd..8af3c92d8b 100644 --- a/distros/humble/python-qt-binding/default.nix +++ b/distros/humble/python-qt-binding/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-python-qt-binding"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/python_qt_binding-release/archive/release/humble/python_qt_binding/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "749f466ebe43e85f8719858eecdac211b682163899711ecf97acd6aaa2818636"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "python_qt_binding-release"; + rev = "release/humble/python_qt_binding/1.1.1-3"; + sha256 = "sha256-/tBDvBZ+x9t5O6ABd7Wpf0ZvoV+Q8jpA2xz3r/UZNGc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/humble/qpoases-vendor/default.nix b/distros/humble/qpoases-vendor/default.nix index 6948f16f68..2c403fc545 100644 --- a/distros/humble/qpoases-vendor/default.nix +++ b/distros/humble/qpoases-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-qpoases-vendor"; version = "3.2.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qpoases_vendor-release/archive/release/humble/qpoases_vendor/3.2.3-3.tar.gz"; - name = "3.2.3-3.tar.gz"; - sha256 = "4b431fdc51538c236519d8f89d69309b260ed8f94c129eb6e829cbda4db0f92e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qpoases_vendor-release"; + rev = "release/humble/qpoases_vendor/3.2.3-3"; + sha256 = "sha256-jUSNiB8b0P8JHYXdXeKMs5Ucxjk+fhbPqxcJnD2GIQ4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/qt-dotgraph/default.nix b/distros/humble/qt-dotgraph/default.nix index 68d8076dd3..936122f4e1 100644 --- a/distros/humble/qt-dotgraph/default.nix +++ b/distros/humble/qt-dotgraph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-qt-dotgraph"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/humble/qt_dotgraph/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "753fc64a982b8b34eee6cb986cbfcd10080630079b8613b0afd9e686d0d59908"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/humble/qt_dotgraph/2.2.2-1"; + sha256 = "sha256-CzS6yseQdbL+LKmXxJS23hm5uw08qZYKUFIcjopSGL0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/qt-gui-app/default.nix b/distros/humble/qt-gui-app/default.nix index 6e3206b9ca..f1425bae44 100644 --- a/distros/humble/qt-gui-app/default.nix +++ b/distros/humble/qt-gui-app/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-qt-gui-app"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/humble/qt_gui_app/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "3f0e9fead7cc231ceb97b4dba8ed6613bbbfa30ff5a1f18a0475bfea86287f5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/humble/qt_gui_app/2.2.2-1"; + sha256 = "sha256-SkWOExe6kPZvGwPqxp25nGJdwi/BL5oSKA05o57Jk9Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/qt-gui-core/default.nix b/distros/humble/qt-gui-core/default.nix index 6b6889bfd6..271903c137 100644 --- a/distros/humble/qt-gui-core/default.nix +++ b/distros/humble/qt-gui-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-qt-gui-core"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/humble/qt_gui_core/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "49ca2bae45782d4ea180a05a182c685bfb296fd3cd05cd8be384b73024e4530b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/humble/qt_gui_core/2.2.2-1"; + sha256 = "sha256-5RYSeJ79zKUP96WXU2E4vbPovoawdAely3ITx8wpJuo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/qt-gui-cpp/default.nix b/distros/humble/qt-gui-cpp/default.nix index acc4cb1373..0fad3099cb 100644 --- a/distros/humble/qt-gui-cpp/default.nix +++ b/distros/humble/qt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-qt-gui-cpp"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/humble/qt_gui_cpp/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "3c8eb0beeea6bd18163938803a37b8a0b27a302612ddc6bd5e979f7a99284b7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/humble/qt_gui_cpp/2.2.2-1"; + sha256 = "sha256-ffOm5jyml6tu6qM2ZvPZaGPPPy1RRhJqcaropeU0dT0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config python-qt-binding qt5.qtbase ]; diff --git a/distros/humble/qt-gui-py-common/default.nix b/distros/humble/qt-gui-py-common/default.nix index a730b99e1c..35caed445c 100644 --- a/distros/humble/qt-gui-py-common/default.nix +++ b/distros/humble/qt-gui-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-qt-gui-py-common"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/humble/qt_gui_py_common/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "37deb0d66736b9ae1c1f29205e054765c0446bddd84574ca7eeacd9852d8d0e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/humble/qt_gui_py_common/2.2.2-1"; + sha256 = "sha256-+parlOa4l6vPnPPs6EskQDBnHzX4tv3z5/Kmg2MwpQA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/qt-gui/default.nix b/distros/humble/qt-gui/default.nix index ee1eea8f6c..9670177e5c 100644 --- a/distros/humble/qt-gui/default.nix +++ b/distros/humble/qt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-qt-gui"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/humble/qt_gui/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "d4ab6a0ab03675365c44403333d4e2f832724cb9ca80dabc80cd55344b064854"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/humble/qt_gui/2.2.2-1"; + sha256 = "sha256-U1usPsbR3Ut4t8xdJlO1D+wmEoa2oyK9X18D+lVxfE8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.pyqt5 qt5.qtbase ]; diff --git a/distros/humble/quality-of-service-demo-cpp/default.nix b/distros/humble/quality-of-service-demo-cpp/default.nix index d3f2977c0e..ec8ea9b765 100644 --- a/distros/humble/quality-of-service-demo-cpp/default.nix +++ b/distros/humble/quality-of-service-demo-cpp/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, example-interfaces, launch, launch-ros, launch-testing, rclcpp, rclcpp-components, rcutils, rmw, rmw-implementation-cmake, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-quality-of-service-demo-cpp"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/quality_of_service_demo_cpp/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "93310552ec1b97a1c44e26afdb366477163f1c1b48d3f3a085834f51190b374b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/quality_of_service_demo_cpp/0.20.3-1"; + sha256 = "sha256-bUcFYNmK7CW9JiOGL0CgM7qXGkBQaxQ4a4YErEJ4/to="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw-implementation-cmake ]; diff --git a/distros/humble/quality-of-service-demo-py/default.nix b/distros/humble/quality-of-service-demo-py/default.nix index 18a7120c3a..bd440696c6 100644 --- a/distros/humble/quality-of-service-demo-py/default.nix +++ b/distros/humble/quality-of-service-demo-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, pythonPackages, rclpy, std-msgs }: buildRosPackage { pname = "ros-humble-quality-of-service-demo-py"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/quality_of_service_demo_py/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "93a19b38f5aa4bc65c85609608de7a2ef36c982b77791235e8073de877d695df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/quality_of_service_demo_py/0.20.3-1"; + sha256 = "sha256-GzTfkE1dn5rRsgshEYeP2XY+aOsyRkaQPYpoqf/XuXc="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/quaternion-operation/default.nix b/distros/humble/quaternion-operation/default.nix index c7786bf588..94f7a95ea4 100644 --- a/distros/humble/quaternion-operation/default.nix +++ b/distros/humble/quaternion-operation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-quaternion-operation"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/quaternion_operation-release/archive/release/humble/quaternion_operation/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "67c5e5d58668db3b853787dd024012458056721ac58af2339dd3d353e2ec84f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "quaternion_operation-release"; + rev = "release/humble/quaternion_operation/0.0.11-1"; + sha256 = "sha256-XFIOq/J1ybBjdR5TFUumOgHlYUH5o2Mcm9zh1zPijKo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/r2r-spl-7/default.nix b/distros/humble/r2r-spl-7/default.nix index bb4e1a0f64..66396af89a 100644 --- a/distros/humble/r2r-spl-7/default.nix +++ b/distros/humble/r2r-spl-7/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-r2r-spl-7"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/r2r_spl-release/archive/release/humble/r2r_spl_7/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "f5ca4a67fc245d933b43ebe7728fa4927c19327c078fda027874a7f59c9bd89c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "r2r_spl-release"; + rev = "release/humble/r2r_spl_7/2.0.1-1"; + sha256 = "sha256-lUD8pvj5msPqBSrRDLEtiCYpVQ0K3g+8oMPsC+OWzJk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/radar-msgs/default.nix b/distros/humble/radar-msgs/default.nix index 9a6f57f2ca..84b6663bee 100644 --- a/distros/humble/radar-msgs/default.nix +++ b/distros/humble/radar-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-radar-msgs"; version = "0.2.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/radar_msgs-release/archive/release/humble/radar_msgs/0.2.1-3.tar.gz"; - name = "0.2.1-3.tar.gz"; - sha256 = "d45ab12ca8e1d52d0dadccc5a88db3cbaf8ef9dacd7e2f466e2e2f6c26fedbae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "radar_msgs-release"; + rev = "release/humble/radar_msgs/0.2.1-3"; + sha256 = "sha256-09etKgWuUL3tN+uERho/rQvfxovMzjJUK+2J9fg5Sa4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/random-numbers/default.nix b/distros/humble/random-numbers/default.nix index 063d956fbe..1b0d4cac2b 100644 --- a/distros/humble/random-numbers/default.nix +++ b/distros/humble/random-numbers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-random-numbers"; version = "2.0.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/random_numbers-release/archive/release/humble/random_numbers/2.0.1-3.tar.gz"; - name = "2.0.1-3.tar.gz"; - sha256 = "d70d1e9b655a20572f167d69b7b49295827896ca1927ebaeba6acbb538f181a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "random_numbers-release"; + rev = "release/humble/random_numbers/2.0.1-3"; + sha256 = "sha256-hQN9n+tLK1rKA+wXOXW/TfT4RzrXxvaIfDlzgV+LJnU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/raspimouse-msgs/default.nix b/distros/humble/raspimouse-msgs/default.nix new file mode 100644 index 0000000000..a0747e7d4a --- /dev/null +++ b/distros/humble/raspimouse-msgs/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rosidl-default-generators, rosidl-default-runtime }: +buildRosPackage { + pname = "ros-humble-raspimouse-msgs"; + version = "1.1.1-r7"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse2-release"; + rev = "release/humble/raspimouse_msgs/1.1.1-7"; + sha256 = "sha256-05Q21zWOIcr7g8SCHQDVLG5YiuGimkuFD9SVv4J2Q9U="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake rosidl-default-generators ]; + checkInputs = [ ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ rosidl-default-runtime ]; + nativeBuildInputs = [ ament-cmake rosidl-default-generators ]; + + meta = { + description = ''RaspiMouse messages''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/humble/raspimouse/default.nix b/distros/humble/raspimouse/default.nix new file mode 100644 index 0000000000..b589da824a --- /dev/null +++ b/distros/humble/raspimouse/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, geometry-msgs, lifecycle-msgs, nav-msgs, raspimouse-msgs, rclcpp, rclcpp-components, rclcpp-lifecycle, std-msgs, std-srvs, tf2, tf2-ros }: +buildRosPackage { + pname = "ros-humble-raspimouse"; + version = "1.1.1-r7"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "raspimouse2-release"; + rev = "release/humble/raspimouse/1.1.1-7"; + sha256 = "sha256-lRuj5udrbAeJtxUBKLl+uoVMZESx9CHcNC5ziBbVric="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ geometry-msgs lifecycle-msgs nav-msgs raspimouse-msgs rclcpp rclcpp-components rclcpp-lifecycle std-msgs std-srvs tf2 tf2-ros ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''RaspiMouse ROS 2 node''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/humble/rc-common-msgs/default.nix b/distros/humble/rc-common-msgs/default.nix index d82374af38..e38781bfcc 100644 --- a/distros/humble/rc-common-msgs/default.nix +++ b/distros/humble/rc-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rc-common-msgs"; version = "0.5.3-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_common_msgs_ros2-release/archive/release/humble/rc_common_msgs/0.5.3-4.tar.gz"; - name = "0.5.3-4.tar.gz"; - sha256 = "0eb6ad5ae24e8f8d5827deeb38a2bd997c46d92fb37582e9f07df4671b81c295"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_common_msgs_ros2-release"; + rev = "release/humble/rc_common_msgs/0.5.3-4"; + sha256 = "sha256-/ApqcAoxtUu0eHcF5gxxFhroOIdz457iCAONfAC2xxQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rc-dynamics-api/default.nix b/distros/humble/rc-dynamics-api/default.nix index be3ba2e8f1..767d9a5937 100644 --- a/distros/humble/rc-dynamics-api/default.nix +++ b/distros/humble/rc-dynamics-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rc-dynamics-api"; version = "0.10.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_dynamics_api-release/archive/release/humble/rc_dynamics_api/0.10.3-3.tar.gz"; - name = "0.10.3-3.tar.gz"; - sha256 = "86d3f4c2f77f0c71c4573db4fbbe81d54ed52189cc553c0bfb9f14d431669de0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_dynamics_api-release"; + rev = "release/humble/rc_dynamics_api/0.10.3-3"; + sha256 = "sha256-Q+zKUMZzx64cpjuiKG8bJOqmaBys1FlMixU8pXCBmvM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/rc-genicam-api/default.nix b/distros/humble/rc-genicam-api/default.nix index 97eb82887c..fab55b9f0b 100644 --- a/distros/humble/rc-genicam-api/default.nix +++ b/distros/humble/rc-genicam-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rc-genicam-api"; version = "2.5.12-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_genicam_api-release/archive/release/humble/rc_genicam_api/2.5.12-3.tar.gz"; - name = "2.5.12-3.tar.gz"; - sha256 = "68f98b062ee2e880b28c98cec35bbb5d3fd7ec3002ab953592341a5befd9ca6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_genicam_api-release"; + rev = "release/humble/rc_genicam_api/2.5.12-3"; + sha256 = "sha256-DAwn3Iyrqk/2Bo8ZSDjpVWoE9h4LLK4Ll+WePjX+0Gs="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/rc-genicam-driver/default.nix b/distros/humble/rc-genicam-driver/default.nix index 01fb7df880..d424cc3e29 100644 --- a/distros/humble/rc-genicam-driver/default.nix +++ b/distros/humble/rc-genicam-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rc-genicam-driver"; version = "0.2.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_genicam_driver_ros2-release/archive/release/humble/rc_genicam_driver/0.2.1-3.tar.gz"; - name = "0.2.1-3.tar.gz"; - sha256 = "5e17998fb1000e00dfa334bb1648def11d768cc8af72ddac0caaa70584ae4067"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_genicam_driver_ros2-release"; + rev = "release/humble/rc_genicam_driver/0.2.1-3"; + sha256 = "sha256-nRYR4RZ3PnqDi707KxIuq4SODUBru+GdMF+Ex296hEw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rc-reason-clients/default.nix b/distros/humble/rc-reason-clients/default.nix index 130feb5aa9..58df1167e6 100644 --- a/distros/humble/rc-reason-clients/default.nix +++ b/distros/humble/rc-reason-clients/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rc-reason-clients"; version = "0.2.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_reason_clients-release/archive/release/humble/rc_reason_clients/0.2.1-4.tar.gz"; - name = "0.2.1-4.tar.gz"; - sha256 = "f0f5e1113217ac1253e7179d8d2c5eaa858d5424c734dae59c8954405b5eb5d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_reason_clients-release"; + rev = "release/humble/rc_reason_clients/0.2.1-4"; + sha256 = "sha256-0AzKL+C5f5BEGPSkQ+Tj53eFBF2C4KMC1hYhmGqCq94="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/rc-reason-msgs/default.nix b/distros/humble/rc-reason-msgs/default.nix index 13617eb8f8..0ba1c4360d 100644 --- a/distros/humble/rc-reason-msgs/default.nix +++ b/distros/humble/rc-reason-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rc-reason-msgs"; version = "0.2.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_reason_clients-release/archive/release/humble/rc_reason_msgs/0.2.1-4.tar.gz"; - name = "0.2.1-4.tar.gz"; - sha256 = "91bd598780ee3942782184cb2c66061591c3e3db00fa9a8da0e46f78c5cf195b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_reason_clients-release"; + rev = "release/humble/rc_reason_msgs/0.2.1-4"; + sha256 = "sha256-/5aKBHyw2TFvQb2O/UJaDxIJJ9vbLwTMAz77XMRKEww="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rcdiscover/default.nix b/distros/humble/rcdiscover/default.nix index eee33c79d0..60398cab22 100644 --- a/distros/humble/rcdiscover/default.nix +++ b/distros/humble/rcdiscover/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcdiscover"; version = "1.1.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcdiscover-release/archive/release/humble/rcdiscover/1.1.4-3.tar.gz"; - name = "1.1.4-3.tar.gz"; - sha256 = "3981ea0a06581bca5350a8f4011a1cbaf06b1a5d753f5d7331db7931dc022af1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcdiscover-release"; + rev = "release/humble/rcdiscover/1.1.4-3"; + sha256 = "sha256-cnj4q4wuS4aANACKRMw8qEocJqlpuA0nGXqxywYAn14="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/rcgcd-spl-14-conversion/default.nix b/distros/humble/rcgcd-spl-14-conversion/default.nix index 1da7719124..ff46705934 100644 --- a/distros/humble/rcgcd-spl-14-conversion/default.nix +++ b/distros/humble/rcgcd-spl-14-conversion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcgcd-spl-14-conversion"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/humble/rcgcd_spl_14_conversion/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "02c1b7e40b784a16574d9a44ba39ae006f5999f6e72d3bfe2855effc42a12424"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/humble/rcgcd_spl_14_conversion/2.0.0-1"; + sha256 = "sha256-ZohxznfsfNd8ZxH9ibvpLrw+q4bpyvD+lNegDPBRSLI="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/rcgcd-spl-14/default.nix b/distros/humble/rcgcd-spl-14/default.nix index b5b82bf9c2..84d6c99270 100644 --- a/distros/humble/rcgcd-spl-14/default.nix +++ b/distros/humble/rcgcd-spl-14/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcgcd-spl-14"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/humble/rcgcd_spl_14/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "a15dc993030f80c4b4d009d9506fb16bee35b40e39e2199204eb9cd253238d1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/humble/rcgcd_spl_14/2.0.0-1"; + sha256 = "sha256-jN3Y8ZdOAhPOwU8l9vEAkCB/JiQw6fjLlxmeVqWi1no="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rcgcrd-spl-4-conversion/default.nix b/distros/humble/rcgcrd-spl-4-conversion/default.nix index cc6d4a56b0..34e242c6e6 100644 --- a/distros/humble/rcgcrd-spl-4-conversion/default.nix +++ b/distros/humble/rcgcrd-spl-4-conversion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcgcrd-spl-4-conversion"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/humble/rcgcrd_spl_4_conversion/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "a6343f4ebbd8d3c5a6dc10d5b0864c79acf266d02adfb6d9baccd6792453b6a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/humble/rcgcrd_spl_4_conversion/2.0.0-1"; + sha256 = "sha256-0DsOGJ2KtqloIDvqkVSOrq+MVN3gg9w3vf/zNVa+HiY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/rcgcrd-spl-4/default.nix b/distros/humble/rcgcrd-spl-4/default.nix index e7c46ee4ef..5fee40dd97 100644 --- a/distros/humble/rcgcrd-spl-4/default.nix +++ b/distros/humble/rcgcrd-spl-4/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcgcrd-spl-4"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/humble/rcgcrd_spl_4/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "7277ccaf67c282aa7347c38ed6b19d6e843e165a99833516789edd565c87eca4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/humble/rcgcrd_spl_4/2.0.0-1"; + sha256 = "sha256-Wp1a0GzTEB5HE5IPGjXTA2HS7ElQXZRPzT955XehU98="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rcl-action/default.nix b/distros/humble/rcl-action/default.nix index 3f88c992dd..8890581223 100644 --- a/distros/humble/rcl-action/default.nix +++ b/distros/humble/rcl-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcl-action"; version = "5.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/humble/rcl_action/5.3.2-1.tar.gz"; - name = "5.3.2-1.tar.gz"; - sha256 = "b87df2ea6d1aef94ec8df1a77381d429a360fc7f0e880f1a16062a9913ba1f9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/humble/rcl_action/5.3.2-1"; + sha256 = "sha256-pGKf9lCnstyNK9fOu0embE+OpL/ZkI8bK33+rimR4qA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rcl-interfaces/default.nix b/distros/humble/rcl-interfaces/default.nix index ba14126549..982237276e 100644 --- a/distros/humble/rcl-interfaces/default.nix +++ b/distros/humble/rcl-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcl-interfaces"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/humble/rcl_interfaces/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "a9fc24c479d99c384f08066f29984444d815712a01ad80fbf5c5cc88be5d6462"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/humble/rcl_interfaces/1.2.1-1"; + sha256 = "sha256-u2J/jcCd1MMdjEgq+WCpXer+ArCc0n37/eBI9WBMV9o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rcl-lifecycle/default.nix b/distros/humble/rcl-lifecycle/default.nix index eb1822b2fe..df82d8956c 100644 --- a/distros/humble/rcl-lifecycle/default.nix +++ b/distros/humble/rcl-lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcl-lifecycle"; version = "5.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/humble/rcl_lifecycle/5.3.2-1.tar.gz"; - name = "5.3.2-1.tar.gz"; - sha256 = "4b1be8f45bde2e59fcc3071cb7a1bb022d1c0ea5efb856a9e0ef06138bbf40e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/humble/rcl_lifecycle/5.3.2-1"; + sha256 = "sha256-YW1mxk7Rr2Fs68rJZM2g+8BSZruhW6wAjOuPGc+TT+M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rcl-logging-interface/default.nix b/distros/humble/rcl-logging-interface/default.nix index 9f3639ff07..6778160160 100644 --- a/distros/humble/rcl-logging-interface/default.nix +++ b/distros/humble/rcl-logging-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcl-logging-interface"; version = "2.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/humble/rcl_logging_interface/2.3.1-1.tar.gz"; - name = "2.3.1-1.tar.gz"; - sha256 = "7b42e9719cd812d094f0acba161911ad6ed6b559b4b1c5201482384c60b78bf4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/humble/rcl_logging_interface/2.3.1-1"; + sha256 = "sha256-/HoV3O8tuCcWjhpSADIOGW3zKPajWVYtqZ7F2Pq3E9U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rcl-logging-noop/default.nix b/distros/humble/rcl-logging-noop/default.nix index 0dc4622c8e..315bb22787 100644 --- a/distros/humble/rcl-logging-noop/default.nix +++ b/distros/humble/rcl-logging-noop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcl-logging-noop"; version = "2.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/humble/rcl_logging_noop/2.3.1-1.tar.gz"; - name = "2.3.1-1.tar.gz"; - sha256 = "b951b25701c5de7185f892a7ada35599e0c9fed75389ab78dd00e69c12e20107"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/humble/rcl_logging_noop/2.3.1-1"; + sha256 = "sha256-d65yR48B4ECdv2QS+sMPj/PVQoBGdVjVtgGNo54ybuA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python3Packages.empy ]; diff --git a/distros/humble/rcl-logging-spdlog/default.nix b/distros/humble/rcl-logging-spdlog/default.nix index 29bd2e7b0d..cf23e4cad1 100644 --- a/distros/humble/rcl-logging-spdlog/default.nix +++ b/distros/humble/rcl-logging-spdlog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcl-logging-spdlog"; version = "2.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/humble/rcl_logging_spdlog/2.3.1-1.tar.gz"; - name = "2.3.1-1.tar.gz"; - sha256 = "688f354b2b4dee1b7c00123a4a61c3eeb02c95e2cc020213efc6bb8f7f474170"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/humble/rcl_logging_spdlog/2.3.1-1"; + sha256 = "sha256-mdIICS8v4njC0+FRKpzz93HaVZmfalZCUoIdUnGbgJ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rcl-yaml-param-parser/default.nix b/distros/humble/rcl-yaml-param-parser/default.nix index f9abcab410..c662342c20 100644 --- a/distros/humble/rcl-yaml-param-parser/default.nix +++ b/distros/humble/rcl-yaml-param-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcl-yaml-param-parser"; version = "5.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/humble/rcl_yaml_param_parser/5.3.2-1.tar.gz"; - name = "5.3.2-1.tar.gz"; - sha256 = "315e39ba847d1af9ae7b3a2331a128fc69dea09a095c8bbad39f1c02640d0701"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/humble/rcl_yaml_param_parser/5.3.2-1"; + sha256 = "sha256-/hLKrjyz3EE96a8LdsS5yvcZelIzcL8uR2nWQuOMEgM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rcutils ]; diff --git a/distros/humble/rcl/default.nix b/distros/humble/rcl/default.nix index 2bd3d008c8..a2a3ec9168 100644 --- a/distros/humble/rcl/default.nix +++ b/distros/humble/rcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcl"; version = "5.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/humble/rcl/5.3.2-1.tar.gz"; - name = "5.3.2-1.tar.gz"; - sha256 = "8751592186b383f1fb176c43ab16dcd017dab761561291d435c644f14838703f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/humble/rcl/5.3.2-1"; + sha256 = "sha256-SFOrJTCsgDsUbJCX+vSjGNliaB3wm2pG12sQhtjYi3s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rclc-examples/default.nix b/distros/humble/rclc-examples/default.nix index 42590c4fb5..b1bd89dcbe 100644 --- a/distros/humble/rclc-examples/default.nix +++ b/distros/humble/rclc-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rclc-examples"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/humble/rclc_examples/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "0251aef75cf428670e80610e95f664154e947e058e50672a6aba93ea667d381b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/humble/rclc_examples/4.0.1-1"; + sha256 = "sha256-cMtxApcoMptppQ+ocs0+sf50LJpmLeBZvJfotmifSOU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rclc-lifecycle/default.nix b/distros/humble/rclc-lifecycle/default.nix index 24e7c0fa2c..5eb8b5ad66 100644 --- a/distros/humble/rclc-lifecycle/default.nix +++ b/distros/humble/rclc-lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rclc-lifecycle"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/humble/rclc_lifecycle/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "8da35c6cbf78abc94580f3b4424d5dc70774d2af6b0559670db08cc9549008d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/humble/rclc_lifecycle/4.0.1-1"; + sha256 = "sha256-qW4eh1/Jzqj6+tYLmu9ZgQBAj3bce5OjswLpt9HnXgA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rclc-parameter/default.nix b/distros/humble/rclc-parameter/default.nix index 8b2eb40cc7..5b2baecd8e 100644 --- a/distros/humble/rclc-parameter/default.nix +++ b/distros/humble/rclc-parameter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rclc-parameter"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/humble/rclc_parameter/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "fec60d842c9539ad58782da003118668a093d1ccd5fb08d4537bf468a05aa1f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/humble/rclc_parameter/4.0.1-1"; + sha256 = "sha256-ngDY3fyoTNt3Dj+yIO6iJfMNwf2Ar2qLQgSC0yD60Hs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rclc/default.nix b/distros/humble/rclc/default.nix index c5ab569d86..d64d0deeff 100644 --- a/distros/humble/rclc/default.nix +++ b/distros/humble/rclc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rclc"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/humble/rclc/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "7440f465d2b9d7dbea651dc3885b852728aea8f38e33ff36852493683a84730c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/humble/rclc/4.0.1-1"; + sha256 = "sha256-AbP7ZYS+48Gzk98QkNbXqYLbrH27igFwkVSDVZ2/+sk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-c ]; diff --git a/distros/humble/rclcpp-action/default.nix b/distros/humble/rclcpp-action/default.nix index d03017acd7..267e11a70d 100644 --- a/distros/humble/rclcpp-action/default.nix +++ b/distros/humble/rclcpp-action/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-msgs, ament-cmake, ament-cmake-gtest, ament-cmake-ros, ament-lint-auto, ament-lint-common, mimick-vendor, performance-test-fixture, rcl-action, rclcpp, rcpputils, rosidl-runtime-c, test-msgs }: buildRosPackage { pname = "ros-humble-rclcpp-action"; - version = "16.0.2-r1"; + version = "16.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/humble/rclcpp_action/16.0.2-1.tar.gz"; - name = "16.0.2-1.tar.gz"; - sha256 = "f009faa2c371cca3a0a9a83a5186032baa8020ce4f7286f38c2e6bf6ded760d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/humble/rclcpp_action/16.0.3-1"; + sha256 = "sha256-g+AK1hZwXP6kmTXAwjROu8df0JzfZJPs848WIJZKvmc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rclcpp-cascade-lifecycle/default.nix b/distros/humble/rclcpp-cascade-lifecycle/default.nix index 061df460e6..6676999f6d 100644 --- a/distros/humble/rclcpp-cascade-lifecycle/default.nix +++ b/distros/humble/rclcpp-cascade-lifecycle/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, cascade-lifecycle-msgs, lifecycle-msgs, rclcpp, rclcpp-lifecycle }: buildRosPackage { pname = "ros-humble-rclcpp-cascade-lifecycle"; - version = "1.0.2-r1"; + version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/fmrico/cascade_lifecycle-release/archive/release/humble/rclcpp_cascade_lifecycle/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "0cd86beddba6347d00b0c08dd3bb551bb3d381d645fb8b00c31b9a51df7b425d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cascade_lifecycle-release"; + rev = "release/humble/rclcpp_cascade_lifecycle/1.0.2-2"; + sha256 = "sha256-YWHDGzAetqxWdK0oM5VwQZhxwmUKPVFFo7j9S792jcY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rclcpp-components/default.nix b/distros/humble/rclcpp-components/default.nix index 9480451a33..28f16656b0 100644 --- a/distros/humble/rclcpp-components/default.nix +++ b/distros/humble/rclcpp-components/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-google-benchmark, ament-cmake-gtest, ament-cmake-ros, ament-index-cpp, ament-lint-auto, ament-lint-common, class-loader, composition-interfaces, launch-testing, rclcpp, rcpputils, std-msgs }: buildRosPackage { pname = "ros-humble-rclcpp-components"; - version = "16.0.2-r1"; + version = "16.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/humble/rclcpp_components/16.0.2-1.tar.gz"; - name = "16.0.2-1.tar.gz"; - sha256 = "d93e21e2c20a2fb3dedb92fcb09aac0fd6c0c08e1d21b3ed7004472f2c573f47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/humble/rclcpp_components/16.0.3-1"; + sha256 = "sha256-Aq59zrXqTt7j07/f7yotlGDMSipxBGP55LAgxERhrbA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rcpputils ]; diff --git a/distros/humble/rclcpp-lifecycle/default.nix b/distros/humble/rclcpp-lifecycle/default.nix index d97db03656..bd006bd08a 100644 --- a/distros/humble/rclcpp-lifecycle/default.nix +++ b/distros/humble/rclcpp-lifecycle/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, ament-lint-auto, ament-lint-common, lifecycle-msgs, mimick-vendor, performance-test-fixture, rcl-lifecycle, rclcpp, rcpputils, rcutils, rmw, rosidl-typesupport-cpp, test-msgs }: buildRosPackage { pname = "ros-humble-rclcpp-lifecycle"; - version = "16.0.2-r1"; + version = "16.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/humble/rclcpp_lifecycle/16.0.2-1.tar.gz"; - name = "16.0.2-1.tar.gz"; - sha256 = "59b9b0ee7b3620d8f7bdc1506418a4c002ea48b6b1b5552853d373715b23702b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/humble/rclcpp_lifecycle/16.0.3-1"; + sha256 = "sha256-jbKEyeBgpm09NW/K9gvOXwKkeuL6t2GR2MUJ74AHkqM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rclcpp/default.nix b/distros/humble/rclcpp/default.nix index aecc7452dc..cf84f3c18b 100644 --- a/distros/humble/rclcpp/default.nix +++ b/distros/humble/rclcpp/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gen-version-h, ament-cmake-gmock, ament-cmake-google-benchmark, ament-cmake-gtest, ament-cmake-ros, ament-index-cpp, ament-lint-auto, ament-lint-common, builtin-interfaces, libstatistics-collector, mimick-vendor, performance-test-fixture, python3, rcl, rcl-interfaces, rcl-yaml-param-parser, rcpputils, rcutils, rmw, rmw-implementation-cmake, rosgraph-msgs, rosidl-default-generators, rosidl-runtime-cpp, rosidl-typesupport-c, rosidl-typesupport-cpp, statistics-msgs, test-msgs, tracetools }: buildRosPackage { pname = "ros-humble-rclcpp"; - version = "16.0.2-r1"; + version = "16.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/humble/rclcpp/16.0.2-1.tar.gz"; - name = "16.0.2-1.tar.gz"; - sha256 = "6ecc7943b78b4559db067649c24a1dce194bcbfd522f24c0c67a712683a04795"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/humble/rclcpp/16.0.3-1"; + sha256 = "sha256-sSfsjaIgniQGKwJLdNoK5A4eB/HRXhSpS4Ny30UaLdU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-gen-version-h ament-cmake-ros python3 ]; diff --git a/distros/humble/rclpy-message-converter-msgs/default.nix b/distros/humble/rclpy-message-converter-msgs/default.nix index 14c143233a..21bae1abbf 100644 --- a/distros/humble/rclpy-message-converter-msgs/default.nix +++ b/distros/humble/rclpy-message-converter-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rclpy-message-converter-msgs"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rospy_message_converter-release/archive/release/humble/rclpy_message_converter_msgs/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "3dac64ea287d7826168b18431c24f989621f740a30eeaf13af84e4334b6b4762"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rospy_message_converter-release"; + rev = "release/humble/rclpy_message_converter_msgs/2.0.1-1"; + sha256 = "sha256-vWAM+JjdKQvohD6qBeuCVmL+zcOgq1szEkS8jYnSPkw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces rosidl-default-generators ]; diff --git a/distros/humble/rclpy-message-converter/default.nix b/distros/humble/rclpy-message-converter/default.nix index a44dfa9820..0d6f62f3e8 100644 --- a/distros/humble/rclpy-message-converter/default.nix +++ b/distros/humble/rclpy-message-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rclpy-message-converter"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rospy_message_converter-release/archive/release/humble/rclpy_message_converter/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "1f68b367e94770cd73e57310b162a8270afa3beaa7a0e0a5a2f55a0286c64eae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rospy_message_converter-release"; + rev = "release/humble/rclpy_message_converter/2.0.1-1"; + sha256 = "sha256-4HeOI1VnkkBwlxa0SlJMAGbmV5bMUIvxslRecDwZm04="; + }; buildType = "ament_python"; buildInputs = [ builtin-interfaces rosidl-default-generators ]; diff --git a/distros/humble/rclpy/default.nix b/distros/humble/rclpy/default.nix index 386a242e85..1f72544215 100644 --- a/distros/humble/rclpy/default.nix +++ b/distros/humble/rclpy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-cmake-pytest, ament-index-python, ament-lint-auto, ament-lint-common, builtin-interfaces, pybind11-vendor, python-cmake-module, pythonPackages, rcl, rcl-action, rcl-interfaces, rcl-lifecycle, rcl-logging-interface, rcl-yaml-param-parser, rcpputils, rcutils, rmw, rmw-implementation, rmw-implementation-cmake, rosgraph-msgs, rosidl-generator-py, rosidl-runtime-c, rpyutils, test-msgs, unique-identifier-msgs }: buildRosPackage { pname = "ros-humble-rclpy"; - version = "3.3.5-r1"; + version = "3.3.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclpy-release/archive/release/humble/rclpy/3.3.5-1.tar.gz"; - name = "3.3.5-1.tar.gz"; - sha256 = "6d369402a9a31ff5a261e30e746bb5a89f551ae2dd4e82dcaa099ca5678b9e45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclpy-release"; + rev = "release/humble/rclpy/3.3.7-1"; + sha256 = "sha256-kveFRRwSx96J18NbUhXiKErOCV0JlRY9XF+nYQjfx3U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pybind11-vendor python-cmake-module rcpputils rcutils rmw-implementation-cmake ]; diff --git a/distros/humble/rcpputils/default.nix b/distros/humble/rcpputils/default.nix index 47c39c0d49..92ad6a5d81 100644 --- a/distros/humble/rcpputils/default.nix +++ b/distros/humble/rcpputils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcpputils"; version = "2.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcpputils-release/archive/release/humble/rcpputils/2.4.0-2.tar.gz"; - name = "2.4.0-2.tar.gz"; - sha256 = "9612e513b6db7efc66d669e73ec014029e7cb6e95b90523d91f8ffc3540cbc47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcpputils-release"; + rev = "release/humble/rcpputils/2.4.0-2"; + sha256 = "sha256-Xb3fxUuRy/QUi2LnTwBWkUgVwsYNSDGvBg1Mx/g9bWY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/humble/rcss3d-agent-basic/default.nix b/distros/humble/rcss3d-agent-basic/default.nix index b5fba0cbb7..53b66b053b 100644 --- a/distros/humble/rcss3d-agent-basic/default.nix +++ b/distros/humble/rcss3d-agent-basic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcss3d-agent-basic"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcss3d_agent-release/archive/release/humble/rcss3d_agent_basic/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "ded0658fe1d76fc73085dbf2b55e56cf7383ca65d073c64cce65e82058821757"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcss3d_agent-release"; + rev = "release/humble/rcss3d_agent_basic/0.2.1-1"; + sha256 = "sha256-BWSFd0km6o2WrL4OwfQruwDECCwGlajyEndSfFpkAtQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rcss3d-agent-msgs/default.nix b/distros/humble/rcss3d-agent-msgs/default.nix index 29d873e45f..ed15578973 100644 --- a/distros/humble/rcss3d-agent-msgs/default.nix +++ b/distros/humble/rcss3d-agent-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcss3d-agent-msgs"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcss3d_agent-release/archive/release/humble/rcss3d_agent_msgs/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "0c3b009d8c37479415cc2da4b9f4e5ad1a65436a97173c05be01db2ebff302f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcss3d_agent-release"; + rev = "release/humble/rcss3d_agent_msgs/0.2.1-1"; + sha256 = "sha256-Xr78ZllKQgw8nFsUJst9N9QQj3Otf+5qdxHPnZByrmI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rcss3d-agent/default.nix b/distros/humble/rcss3d-agent/default.nix index 4588c4ec6b..3644080363 100644 --- a/distros/humble/rcss3d-agent/default.nix +++ b/distros/humble/rcss3d-agent/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcss3d-agent"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcss3d_agent-release/archive/release/humble/rcss3d_agent/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "d42fe79013b25837e8955923aed1079cfce2426c321df6ba011ed8e68c388045"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcss3d_agent-release"; + rev = "release/humble/rcss3d_agent/0.2.1-1"; + sha256 = "sha256-RvUiVgKOMTlAyvsAtAdslsPg3GWfft47DcuWAR3U7fs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rcutils/default.nix b/distros/humble/rcutils/default.nix index 9f43bcb522..98f71c6d84 100644 --- a/distros/humble/rcutils/default.nix +++ b/distros/humble/rcutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rcutils"; version = "5.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcutils-release/archive/release/humble/rcutils/5.1.2-1.tar.gz"; - name = "5.1.2-1.tar.gz"; - sha256 = "bac0449f77f38e8228c2fb3cb2e2c113d4e3f1315a5e1e76e3fa26598a1fbac7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcutils-release"; + rev = "release/humble/rcutils/5.1.2-1"; + sha256 = "sha256-CpxEQNuONTOB/w9QQGzpx34RwNE3u/TutU0wsikCsnw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python3Packages.empy ]; diff --git a/distros/humble/realsense2-camera-msgs/default.nix b/distros/humble/realsense2-camera-msgs/default.nix index 3f3322187c..1954fff8a3 100644 --- a/distros/humble/realsense2-camera-msgs/default.nix +++ b/distros/humble/realsense2-camera-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-realsense2-camera-msgs"; version = "4.51.1-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/humble/realsense2_camera_msgs/4.51.1-1.tar.gz"; - name = "4.51.1-1.tar.gz"; - sha256 = "0a1b7df957dd5d3ea827c9233cf2dfbd779818c318cf26ea31f6adb60fcfee9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/humble/realsense2_camera_msgs/4.51.1-1"; + sha256 = "sha256-n/1oSiCcxvKQEDde1zImo44mSgOwaFXd2GchxlVUexI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/realsense2-camera/default.nix b/distros/humble/realsense2-camera/default.nix index 681342c684..e4848763f3 100644 --- a/distros/humble/realsense2-camera/default.nix +++ b/distros/humble/realsense2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-realsense2-camera"; version = "4.51.1-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/humble/realsense2_camera/4.51.1-1.tar.gz"; - name = "4.51.1-1.tar.gz"; - sha256 = "0c85f59e0775a70bf9377a16efc5271eb8e072999bd8eddad169764b11b54fe6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/humble/realsense2_camera/4.51.1-1"; + sha256 = "sha256-O/ta/1y9TxZ4fnhsBw20dq7eCrtG+nuRaN35kbJx2dc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/humble/realsense2-description/default.nix b/distros/humble/realsense2-description/default.nix index 3deb846dfb..a31aa9517b 100644 --- a/distros/humble/realsense2-description/default.nix +++ b/distros/humble/realsense2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-realsense2-description"; version = "4.51.1-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/humble/realsense2_description/4.51.1-1.tar.gz"; - name = "4.51.1-1.tar.gz"; - sha256 = "0c12eac0d6f965692471c1e273e9b6f376139216e21350d5d4ee0924614aec11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/humble/realsense2_description/4.51.1-1"; + sha256 = "sha256-7xl3PXh5S904NsGFLRSC121dwycHugAR8VcHIP0yvXE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/realtime-tools/default.nix b/distros/humble/realtime-tools/default.nix index 4c0d723066..8dbcd34533 100644 --- a/distros/humble/realtime-tools/default.nix +++ b/distros/humble/realtime-tools/default.nix @@ -2,19 +2,23 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, rclcpp, rclcpp-action, test-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, rclcpp, rclcpp-action, test-msgs }: buildRosPackage { pname = "ros-humble-realtime-tools"; - version = "2.4.0-r1"; + version = "2.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/realtime_tools-release/archive/release/humble/realtime_tools/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "99c99240f1ef6acfbeda4158b6f3e0f162f71463cbdc49fddaf2e110661f3b25"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "realtime_tools-release"; + rev = "release/humble/realtime_tools/2.5.0-1"; + sha256 = "sha256-Q+ZmEMwbVher38kNPY7nBhoTCWhDQRs6ytN4V4cZqjM="; + }; buildType = "ament_cmake"; - checkInputs = [ rclcpp-action test-msgs ]; + checkInputs = [ ament-cmake-gmock test-msgs ]; propagatedBuildInputs = [ ament-cmake rclcpp rclcpp-action ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/humble/resource-retriever/default.nix b/distros/humble/resource-retriever/default.nix index b3a1c03104..385a714a6a 100644 --- a/distros/humble/resource-retriever/default.nix +++ b/distros/humble/resource-retriever/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-ros, ament-index-cpp, ament-index-python, ament-lint-auto, ament-lint-common, libcurl-vendor, python-cmake-module, pythonPackages }: buildRosPackage { pname = "ros-humble-resource-retriever"; - version = "3.1.0-r2"; + version = "3.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/resource_retriever-release/archive/release/humble/resource_retriever/3.1.0-2.tar.gz"; - name = "3.1.0-2.tar.gz"; - sha256 = "6008d843c9005885be677a1e1678b08425a2b2729d61e1dd19e876b5872a80ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "resource_retriever-release"; + rev = "release/humble/resource_retriever/3.1.1-1"; + sha256 = "sha256-eg/0unIGbPEsFz0d6Ol6XmavafOcY1abMJE7og89dzs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rmf-api-msgs/default.nix b/distros/humble/rmf-api-msgs/default.nix index 6348b7ad12..c5b605330d 100644 --- a/distros/humble/rmf-api-msgs/default.nix +++ b/distros/humble/rmf-api-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-api-msgs"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_api_msgs-release/archive/release/humble/rmf_api_msgs/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "7980b23f156fa9c8f50e3e26c292b2d2230abdac25e1ae6036973cfbfe009926"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_api_msgs-release"; + rev = "release/humble/rmf_api_msgs/0.0.1-1"; + sha256 = "sha256-h4F3FbFrB5lQ4zR80l3Dj3w4eoUeCzJBa5s9iUPL6fg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-battery/default.nix b/distros/humble/rmf-battery/default.nix index 87a9375ed3..9887030618 100644 --- a/distros/humble/rmf-battery/default.nix +++ b/distros/humble/rmf-battery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-battery"; version = "0.1.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_battery-release/archive/release/humble/rmf_battery/0.1.3-2.tar.gz"; - name = "0.1.3-2.tar.gz"; - sha256 = "db1f2855e8691e4be28d9cc3fdd66bbf2318299ee97ca1454c3d347f56692609"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_battery-release"; + rev = "release/humble/rmf_battery/0.1.3-2"; + sha256 = "sha256-oGw9NxbR7XnmDLwVkWHPmJHRVwOZtCV59cLWq56hrUA="; + }; buildType = "cmake"; buildInputs = [ eigen eigen3-cmake-module ]; diff --git a/distros/humble/rmf-building-map-msgs/default.nix b/distros/humble/rmf-building-map-msgs/default.nix index 6d3a0a9e39..82fa8dee4a 100644 --- a/distros/humble/rmf-building-map-msgs/default.nix +++ b/distros/humble/rmf-building-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-building-map-msgs"; version = "1.2.0-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_building_map_msgs-release/archive/release/humble/rmf_building_map_msgs/1.2.0-6.tar.gz"; - name = "1.2.0-6.tar.gz"; - sha256 = "79a22962c463a40bee6c7fb356ab3dd0b727a19135a1e97e4fe6a9d33daa3494"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_building_map_msgs-release"; + rev = "release/humble/rmf_building_map_msgs/1.2.0-6"; + sha256 = "sha256-snyMuXdNPfPqMZ8hpU/Lno8b23lqgRLHWYygxrKe3tQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-building-sim-common/default.nix b/distros/humble/rmf-building-sim-common/default.nix index 630b170948..e695e8c234 100644 --- a/distros/humble/rmf-building-sim-common/default.nix +++ b/distros/humble/rmf-building-sim-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-building-sim-common"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/humble/rmf_building_sim_common/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "1d1a7d99ff349deee856b966eed8a402dad2d01c4f7baa83d6314fab04c9ecbb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/humble/rmf_building_sim_common/2.0.0-1"; + sha256 = "sha256-m+erezYIgPF/6kubq+BP5hUVj/BzCSetD9APTjO/Kd0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-building-sim-gz-classic-plugins/default.nix b/distros/humble/rmf-building-sim-gz-classic-plugins/default.nix index bb9cc1f6aa..da52eb61f8 100644 --- a/distros/humble/rmf-building-sim-gz-classic-plugins/default.nix +++ b/distros/humble/rmf-building-sim-gz-classic-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-building-sim-gz-classic-plugins"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/humble/rmf_building_sim_gz_classic_plugins/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "3e45c0266ca6841d64421b9ad0ee96c3ce68cdf40407f2c366abe50b38ce388e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/humble/rmf_building_sim_gz_classic_plugins/2.0.0-1"; + sha256 = "sha256-Mg2m6ogUnJjTr5g0leCh5gggCHw5ZKS/X+zhWhTyyHs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-charger-msgs/default.nix b/distros/humble/rmf-charger-msgs/default.nix index 29b8008c6b..d9a78a8c0d 100644 --- a/distros/humble/rmf-charger-msgs/default.nix +++ b/distros/humble/rmf-charger-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-charger-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_charger_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "293f6e8f625b49d80d04786ab833a000540c1ee1b8dc2212b8f0e884b0667047"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_charger_msgs/3.0.2-1"; + sha256 = "sha256-4vGvZLfBSIo9E8ERxKDXo4TeiQAl3Cm+GgobEDOqYvU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-cmake-uncrustify/default.nix b/distros/humble/rmf-cmake-uncrustify/default.nix index 6322573a18..696d219067 100644 --- a/distros/humble/rmf-cmake-uncrustify/default.nix +++ b/distros/humble/rmf-cmake-uncrustify/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-cmake-uncrustify"; version = "1.2.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_cmake_uncrustify-release/archive/release/humble/rmf_cmake_uncrustify/1.2.0-4.tar.gz"; - name = "1.2.0-4.tar.gz"; - sha256 = "f2c3d4532958095a5a10fef5b73027da5a3fdcf215cd17bebe9cc907735d1598"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_cmake_uncrustify-release"; + rev = "release/humble/rmf_cmake_uncrustify/1.2.0-4"; + sha256 = "sha256-YwXGjK9Uaj03Os5oVwylNtS6dDmirgOgm6bY+0K+8Ic="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/rmf-dispenser-msgs/default.nix b/distros/humble/rmf-dispenser-msgs/default.nix index 93c47c9933..3874024bfd 100644 --- a/distros/humble/rmf-dispenser-msgs/default.nix +++ b/distros/humble/rmf-dispenser-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-dispenser-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_dispenser_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "c2c325a2e5a9fd32db6ffa2db288f50a352eb89acb680a5e6fb1a19450e1c28c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_dispenser_msgs/3.0.2-1"; + sha256 = "sha256-iNMN6NJs3s2ZsHxHu9opSZOBDchOT/IdFZ4VuWr5IaM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-door-msgs/default.nix b/distros/humble/rmf-door-msgs/default.nix index 9203a9d7d0..bcb960daed 100644 --- a/distros/humble/rmf-door-msgs/default.nix +++ b/distros/humble/rmf-door-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-door-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_door_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "d16d60f2197b08975d08a62b675b31f7a5b56f44903cd3d9875ee18554b8832d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_door_msgs/3.0.2-1"; + sha256 = "sha256-DZ4/GoMrs1KVn2qFqdF4rNrgsmrB8MtxXhM59DF9INo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-fleet-adapter-python/default.nix b/distros/humble/rmf-fleet-adapter-python/default.nix index 044f241aef..924190ad55 100644 --- a/distros/humble/rmf-fleet-adapter-python/default.nix +++ b/distros/humble/rmf-fleet-adapter-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-fleet-adapter-python"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/humble/rmf_fleet_adapter_python/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "50ee7c00f05ae8085f28e848e33d1799642c45eedea37bf7d4fdfd81aab9a5fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/humble/rmf_fleet_adapter_python/2.1.2-1"; + sha256 = "sha256-s3WYFs/d1Kxh3rtV7v2gAHOmTSbTtO2J+t5fAuIbP98="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-pytest ]; diff --git a/distros/humble/rmf-fleet-adapter/default.nix b/distros/humble/rmf-fleet-adapter/default.nix index 75d8a2eec4..d5dd1a8a4c 100644 --- a/distros/humble/rmf-fleet-adapter/default.nix +++ b/distros/humble/rmf-fleet-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-fleet-adapter"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/humble/rmf_fleet_adapter/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "a921eb4efc348842adeccb006e900bc5b84d55e78e26e6101959915d4baccd4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/humble/rmf_fleet_adapter/2.1.2-1"; + sha256 = "sha256-nhu7m0bf0ORhJStcjxrdpmVXf0oRVIdm8C2QDRcy+zQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen libyamlcpp ]; diff --git a/distros/humble/rmf-fleet-msgs/default.nix b/distros/humble/rmf-fleet-msgs/default.nix index aea9bc5865..261e2e27ce 100644 --- a/distros/humble/rmf-fleet-msgs/default.nix +++ b/distros/humble/rmf-fleet-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-fleet-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_fleet_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "dfb2d07ac460fe8bc5e54910defe8c80f7f9ea67b9383405e44086d3edf7dbad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_fleet_msgs/3.0.2-1"; + sha256 = "sha256-CFa6/eKQMXbJdvmpAowO/8qQ/D1y5uvy9ovOQweVJt0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-ingestor-msgs/default.nix b/distros/humble/rmf-ingestor-msgs/default.nix index 336199e3ae..a561f4f091 100644 --- a/distros/humble/rmf-ingestor-msgs/default.nix +++ b/distros/humble/rmf-ingestor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-ingestor-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_ingestor_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "72f943e9f491ee15f899c239921d33ee5aef14465bb07ea2510996943f3c15a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_ingestor_msgs/3.0.2-1"; + sha256 = "sha256-tL6Cp59t7ulNQnu7hDBs86RQ1SQ1TIzJYcVF7roRjlQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-lift-msgs/default.nix b/distros/humble/rmf-lift-msgs/default.nix index 2a2aa18567..c7950ce026 100644 --- a/distros/humble/rmf-lift-msgs/default.nix +++ b/distros/humble/rmf-lift-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-lift-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_lift_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "bdfb2188197f9db9c2c1e213380bc2ed9152d5e6695784c2625ccdfeae2a11eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_lift_msgs/3.0.2-1"; + sha256 = "sha256-6WzzKCLRIzQio1Ebs/w9u6lGKDRCxZHl/elHv2M/o3c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-obstacle-msgs/default.nix b/distros/humble/rmf-obstacle-msgs/default.nix index 6eca4880ab..36ada6eeee 100644 --- a/distros/humble/rmf-obstacle-msgs/default.nix +++ b/distros/humble/rmf-obstacle-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-obstacle-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_obstacle_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "3aedc438760ce7bab58ef4a93fa2f294bd931abf91f93728899353970a89420f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_obstacle_msgs/3.0.2-1"; + sha256 = "sha256-yQq/6bZxOdGT2SFHMn4vQyPU4v/2myKJWwbkC7BqahM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-robot-sim-common/default.nix b/distros/humble/rmf-robot-sim-common/default.nix index 6e58e2a7c5..fb6908aa34 100644 --- a/distros/humble/rmf-robot-sim-common/default.nix +++ b/distros/humble/rmf-robot-sim-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-robot-sim-common"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/humble/rmf_robot_sim_common/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "53da938750b958d7338859c43a18c4b4a6ffe2af7648a9de9a833a6f293a2673"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/humble/rmf_robot_sim_common/2.0.0-1"; + sha256 = "sha256-IuYKkMsVg6T/njTAoWEph65/bez/rgULyYgub6xPIVE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-robot-sim-gz-classic-plugins/default.nix b/distros/humble/rmf-robot-sim-gz-classic-plugins/default.nix index 3383936e11..5b19886416 100644 --- a/distros/humble/rmf-robot-sim-gz-classic-plugins/default.nix +++ b/distros/humble/rmf-robot-sim-gz-classic-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-robot-sim-gz-classic-plugins"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/humble/rmf_robot_sim_gz_classic_plugins/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "d742cb4f3908ff3314ced85c3e7fa24d2ab079e38d2502cb9ba1914fe0b0136e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/humble/rmf_robot_sim_gz_classic_plugins/2.0.0-1"; + sha256 = "sha256-8HbGHykuYSSLz3x/8MQUe32fpQDIq7a1KWQXhmQ99TU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-scheduler-msgs/default.nix b/distros/humble/rmf-scheduler-msgs/default.nix index bcf3d848fb..27bedf9328 100644 --- a/distros/humble/rmf-scheduler-msgs/default.nix +++ b/distros/humble/rmf-scheduler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-scheduler-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_scheduler_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "0684576996aee326eafd100d2e027a045ff860c16919533092be869ea8b71733"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_scheduler_msgs/3.0.2-1"; + sha256 = "sha256-A3Z12sm+6O3gYcBaT6WpnByHpjr1Z9NHTTI7qUEKpkI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-site-map-msgs/default.nix b/distros/humble/rmf-site-map-msgs/default.nix index c8c09e9636..cf5f101adc 100644 --- a/distros/humble/rmf-site-map-msgs/default.nix +++ b/distros/humble/rmf-site-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-site-map-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_site_map_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "edbeeb54b2efbe832b25e44e3c250be92cf06deeb9840a36673db8273c26aa64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_site_map_msgs/3.0.2-1"; + sha256 = "sha256-1XFEKfUJX0WX7J2hgLsCBAGNmLr8rGxCv2No62KeDjg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-task-msgs/default.nix b/distros/humble/rmf-task-msgs/default.nix index 374f268aa6..fcc2d2fb3a 100644 --- a/distros/humble/rmf-task-msgs/default.nix +++ b/distros/humble/rmf-task-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-task-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_task_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "5e46a2444e7d1fab5b71596f1b18351d141540886684e5425851bd4e63217bbf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_task_msgs/3.0.2-1"; + sha256 = "sha256-VQIlf3lwjm+YzFprx0m6KsFMFvhyL9ZwG6L0o9mZJio="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-task-ros2/default.nix b/distros/humble/rmf-task-ros2/default.nix index 1f98c2f86c..3b324682f0 100644 --- a/distros/humble/rmf-task-ros2/default.nix +++ b/distros/humble/rmf-task-ros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-task-ros2"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/humble/rmf_task_ros2/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "487505ee5d1cb9e501a1206104f71f60d5e768202b7c3fbdf1dba53a8adc11b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/humble/rmf_task_ros2/2.1.2-1"; + sha256 = "sha256-GNoZeeN1ZYoV8BEqTISi/hpnyy5lfW9ENcaTd1x7wHM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/humble/rmf-task-sequence/default.nix b/distros/humble/rmf-task-sequence/default.nix index 7a3f27e4f5..666a0b2582 100644 --- a/distros/humble/rmf-task-sequence/default.nix +++ b/distros/humble/rmf-task-sequence/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-task-sequence"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_task-release/archive/release/humble/rmf_task_sequence/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "15b0696f45af7dbbe0e0e9def11eb0d06efdf592abd3728a24e1a7507b589e90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_task-release"; + rev = "release/humble/rmf_task_sequence/2.1.1-1"; + sha256 = "sha256-US8cPib7cqCNyF2imJglb6iIX3UWkk14TZb6qea4MFY="; + }; buildType = "cmake"; checkInputs = [ ament-cmake-catch2 ament-cmake-uncrustify ]; diff --git a/distros/humble/rmf-task/default.nix b/distros/humble/rmf-task/default.nix index 23a5466aeb..e56597d9cc 100644 --- a/distros/humble/rmf-task/default.nix +++ b/distros/humble/rmf-task/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-task"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_task-release/archive/release/humble/rmf_task/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "4b3146af040070f44d93f2854cdc919d7d57472815abd05f9f3eb3962714cd04"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_task-release"; + rev = "release/humble/rmf_task/2.1.1-1"; + sha256 = "sha256-xbIuHYU+88cnbBGP7NcZP4tomgLWxNGSJuRqyE3kHRM="; + }; buildType = "cmake"; checkInputs = [ ament-cmake-catch2 ament-cmake-uncrustify ]; diff --git a/distros/humble/rmf-traffic-editor-assets/default.nix b/distros/humble/rmf-traffic-editor-assets/default.nix index 54a1c15897..33332032b8 100644 --- a/distros/humble/rmf-traffic-editor-assets/default.nix +++ b/distros/humble/rmf-traffic-editor-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-traffic-editor-assets"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/humble/rmf_traffic_editor_assets/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "3b456d708f55d63f63caa8172de220f770261cbcb812112a8a610618d51f5c5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/humble/rmf_traffic_editor_assets/1.6.0-1"; + sha256 = "sha256-3HVyWZy2Em7zQxEzVkXZU7O+iJdNBU0SMNuKfOPzzts="; + }; buildType = "ament_python"; diff --git a/distros/humble/rmf-traffic-editor-test-maps/default.nix b/distros/humble/rmf-traffic-editor-test-maps/default.nix index d2c05066bf..e975c43b07 100644 --- a/distros/humble/rmf-traffic-editor-test-maps/default.nix +++ b/distros/humble/rmf-traffic-editor-test-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-traffic-editor-test-maps"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/humble/rmf_traffic_editor_test_maps/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "e7f8051b463fdf347396295b3503a7621aac40794237295439f8c8e0b3745a30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/humble/rmf_traffic_editor_test_maps/1.6.0-1"; + sha256 = "sha256-YEuFPXau+4A9aHgXCPVNxOoqSM5s77RXplHkMwe+XJo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmf-building-map-tools ros2run ]; diff --git a/distros/humble/rmf-traffic-editor/default.nix b/distros/humble/rmf-traffic-editor/default.nix index a0fd42aacb..ca678ddf65 100644 --- a/distros/humble/rmf-traffic-editor/default.nix +++ b/distros/humble/rmf-traffic-editor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-traffic-editor"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/humble/rmf_traffic_editor/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "0dc55c74f540d62f142759427c25da387956fd7c4a1c53e4cc4d2f745b852f1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/humble/rmf_traffic_editor/1.6.0-1"; + sha256 = "sha256-dHrJ7FHaRCA+Oa8rqL6u6Okzlr1dWvUZcQqxW5cTb9A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-index-cpp eigen libyamlcpp qt5.qtbase rmf-utils ]; diff --git a/distros/humble/rmf-traffic-examples/default.nix b/distros/humble/rmf-traffic-examples/default.nix index 327a31a807..4c2f1643a3 100644 --- a/distros/humble/rmf-traffic-examples/default.nix +++ b/distros/humble/rmf-traffic-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-traffic-examples"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic-release/archive/release/humble/rmf_traffic_examples/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "15e308aa97927ca5a29cecbb144033000a4b762277a2aefc81d196e25b67d494"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic-release"; + rev = "release/humble/rmf_traffic_examples/3.0.0-1"; + sha256 = "sha256-bBRDoknCyTKV2epwCF7WNWrDCGPK9bJJuydn6S9n7nU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/rmf-traffic-msgs/default.nix b/distros/humble/rmf-traffic-msgs/default.nix index a0fc875ecf..1a1e6d012b 100644 --- a/distros/humble/rmf-traffic-msgs/default.nix +++ b/distros/humble/rmf-traffic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-traffic-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_traffic_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "71ab4ea9d3ea59984a7cd5605cc03c7278f231fe88408034c43fd1bf4504874a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_traffic_msgs/3.0.2-1"; + sha256 = "sha256-Mpro9J9umfpGkfpGplbSA5ht3fMZWfkV57m4D3EOwkU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-traffic-ros2/default.nix b/distros/humble/rmf-traffic-ros2/default.nix index fe7736d55c..a21275ff42 100644 --- a/distros/humble/rmf-traffic-ros2/default.nix +++ b/distros/humble/rmf-traffic-ros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-traffic-ros2"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/humble/rmf_traffic_ros2/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "33d289795764a3deeb3ebd2f289e0832cc4e3d900c8874b882d1f705e32b15d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/humble/rmf_traffic_ros2/2.1.2-1"; + sha256 = "sha256-VVLTJbIr4nL8EkVB97IQMBwMhYnsyWlI6itaK51Xg0U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/humble/rmf-traffic/default.nix b/distros/humble/rmf-traffic/default.nix index dbcde97735..38c1f29857 100644 --- a/distros/humble/rmf-traffic/default.nix +++ b/distros/humble/rmf-traffic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-traffic"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic-release/archive/release/humble/rmf_traffic/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "6f736e93bd5abe6583db69d5329fb43a421669e34dde2dae0400e1fd7fed7ec7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic-release"; + rev = "release/humble/rmf_traffic/3.0.0-1"; + sha256 = "sha256-7ltO2BBCmnZ53l/P0JcbgduPk36d2Canzw7ZkWPeC4Q="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/rmf-utils/default.nix b/distros/humble/rmf-utils/default.nix index 527c086cf8..3c966a9ee2 100644 --- a/distros/humble/rmf-utils/default.nix +++ b/distros/humble/rmf-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-utils"; version = "1.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_utils-release/archive/release/humble/rmf_utils/1.4.0-2.tar.gz"; - name = "1.4.0-2.tar.gz"; - sha256 = "7b9c348b18b9195a31bfd8acd239f83994f333ad532228b6179b89080e5b4bbb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_utils-release"; + rev = "release/humble/rmf_utils/1.4.0-2"; + sha256 = "sha256-0J61gdqsqdGIb+/2E3zFOq/Z3qjwXkncR96hBB8a8S0="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/rmf-visualization-building-systems/default.nix b/distros/humble/rmf-visualization-building-systems/default.nix index e1fc0938e4..6de71de4ff 100644 --- a/distros/humble/rmf-visualization-building-systems/default.nix +++ b/distros/humble/rmf-visualization-building-systems/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization-building-systems"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/humble/rmf_visualization_building_systems/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "67921b36a3aa7987cc29ac420439c746382c4c844a13df0f37551bf4b8250bf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/humble/rmf_visualization_building_systems/2.0.0-1"; + sha256 = "sha256-31I33Y2suuRqtFaPTMoylNDisriDZRClFfB5W6OTR5I="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/rmf-visualization-fleet-states/default.nix b/distros/humble/rmf-visualization-fleet-states/default.nix index ccf3901dd0..a86cc28180 100644 --- a/distros/humble/rmf-visualization-fleet-states/default.nix +++ b/distros/humble/rmf-visualization-fleet-states/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization-fleet-states"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/humble/rmf_visualization_fleet_states/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "73f0edf6f0f08a8bde0ad4bdc1c6f937bc97540fd1659702650bd9e1343078c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/humble/rmf_visualization_fleet_states/2.0.0-1"; + sha256 = "sha256-KmCFYyRi3OC+Y7Srk9Yu2LUtY67kLkoNIN6wOTcA4J8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-visualization-floorplans/default.nix b/distros/humble/rmf-visualization-floorplans/default.nix index 4d933ec4f0..840a7e60ef 100644 --- a/distros/humble/rmf-visualization-floorplans/default.nix +++ b/distros/humble/rmf-visualization-floorplans/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization-floorplans"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/humble/rmf_visualization_floorplans/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "d32bc40b05838deeb62717baf71b2dfbb1331a19af40e7452427e9c933568478"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/humble/rmf_visualization_floorplans/2.0.0-1"; + sha256 = "sha256-DatGmTaZ5kgA9hFL9neuZW+NQdnMbdzQtH6SY0vrDoQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-visualization-msgs/default.nix b/distros/humble/rmf-visualization-msgs/default.nix index 3bfa62c71e..999652174d 100644 --- a/distros/humble/rmf-visualization-msgs/default.nix +++ b/distros/humble/rmf-visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization-msgs"; version = "1.2.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization_msgs-release/archive/release/humble/rmf_visualization_msgs/1.2.0-4.tar.gz"; - name = "1.2.0-4.tar.gz"; - sha256 = "cee1982bfa7d3df73fe7cd38432ae792aac94ee1ba07f2de07040755e93fdce7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization_msgs-release"; + rev = "release/humble/rmf_visualization_msgs/1.2.0-4"; + sha256 = "sha256-f0qmm88R8ojtHtOAJxyMJRQyfj2ycFGIOQVZfRMWkyE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmf-visualization-navgraphs/default.nix b/distros/humble/rmf-visualization-navgraphs/default.nix index 6af67c3fe2..e1bb15ea1c 100644 --- a/distros/humble/rmf-visualization-navgraphs/default.nix +++ b/distros/humble/rmf-visualization-navgraphs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization-navgraphs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/humble/rmf_visualization_navgraphs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "dc8b8b117fa1799583ca356e3572f2b19c913f66b0af2a3ad6cc8ec6b174326c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/humble/rmf_visualization_navgraphs/2.0.0-1"; + sha256 = "sha256-Y3fvl5vcN7ATCegGR3G+E2YKBGPi1NJIHIIBb53Uho8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-visualization-obstacles/default.nix b/distros/humble/rmf-visualization-obstacles/default.nix index f429e9152f..07e3117631 100644 --- a/distros/humble/rmf-visualization-obstacles/default.nix +++ b/distros/humble/rmf-visualization-obstacles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization-obstacles"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/humble/rmf_visualization_obstacles/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "b6c5d77a5004de6d5c436cd57c90a55e1248e0ea88250ce6cb241d2c89676039"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/humble/rmf_visualization_obstacles/2.0.0-1"; + sha256 = "sha256-nwTw+bnDvsAQlD3fKyZOY1sPW0shxpGl8/ls4yKTaYA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-visualization-rviz2-plugins/default.nix b/distros/humble/rmf-visualization-rviz2-plugins/default.nix index 9f1e15a7ab..e9adea0f94 100644 --- a/distros/humble/rmf-visualization-rviz2-plugins/default.nix +++ b/distros/humble/rmf-visualization-rviz2-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization-rviz2-plugins"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/humble/rmf_visualization_rviz2_plugins/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "183b394a7a33ff799e5b6f07287e8068e50e4d9ee24d030fc78fd41f18858ed1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/humble/rmf_visualization_rviz2_plugins/2.0.0-1"; + sha256 = "sha256-g9X08LRpCbEKqSL4puhJ5rIXXttYdVQinmU8sOW3yk0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/humble/rmf-visualization-schedule/default.nix b/distros/humble/rmf-visualization-schedule/default.nix index e7022eff8a..09da36448e 100644 --- a/distros/humble/rmf-visualization-schedule/default.nix +++ b/distros/humble/rmf-visualization-schedule/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization-schedule"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/humble/rmf_visualization_schedule/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "9fea5a72fd57a06aff03e25e2e6200894972ba66ca7715aaf27ed600f5b22581"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/humble/rmf_visualization_schedule/2.0.0-1"; + sha256 = "sha256-TOSTTF4/3P9a02qJDFN5OHiEAnq1Wby9RUmK2AEv4FA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-visualization/default.nix b/distros/humble/rmf-visualization/default.nix index 639b4a4978..585409dad7 100644 --- a/distros/humble/rmf-visualization/default.nix +++ b/distros/humble/rmf-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-visualization"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/humble/rmf_visualization/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "023568176909f0cf510af5d79ad8a77d6944da13929e36a566e6a4a6c5b2fc3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/humble/rmf_visualization/2.0.0-1"; + sha256 = "sha256-ApDNtcBpvG4ZnBqm7NSq0v6TYfSdLk3uJDAtqAS+vg8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rmf-websocket/default.nix b/distros/humble/rmf-websocket/default.nix index 2a71605431..38f6bcd153 100644 --- a/distros/humble/rmf-websocket/default.nix +++ b/distros/humble/rmf-websocket/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-websocket"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/humble/rmf_websocket/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "796db4d3c56f0b57d5bc6aa949fdf5e43dd03bb2b89669ef2a3970a70866d45b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/humble/rmf_websocket/2.1.2-1"; + sha256 = "sha256-ryGSxKGS5CeRUUw9vuR9ehUBZy396JC8mTLmPjg8Er8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/humble/rmf-workcell-msgs/default.nix b/distros/humble/rmf-workcell-msgs/default.nix index 5fbb1de5e5..de43b39b46 100644 --- a/distros/humble/rmf-workcell-msgs/default.nix +++ b/distros/humble/rmf-workcell-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmf-workcell-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/humble/rmf_workcell_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "bf623c7cc0db874893a4dd189a6f17feb422d28174203a7d8b68d8b323107cab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/humble/rmf_workcell_msgs/3.0.2-1"; + sha256 = "sha256-xbcYhUVF2L0w6qNqAGKdGVjr2jWldgyA5ob23ZmS+yU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmw-connextdds-common/default.nix b/distros/humble/rmw-connextdds-common/default.nix index 197e1e436f..120804500a 100644 --- a/distros/humble/rmw-connextdds-common/default.nix +++ b/distros/humble/rmw-connextdds-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw-connextdds-common"; version = "0.11.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_connextdds-release/archive/release/humble/rmw_connextdds_common/0.11.1-2.tar.gz"; - name = "0.11.1-2.tar.gz"; - sha256 = "5e6ecf7df102a5db269f662284e21f952806e509a9eecc5701e287831a7eac91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_connextdds-release"; + rev = "release/humble/rmw_connextdds_common/0.11.1-2"; + sha256 = "sha256-QuqFET9cLn220n86uh9NdK/Iv6RPdYd0yZ9crYHwYgk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rmw-connextdds/default.nix b/distros/humble/rmw-connextdds/default.nix index c577fbc1db..de4500668b 100644 --- a/distros/humble/rmw-connextdds/default.nix +++ b/distros/humble/rmw-connextdds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw-connextdds"; version = "0.11.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_connextdds-release/archive/release/humble/rmw_connextdds/0.11.1-2.tar.gz"; - name = "0.11.1-2.tar.gz"; - sha256 = "bbf18dfe4bd7af0e2482435d20a39313397e0916bb7553db7209ee4b4489d4d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_connextdds-release"; + rev = "release/humble/rmw_connextdds/0.11.1-2"; + sha256 = "sha256-q/dCKKBoSXsRpzTSqufVEmjzXh+Dp5sLHRHE3cJJ2iE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rmw-cyclonedds-cpp/default.nix b/distros/humble/rmw-cyclonedds-cpp/default.nix index 75793fdb41..90e729cf21 100644 --- a/distros/humble/rmw-cyclonedds-cpp/default.nix +++ b/distros/humble/rmw-cyclonedds-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw-cyclonedds-cpp"; version = "1.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_cyclonedds-release/archive/release/humble/rmw_cyclonedds_cpp/1.3.4-1.tar.gz"; - name = "1.3.4-1.tar.gz"; - sha256 = "c12f9488236054acec2221195bcde772869945fa9302360f7c23e6281ac9b8d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_cyclonedds-release"; + rev = "release/humble/rmw_cyclonedds_cpp/1.3.4-1"; + sha256 = "sha256-YmAUomFUBIQyg6htBkT6gJiF3m65hoEzp/IO/1iFKts="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rmw-dds-common/default.nix b/distros/humble/rmw-dds-common/default.nix index fada06ebd7..619555ba21 100644 --- a/distros/humble/rmw-dds-common/default.nix +++ b/distros/humble/rmw-dds-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw-dds-common"; version = "1.6.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_dds_common-release/archive/release/humble/rmw_dds_common/1.6.0-2.tar.gz"; - name = "1.6.0-2.tar.gz"; - sha256 = "d2ae60d3c4751a03a868b3b0635c96ef12b4b7354db751a91c26666993e5e450"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_dds_common-release"; + rev = "release/humble/rmw_dds_common/1.6.0-2"; + sha256 = "sha256-Q4i60TiYXYrxyZG2wPLEOe4KNP6iZSgL2Ygnv54zwTM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rmw-fastrtps-cpp/default.nix b/distros/humble/rmw-fastrtps-cpp/default.nix index 90e3b354a2..677c426c53 100644 --- a/distros/humble/rmw-fastrtps-cpp/default.nix +++ b/distros/humble/rmw-fastrtps-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw-fastrtps-cpp"; version = "6.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/humble/rmw_fastrtps_cpp/6.2.2-1.tar.gz"; - name = "6.2.2-1.tar.gz"; - sha256 = "d7ac19ec177e19f6d44543d0192ca1f85366cfc93bbbedfb775bff2e6a4c5a8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/humble/rmw_fastrtps_cpp/6.2.2-1"; + sha256 = "sha256-06EeL06Qh3CVPLCaRg1UJe4SvnEX0Jqa0HjzKTpkMIA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rmw-fastrtps-dynamic-cpp/default.nix b/distros/humble/rmw-fastrtps-dynamic-cpp/default.nix index 41ea6f7c4e..4d29289811 100644 --- a/distros/humble/rmw-fastrtps-dynamic-cpp/default.nix +++ b/distros/humble/rmw-fastrtps-dynamic-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw-fastrtps-dynamic-cpp"; version = "6.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/humble/rmw_fastrtps_dynamic_cpp/6.2.2-1.tar.gz"; - name = "6.2.2-1.tar.gz"; - sha256 = "c86d46653ee0312f4d91f7de7564d8cb1d28a2f7b488bf2822af0971acc91758"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/humble/rmw_fastrtps_dynamic_cpp/6.2.2-1"; + sha256 = "sha256-OnGF5+5k/4rmKtoKBB1Xoug/hj0h+QAnjqNTsxXCHo4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rmw-fastrtps-shared-cpp/default.nix b/distros/humble/rmw-fastrtps-shared-cpp/default.nix index 66b63bbeb2..4489fe8d9c 100644 --- a/distros/humble/rmw-fastrtps-shared-cpp/default.nix +++ b/distros/humble/rmw-fastrtps-shared-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw-fastrtps-shared-cpp"; version = "6.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/humble/rmw_fastrtps_shared_cpp/6.2.2-1.tar.gz"; - name = "6.2.2-1.tar.gz"; - sha256 = "7714786f855c543ccd128a1b30039b2bf63b2931bcce0fa5e340fb87936876ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/humble/rmw_fastrtps_shared_cpp/6.2.2-1"; + sha256 = "sha256-NRSdhYa8L2s7DtKvWI7GjwXVhS0Yh29HmYrHRQC2QNM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rmw-implementation-cmake/default.nix b/distros/humble/rmw-implementation-cmake/default.nix index a8517e84a2..56406b1e3a 100644 --- a/distros/humble/rmw-implementation-cmake/default.nix +++ b/distros/humble/rmw-implementation-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw-implementation-cmake"; version = "6.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw-release/archive/release/humble/rmw_implementation_cmake/6.1.1-1.tar.gz"; - name = "6.1.1-1.tar.gz"; - sha256 = "e5e5c5696813beab25d4097e7369205c6c2fca18c04c4eaa5474b5543f643d07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw-release"; + rev = "release/humble/rmw_implementation_cmake/6.1.1-1"; + sha256 = "sha256-epmg1wFhVVtVSrRdV/+kY3g3ClEtmUec7hYgLO30QV0="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/rmw-implementation/default.nix b/distros/humble/rmw-implementation/default.nix index a7417a6397..126f7a849d 100644 --- a/distros/humble/rmw-implementation/default.nix +++ b/distros/humble/rmw-implementation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-cpp, ament-lint-auto, ament-lint-common, performance-test-fixture, rcpputils, rcutils, rmw, rmw-connextdds, rmw-cyclonedds-cpp, rmw-fastrtps-cpp, rmw-fastrtps-dynamic-cpp, rmw-implementation-cmake }: buildRosPackage { pname = "ros-humble-rmw-implementation"; - version = "2.8.1-r2"; + version = "2.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_implementation-release/archive/release/humble/rmw_implementation/2.8.1-2.tar.gz"; - name = "2.8.1-2.tar.gz"; - sha256 = "e6849af5a00e390c73c8d423779e0587b2a64770ea49981decd4fc0e0619a5f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_implementation-release"; + rev = "release/humble/rmw_implementation/2.8.2-1"; + sha256 = "sha256-echvjsXS1PJa+8hxJRysaSqygfVOlIT4ewjlifEM1/o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw rmw-connextdds rmw-cyclonedds-cpp rmw-fastrtps-cpp rmw-fastrtps-dynamic-cpp ]; diff --git a/distros/humble/rmw/default.nix b/distros/humble/rmw/default.nix index e72e534fc6..35ad62cb37 100644 --- a/distros/humble/rmw/default.nix +++ b/distros/humble/rmw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rmw"; version = "6.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw-release/archive/release/humble/rmw/6.1.1-1.tar.gz"; - name = "6.1.1-1.tar.gz"; - sha256 = "381bfc803424f0bc543c16725074d339190a9f2e5e5964bc59a79506b0c7959d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw-release"; + rev = "release/humble/rmw/6.1.1-1"; + sha256 = "sha256-PjoOwMzIsqX9Z9CaVKwZj2HsOm4GSt5njONdsPvMbOk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ament-cmake-version ]; diff --git a/distros/humble/robot-calibration-msgs/default.nix b/distros/humble/robot-calibration-msgs/default.nix index 842a2a4347..8293d16f56 100644 --- a/distros/humble/robot-calibration-msgs/default.nix +++ b/distros/humble/robot-calibration-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-robot-calibration-msgs"; version = "0.8.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_calibration-release/archive/release/humble/robot_calibration_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "416c8562484550974e108e3e7c3adcc48f50e2bbde1bf75a843d57ece74e927d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_calibration-release"; + rev = "release/humble/robot_calibration_msgs/0.8.0-1"; + sha256 = "sha256-DTC4fHYediXuBlv9ZfjpeWB0ynuOhiQcJyCxBN1Ob+s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/robot-calibration/default.nix b/distros/humble/robot-calibration/default.nix index a201589d6d..ceb212e4e1 100644 --- a/distros/humble/robot-calibration/default.nix +++ b/distros/humble/robot-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-robot-calibration"; version = "0.8.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_calibration-release/archive/release/humble/robot_calibration/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "61615283317eda03d7dd8cb7955576b5ff1904f58617c476c82610acfa70822d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_calibration-release"; + rev = "release/humble/robot_calibration/0.8.0-1"; + sha256 = "sha256-VOm9ljE353W1G3t2bZ1BzjYsZi0oM0ln7GnGjKtwT1M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake boost eigen ]; diff --git a/distros/humble/robot-controllers-interface/default.nix b/distros/humble/robot-controllers-interface/default.nix index 76f46c8501..a46e04fc22 100644 --- a/distros/humble/robot-controllers-interface/default.nix +++ b/distros/humble/robot-controllers-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-robot-controllers-interface"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-ros2-release/archive/release/humble/robot_controllers_interface/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "0dabadd61f4c4577879d53502fb1ae826285e755bf08a03756c653f28da2d5da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-ros2-release"; + rev = "release/humble/robot_controllers_interface/0.9.3-1"; + sha256 = "sha256-RnV2xz0xdp3ejwJr9rHTKXhBc3FzfCEHIJwGwqrNZ7o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/robot-controllers-msgs/default.nix b/distros/humble/robot-controllers-msgs/default.nix index fee4e79b40..86f9757ad0 100644 --- a/distros/humble/robot-controllers-msgs/default.nix +++ b/distros/humble/robot-controllers-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-robot-controllers-msgs"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-ros2-release/archive/release/humble/robot_controllers_msgs/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "dd8b03b0617a7e93dbcd175615138c8f2f4a793aab2be3bbd273c9cd5fdae18f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-ros2-release"; + rev = "release/humble/robot_controllers_msgs/0.9.3-1"; + sha256 = "sha256-utKROZ18GIYSRr1eO7wR5SHfPu2qKiX38fAMIqeqwwo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/robot-controllers/default.nix b/distros/humble/robot-controllers/default.nix index 07f7315f6f..6788c111d9 100644 --- a/distros/humble/robot-controllers/default.nix +++ b/distros/humble/robot-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-robot-controllers"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-ros2-release/archive/release/humble/robot_controllers/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "801b0e3177664043f852d61324299b4ec592510b7d0059830446c4b5cb7c649a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-ros2-release"; + rev = "release/humble/robot_controllers/0.9.3-1"; + sha256 = "sha256-CW/MOZq5Lr+ookyxZHNH4xoBmG7I9gfRf+/28JicDNM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/robot-localization/default.nix b/distros/humble/robot-localization/default.nix index aa1a6c05bf..57097c1d82 100644 --- a/distros/humble/robot-localization/default.nix +++ b/distros/humble/robot-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-robot-localization"; version = "3.3.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_localization-release/archive/release/humble/robot_localization/3.3.1-2.tar.gz"; - name = "3.3.1-2.tar.gz"; - sha256 = "2fe8d19d83c176e6cc4e9a8cf0dc5bdb1f1fea2d08c2aa8fd8f4443e0192cc96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_localization-release"; + rev = "release/humble/robot_localization/3.3.1-2"; + sha256 = "sha256-B90LdMnt4IqfGJ9CkuOZdILf28ssmz15az1nsgizX8U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces rosidl-default-generators ]; diff --git a/distros/humble/robot-state-publisher/default.nix b/distros/humble/robot-state-publisher/default.nix index e1428bf53a..312320f4cc 100644 --- a/distros/humble/robot-state-publisher/default.nix +++ b/distros/humble/robot-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-robot-state-publisher"; version = "3.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_state_publisher-release/archive/release/humble/robot_state_publisher/3.0.2-2.tar.gz"; - name = "3.0.2-2.tar.gz"; - sha256 = "bba04ccb6962f707d1aa277ec0c1f0e94a3fd4094b64b7b391c35330ffd1ff26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_state_publisher-release"; + rev = "release/humble/robot_state_publisher/3.0.2-2"; + sha256 = "sha256-cu6CiIT7/Um5OgupHa0HTNWrdeuRxFtKkfRUBuNWqAY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/robot-upstart/default.nix b/distros/humble/robot-upstart/default.nix index 4bd5076c36..6e4bfd8912 100644 --- a/distros/humble/robot-upstart/default.nix +++ b/distros/humble/robot-upstart/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-robot-upstart"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/robot_upstart-release/archive/release/humble/robot_upstart/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "310d5e60443ca37dce66b7240c80bd21ddd1e29ba8479b88468c7d64474432e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "robot_upstart-release"; + rev = "release/humble/robot_upstart/1.0.2-1"; + sha256 = "sha256-kNE7THXKJblslBfs8CGEAhPHPw0sZ202Rrixj7X5L4g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ros-base/default.nix b/distros/humble/ros-base/default.nix index 6efbc01e7f..2628d9a94c 100644 --- a/distros/humble/ros-base/default.nix +++ b/distros/humble/ros-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-base"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/humble/ros_base/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "166f57288db506aa72a16d505477b030bca359bf9be94b114f7e58feccdab057"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/humble/ros_base/0.10.0-1"; + sha256 = "sha256-qTPrFPcFntKAifYcXqjryFyhWK0SgTD9g57SPOb7S9U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros-core/default.nix b/distros/humble/ros-core/default.nix index 167c24accf..ad4fde5eec 100644 --- a/distros/humble/ros-core/default.nix +++ b/distros/humble/ros-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-core"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/humble/ros_core/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "ac39d23b2bc3c3053c7ab98bb5fbb86038593a9bbda19300715970643612f0b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/humble/ros_core/0.10.0-1"; + sha256 = "sha256-Oq1qKMDCrNKnoDWlaZtBuCMhiDEWEaPoyvkumjxWuFg="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake ament-cmake-auto ament-cmake-gmock ament-cmake-gtest ament-cmake-pytest ament-cmake-ros ament-index-cpp ament-index-python ament-lint-auto ament-lint-common class-loader common-interfaces launch launch-ros launch-testing launch-testing-ament-cmake launch-testing-ros launch-xml launch-yaml pluginlib rcl-lifecycle rclcpp rclcpp-action rclcpp-lifecycle rclpy ros-environment ros2cli-common-extensions ros2launch rosidl-default-generators rosidl-default-runtime sros2 sros2-cmake ]; diff --git a/distros/humble/ros-environment/default.nix b/distros/humble/ros-environment/default.nix index 9e482b8322..0848dcb626 100644 --- a/distros/humble/ros-environment/default.nix +++ b/distros/humble/ros-environment/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-environment"; version = "3.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_environment-release/archive/release/humble/ros_environment/3.2.2-1.tar.gz"; - name = "3.2.2-1.tar.gz"; - sha256 = "1f7e699fa551b7b281613eaeb585ad53a2c51772fedaf0d7f5c0badd274e2ee1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_environment-release"; + rev = "release/humble/ros_environment/3.2.2-1"; + sha256 = "sha256-XtonGZlyFRb0OxhZIDY7WYOKJsVQrXFb74koRHjhkdg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/ros-gz-interfaces/default.nix b/distros/humble/ros-gz-interfaces/default.nix index eba835b912..7d73d99ef5 100644 --- a/distros/humble/ros-gz-interfaces/default.nix +++ b/distros/humble/ros-gz-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-gz-interfaces"; version = "0.244.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/humble/ros_gz_interfaces/0.244.9-1.tar.gz"; - name = "0.244.9-1.tar.gz"; - sha256 = "a06956b9c5c6cf237be171abc449a43601842e92a474b4d85d14c418ce26a3b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/humble/ros_gz_interfaces/0.244.9-1"; + sha256 = "sha256-y6BFBgrIUJw0C6zJf2i1w6Enk6OgTabeT1Q+7OVtq1I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/ros-gz/default.nix b/distros/humble/ros-gz/default.nix index 62e21ed03e..4a5e80ccc5 100644 --- a/distros/humble/ros-gz/default.nix +++ b/distros/humble/ros-gz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-gz"; version = "0.244.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/humble/ros_gz/0.244.9-1.tar.gz"; - name = "0.244.9-1.tar.gz"; - sha256 = "2fbc392f4222e8682ec98815ada605046aaa220c21af9592aa97f0ece9c79f6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/humble/ros_gz/0.244.9-1"; + sha256 = "sha256-tgUuNS1GhbRDYZy8gO31BphO6121O03S4ln6NYMzrQw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros-ign-bridge/default.nix b/distros/humble/ros-ign-bridge/default.nix index 9ee1c8dbcf..95649dae1f 100644 --- a/distros/humble/ros-ign-bridge/default.nix +++ b/distros/humble/ros-ign-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-ign-bridge"; version = "0.244.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/humble/ros_ign_bridge/0.244.9-1.tar.gz"; - name = "0.244.9-1.tar.gz"; - sha256 = "80dcd175ae473385264f59182272e585e3bef0c8169a95fc18799065ddf6030c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/humble/ros_ign_bridge/0.244.9-1"; + sha256 = "sha256-rxG0D+RJ/XSh2aC87RN47VhEuRMigDQpCaahCBdIPuk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-index-cpp ]; diff --git a/distros/humble/ros-ign-gazebo-demos/default.nix b/distros/humble/ros-ign-gazebo-demos/default.nix index 042f923054..6146f3b983 100644 --- a/distros/humble/ros-ign-gazebo-demos/default.nix +++ b/distros/humble/ros-ign-gazebo-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-ign-gazebo-demos"; version = "0.244.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/humble/ros_ign_gazebo_demos/0.244.9-1.tar.gz"; - name = "0.244.9-1.tar.gz"; - sha256 = "89a1de4beee7da6ef1128f778b16aa4ba1c463a0e6c59cf2ea9d64cedd022318"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/humble/ros_ign_gazebo_demos/0.244.9-1"; + sha256 = "sha256-DvI5AXWtS0eYwRjyzrnGCfnDvlQwdsECW6K4e+8G+To="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros-ign-gazebo/default.nix b/distros/humble/ros-ign-gazebo/default.nix index 4503342602..6b8e463606 100644 --- a/distros/humble/ros-ign-gazebo/default.nix +++ b/distros/humble/ros-ign-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-ign-gazebo"; version = "0.244.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/humble/ros_ign_gazebo/0.244.9-1.tar.gz"; - name = "0.244.9-1.tar.gz"; - sha256 = "949d8729d310d6983da0f79ab143f1f690f41db6209bb67b4145b966c04f73cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/humble/ros_ign_gazebo/0.244.9-1"; + sha256 = "sha256-SD6Nw6CZM+yrCnJ+nMryhJFuAJEsiX9Hb0oRsiV4ce4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-index-cpp ]; diff --git a/distros/humble/ros-ign-image/default.nix b/distros/humble/ros-ign-image/default.nix index 45ad44df00..7c08b12121 100644 --- a/distros/humble/ros-ign-image/default.nix +++ b/distros/humble/ros-ign-image/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-ign-image"; version = "0.244.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/humble/ros_ign_image/0.244.9-1.tar.gz"; - name = "0.244.9-1.tar.gz"; - sha256 = "02fcebeeb259c299b5fb622e425718feadb0ab539a0c72809c95045fa57e5d21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/humble/ros_ign_image/0.244.9-1"; + sha256 = "sha256-1eCU7QzWM8Tqa3mkeT27uvLWLVWcAx5d6F8bbuR5Tik="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-index-cpp ]; diff --git a/distros/humble/ros-ign-interfaces/default.nix b/distros/humble/ros-ign-interfaces/default.nix index 3d7f4aff0b..03a240dbbd 100644 --- a/distros/humble/ros-ign-interfaces/default.nix +++ b/distros/humble/ros-ign-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-ign-interfaces"; version = "0.244.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/humble/ros_ign_interfaces/0.244.9-1.tar.gz"; - name = "0.244.9-1.tar.gz"; - sha256 = "e91a8e335924a9e13166908c3bd2c5c94d21025bf02ecaf9d5ce7f81919e2732"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/humble/ros_ign_interfaces/0.244.9-1"; + sha256 = "sha256-TxDaMepYD5Gk9207IBvu8SbELeDmpyjTxSliNd3J+4k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/ros-ign/default.nix b/distros/humble/ros-ign/default.nix index fad902ba24..23689483e0 100644 --- a/distros/humble/ros-ign/default.nix +++ b/distros/humble/ros-ign/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-ign"; version = "0.244.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/humble/ros_ign/0.244.9-1.tar.gz"; - name = "0.244.9-1.tar.gz"; - sha256 = "046e5cddc8cb570afa3f8a250afd4563781ab1ba6f454cdde12aebf52286ab7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/humble/ros_ign/0.244.9-1"; + sha256 = "sha256-vt585wZtcTrDDyq4ALdxXRrHHLg11+kK9uffHDqsrZU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros-image-to-qimage/default.nix b/distros/humble/ros-image-to-qimage/default.nix index d501096b84..6e61de9d33 100644 --- a/distros/humble/ros-image-to-qimage/default.nix +++ b/distros/humble/ros-image-to-qimage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-image-to-qimage"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_image_to_qimage-release/archive/release/humble/ros_image_to_qimage/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "871e132e8af334e312f8594c0b7484f7e239baf7f404b671206e03b44102a245"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_image_to_qimage-release"; + rev = "release/humble/ros_image_to_qimage/0.2.1-1"; + sha256 = "sha256-iMqDiWxhiE4eCCykP4aNhTgnJKweSAasczj8BSo2yK8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros-testing/default.nix b/distros/humble/ros-testing/default.nix index 5a91a7de14..4077f1474b 100644 --- a/distros/humble/ros-testing/default.nix +++ b/distros/humble/ros-testing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-testing"; version = "0.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_testing-release/archive/release/humble/ros_testing/0.4.0-3.tar.gz"; - name = "0.4.0-3.tar.gz"; - sha256 = "d11fe885a4ee83c4ba2bf312c8d5dd556ab06d32368865741793c04e70660a40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_testing-release"; + rev = "release/humble/ros_testing/0.4.0-3"; + sha256 = "sha256-sUwtH8qmHyoxmIc0wz8dHJFON0w90U1JFymI3aV6c1U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-core ament-cmake-export-dependencies ]; diff --git a/distros/humble/ros-workspace/default.nix b/distros/humble/ros-workspace/default.nix index 02239f2665..b4f00b2d2b 100644 --- a/distros/humble/ros-workspace/default.nix +++ b/distros/humble/ros-workspace/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros-workspace"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_workspace-release/archive/release/humble/ros_workspace/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "4b3043a5011161d87e4892a58e106a8ba5cb45dcf9b96e027968c0e5de6da443"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_workspace-release"; + rev = "release/humble/ros_workspace/1.0.2-2"; + sha256 = "sha256-FXiyjTZx5N94wlqTFY6bxysv+eiH6noKxFlYXOwcV2M="; + }; buildType = "cmake"; buildInputs = [ ament-cmake-core ament-package cmake ]; diff --git a/distros/humble/ros2-control-test-assets/default.nix b/distros/humble/ros2-control-test-assets/default.nix index ef0ca40618..2e8402db88 100644 --- a/distros/humble/ros2-control-test-assets/default.nix +++ b/distros/humble/ros2-control-test-assets/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake }: buildRosPackage { pname = "ros-humble-ros2-control-test-assets"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/ros2_control_test_assets/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "f0105ec2eb47daeffb3580c71b44bee3e15275e9bfb408e07dace7752c6eb87e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/ros2_control_test_assets/2.21.0-1"; + sha256 = "sha256-LsHGFG6HgVtdu97ZnvdTcW66R5+FpfXCY4MqnxOsj54="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros2-control/default.nix b/distros/humble/ros2-control/default.nix index 73ebe09410..4ede5de41c 100644 --- a/distros/humble/ros2-control/default.nix +++ b/distros/humble/ros2-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, controller-interface, controller-manager, controller-manager-msgs, hardware-interface, joint-limits, ros2-control-test-assets, ros2controlcli, transmission-interface }: buildRosPackage { pname = "ros-humble-ros2-control"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/ros2_control/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "72ed7b66a6cd1f0529dda7845699c2b38ae19f8577c903690704fede7e7a2ba1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/ros2_control/2.21.0-1"; + sha256 = "sha256-zVUUtY5ostQdWV+wt4e9az/Ehr5rzpE3biR3+B0fVjE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros2-controllers-test-nodes/default.nix b/distros/humble/ros2-controllers-test-nodes/default.nix index 7220f4920d..a80a30f289 100644 --- a/distros/humble/ros2-controllers-test-nodes/default.nix +++ b/distros/humble/ros2-controllers-test-nodes/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, pythonPackages, rclpy, std-msgs, trajectory-msgs }: buildRosPackage { pname = "ros-humble-ros2-controllers-test-nodes"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/ros2_controllers_test_nodes/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "5e7aee9f4fb75533ed72b77b7c49559fc4b1d04bb9be8f04d78168784125e878"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/ros2_controllers_test_nodes/2.16.0-1"; + sha256 = "sha256-rDhB7hrxdis/Xj4eC3x8kBUzU+WN7mseWal02ypur4s="; + }; buildType = "ament_python"; checkInputs = [ pythonPackages.pytest ]; diff --git a/distros/humble/ros2-controllers/default.nix b/distros/humble/ros2-controllers/default.nix index b67d89a5fa..f329ca8aee 100644 --- a/distros/humble/ros2-controllers/default.nix +++ b/distros/humble/ros2-controllers/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, admittance-controller, ament-cmake, diff-drive-controller, effort-controllers, force-torque-sensor-broadcaster, forward-command-controller, imu-sensor-broadcaster, joint-state-broadcaster, joint-trajectory-controller, position-controllers, tricycle-controller, velocity-controllers }: buildRosPackage { pname = "ros-humble-ros2-controllers"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/ros2_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "6efd6998095c4b097726dccfd456d6d2721fa2292a50f0537d128f1ed7c0c17d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/ros2_controllers/2.16.0-1"; + sha256 = "sha256-IN01ApLAO0YIv/ID5U4jwYRYsPt596d/6P/oOqOdQGk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros2-socketcan/default.nix b/distros/humble/ros2-socketcan/default.nix index 47d7babc02..49a295a6ad 100644 --- a/distros/humble/ros2-socketcan/default.nix +++ b/distros/humble/ros2-socketcan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2-socketcan"; version = "1.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_socketcan-release/archive/release/humble/ros2_socketcan/1.1.0-3.tar.gz"; - name = "1.1.0-3.tar.gz"; - sha256 = "faa44746237d959c156abcb6d59a3e5ec7f6f1d1f9053cfe0543a122881da0dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_socketcan-release"; + rev = "release/humble/ros2_socketcan/1.1.0-3"; + sha256 = "sha256-5X1Zt8nQDN5Bp9dZgz8CzQW6gMNhDsjMt0D6P1X/JSg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/ros2acceleration/default.nix b/distros/humble/ros2acceleration/default.nix index 91784288eb..265a12be3b 100644 --- a/distros/humble/ros2acceleration/default.nix +++ b/distros/humble/ros2acceleration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2acceleration"; version = "0.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2acceleration-release/archive/release/humble/ros2acceleration/0.5.1-2.tar.gz"; - name = "0.5.1-2.tar.gz"; - sha256 = "75736334d2e7154d509ba6b39cd4bf785928d36799a678de6921e61b5365fa45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2acceleration-release"; + rev = "release/humble/ros2acceleration/0.5.1-2"; + sha256 = "sha256-DRkaUv6JAKKbX1+DqnpK8wTDm1+jlEoHal/0i6rhA6I="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest test-msgs ]; diff --git a/distros/humble/ros2action/default.nix b/distros/humble/ros2action/default.nix index d29e71c7a2..0f1abed4df 100644 --- a/distros/humble/ros2action/default.nix +++ b/distros/humble/ros2action/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-msgs, ament-copyright, ament-flake8, ament-index-python, ament-pep257, ament-xmllint, launch, launch-testing, launch-testing-ros, python3Packages, pythonPackages, rclpy, ros2cli, rosidl-runtime-py, test-msgs }: buildRosPackage { pname = "ros-humble-ros2action"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2action/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "9501ff0d60dfa880c7a3ab8f819ee21e408f656bf2d8f0fc15a6c0e793c3a0de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2action/0.18.5-1"; + sha256 = "sha256-690QiviMyWe2Frcs7BWSCqZMOUQMDcoeK3BGOgUJ8Mo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest test-msgs ]; diff --git a/distros/humble/ros2bag/default.nix b/distros/humble/ros2bag/default.nix index 3f517a1b0d..4d923805b6 100644 --- a/distros/humble/ros2bag/default.nix +++ b/distros/humble/ros2bag/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, launch-testing, launch-testing-ros, pythonPackages, ros2cli, rosbag2-py, rosbag2-transport }: buildRosPackage { pname = "ros-humble-ros2bag"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/ros2bag/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "4cfdeaba917b42c26f0196035bf358fb5efe806ad6b8661612f4639b6e309afe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/ros2bag/0.15.4-2"; + sha256 = "sha256-E8hIKm/Gz7Q4dJy+sRlvQSHL52aiUAYzhxfNyz6XwaE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch-testing launch-testing-ros pythonPackages.pytest ]; diff --git a/distros/humble/ros2cli-common-extensions/default.nix b/distros/humble/ros2cli-common-extensions/default.nix index 2aab20764b..b1e945baf5 100644 --- a/distros/humble/ros2cli-common-extensions/default.nix +++ b/distros/humble/ros2cli-common-extensions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2cli-common-extensions"; version = "0.1.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli_common_extensions-release/archive/release/humble/ros2cli_common_extensions/0.1.1-4.tar.gz"; - name = "0.1.1-4.tar.gz"; - sha256 = "2fefe07f49de32f9d463eba48bcd825b52cb91585084a633db0109b44f3e7c4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli_common_extensions-release"; + rev = "release/humble/ros2cli_common_extensions/0.1.1-4"; + sha256 = "sha256-32uWObO3hDPv9L3mLpl5Vm3mz4eGpui9idqtKeQmQH0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros2cli-test-interfaces/default.nix b/distros/humble/ros2cli-test-interfaces/default.nix index d804b952a1..78d50e2de5 100644 --- a/distros/humble/ros2cli-test-interfaces/default.nix +++ b/distros/humble/ros2cli-test-interfaces/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-msgs, ament-cmake, ament-lint-common, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-humble-ros2cli-test-interfaces"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2cli_test_interfaces/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "1d61d81df6177c086ab4165dae655cbf75ab158f078c80ecf8268ac5f401480f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2cli_test_interfaces/0.18.5-1"; + sha256 = "sha256-sC3Hi5ynUENUQPjk1pYZKbBtw4U5FmtISml8lqwV8lU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/ros2cli/default.nix b/distros/humble/ros2cli/default.nix index 4f753fe616..7b9305def7 100644 --- a/distros/humble/ros2cli/default.nix +++ b/distros/humble/ros2cli/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, python3Packages, pythonPackages, rclpy, test-msgs }: buildRosPackage { pname = "ros-humble-ros2cli"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2cli/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "7da758be498ee7288d461edcfeb77d8f62075b2450a8b903649419a4d585c762"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2cli/0.18.5-1"; + sha256 = "sha256-gsi6BSHMx+bQDyosTmi5Iop3nO2QPLUfsmjXXeuTnfQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint python3Packages.pytest-timeout pythonPackages.pytest test-msgs ]; diff --git a/distros/humble/ros2component/default.nix b/distros/humble/ros2component/default.nix index b8e9d22a4b..220d25bbec 100644 --- a/distros/humble/ros2component/default.nix +++ b/distros/humble/ros2component/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, ament-xmllint, composition-interfaces, python3Packages, pythonPackages, rcl-interfaces, rclcpp-components, rclpy, ros2cli, ros2node, ros2param, ros2pkg }: buildRosPackage { pname = "ros-humble-ros2component"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2component/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "beddb385af72f57548a613f9eae42ebeb6266d8ea9640d214478ba8ad9580a44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2component/0.18.5-1"; + sha256 = "sha256-lFsBOQM95F6f4ujOcznajAYhOHdCNGzgP2WR3cvpOI0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/humble/ros2controlcli/default.nix b/distros/humble/ros2controlcli/default.nix index 3c7a36d9c5..682aeb418c 100644 --- a/distros/humble/ros2controlcli/default.nix +++ b/distros/humble/ros2controlcli/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, controller-manager, controller-manager-msgs, python3Packages, rclpy, ros2cli, ros2node, ros2param, rosidl-runtime-py }: buildRosPackage { pname = "ros-humble-ros2controlcli"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/ros2controlcli/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "b6daff70a1acc11affcfd2f0ee68162003d5a0491c4d1384bcca044b4dbbcf88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/ros2controlcli/2.21.0-1"; + sha256 = "sha256-cqdIXRpFVTvspiLf1qEbe/ZhnJ9lf69vDjASk4HV3Fg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint ]; diff --git a/distros/humble/ros2doctor/default.nix b/distros/humble/ros2doctor/default.nix index 545fc2d363..6d72a2b324 100644 --- a/distros/humble/ros2doctor/default.nix +++ b/distros/humble/ros2doctor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, ament-xmllint, launch, launch-ros, launch-testing, launch-testing-ros, python3Packages, pythonPackages, rclpy, ros-environment, ros2cli, std-msgs }: buildRosPackage { pname = "ros-humble-ros2doctor"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2doctor/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "12d67146324613fc9a5ef89a7cf93d2d5d912483da07deb581bd808d52e86768"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2doctor/0.18.5-1"; + sha256 = "sha256-I750eKJglhfUyfjlEcO9ELdWaRG0cWAG765BDIam0xA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest std-msgs ]; diff --git a/distros/humble/ros2interface/default.nix b/distros/humble/ros2interface/default.nix index 9a95545543..124e0028d2 100644 --- a/distros/humble/ros2interface/default.nix +++ b/distros/humble/ros2interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, ament-xmllint, launch, launch-testing, launch-testing-ros, python3Packages, pythonPackages, ros2cli, ros2cli-test-interfaces, rosidl-runtime-py, test-msgs }: buildRosPackage { pname = "ros-humble-ros2interface"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2interface/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "05b0748f6cc9f08101ad0000d84dfc54d435c8e1ecb782b6fb39f31176cd7829"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2interface/0.18.5-1"; + sha256 = "sha256-BHhHirC7Mbx6sYLjIpItIPpTM8MbLnQXGMdoZa5Mv2E="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest ros2cli-test-interfaces test-msgs ]; diff --git a/distros/humble/ros2launch-security-examples/default.nix b/distros/humble/ros2launch-security-examples/default.nix index 99298a174c..59087998a6 100644 --- a/distros/humble/ros2launch-security-examples/default.nix +++ b/distros/humble/ros2launch-security-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2launch-security-examples"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2launch_security-release/archive/release/humble/ros2launch_security_examples/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "193729d779fbe4306e2bf30050b9a0a73f5eb54214bd3d67ffcc4bb6fee43f55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2launch_security-release"; + rev = "release/humble/ros2launch_security_examples/1.0.0-3"; + sha256 = "sha256-NWaQ/UIv5e//ahvk4u8zBHDsw6po6o9VLTnHTmXsQR8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros2launch-security/default.nix b/distros/humble/ros2launch-security/default.nix index 12e7781f6d..90a64eb365 100644 --- a/distros/humble/ros2launch-security/default.nix +++ b/distros/humble/ros2launch-security/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2launch-security"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2launch_security-release/archive/release/humble/ros2launch_security/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "0d1b712369ee608f63c57553254d1245da1d1e6bf559fddf68f4902d6d91a65b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2launch_security-release"; + rev = "release/humble/ros2launch_security/1.0.0-3"; + sha256 = "sha256-MM1mvGLVBpSePXEUKQScahRPpulucGxMTaTp+jSKbNo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 demo-nodes-py launch-ros pythonPackages.pytest ros2launch sros2 ]; diff --git a/distros/humble/ros2launch/default.nix b/distros/humble/ros2launch/default.nix index 618d9b45e7..cda41ae34d 100644 --- a/distros/humble/ros2launch/default.nix +++ b/distros/humble/ros2launch/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, launch, launch-ros, launch-xml, launch-yaml, pythonPackages, ros2cli, ros2pkg }: buildRosPackage { pname = "ros-humble-ros2launch"; - version = "0.19.3-r1"; + version = "0.19.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/humble/ros2launch/0.19.3-1.tar.gz"; - name = "0.19.3-1.tar.gz"; - sha256 = "e935b92509e685af5b86d530b4155b2f97fd3cec2f8bce23bb88ccc80254059f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/humble/ros2launch/0.19.4-1"; + sha256 = "sha256-L1mGtfF7OTm8MSgoyNWlHxCF9ZNgeHuht/a6So1C7ZE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ros2lifecycle-test-fixtures/default.nix b/distros/humble/ros2lifecycle-test-fixtures/default.nix index a87d722ac0..e548a6c560 100644 --- a/distros/humble/ros2lifecycle-test-fixtures/default.nix +++ b/distros/humble/ros2lifecycle-test-fixtures/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rclcpp, rclcpp-lifecycle }: buildRosPackage { pname = "ros-humble-ros2lifecycle-test-fixtures"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2lifecycle_test_fixtures/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "a9c2d0b1fa62c4c3a94265a6b06a9893f21d823caf43706d31884e4fa07ae1f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2lifecycle_test_fixtures/0.18.5-1"; + sha256 = "sha256-LjBztIpMDZoJvr8AammjWQnn3vYk2qXpyHkC1BpI9Z0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ros2lifecycle/default.nix b/distros/humble/ros2lifecycle/default.nix index 44b0ec34f4..9d9936aa5c 100644 --- a/distros/humble/ros2lifecycle/default.nix +++ b/distros/humble/ros2lifecycle/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, launch, launch-ros, launch-testing, launch-testing-ros, lifecycle-msgs, python3Packages, pythonPackages, rclpy, ros2cli, ros2lifecycle-test-fixtures, ros2node, ros2service }: buildRosPackage { pname = "ros-humble-ros2lifecycle"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2lifecycle/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "e5b0ee984fe27f2a790b20bea1ade7ea9c269abca0dd08be3c5810d2b5c72e65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2lifecycle/0.18.5-1"; + sha256 = "sha256-N+YWRMi5jexYiFFoVFz+UAGxw2DqTkKf/woMk1LB7p8="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest ros2lifecycle-test-fixtures ]; diff --git a/distros/humble/ros2multicast/default.nix b/distros/humble/ros2multicast/default.nix index 73152fe5d5..6a7d2e8417 100644 --- a/distros/humble/ros2multicast/default.nix +++ b/distros/humble/ros2multicast/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, python3Packages, pythonPackages, ros2cli }: buildRosPackage { pname = "ros-humble-ros2multicast"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2multicast/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "55eb9b77618af35ca205c3d9244fc479561ffd6ff31303a1cbc9626e56f184a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2multicast/0.18.5-1"; + sha256 = "sha256-1lKMehRtIwiWANdY8q6IuZQX4AlQtayBCSagKleUWKI="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/humble/ros2node/default.nix b/distros/humble/ros2node/default.nix index d88c51b789..1c0cb1a9e1 100644 --- a/distros/humble/ros2node/default.nix +++ b/distros/humble/ros2node/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, launch, launch-ros, launch-testing, launch-testing-ros, python3Packages, pythonPackages, rclpy, ros2cli, test-msgs }: buildRosPackage { pname = "ros-humble-ros2node"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2node/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "d8e2375d98e35fa45ce39a963edfe0c7dc976ddc98eb3b5ab2311173067ce156"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2node/0.18.5-1"; + sha256 = "sha256-gp2girTRGJreD4UfS1eQo/90qzcZ2fFxrbUSC6i0/T0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest rclpy test-msgs ]; diff --git a/distros/humble/ros2nodl/default.nix b/distros/humble/ros2nodl/default.nix index 12ab7acf2a..aded5ccb2e 100644 --- a/distros/humble/ros2nodl/default.nix +++ b/distros/humble/ros2nodl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2nodl"; version = "0.3.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nodl-release/archive/release/humble/ros2nodl/0.3.1-3.tar.gz"; - name = "0.3.1-3.tar.gz"; - sha256 = "f4ed8ea39c51ba105b641cf8a2249d84b52d9e94f364237ddd6d938833eb45f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nodl-release"; + rev = "release/humble/ros2nodl/0.3.1-3"; + sha256 = "sha256-8JQgseO9AxfsDy2YuxQ/dojS/6MOLaCKwBGUX8hIgwk="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-lint-auto ament-lint-common ament-mypy python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/humble/ros2param/default.nix b/distros/humble/ros2param/default.nix index 3330b0787e..a0ff041f21 100644 --- a/distros/humble/ros2param/default.nix +++ b/distros/humble/ros2param/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, launch, launch-ros, launch-testing, launch-testing-ros, python3Packages, pythonPackages, rcl-interfaces, rclpy, ros2cli, ros2node, ros2service }: buildRosPackage { pname = "ros-humble-ros2param"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2param/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "de52b3656d9e3543978de33ceca334370988baebb7fe79c7f069246101451a3c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2param/0.18.5-1"; + sha256 = "sha256-DIQYB35PnI321L/GfqryLvzNGRCZu+Yb0dUEajmmCS0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/humble/ros2pkg/default.nix b/distros/humble/ros2pkg/default.nix index 56353012e5..f548577b1f 100644 --- a/distros/humble/ros2pkg/default.nix +++ b/distros/humble/ros2pkg/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-index-python, ament-pep257, ament-xmllint, launch, launch-testing, launch-testing-ros, python3Packages, pythonPackages, ros2cli }: buildRosPackage { pname = "ros-humble-ros2pkg"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2pkg/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "a7ffe941b4733b39c21edb7ea23ea9434ffc35b2a3750a4508cff18d547e04a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2pkg/0.18.5-1"; + sha256 = "sha256-F2DgtxCmAmYE4EEnIPXqQLrhZ+t8Eh233Vaukhp1sLs="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 ament-xmllint launch launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/humble/ros2run/default.nix b/distros/humble/ros2run/default.nix index af9e554fe6..bdee9e0a28 100644 --- a/distros/humble/ros2run/default.nix +++ b/distros/humble/ros2run/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, python3Packages, pythonPackages, ros2cli, ros2pkg }: buildRosPackage { pname = "ros-humble-ros2run"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2run/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "40a6c7dc5e0f674d9856391321ab2fc7c849917682f8c883705be3a8a3bf4bd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2run/0.18.5-1"; + sha256 = "sha256-1FZaR8IRQ7x6khhLCXBgMQRD0JqkEna3005JYLo1jWI="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/humble/ros2service/default.nix b/distros/humble/ros2service/default.nix index 36246a41e2..bd7fc3ddeb 100644 --- a/distros/humble/ros2service/default.nix +++ b/distros/humble/ros2service/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, launch, launch-ros, launch-testing, launch-testing-ros, python3Packages, pythonPackages, rclpy, ros2cli, rosidl-runtime-py, test-msgs }: buildRosPackage { pname = "ros-humble-ros2service"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2service/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "9777f6c67ab66330f2979eed4f83dbaa37fd82a9e426674d384d8b361638d583"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2service/0.18.5-1"; + sha256 = "sha256-wq69dxxYlpOBwNsOaJEjMNk5EkJf5IrdOcGm90AKTuk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest test-msgs ]; diff --git a/distros/humble/ros2test/default.nix b/distros/humble/ros2test/default.nix index 8c7851adcc..98daf1d693 100644 --- a/distros/humble/ros2test/default.nix +++ b/distros/humble/ros2test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2test"; version = "0.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_testing-release/archive/release/humble/ros2test/0.4.0-3.tar.gz"; - name = "0.4.0-3.tar.gz"; - sha256 = "17c9a431a18754ad43a2a124f17294a35f4d1ddc258c0744f172d93e2eeff2b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_testing-release"; + rev = "release/humble/ros2test/0.4.0-3"; + sha256 = "sha256-0ct2zxFuOGf8MCy8K08EszVJLrK4DTFg2kn5JpqzLr0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ros2topic/default.nix b/distros/humble/ros2topic/default.nix index f900d2d6bf..d9240f957a 100644 --- a/distros/humble/ros2topic/default.nix +++ b/distros/humble/ros2topic/default.nix @@ -2,19 +2,23 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, geometry-msgs, launch, launch-ros, launch-testing, launch-testing-ros, python3Packages, pythonPackages, rclpy, ros2cli, rosidl-runtime-py, std-msgs, test-msgs }: +{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, geometry-msgs, launch, launch-ros, launch-testing, launch-testing-ros, python3Packages, pythonPackages, rclpy, ros2cli, rosgraph-msgs, rosidl-runtime-py, std-msgs, test-msgs }: buildRosPackage { pname = "ros-humble-ros2topic"; - version = "0.18.4-r1"; + version = "0.18.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/humble/ros2topic/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "28684cdc5e93252e6ad2b922f4391283fc1f0643c3bf4365fe941c795d470b1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/humble/ros2topic/0.18.5-1"; + sha256 = "sha256-0ck4Tgqfn3qvArrmeWujqj6zv18RMgQTn07Ck+4EsAU="; + }; buildType = "ament_python"; - checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint geometry-msgs launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest std-msgs test-msgs ]; + checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint geometry-msgs launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest rosgraph-msgs std-msgs test-msgs ]; propagatedBuildInputs = [ python3Packages.numpy python3Packages.pyyaml rclpy ros2cli rosidl-runtime-py ]; meta = { diff --git a/distros/humble/ros2trace-analysis/default.nix b/distros/humble/ros2trace-analysis/default.nix index fcdf9698b2..3dea3e1a8d 100644 --- a/distros/humble/ros2trace-analysis/default.nix +++ b/distros/humble/ros2trace-analysis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2trace-analysis"; version = "3.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tracetools_analysis-release/archive/release/humble/ros2trace_analysis/3.0.0-4.tar.gz"; - name = "3.0.0-4.tar.gz"; - sha256 = "13a151da549f7a866ae4b7a7e643b9eb6b71a2a7e4c5c3ff82db50d2c602a8bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tracetools_analysis-release"; + rev = "release/humble/ros2trace_analysis/3.0.0-4"; + sha256 = "sha256-88nEQ39lxqn4A5k9lH63DZqI0nV7umn2QUpbOCQyVpE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/humble/ros2trace/default.nix b/distros/humble/ros2trace/default.nix index 952ebcb522..5b00e2b16b 100644 --- a/distros/humble/ros2trace/default.nix +++ b/distros/humble/ros2trace/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ros2trace"; version = "4.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/humble/ros2trace/4.1.1-1.tar.gz"; - name = "4.1.1-1.tar.gz"; - sha256 = "a857fac26f8eee829574f3b68ace8651b3db8a548e7a58bd1376317148ddab1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/humble/ros2trace/4.1.1-1"; + sha256 = "sha256-NUrR9x2Cum2Cq1ZleWr+iFVOlRKghvuR5RRy7m3soQQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/humble/rosapi-msgs/default.nix b/distros/humble/rosapi-msgs/default.nix index 18b95a7d67..9a626db794 100644 --- a/distros/humble/rosapi-msgs/default.nix +++ b/distros/humble/rosapi-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosapi-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/humble/rosapi_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "2a08000fd0ae32eb771a5689839129c373001800e76866270a72870b66f115d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/humble/rosapi_msgs/1.3.1-1"; + sha256 = "sha256-Q4dTs68oi8RWGF2fto9PtQNCnoH23yoHPnNZkMLJBRE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-default-generators ]; diff --git a/distros/humble/rosapi/default.nix b/distros/humble/rosapi/default.nix index 19ec8df372..f6bcbfe91f 100644 --- a/distros/humble/rosapi/default.nix +++ b/distros/humble/rosapi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosapi"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/humble/rosapi/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "90459e7105d498c75a42ac39911b5f1755dd8448e4570224d59db02d9f1596d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/humble/rosapi/1.3.1-1"; + sha256 = "sha256-xyStRT/4J+A6f1qaIk41X5un6h8s/aFEGdHcIQofWHg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rosbag2-compression-zstd/default.nix b/distros/humble/rosbag2-compression-zstd/default.nix index bc77432d33..13cdf48589 100644 --- a/distros/humble/rosbag2-compression-zstd/default.nix +++ b/distros/humble/rosbag2-compression-zstd/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, pluginlib, rclcpp, rcpputils, rcutils, rosbag2-compression, rosbag2-test-common, zstd-vendor }: buildRosPackage { pname = "ros-humble-rosbag2-compression-zstd"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_compression_zstd/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "2d16caa07be4ad330ab428c3d6c1ea9645b70f840cb6bf6db37b6928df594867"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_compression_zstd/0.15.4-2"; + sha256 = "sha256-EIDnVi1hwxOvK4AAE9pTUVz0f4TNp+MZddNBr39Khf8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-compression/default.nix b/distros/humble/rosbag2-compression/default.nix index 430ddfa00e..79be26476c 100644 --- a/distros/humble/rosbag2-compression/default.nix +++ b/distros/humble/rosbag2-compression/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, rclcpp, rcpputils, rcutils, rosbag2-cpp, rosbag2-storage, rosbag2-test-common }: buildRosPackage { pname = "ros-humble-rosbag2-compression"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_compression/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "7b614e7a375e13cd12ae0ef9fc0a799f39b5ebc220279e39056c99090e7323cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_compression/0.15.4-2"; + sha256 = "sha256-x3P4lKXJP+IYyI2od75BJlwerrXzu4QsZ3cy1iUUIzk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-cpp/default.nix b/distros/humble/rosbag2-cpp/default.nix index 9491b9fdb0..1efc9f2306 100644 --- a/distros/humble/rosbag2-cpp/default.nix +++ b/distros/humble/rosbag2-cpp/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-index-cpp, ament-lint-auto, ament-lint-common, pluginlib, rclcpp, rcpputils, rcutils, rmw, rmw-implementation, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-test-common, rosidl-runtime-c, rosidl-runtime-cpp, rosidl-typesupport-cpp, rosidl-typesupport-introspection-cpp, shared-queues-vendor, test-msgs }: buildRosPackage { pname = "ros-humble-rosbag2-cpp"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_cpp/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "aedebc33eabe86405ee03416bfadb48e6aa2d944f7a2c01ae65bb5e52e240cd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_cpp/0.15.4-2"; + sha256 = "sha256-q/EFvI5Waz+CbPJPq/aidWHfCyOdEgSNTvRr+NmpK0c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-interfaces/default.nix b/distros/humble/rosbag2-interfaces/default.nix index a9ee2f3c51..752bec5ed2 100644 --- a/distros/humble/rosbag2-interfaces/default.nix +++ b/distros/humble/rosbag2-interfaces/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-humble-rosbag2-interfaces"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_interfaces/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "29d9bf83e374b734b073463808199a0f2ebfa2051c150325a63b75c5377ef6ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_interfaces/0.15.4-2"; + sha256 = "sha256-qsY7HslMjj6ToTmLZFiQbsljzXvAiRE5rlf/6FPwGTE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rosbag2-performance-benchmarking/default.nix b/distros/humble/rosbag2-performance-benchmarking/default.nix index 57c162a074..2097c98031 100644 --- a/distros/humble/rosbag2-performance-benchmarking/default.nix +++ b/distros/humble/rosbag2-performance-benchmarking/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rclcpp, rmw, rosbag2-compression, rosbag2-cpp, rosbag2-storage, std-msgs, yaml-cpp-vendor }: buildRosPackage { pname = "ros-humble-rosbag2-performance-benchmarking"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_performance_benchmarking/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "b5b012e94618554a20125bfd44b8f469060f324b6cad87c1b8abbc00ddb604d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_performance_benchmarking/0.15.4-2"; + sha256 = "sha256-OBpF+2rdTK/KvD+x0I1+xVTkLmPlaeobrBacOnr6q+k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-py/default.nix b/distros/humble/rosbag2-py/default.nix index ef444eeefd..bcad4a8a7d 100644 --- a/distros/humble/rosbag2-py/default.nix +++ b/distros/humble/rosbag2-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-python, ament-cmake-ros, ament-lint-auto, ament-lint-common, pybind11-vendor, python-cmake-module, pythonPackages, rcl-interfaces, rclpy, rosbag2-compression, rosbag2-cpp, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-transport, rosidl-runtime-py, rpyutils, std-msgs }: buildRosPackage { pname = "ros-humble-rosbag2-py"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_py/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "d4a80054b9d00e5bc5064f6f90b3d1f5fb35bffc5c7e0f3e2b6aa733d5c979ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_py/0.15.4-2"; + sha256 = "sha256-uV9nypPP3+EvFDQoFX5QLT8kUK4FPkzqQ2Atjv6LS7Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros python-cmake-module ]; diff --git a/distros/humble/rosbag2-storage-default-plugins/default.nix b/distros/humble/rosbag2-storage-default-plugins/default.nix index b59973d88a..d25ab34b56 100644 --- a/distros/humble/rosbag2-storage-default-plugins/default.nix +++ b/distros/humble/rosbag2-storage-default-plugins/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, pluginlib, rcpputils, rcutils, rosbag2-storage, rosbag2-test-common, sqlite3-vendor, yaml-cpp-vendor }: buildRosPackage { pname = "ros-humble-rosbag2-storage-default-plugins"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_storage_default_plugins/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "4085b664b3ead0926ba41274e3c9b8845751a53545def359d137749e293fc32e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_storage_default_plugins/0.15.4-2"; + sha256 = "sha256-SUSMbXTKw0UcEChcR0Oc6M/PRi0tzPGQYQUQGiLFEZE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-storage-mcap-testdata/default.nix b/distros/humble/rosbag2-storage-mcap-testdata/default.nix index 890f597863..9e63076c21 100644 --- a/distros/humble/rosbag2-storage-mcap-testdata/default.nix +++ b/distros/humble/rosbag2-storage-mcap-testdata/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rosidl-default-generators }: buildRosPackage { pname = "ros-humble-rosbag2-storage-mcap-testdata"; - version = "0.6.0-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/humble/rosbag2_storage_mcap_testdata/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "d8305a4055102a97c0f311f22600e3e10525fa974d8daebc8f6bd80b7623c064"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_storage_mcap_testdata/0.15.4-2"; + sha256 = "sha256-kKnaDzwkoVAkuSTvELj9UqDyP9ETRax07LGgP2zlG28="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rosbag2-storage-mcap/default.nix b/distros/humble/rosbag2-storage-mcap/default.nix index be35b321b7..dea0f926a9 100644 --- a/distros/humble/rosbag2-storage-mcap/default.nix +++ b/distros/humble/rosbag2-storage-mcap/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-clang-format, ament-cmake-gmock, ament-index-cpp, ament-lint-auto, ament-lint-common, mcap-vendor, pluginlib, rcpputils, rcutils, rosbag2-cpp, rosbag2-storage, rosbag2-storage-mcap-testdata, rosbag2-test-common, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-clang-format, ament-cmake-gmock, ament-index-cpp, ament-lint-auto, ament-lint-common, mcap-vendor, pluginlib, rcpputils, rcutils, rosbag2-storage, rosbag2-storage-mcap-testdata, rosbag2-test-common, std-msgs }: buildRosPackage { pname = "ros-humble-rosbag2-storage-mcap"; - version = "0.6.0-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/humble/rosbag2_storage_mcap/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "8f8f48cd3a3e2b3f0b71420794b9c8bf769663ff7adf391a5a4157f335822b39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_storage_mcap/0.15.4-2"; + sha256 = "sha256-C4ebGHffACWts7I7JE6O9f+vlsfomYhNUpdmcOqk8ps="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; - checkInputs = [ ament-cmake-clang-format ament-cmake-gmock ament-lint-auto ament-lint-common rcpputils rosbag2-cpp rosbag2-storage-mcap-testdata rosbag2-test-common std-msgs ]; + checkInputs = [ ament-cmake-clang-format ament-cmake-gmock ament-lint-auto ament-lint-common rcpputils rosbag2-storage-mcap-testdata rosbag2-test-common std-msgs ]; propagatedBuildInputs = [ ament-index-cpp mcap-vendor pluginlib rcutils rosbag2-storage ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-storage/default.nix b/distros/humble/rosbag2-storage/default.nix index a59ed259a5..fd15ca4338 100644 --- a/distros/humble/rosbag2-storage/default.nix +++ b/distros/humble/rosbag2-storage/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-gtest, ament-lint-auto, ament-lint-common, pluginlib, rcpputils, rcutils, rosbag2-test-common, yaml-cpp-vendor }: buildRosPackage { pname = "ros-humble-rosbag2-storage"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_storage/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "83846c646e39694544c3502b3d0883440157c8ebdc8005b03de6018ce42acf98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_storage/0.15.4-2"; + sha256 = "sha256-vHiGmjwhzPedGtk3O8p4Z3cAMnjFnXahBJqRSZ3BHkk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-test-common/default.nix b/distros/humble/rosbag2-test-common/default.nix index 5cd00d9cc2..840933800f 100644 --- a/distros/humble/rosbag2-test-common/default.nix +++ b/distros/humble/rosbag2-test-common/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rclcpp, rcutils }: buildRosPackage { pname = "ros-humble-rosbag2-test-common"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_test_common/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "d44be0a25ec2546e6a4f80c3b94989e608b9cf08090d7407dcb68fdb367e2957"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_test_common/0.15.4-2"; + sha256 = "sha256-1OqSjmYk/lth8Tis8btfs/gcnJFkX6YeHnNUcsePQfc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-tests/default.nix b/distros/humble/rosbag2-tests/default.nix index 03401e3ba6..998d1eb584 100644 --- a/distros/humble/rosbag2-tests/default.nix +++ b/distros/humble/rosbag2-tests/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-index-cpp, ament-lint-auto, ament-lint-common, rclcpp, rcpputils, ros2bag, rosbag2-compression, rosbag2-compression-zstd, rosbag2-cpp, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-test-common, std-msgs, test-msgs }: buildRosPackage { pname = "ros-humble-rosbag2-tests"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_tests/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "6c7838bf8cacc318395c5f073772b5f8bc4d830bc4b860d061a45f1342283b89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_tests/0.15.4-2"; + sha256 = "sha256-w0B7/L3sNgiBE9hzqszwDIdWrpj9YcNmywzXUfKx3GU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbag2-transport/default.nix b/distros/humble/rosbag2-transport/default.nix index 850cce61b3..c3ffd78c35 100644 --- a/distros/humble/rosbag2-transport/default.nix +++ b/distros/humble/rosbag2-transport/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gmock, ament-cmake-ros, ament-index-cpp, ament-lint-auto, ament-lint-common, keyboard-handler, rclcpp, rmw, rmw-implementation-cmake, rosbag2-compression, rosbag2-compression-zstd, rosbag2-cpp, rosbag2-interfaces, rosbag2-storage, rosbag2-test-common, shared-queues-vendor, test-msgs, yaml-cpp-vendor }: buildRosPackage { pname = "ros-humble-rosbag2-transport"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2_transport/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "e698a50986c99103de214d43865ad0dcc7704a0a4288e3a3cf9466c7bef15bb1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2_transport/0.15.4-2"; + sha256 = "sha256-NqtJ8oWD1GFuNFKMtw9pmlIuRXEBgXUdeiLyzVfylm0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rosbag2/default.nix b/distros/humble/rosbag2/default.nix index 779adef4e1..aa20877faa 100644 --- a/distros/humble/rosbag2/default.nix +++ b/distros/humble/rosbag2/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ros2bag, rosbag2-compression, rosbag2-compression-zstd, rosbag2-cpp, rosbag2-py, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-test-common, rosbag2-tests, rosbag2-transport, shared-queues-vendor, sqlite3-vendor }: buildRosPackage { pname = "ros-humble-rosbag2"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/rosbag2/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "91569b1dd8ce6b89896303b07f3dcfa252c64aede6a4b540e17854cc497701bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/rosbag2/0.15.4-2"; + sha256 = "sha256-/h9xdIpA8llrC5/v4uHKwChd4WzXQza7/sQUx4Bgn8A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosbridge-library/default.nix b/distros/humble/rosbridge-library/default.nix index 35247fe082..618a21c847 100644 --- a/distros/humble/rosbridge-library/default.nix +++ b/distros/humble/rosbridge-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosbridge-library"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/humble/rosbridge_library/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "3d9730d50cca9b68f47f1eff36f2a61fe7671fc6d37ba3da4db29aa2d1f65999"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/humble/rosbridge_library/1.3.1-1"; + sha256 = "sha256-N/PN8jn57yPt/8PpynUAVchkFfftkKbyDD0SUeiNDRA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/humble/rosbridge-msgs/default.nix b/distros/humble/rosbridge-msgs/default.nix index f7c8ffc298..5154c603cb 100644 --- a/distros/humble/rosbridge-msgs/default.nix +++ b/distros/humble/rosbridge-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosbridge-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/humble/rosbridge_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "8b3b2eed3876eca3fddbf515267aef4f6af59a8bf5d09ee52db209f4dad593cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/humble/rosbridge_msgs/1.3.1-1"; + sha256 = "sha256-fa8a7XqxoY7IgwXCc994LiFABO2+hCdOVKmPRxpT3PQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros builtin-interfaces rosidl-default-generators ]; diff --git a/distros/humble/rosbridge-server/default.nix b/distros/humble/rosbridge-server/default.nix index 8b8b425ee9..1064c04167 100644 --- a/distros/humble/rosbridge-server/default.nix +++ b/distros/humble/rosbridge-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosbridge-server"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/humble/rosbridge_server/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "c1344e1d9b2f593e9bce6bff69e8cb0518eef3d11781af626e049f67fc572355"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/humble/rosbridge_server/1.3.1-1"; + sha256 = "sha256-+/YXaqhSZxsnXK/roPCndJ03rrcWji3q1guEQ09g4jE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/humble/rosbridge-suite/default.nix b/distros/humble/rosbridge-suite/default.nix index d8805dfcfc..cc33779a2c 100644 --- a/distros/humble/rosbridge-suite/default.nix +++ b/distros/humble/rosbridge-suite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosbridge-suite"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/humble/rosbridge_suite/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "402a522e6405ddca4b00de5c4b776096485946df02792601b6e163d3582d66e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/humble/rosbridge_suite/1.3.1-1"; + sha256 = "sha256-GCCnTrZrj1fE7QXPG5N1kyb5GiaunUe6YsYLdnGRJJ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/rosbridge-test-msgs/default.nix b/distros/humble/rosbridge-test-msgs/default.nix index f9157ab41d..2ecd046f3e 100644 --- a/distros/humble/rosbridge-test-msgs/default.nix +++ b/distros/humble/rosbridge-test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosbridge-test-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/humble/rosbridge_test_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "d7dbf6b797946819da9f2dafbc9217ffd54fc82fd7039dac44bdb6a80b57083b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/humble/rosbridge_test_msgs/1.3.1-1"; + sha256 = "sha256-QbIObUjU3gN7gPnoKMc6Yu+ZEnUDP+vtpzT81rjq2xg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rosgraph-msgs/default.nix b/distros/humble/rosgraph-msgs/default.nix index 4befe74997..8f48506cb8 100644 --- a/distros/humble/rosgraph-msgs/default.nix +++ b/distros/humble/rosgraph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosgraph-msgs"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/humble/rosgraph_msgs/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "53d5a5e58c1b34a079cb32208413438117de316127c67da1d1426a1715f6623a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/humble/rosgraph_msgs/1.2.1-1"; + sha256 = "sha256-9WwmVQX38Kmj9mKBy3Qo68QYyt9ptuWlSUx98uW+Ejo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rosidl-adapter/default.nix b/distros/humble/rosidl-adapter/default.nix index 9a052f7bbc..82dcf1fc0a 100644 --- a/distros/humble/rosidl-adapter/default.nix +++ b/distros/humble/rosidl-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-adapter"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_adapter/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "454d8c14715eaeada18b5e2ead992cabfd2f310b56727910370fab72d690bc6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_adapter/3.1.4-1"; + sha256 = "sha256-A7TQS4gy0Vuc82Sk2/j/FHt7zjWQq2i9ggeAsXjNO1k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosidl-cli/default.nix b/distros/humble/rosidl-cli/default.nix index 1235c67ae0..4a9934dc11 100644 --- a/distros/humble/rosidl-cli/default.nix +++ b/distros/humble/rosidl-cli/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-cli"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_cli/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "4433a5902065f400a4fd438e0663ad5a5a2900382c9121d56ec402450d0d3271"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_cli/3.1.4-1"; + sha256 = "sha256-fnycr256HCI6PMNTpW/69890bNrExJwKd3OzxeFaNMk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/humble/rosidl-cmake/default.nix b/distros/humble/rosidl-cmake/default.nix index ea159c94fe..f8d88fb1e8 100644 --- a/distros/humble/rosidl-cmake/default.nix +++ b/distros/humble/rosidl-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-cmake"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_cmake/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "06f09be35abc2db16eeb49f890b0c775ec4e84c238f4b5ede10d211728f08986"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_cmake/3.1.4-1"; + sha256 = "sha256-2hwZhE3cVq7tLhmr+iu/qXlN89pXeou1W8l2moSORiU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/humble/rosidl-default-generators/default.nix b/distros/humble/rosidl-default-generators/default.nix index 387767cdad..dc6696decd 100644 --- a/distros/humble/rosidl-default-generators/default.nix +++ b/distros/humble/rosidl-default-generators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-default-generators"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/humble/rosidl_default_generators/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "4a7ac8bb2e58a6b0d3adbb2329f048ffba1f6358044b2be490869e7b428e2188"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_defaults-release"; + rev = "release/humble/rosidl_default_generators/1.2.0-2"; + sha256 = "sha256-vtXybJ/2s8rmMVm19tQKopkkTncUiSzDqk5LQS/2tBc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosidl-default-runtime/default.nix b/distros/humble/rosidl-default-runtime/default.nix index f94051dd7b..87e171abd5 100644 --- a/distros/humble/rosidl-default-runtime/default.nix +++ b/distros/humble/rosidl-default-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-default-runtime"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/humble/rosidl_default_runtime/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "878f2541e775ab1d1ac8bd616a667c762acd925699c33c89646d45988c61e60c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_defaults-release"; + rev = "release/humble/rosidl_default_runtime/1.2.0-2"; + sha256 = "sha256-D8f8pyTUOE6fCgzufPRrcZ55sRlr69SdumuckOP+L9A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosidl-generator-c/default.nix b/distros/humble/rosidl-generator-c/default.nix index 033927e5ef..75583382bc 100644 --- a/distros/humble/rosidl-generator-c/default.nix +++ b/distros/humble/rosidl-generator-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-generator-c"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_generator_c/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "11ce9241c8c8c9303b47ae050cd8d994aeca93a4dd759cc0116ec75f14952825"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_generator_c/3.1.4-1"; + sha256 = "sha256-4bGynla3wv6QFs1B2EnNSZTCwad1mhxveqKJXBSFDi0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros ]; diff --git a/distros/humble/rosidl-generator-cpp/default.nix b/distros/humble/rosidl-generator-cpp/default.nix index 26e5613615..d83d5069aa 100644 --- a/distros/humble/rosidl-generator-cpp/default.nix +++ b/distros/humble/rosidl-generator-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-generator-cpp"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_generator_cpp/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "98637e8223df9a4e1a797b6f3a2752ac959544ad96bd1799cd2b977505089d0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_generator_cpp/3.1.4-1"; + sha256 = "sha256-d3uVelG9EUTbXwxw55iBg0rxWoDYHtxUOCJJ03FSawM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosidl-generator-dds-idl/default.nix b/distros/humble/rosidl-generator-dds-idl/default.nix index e6e1377029..dc30da09cf 100644 --- a/distros/humble/rosidl-generator-dds-idl/default.nix +++ b/distros/humble/rosidl-generator-dds-idl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-generator-dds-idl"; version = "0.8.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_dds-release/archive/release/humble/rosidl_generator_dds_idl/0.8.1-2.tar.gz"; - name = "0.8.1-2.tar.gz"; - sha256 = "c6e82b80a5f6b86113d55700cedcf553b66293bf8a91af673f823878e363e135"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_dds-release"; + rev = "release/humble/rosidl_generator_dds_idl/0.8.1-2"; + sha256 = "sha256-UbHyVv/Xq0JbRDATE+abOq2ictJ0GXQ/mufIPF8i8A8="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-pytest ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/rosidl-generator-py/default.nix b/distros/humble/rosidl-generator-py/default.nix index 3be39a2ff3..0f9122471b 100644 --- a/distros/humble/rosidl-generator-py/default.nix +++ b/distros/humble/rosidl-generator-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-generator-py"; version = "0.14.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_python-release/archive/release/humble/rosidl_generator_py/0.14.4-1.tar.gz"; - name = "0.14.4-1.tar.gz"; - sha256 = "c42bf0238f4f0c9d753d5ef6e28c8d75897d65b225277d9d47ad178752d3288e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_python-release"; + rev = "release/humble/rosidl_generator_py/0.14.4-1"; + sha256 = "sha256-Jp9R01WPAydslbFGcZGc3bNj7fqZgTGvygwYkF7HUac="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-pytest ament-index-python ament-lint-auto ament-lint-common python-cmake-module python3Packages.numpy pythonPackages.pytest rmw rosidl-cmake rosidl-generator-c rosidl-generator-cpp rosidl-parser rosidl-typesupport-c rosidl-typesupport-fastrtps-c rosidl-typesupport-introspection-c rpyutils test-interface-files ]; diff --git a/distros/humble/rosidl-parser/default.nix b/distros/humble/rosidl-parser/default.nix index cdacc8e75e..3f4c2dc694 100644 --- a/distros/humble/rosidl-parser/default.nix +++ b/distros/humble/rosidl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-parser"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_parser/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "3ececdeb8fc8d6951ae537558c98be69cd6cc473e24f5a72cc4166cbd0b8ce1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_parser/3.1.4-1"; + sha256 = "sha256-q7IF8v2peZVfmtQoplD8J3ayWV5y9gEt6uMHCoBbo+M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosidl-runtime-c/default.nix b/distros/humble/rosidl-runtime-c/default.nix index 64d4cdd183..d160a0f549 100644 --- a/distros/humble/rosidl-runtime-c/default.nix +++ b/distros/humble/rosidl-runtime-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-runtime-c"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_runtime_c/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "50256badd9c03f0b253a16d4f406cf05b751e5544d13c7c07d06786ceae906c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_runtime_c/3.1.4-1"; + sha256 = "sha256-YpYiT5E/atSgXkrtBkOXeuIiEaUVHlBpaHE0bBWyKqI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rosidl-runtime-cpp/default.nix b/distros/humble/rosidl-runtime-cpp/default.nix index 8eda977c18..b5f50df0d0 100644 --- a/distros/humble/rosidl-runtime-cpp/default.nix +++ b/distros/humble/rosidl-runtime-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-runtime-cpp"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_runtime_cpp/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "32440b5fdfd8df90e002bccc3a9d1bd4ec5a0ea2dacb4a85d1bcb73024883fc1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_runtime_cpp/3.1.4-1"; + sha256 = "sha256-J5Dv2T1mMflVM+fTpK1eGrrGV4UQVWd/YuaKWiIQJfs="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common performance-test-fixture ]; diff --git a/distros/humble/rosidl-runtime-py/default.nix b/distros/humble/rosidl-runtime-py/default.nix index 5e6a08d4f0..c5dba19453 100644 --- a/distros/humble/rosidl-runtime-py/default.nix +++ b/distros/humble/rosidl-runtime-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-runtime-py"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_runtime_py-release/archive/release/humble/rosidl_runtime_py/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "74a677584c14e7f248efeef51889047be931de4ecfefab3b22897903f7a6b6f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_runtime_py-release"; + rev = "release/humble/rosidl_runtime_py/0.9.3-1"; + sha256 = "sha256-MUYbiVx360VWn/HJ8UHL02+QwvfOKxMZj+B+NvOLdHk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest std-msgs std-srvs test-msgs ]; diff --git a/distros/humble/rosidl-typesupport-c/default.nix b/distros/humble/rosidl-typesupport-c/default.nix index 26cfb0c648..0cc9382409 100644 --- a/distros/humble/rosidl-typesupport-c/default.nix +++ b/distros/humble/rosidl-typesupport-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-typesupport-c"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/humble/rosidl_typesupport_c/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "98e0dc0df20ebf3a9b8222db07d970f3bbe67ed937a4ee72c6a73e053378b510"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport-release"; + rev = "release/humble/rosidl_typesupport_c/2.0.0-2"; + sha256 = "sha256-nOo9egEXV6lM3TllNPG5gqsOp+beZ7b02hf9idZhhEY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-introspection-c ]; diff --git a/distros/humble/rosidl-typesupport-cpp/default.nix b/distros/humble/rosidl-typesupport-cpp/default.nix index d8b410e17d..e42f28a72e 100644 --- a/distros/humble/rosidl-typesupport-cpp/default.nix +++ b/distros/humble/rosidl-typesupport-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-typesupport-cpp"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/humble/rosidl_typesupport_cpp/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "a3b0abbad82f87096c59792214c0e3adbf9e9234296b0ccee0dd5542eafa6c88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport-release"; + rev = "release/humble/rosidl_typesupport_cpp/2.0.0-2"; + sha256 = "sha256-cck7L+c8Pc/Js0zBTTdgb9HC/gHgBdTZz86djuAMbjE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-introspection-cpp ]; diff --git a/distros/humble/rosidl-typesupport-fastrtps-c/default.nix b/distros/humble/rosidl-typesupport-fastrtps-c/default.nix index cdf37b9b72..0f8ebfe253 100644 --- a/distros/humble/rosidl-typesupport-fastrtps-c/default.nix +++ b/distros/humble/rosidl-typesupport-fastrtps-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-typesupport-fastrtps-c"; version = "2.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/humble/rosidl_typesupport_fastrtps_c/2.2.0-2.tar.gz"; - name = "2.2.0-2.tar.gz"; - sha256 = "a200141f07014302a96b7ccfd0ad0addc33a3512e0ede31c91120673a843299a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/humble/rosidl_typesupport_fastrtps_c/2.2.0-2"; + sha256 = "sha256-zyYOVte78qfF1d2ZQsRGfZHaDKREHXykaTMf4uCyo6U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/humble/rosidl-typesupport-fastrtps-cpp/default.nix b/distros/humble/rosidl-typesupport-fastrtps-cpp/default.nix index a1f391a78a..bc62040166 100644 --- a/distros/humble/rosidl-typesupport-fastrtps-cpp/default.nix +++ b/distros/humble/rosidl-typesupport-fastrtps-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-typesupport-fastrtps-cpp"; version = "2.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/humble/rosidl_typesupport_fastrtps_cpp/2.2.0-2.tar.gz"; - name = "2.2.0-2.tar.gz"; - sha256 = "853b3c4cac63a416be3fc2de4bfb58e5eb57b7761ec4821fc08ea43150814ab8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/humble/rosidl_typesupport_fastrtps_cpp/2.2.0-2"; + sha256 = "sha256-dsamUxje4vbDePqLtGlvd8cj6sAVsksUszRCnsO1drM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/rosidl-typesupport-interface/default.nix b/distros/humble/rosidl-typesupport-interface/default.nix index 04c00c0bdd..e3769308cb 100644 --- a/distros/humble/rosidl-typesupport-interface/default.nix +++ b/distros/humble/rosidl-typesupport-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-typesupport-interface"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_typesupport_interface/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "c33b7040c0373090b51b4e96f31033999c1b22e6d57d8d34c31dc63610003511"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_typesupport_interface/3.1.4-1"; + sha256 = "sha256-jIP+eyU+CavVHpwGlU0NTmo32MFEU1vqzRzmB/0oVQM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rosidl-typesupport-introspection-c/default.nix b/distros/humble/rosidl-typesupport-introspection-c/default.nix index 4eaa90340d..4bca82a6fd 100644 --- a/distros/humble/rosidl-typesupport-introspection-c/default.nix +++ b/distros/humble/rosidl-typesupport-introspection-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-typesupport-introspection-c"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_typesupport_introspection_c/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "5c3cac9854c9139b602417c7f565867eb25f3cf4e1a5f80c9fc615dff1664c74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_typesupport_introspection_c/3.1.4-1"; + sha256 = "sha256-fnYFWQ0pJdQh0S+NN+rMG4+8l3DohpBPLY2OO7/Gqrs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rosidl-typesupport-introspection-cpp/default.nix b/distros/humble/rosidl-typesupport-introspection-cpp/default.nix index 1bd98067dc..29f30bebca 100644 --- a/distros/humble/rosidl-typesupport-introspection-cpp/default.nix +++ b/distros/humble/rosidl-typesupport-introspection-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rosidl-typesupport-introspection-cpp"; version = "3.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/humble/rosidl_typesupport_introspection_cpp/3.1.4-1.tar.gz"; - name = "3.1.4-1.tar.gz"; - sha256 = "efe1c14446cbecc66469d96ad265c21c2e6c2f90f4474c2ba30548fd9464483c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/humble/rosidl_typesupport_introspection_cpp/3.1.4-1"; + sha256 = "sha256-vafWo5655vXC1Kogxvtj0YMU/CBM6nOLw3MFvSCdqbo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/rot-conv/default.nix b/distros/humble/rot-conv/default.nix index dd99569803..71ac1c4fa9 100644 --- a/distros/humble/rot-conv/default.nix +++ b/distros/humble/rot-conv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rot-conv"; version = "1.0.11-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rot_conv_lib-release/archive/release/humble/rot_conv/1.0.11-2.tar.gz"; - name = "1.0.11-2.tar.gz"; - sha256 = "2c41af103e6d85937bac5d157dfffd6d8442edd7c48984bc54a97f8b49278493"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rot_conv_lib-release"; + rev = "release/humble/rot_conv/1.0.11-2"; + sha256 = "sha256-6/6mfqRarCEYQCMc18m5vFDCS0UjiBqGWsoHUEB7LiU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rplidar-ros/default.nix b/distros/humble/rplidar-ros/default.nix index 25881de94e..436895ac90 100644 --- a/distros/humble/rplidar-ros/default.nix +++ b/distros/humble/rplidar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rplidar-ros"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rplidar_ros-release/archive/release/humble/rplidar_ros/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "607951a119995e471d3c5d19b9022d54a2ee4de7d92865036f19ec9433b17885"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rplidar_ros-release"; + rev = "release/humble/rplidar_ros/2.1.0-1"; + sha256 = "sha256-lOiYrTggsDiQb9sCYtWAup4+kVoMnpSYqKqWGtnb2AU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ament-cmake-ros ]; diff --git a/distros/humble/rpyutils/default.nix b/distros/humble/rpyutils/default.nix index 878af1830c..c8ee08229e 100644 --- a/distros/humble/rpyutils/default.nix +++ b/distros/humble/rpyutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rpyutils"; version = "0.2.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rpyutils-release/archive/release/humble/rpyutils/0.2.1-2.tar.gz"; - name = "0.2.1-2.tar.gz"; - sha256 = "d35a40fddeb91bd9d436fffbf8081b71fec4a60934be2f05555519f62cccb81c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rpyutils-release"; + rev = "release/humble/rpyutils/0.2.1-2"; + sha256 = "sha256-SLFZqnfQmfF/5Mf3+hq8ePwMaE+e44rkrYJ62KU6+aU="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/humble/rqt-action/default.nix b/distros/humble/rqt-action/default.nix index 4133e7e8b3..1b824089c4 100644 --- a/distros/humble/rqt-action/default.nix +++ b/distros/humble/rqt-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-action"; version = "2.0.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_action-release/archive/release/humble/rqt_action/2.0.1-3.tar.gz"; - name = "2.0.1-3.tar.gz"; - sha256 = "12112e90139283eeecf37fd61d55dd7a1254eeb3c394271e9d5134b7dc8237fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_action-release"; + rev = "release/humble/rqt_action/2.0.1-3"; + sha256 = "sha256-YE20Hf//2FHYnbnCI5YOD9PWfHDi8xkZwtt5cRkz1io="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding rclpy rqt-gui rqt-gui-py rqt-msg rqt-py-common ]; diff --git a/distros/humble/rqt-bag-plugins/default.nix b/distros/humble/rqt-bag-plugins/default.nix index 1ca6c13f1b..675d11d9ad 100644 --- a/distros/humble/rqt-bag-plugins/default.nix +++ b/distros/humble/rqt-bag-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-bag-plugins"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_bag-release/archive/release/humble/rqt_bag_plugins/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "722740238f2059ba717e953dffe7628941ccc7f04346644a49e2b161fbd7cfe8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_bag-release"; + rev = "release/humble/rqt_bag_plugins/1.1.4-1"; + sha256 = "sha256-EjU7yehytEhkH9wZvjCav4ddHYI+FyrvtxYPOJA1ALI="; + }; buildType = "ament_python"; propagatedBuildInputs = [ geometry-msgs python3Packages.pillow python3Packages.pycairo rclpy rosbag2 rqt-bag rqt-gui rqt-gui-py rqt-plot sensor-msgs std-msgs ]; diff --git a/distros/humble/rqt-bag/default.nix b/distros/humble/rqt-bag/default.nix index 5994f96cf9..12bb681bcf 100644 --- a/distros/humble/rqt-bag/default.nix +++ b/distros/humble/rqt-bag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-bag"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_bag-release/archive/release/humble/rqt_bag/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "ec2ced29c2eb4d794ac40285762c0e0ca526646794d4a6ca21bab932dd4cb258"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_bag-release"; + rev = "release/humble/rqt_bag/1.1.4-1"; + sha256 = "sha256-JxzNj0JvktfoXlixmG/Sm1t4u4AV0RVUwN8S0jZZeVc="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding rclpy rosbag2-py rqt-gui rqt-gui-py ]; diff --git a/distros/humble/rqt-common-plugins/default.nix b/distros/humble/rqt-common-plugins/default.nix index 2b89ac8167..f1658cdfa5 100644 --- a/distros/humble/rqt-common-plugins/default.nix +++ b/distros/humble/rqt-common-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-common-plugins"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_common_plugins-release/archive/release/humble/rqt_common_plugins/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "4d949634b468347fc8a2949232bb6528e2af63d3e9efd2f02b0f78061458da34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_common_plugins-release"; + rev = "release/humble/rqt_common_plugins/1.2.0-1"; + sha256 = "sha256-rSJ8tB78EOgjtaHw8wleVvW+Rx9+z5d0IAznXj0aKmg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rqt-console/default.nix b/distros/humble/rqt-console/default.nix index 9cc2a1a81e..9d8612be53 100644 --- a/distros/humble/rqt-console/default.nix +++ b/distros/humble/rqt-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-console"; version = "2.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_console-release/archive/release/humble/rqt_console/2.0.2-3.tar.gz"; - name = "2.0.2-3.tar.gz"; - sha256 = "06759f530a897cb663e7d7648843466bfb775dc8bdd2f86adf727c1b46b6c760"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_console-release"; + rev = "release/humble/rqt_console/2.0.2-3"; + sha256 = "sha256-a2PcWtK997Gm2BkwEUHFMGfhy29uJPQwRt7CpqL83xg="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding rcl-interfaces rclpy rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/humble/rqt-controller-manager/default.nix b/distros/humble/rqt-controller-manager/default.nix index fb5113c3a2..50fef79401 100644 --- a/distros/humble/rqt-controller-manager/default.nix +++ b/distros/humble/rqt-controller-manager/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, controller-manager-msgs, rclpy, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-humble-rqt-controller-manager"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/rqt_controller_manager/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "a4b811bb9d61d024366d8d710af9335e4f148b10ec6266e55c8fcb72dcad4714"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/rqt_controller_manager/2.21.0-1"; + sha256 = "sha256-RbMTNUPw5dyLRX/QKw0RO2J49UV0LxOvfSyM0x+pxEo="; + }; buildType = "ament_python"; propagatedBuildInputs = [ controller-manager-msgs rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/humble/rqt-graph/default.nix b/distros/humble/rqt-graph/default.nix index 58c938846b..bb784b6ccd 100644 --- a/distros/humble/rqt-graph/default.nix +++ b/distros/humble/rqt-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-graph"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_graph-release/archive/release/humble/rqt_graph/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "83b91378ba6784838afb72ed518fa74b85917fcd0754c88de47eb64209a243e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_graph-release"; + rev = "release/humble/rqt_graph/1.3.0-1"; + sha256 = "sha256-DHW+qtooAbRbltsOgjKZG7hoxFQRjeW+ySu9UtSsi9A="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding qt-dotgraph rqt-gui rqt-gui-py ]; diff --git a/distros/humble/rqt-gui-cpp/default.nix b/distros/humble/rqt-gui-cpp/default.nix index a68a9c1456..9142d8190c 100644 --- a/distros/humble/rqt-gui-cpp/default.nix +++ b/distros/humble/rqt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-gui-cpp"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/humble/rqt_gui_cpp/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "8ebf87599693fbeab3ed3274d74410f1ea1babc174c8cba95f9e5f7c8d8187c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/humble/rqt_gui_cpp/1.1.4-1"; + sha256 = "sha256-3oPMWFKkxJOkgApFtRYY2IOmkPlpWi/BQCRpIYS0miU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/humble/rqt-gui-py/default.nix b/distros/humble/rqt-gui-py/default.nix index 9976e1c269..4f86347bdb 100644 --- a/distros/humble/rqt-gui-py/default.nix +++ b/distros/humble/rqt-gui-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-gui-py"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/humble/rqt_gui_py/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "0b3c5165f8d1e30264d464242e151f5b02201a1d16f3c6a418b588d16c8f7e86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/humble/rqt_gui_py/1.1.4-1"; + sha256 = "sha256-jP7e9GNl8xCGWMizCSL/aj+9Zvem9F+8kHcyKOCuE/I="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/rqt-gui/default.nix b/distros/humble/rqt-gui/default.nix index 4362f5e6f9..b5a9471c20 100644 --- a/distros/humble/rqt-gui/default.nix +++ b/distros/humble/rqt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-gui"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/humble/rqt_gui/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "501a7b79d9936f644e1c9ff18056ed1df18a3c47110224bb634c9f9177eec030"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/humble/rqt_gui/1.1.4-1"; + sha256 = "sha256-eH53JHQpa99RtEoZlEMNVXiGi0FLIePgnwxFDuoEhY4="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/rqt-image-overlay-layer/default.nix b/distros/humble/rqt-image-overlay-layer/default.nix index cb5b8de4f5..3e139e2bc3 100644 --- a/distros/humble/rqt-image-overlay-layer/default.nix +++ b/distros/humble/rqt-image-overlay-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-image-overlay-layer"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_overlay-release/archive/release/humble/rqt_image_overlay_layer/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "6f117ecd38f566866e35fb44949abd4049b7e3dff74d6f6d1edcd1f03a35b375"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_image_overlay-release"; + rev = "release/humble/rqt_image_overlay_layer/0.1.3-1"; + sha256 = "sha256-qBXKAQurQgQhoyzn8PRbIOjiZJ2TiEYEaqPtQO+o7H8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rqt-image-overlay/default.nix b/distros/humble/rqt-image-overlay/default.nix index e9eb98d019..77c04f5e16 100644 --- a/distros/humble/rqt-image-overlay/default.nix +++ b/distros/humble/rqt-image-overlay/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-image-overlay"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_overlay-release/archive/release/humble/rqt_image_overlay/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "ad0d97e88c490b06bd486c480f65ddc6686bb6eb5e8883c3fcfee9e3415c3930"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_image_overlay-release"; + rev = "release/humble/rqt_image_overlay/0.1.3-1"; + sha256 = "sha256-rPS2F9QZ5QONO3jPFhyrtwhELpio617S9fbPeCfkqYk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rqt-image-view/default.nix b/distros/humble/rqt-image-view/default.nix index 255b148306..8de8e3ee33 100644 --- a/distros/humble/rqt-image-view/default.nix +++ b/distros/humble/rqt-image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-image-view"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_view-release/archive/release/humble/rqt_image_view/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "a004e73d92bad2648bbf09be411f6944c364c859a84a9c28ff7db6eb408ae6eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_image_view-release"; + rev = "release/humble/rqt_image_view/1.2.0-2"; + sha256 = "sha256-X3GHcEegbG/Z45tA1fhYO3xlE1Fr0WKRaNpZRXYhF2Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/humble/rqt-joint-trajectory-controller/default.nix b/distros/humble/rqt-joint-trajectory-controller/default.nix index 5876406051..0b5b1bd23f 100644 --- a/distros/humble/rqt-joint-trajectory-controller/default.nix +++ b/distros/humble/rqt-joint-trajectory-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, control-msgs, controller-manager-msgs, python-qt-binding, python3Packages, qt-gui, rclpy, rqt-gui, rqt-gui-py, trajectory-msgs }: buildRosPackage { pname = "ros-humble-rqt-joint-trajectory-controller"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/rqt_joint_trajectory_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "47aa1824859f38411e4dc793d6668d59b587374e650a65a71ebbaf26e6715201"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/rqt_joint_trajectory_controller/2.16.0-1"; + sha256 = "sha256-q3tFCYR11qtGhLg5vWSgr9ygMFCzuQjC55CBUKBGRwA="; + }; buildType = "ament_python"; propagatedBuildInputs = [ control-msgs controller-manager-msgs python-qt-binding python3Packages.rospkg qt-gui rclpy rqt-gui rqt-gui-py trajectory-msgs ]; diff --git a/distros/humble/rqt-moveit/default.nix b/distros/humble/rqt-moveit/default.nix index 324f34c275..8d419dc41e 100644 --- a/distros/humble/rqt-moveit/default.nix +++ b/distros/humble/rqt-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-moveit"; version = "1.0.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_moveit-release/archive/release/humble/rqt_moveit/1.0.1-3.tar.gz"; - name = "1.0.1-3.tar.gz"; - sha256 = "479029b190e2c85a94f8a82146f968bb2e816b6a5b53d172f1428b3ba21346ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_moveit-release"; + rev = "release/humble/rqt_moveit/1.0.1-3"; + sha256 = "sha256-A4bGoHfpokKaYjSrBzvtYgzyf6sJGECfPJCIM0iZgYU="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.setuptools rosidl-default-generators ]; diff --git a/distros/humble/rqt-msg/default.nix b/distros/humble/rqt-msg/default.nix index 148ae54698..5038c4ec65 100644 --- a/distros/humble/rqt-msg/default.nix +++ b/distros/humble/rqt-msg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-msg"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_msg-release/archive/release/humble/rqt_msg/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "a457834c44068d33b03bdad0fe9cffe7da199f0e863fe51532f38f47bef1b848"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_msg-release"; + rev = "release/humble/rqt_msg/1.2.0-1"; + sha256 = "sha256-FyLj4I2R0NF5DK+LFLMbZCOzhfm9D5wwkNzFC9odAgE="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg rclpy rqt-console rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/humble/rqt-plot/default.nix b/distros/humble/rqt-plot/default.nix index c83c14f95e..e1982ef2b1 100644 --- a/distros/humble/rqt-plot/default.nix +++ b/distros/humble/rqt-plot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-plot"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_plot-release/archive/release/humble/rqt_plot/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "0b79948cc297ac24f789161fc6560de94e205ff05cb16c688adbfa7b8667621b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_plot-release"; + rev = "release/humble/rqt_plot/1.1.2-1"; + sha256 = "sha256-B58/zc1QB0LN58S+4u16C6x6cGSJgIAuy81H3YhGKp0="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg python3Packages.matplotlib python3Packages.numpy qt-gui-py-common rclpy rqt-gui rqt-gui-py rqt-py-common std-msgs ]; diff --git a/distros/humble/rqt-publisher/default.nix b/distros/humble/rqt-publisher/default.nix index c5e978cc19..26e6efc6d2 100644 --- a/distros/humble/rqt-publisher/default.nix +++ b/distros/humble/rqt-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-publisher"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_publisher-release/archive/release/humble/rqt_publisher/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "96f9ca2d88195de9faa4997076b6a935322fa9ef7defc6ff22b6111b29c99c64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_publisher-release"; + rev = "release/humble/rqt_publisher/1.5.0-1"; + sha256 = "sha256-TUzzaAtuC8QQpggWr5+VS4qa+8q3Ni6gYYSszPAOxv0="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg qt-gui-py-common rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/humble/rqt-py-common/default.nix b/distros/humble/rqt-py-common/default.nix index 055ea9ce28..87adabb3aa 100644 --- a/distros/humble/rqt-py-common/default.nix +++ b/distros/humble/rqt-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-py-common"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/humble/rqt_py_common/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "d4fff9ad6dd1f6aba35873040e5681f6be38a01c58e858d1c43883c7dc041b2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/humble/rqt_py_common/1.1.4-1"; + sha256 = "sha256-GK7iIHH+KYNKNaQYBnyDAwk1UsxVwPfckqljxbheN4g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rqt-py-console/default.nix b/distros/humble/rqt-py-console/default.nix index b17336caee..a6504e7e75 100644 --- a/distros/humble/rqt-py-console/default.nix +++ b/distros/humble/rqt-py-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-py-console"; version = "1.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_py_console-release/archive/release/humble/rqt_py_console/1.0.2-3.tar.gz"; - name = "1.0.2-3.tar.gz"; - sha256 = "a6f45c7bb2e61c6503ede1a13f2b79974e2c153e15a812cdd6790663d8d49254"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_py_console-release"; + rev = "release/humble/rqt_py_console/1.0.2-3"; + sha256 = "sha256-yLjOc2LoQeh7Yx+T6GKB+Xbdm3NG47pMTU2gIzn+uZY="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding qt-gui qt-gui-py-common rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/humble/rqt-reconfigure/default.nix b/distros/humble/rqt-reconfigure/default.nix index 4f01436d6c..ee7c1958fe 100644 --- a/distros/humble/rqt-reconfigure/default.nix +++ b/distros/humble/rqt-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-reconfigure"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_reconfigure-release/archive/release/humble/rqt_reconfigure/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "802dd23f447a9046b0dabd35ecf312f76d6a79183c07be905a56b3f6dcfa4e4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_reconfigure-release"; + rev = "release/humble/rqt_reconfigure/1.1.1-1"; + sha256 = "sha256-PFDoCfUOEV6QDxl+KWTOyMjsNDRlAgRM1+8SXP68teQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-xmllint ]; diff --git a/distros/humble/rqt-robot-dashboard/default.nix b/distros/humble/rqt-robot-dashboard/default.nix index d21f156796..3b5d363468 100644 --- a/distros/humble/rqt-robot-dashboard/default.nix +++ b/distros/humble/rqt-robot-dashboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-robot-dashboard"; version = "0.6.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_dashboard-release/archive/release/humble/rqt_robot_dashboard/0.6.1-3.tar.gz"; - name = "0.6.1-3.tar.gz"; - sha256 = "b38454be3d745cbae51f3ac169ea7ab0089a09e39f2a621ba7fc41bf2ebddc4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_robot_dashboard-release"; + rev = "release/humble/rqt_robot_dashboard/0.6.1-3"; + sha256 = "sha256-o2FskVGSpDLTcYD8PlfRgHpBlDa3UId/Xq+IlAvaZGY="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.setuptools ]; diff --git a/distros/humble/rqt-robot-monitor/default.nix b/distros/humble/rqt-robot-monitor/default.nix index 207a2acfb6..9824eefb26 100644 --- a/distros/humble/rqt-robot-monitor/default.nix +++ b/distros/humble/rqt-robot-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-robot-monitor"; version = "1.0.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_monitor-release/archive/release/humble/rqt_robot_monitor/1.0.5-2.tar.gz"; - name = "1.0.5-2.tar.gz"; - sha256 = "d49637f038374f091b0fa296b4d77d1a5d25f2c5397e5e46f7e774c296d69ac8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_robot_monitor-release"; + rev = "release/humble/rqt_robot_monitor/1.0.5-2"; + sha256 = "sha256-4cOwsLyW7ouFZM1kNCA3d/8k1Ogm6pt51x0xuWtGqcA="; + }; buildType = "ament_python"; buildInputs = [ rosidl-default-generators ]; diff --git a/distros/humble/rqt-robot-steering/default.nix b/distros/humble/rqt-robot-steering/default.nix index 7ed17774eb..c9b2e9dbd5 100644 --- a/distros/humble/rqt-robot-steering/default.nix +++ b/distros/humble/rqt-robot-steering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-robot-steering"; version = "1.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_steering-release/archive/release/humble/rqt_robot_steering/1.0.0-4.tar.gz"; - name = "1.0.0-4.tar.gz"; - sha256 = "9059965d71f3e4b81b2f9bc45e927ab913e92818905c62abdbae1fd162ee4541"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_robot_steering-release"; + rev = "release/humble/rqt_robot_steering/1.0.0-4"; + sha256 = "sha256-GQCdfFYxE/yR3Eostcf+T9VKwP2N45EzidAhXz5uVrw="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python geometry-msgs python-qt-binding rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/humble/rqt-runtime-monitor/default.nix b/distros/humble/rqt-runtime-monitor/default.nix index 29cdfd3209..673ff7bcbe 100644 --- a/distros/humble/rqt-runtime-monitor/default.nix +++ b/distros/humble/rqt-runtime-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-runtime-monitor"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_runtime_monitor-release/archive/release/humble/rqt_runtime_monitor/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "ae351146e14f6bc95b76fb4992c5e57d9033c0f9d9807263e1fd2cb61acf8f82"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_runtime_monitor-release"; + rev = "release/humble/rqt_runtime_monitor/1.0.0-3"; + sha256 = "sha256-7LyebmhKcj1ltMsj4LbDUxXX5v9ejuW4g4lIKitP28Q="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/rqt-service-caller/default.nix b/distros/humble/rqt-service-caller/default.nix index d42bf6c3e8..ed925cefd8 100644 --- a/distros/humble/rqt-service-caller/default.nix +++ b/distros/humble/rqt-service-caller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-service-caller"; version = "1.0.5-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_service_caller-release/archive/release/humble/rqt_service_caller/1.0.5-3.tar.gz"; - name = "1.0.5-3.tar.gz"; - sha256 = "2b6452bbaefe8194e87be8624ffefd4869e70c552dcd7bd6ffe93573cae790c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_service_caller-release"; + rev = "release/humble/rqt_service_caller/1.0.5-3"; + sha256 = "sha256-ZIAMenPCiVlqoXUvFI0pukwPJC43v4GOkQH7JEHO9W4="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/humble/rqt-shell/default.nix b/distros/humble/rqt-shell/default.nix index cb19e29398..1326e3626f 100644 --- a/distros/humble/rqt-shell/default.nix +++ b/distros/humble/rqt-shell/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-shell"; version = "1.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_shell-release/archive/release/humble/rqt_shell/1.0.2-3.tar.gz"; - name = "1.0.2-3.tar.gz"; - sha256 = "ff2799774bc4ba6b5c73bd90cc0a50cc7117d16dc601e343039c5bd107cadb63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_shell-release"; + rev = "release/humble/rqt_shell/1.0.2-3"; + sha256 = "sha256-TQTnT4NLOyyBYWKjB+/sJ7oGIkAG3FXQezqxdFXUGQc="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg qt-gui qt-gui-py-common rqt-gui rqt-gui-py ]; diff --git a/distros/humble/rqt-srv/default.nix b/distros/humble/rqt-srv/default.nix index 2504655d61..3af3cd215c 100644 --- a/distros/humble/rqt-srv/default.nix +++ b/distros/humble/rqt-srv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-srv"; version = "1.0.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_srv-release/archive/release/humble/rqt_srv/1.0.3-3.tar.gz"; - name = "1.0.3-3.tar.gz"; - sha256 = "02106a0281c9b037a9467941d92799e56bb601dcc016e1cfc0589faefffba913"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_srv-release"; + rev = "release/humble/rqt_srv/1.0.3-3"; + sha256 = "sha256-q6xLT+in38OgaER7EjAFQvGQIqlXCP85eR4andyqu8g="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rclpy rqt-gui rqt-gui-py rqt-msg ]; diff --git a/distros/humble/rqt-tf-tree/default.nix b/distros/humble/rqt-tf-tree/default.nix index bf4391ad2a..9f87a9fe59 100644 --- a/distros/humble/rqt-tf-tree/default.nix +++ b/distros/humble/rqt-tf-tree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-tf-tree"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_tf_tree-release/archive/release/humble/rqt_tf_tree/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "e1c9088f325151b29ff3f3d5b7192fa2ed8cf6c0718d86d14716238c143c11e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_tf_tree-release"; + rev = "release/humble/rqt_tf_tree/1.0.4-1"; + sha256 = "sha256-lSihCkueyTt2JXyG3jG9jZwxU5/m1zSimSfNldkQjiM="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.mock ]; diff --git a/distros/humble/rqt-topic/default.nix b/distros/humble/rqt-topic/default.nix index 1c4adec5ad..98bc9c2012 100644 --- a/distros/humble/rqt-topic/default.nix +++ b/distros/humble/rqt-topic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt-topic"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_topic-release/archive/release/humble/rqt_topic/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "28a47feaae4c3f19d7813cfaab866df02918dbb46803cd7cb72b077f47be2e70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_topic-release"; + rev = "release/humble/rqt_topic/1.5.0-1"; + sha256 = "sha256-AjYYpTRSF3CLhU/5RnqU2KzpJa09q5YbUTnA5oruE94="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-xmllint ]; diff --git a/distros/humble/rqt/default.nix b/distros/humble/rqt/default.nix index 0df8f73761..2e56a06ea6 100644 --- a/distros/humble/rqt/default.nix +++ b/distros/humble/rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rqt"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/humble/rqt/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "616b8ef6a32905f9ad7e00d4d4354301a8218fd309e6fabd5d54b869a91def39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/humble/rqt/1.1.4-1"; + sha256 = "sha256-P4LfEfObVMPnvnhys2/w+eT0ZGOSuMl26+BGUrHSosE="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rqt-gui rqt-gui-cpp rqt-gui-py rqt-py-common ]; diff --git a/distros/humble/rt-manipulators-cpp/default.nix b/distros/humble/rt-manipulators-cpp/default.nix index 07f24ddf5d..4eb4ad50af 100644 --- a/distros/humble/rt-manipulators-cpp/default.nix +++ b/distros/humble/rt-manipulators-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rt-manipulators-cpp"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_manipulators_cpp-release/archive/release/humble/rt_manipulators_cpp/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "73bfa412d1d5371ad93e51e3bf60f69c564927c72083089eb304520db4bbb338"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_manipulators_cpp-release"; + rev = "release/humble/rt_manipulators_cpp/1.0.0-1"; + sha256 = "sha256-YUJkRUHMLukwe5vyCr9kFhmmkkBb/ezgelg3SKIop3w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rt-manipulators-examples/default.nix b/distros/humble/rt-manipulators-examples/default.nix index 3afd0b582c..3a2419cc40 100644 --- a/distros/humble/rt-manipulators-examples/default.nix +++ b/distros/humble/rt-manipulators-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rt-manipulators-examples"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_manipulators_cpp-release/archive/release/humble/rt_manipulators_examples/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "20c93e6ae62c7089a508a37243b60017ff27c403f1dc1791499b81d6a2aaa3af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_manipulators_cpp-release"; + rev = "release/humble/rt_manipulators_examples/1.0.0-1"; + sha256 = "sha256-dHVhmshZaD7z/hfD5tLkvXw6mehXEQSlivgKwLZ4YZM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rt-usb-9axisimu-driver/default.nix b/distros/humble/rt-usb-9axisimu-driver/default.nix new file mode 100644 index 0000000000..00efe788ab --- /dev/null +++ b/distros/humble/rt-usb-9axisimu-driver/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, rclcpp, rclcpp-components, rclcpp-lifecycle, sensor-msgs, std-msgs, std-srvs }: +buildRosPackage { + pname = "ros-humble-rt-usb-9axisimu-driver"; + version = "2.0.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rt_usb_9axisimu_driver-release"; + rev = "release/humble/rt_usb_9axisimu_driver/2.0.2-1"; + sha256 = "sha256-MDRw+0TlCRvXa7mHA4a33Xv/lrMHiX2/k+BzVV9aXvM="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ rclcpp rclcpp-components rclcpp-lifecycle sensor-msgs std-msgs std-srvs ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''The rt_usb_9axisimu_driver package''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/rtabmap-ros/default.nix b/distros/humble/rtabmap-ros/default.nix index 09d14db20e..297b9c4d7e 100644 --- a/distros/humble/rtabmap-ros/default.nix +++ b/distros/humble/rtabmap-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rtabmap-ros"; version = "0.20.22-r1"; - src = fetchurl { - url = "https://github.com/introlab/rtabmap_ros-release/archive/release/humble/rtabmap_ros/0.20.22-1.tar.gz"; - name = "0.20.22-1.tar.gz"; - sha256 = "862a4619a3f25e8d7abd8b817a9172ea1fd8384dd042db0d59f0198d6a17ba9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "rtabmap_ros-release"; + rev = "release/humble/rtabmap_ros/0.20.22-1"; + sha256 = "sha256-ASf2TsLhTW+nWZfOMxsgZ0mGwkJbxrPhb3aguTbu28c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python pcl ros-environment rosidl-default-generators ]; diff --git a/distros/humble/rtcm-msgs/default.nix b/distros/humble/rtcm-msgs/default.nix index 941bfaf73a..e612c4f0a9 100644 --- a/distros/humble/rtcm-msgs/default.nix +++ b/distros/humble/rtcm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rtcm-msgs"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rtcm_msgs-release/archive/release/humble/rtcm_msgs/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "60b96f5d72593b069caf9d273b191c69baa7bc25d43cde8d63d5615d769d3ccf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rtcm_msgs-release"; + rev = "release/humble/rtcm_msgs/1.1.6-1"; + sha256 = "sha256-5yTtIdGostlOwChSlKKL4JivCyK284g0KYZxB6GBtBY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces ros-environment rosidl-default-generators ]; diff --git a/distros/humble/rti-connext-dds-cmake-module/default.nix b/distros/humble/rti-connext-dds-cmake-module/default.nix index c777103f60..d05aeef0bc 100644 --- a/distros/humble/rti-connext-dds-cmake-module/default.nix +++ b/distros/humble/rti-connext-dds-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rti-connext-dds-cmake-module"; version = "0.11.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_connextdds-release/archive/release/humble/rti_connext_dds_cmake_module/0.11.1-2.tar.gz"; - name = "0.11.1-2.tar.gz"; - sha256 = "9c498b779e8eda7f7c78c5ddf69c86e4a3b23cc8ed5e29942571b0dc6bc5ee67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_connextdds-release"; + rev = "release/humble/rti_connext_dds_cmake_module/0.11.1-2"; + sha256 = "sha256-NCuXFZxAvaoP9/cqkYcCX4aGL6sA5NodxsGjjj+vDuw="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/rttest/default.nix b/distros/humble/rttest/default.nix index 615fcf8140..d7307421e4 100644 --- a/distros/humble/rttest/default.nix +++ b/distros/humble/rttest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rttest"; version = "0.13.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/realtime_support-release/archive/release/humble/rttest/0.13.0-2.tar.gz"; - name = "0.13.0-2.tar.gz"; - sha256 = "b2fdf2304565bb63bc0ebc636fd763cef703b120457f7238bef8fa029f14c48e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "realtime_support-release"; + rev = "release/humble/rttest/0.13.0-2"; + sha256 = "sha256-PC9D2ZP/+d4cJp4oF8oJtElhBMMJCsXsSidVy22Rfwo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ruckig/default.nix b/distros/humble/ruckig/default.nix index 10a2764a40..05c227eb0c 100644 --- a/distros/humble/ruckig/default.nix +++ b/distros/humble/ruckig/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, cmake }: buildRosPackage { pname = "ros-humble-ruckig"; - version = "0.6.3-r7"; + version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ruckig-release/archive/release/humble/ruckig/0.6.3-7.tar.gz"; - name = "0.6.3-7.tar.gz"; - sha256 = "6d01590694ffad000dfeb3c85c90453d725a23d3b58ff3fdf95087455c8e7cdf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ruckig-release"; + rev = "release/humble/ruckig/0.9.2-1"; + sha256 = "sha256-xzv0PejVB2frTXtd7fnF72E49MOQaARx6boGHYzyVnQ="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/rviz-2d-overlay-msgs/default.nix b/distros/humble/rviz-2d-overlay-msgs/default.nix index 4870b6406c..5dba8d4477 100644 --- a/distros/humble/rviz-2d-overlay-msgs/default.nix +++ b/distros/humble/rviz-2d-overlay-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rviz-2d-overlay-msgs"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz_2d_overlay_plugins-release/archive/release/humble/rviz_2d_overlay_msgs/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "fad634de90d6af5ff1902e504bb35c2b2b26df0e8711487ca47e2e30d1004e54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz_2d_overlay_plugins-release"; + rev = "release/humble/rviz_2d_overlay_msgs/1.2.1-1"; + sha256 = "sha256-C7S+lCIduBpuVmNNB6nFZ7LkOw2X/TQKq5tqZAkMElk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/rviz-2d-overlay-plugins/default.nix b/distros/humble/rviz-2d-overlay-plugins/default.nix index 30a496a783..30c8bb2032 100644 --- a/distros/humble/rviz-2d-overlay-plugins/default.nix +++ b/distros/humble/rviz-2d-overlay-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rviz-2d-overlay-plugins"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz_2d_overlay_plugins-release/archive/release/humble/rviz_2d_overlay_plugins/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "e6aa2b8ea14c4213588b9436dbcd9b40423bcba27ff50c7ef2c0b7384e9d763b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz_2d_overlay_plugins-release"; + rev = "release/humble/rviz_2d_overlay_plugins/1.2.1-1"; + sha256 = "sha256-rIew6GpO1eY12AZkzSr3GYbOYianUUp0PzJeDzXQg2U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rviz-assimp-vendor/default.nix b/distros/humble/rviz-assimp-vendor/default.nix index dd47b9bc25..439d865bd3 100644 --- a/distros/humble/rviz-assimp-vendor/default.nix +++ b/distros/humble/rviz-assimp-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-lint-cmake, ament-cmake-xmllint, ament-lint-auto, assimp }: buildRosPackage { pname = "ros-humble-rviz-assimp-vendor"; - version = "11.2.4-r1"; + version = "11.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/humble/rviz_assimp_vendor/11.2.4-1.tar.gz"; - name = "11.2.4-1.tar.gz"; - sha256 = "47baf1a5958c06762f56d1a28cf73e5f29cff2b4700ce04c39b7c5e4d23392d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/humble/rviz_assimp_vendor/11.2.5-1"; + sha256 = "sha256-foEuqZKPI53LcjbRS8eR8z7p47lKeH2WcVrI5V+adTg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rviz-common/default.nix b/distros/humble/rviz-common/default.nix index 16b57b9288..c246a1cd8b 100644 --- a/distros/humble/rviz-common/default.nix +++ b/distros/humble/rviz-common/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-lint-cmake, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, geometry-msgs, message-filters, pluginlib, qt5, rclcpp, resource-retriever, rviz-ogre-vendor, rviz-rendering, sensor-msgs, std-msgs, tf2, tf2-geometry-msgs, tf2-ros, tinyxml2-vendor, urdf, yaml-cpp-vendor }: buildRosPackage { pname = "ros-humble-rviz-common"; - version = "11.2.4-r1"; + version = "11.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/humble/rviz_common/11.2.4-1.tar.gz"; - name = "11.2.4-1.tar.gz"; - sha256 = "49e1142069ab0e7c4e05f48a83aa0520d59f428563cf9c6ad18e1a417d586108"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/humble/rviz_common/11.2.5-1"; + sha256 = "sha256-K2/SNb0U/vfcxwFtH35auo36oTYdt5ZfrBS9m7PRDrA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rviz-default-plugins/default.nix b/distros/humble/rviz-default-plugins/default.nix index b9abbbc185..3303c9b2c7 100644 --- a/distros/humble/rviz-default-plugins/default.nix +++ b/distros/humble/rviz-default-plugins/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-lint-cmake, ament-cmake-uncrustify, ament-cmake-xmllint, ament-index-cpp, ament-lint-auto, geometry-msgs, ignition-math6-vendor, image-transport, interactive-markers, laser-geometry, map-msgs, nav-msgs, pluginlib, qt5, rclcpp, resource-retriever, rviz-common, rviz-ogre-vendor, rviz-rendering, rviz-rendering-tests, rviz-visual-testing-framework, tf2, tf2-geometry-msgs, tf2-ros, urdf, visualization-msgs }: buildRosPackage { pname = "ros-humble-rviz-default-plugins"; - version = "11.2.4-r1"; + version = "11.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/humble/rviz_default_plugins/11.2.4-1.tar.gz"; - name = "11.2.4-1.tar.gz"; - sha256 = "b4e914c28dd263b4c7bedeb1d85bb896190cf2b7155344a6f9839d0fe3d312b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/humble/rviz_default_plugins/11.2.5-1"; + sha256 = "sha256-Z1bnF3AHvEMbT5TIrTMGjes3chymdrR+3FWWpSn9EM4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rviz-imu-plugin/default.nix b/distros/humble/rviz-imu-plugin/default.nix index 6333f98358..c17c67c96d 100644 --- a/distros/humble/rviz-imu-plugin/default.nix +++ b/distros/humble/rviz-imu-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-rviz-imu-plugin"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/humble/rviz_imu_plugin/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "1252d0455957ee5230dda4a85bc2ef1b06aafcd46e4b4346d0d74dc656d107f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/humble/rviz_imu_plugin/2.1.3-1"; + sha256 = "sha256-PTP1jn127e3dBx0iCfyHU2gcO709T+HE0I+CZyIHCJY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rviz-ogre-vendor/default.nix b/distros/humble/rviz-ogre-vendor/default.nix index 36d8a21d0e..865e5722e6 100644 --- a/distros/humble/rviz-ogre-vendor/default.nix +++ b/distros/humble/rviz-ogre-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-xmllint, ament-lint-auto, freetype, git, libGL, libGLU, pkg-config, xorg }: buildRosPackage { pname = "ros-humble-rviz-ogre-vendor"; - version = "11.2.4-r1"; + version = "11.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/humble/rviz_ogre_vendor/11.2.4-1.tar.gz"; - name = "11.2.4-1.tar.gz"; - sha256 = "33f9865d8fe1566a2c4b793003571f73a106ffc622975b36c8c08e6192a4b75f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/humble/rviz_ogre_vendor/11.2.5-1"; + sha256 = "sha256-9SewQhHDdOYeRzosasqJpG+NNenuEzP7OcPj+oDyfDQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git pkg-config ]; diff --git a/distros/humble/rviz-rendering-tests/default.nix b/distros/humble/rviz-rendering-tests/default.nix index 67afc961f1..eab0d010f8 100644 --- a/distros/humble/rviz-rendering-tests/default.nix +++ b/distros/humble/rviz-rendering-tests/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-lint-cmake, ament-cmake-uncrustify, ament-cmake-xmllint, ament-index-cpp, ament-lint-auto, qt5, resource-retriever, rviz-rendering }: buildRosPackage { pname = "ros-humble-rviz-rendering-tests"; - version = "11.2.4-r1"; + version = "11.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/humble/rviz_rendering_tests/11.2.4-1.tar.gz"; - name = "11.2.4-1.tar.gz"; - sha256 = "619b56e48f3bbc41ebcc552f74ec32e44d0758b9720b340e3f4f6377b56b422f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/humble/rviz_rendering_tests/11.2.5-1"; + sha256 = "sha256-b5qM1EmenTExE+fwXXeftOiQ78NFrwUYJp0c0w1iQqc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/humble/rviz-rendering/default.nix b/distros/humble/rviz-rendering/default.nix index 6fb4291d6d..b6f89fa5c5 100644 --- a/distros/humble/rviz-rendering/default.nix +++ b/distros/humble/rviz-rendering/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-lint-cmake, ament-cmake-uncrustify, ament-cmake-xmllint, ament-index-cpp, ament-lint-auto, eigen, eigen3-cmake-module, qt5, resource-retriever, rviz-assimp-vendor, rviz-ogre-vendor }: buildRosPackage { pname = "ros-humble-rviz-rendering"; - version = "11.2.4-r1"; + version = "11.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/humble/rviz_rendering/11.2.4-1.tar.gz"; - name = "11.2.4-1.tar.gz"; - sha256 = "f86fca75d9f67c1aafe4cddd7b18842a94c080746fe12b3f51da1e1c7ff067da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/humble/rviz_rendering/11.2.5-1"; + sha256 = "sha256-zFW7/ZcHTjDKMXcYqEeoA+/q2JmhRegMzX0nXUIbRec="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rviz-visual-testing-framework/default.nix b/distros/humble/rviz-visual-testing-framework/default.nix index 6210c7b7e4..26885680f9 100644 --- a/distros/humble/rviz-visual-testing-framework/default.nix +++ b/distros/humble/rviz-visual-testing-framework/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-lint-cmake, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, qt5, rcutils, rviz-common }: buildRosPackage { pname = "ros-humble-rviz-visual-testing-framework"; - version = "11.2.4-r1"; + version = "11.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/humble/rviz_visual_testing_framework/11.2.4-1.tar.gz"; - name = "11.2.4-1.tar.gz"; - sha256 = "698df16995e8355cefdc097881ce0ebb67215f3beb9b185c49be97d9c80b5dad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/humble/rviz_visual_testing_framework/11.2.5-1"; + sha256 = "sha256-SrX8HaCuFzW0Iu4A6KhZKB06CSqQLYtOdilCsgI1Jms="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/humble/rviz-visual-tools/default.nix b/distros/humble/rviz-visual-tools/default.nix index 11f198efd5..9d384aea82 100644 --- a/distros/humble/rviz-visual-tools/default.nix +++ b/distros/humble/rviz-visual-tools/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-python, ament-lint-auto, ament-lint-common, eigen, eigen-stl-containers, eigen3-cmake-module, geometry-msgs, interactive-markers, launch, launch-ros, pluginlib, qt5, rclcpp, rclcpp-components, rviz-common, rviz-default-plugins, rviz-ogre-vendor, rviz-rendering, rviz2, sensor-msgs, shape-msgs, std-msgs, tf2, tf2-eigen, tf2-geometry-msgs, trajectory-msgs, visualization-msgs }: buildRosPackage { pname = "ros-humble-rviz-visual-tools"; - version = "4.1.3-r1"; + version = "4.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz_visual_tools-release/archive/release/humble/rviz_visual_tools/4.1.3-1.tar.gz"; - name = "4.1.3-1.tar.gz"; - sha256 = "49e3607f5fd4c62155d1b9522c53a1eb2103359ec19ee0ed41840fb44b0dd51b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz_visual_tools-release"; + rev = "release/humble/rviz_visual_tools/4.1.4-1"; + sha256 = "sha256-tVfPKQNpM962nm3D4nPbalanEed98pZ6A4v4ySC79yI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/rviz2/default.nix b/distros/humble/rviz2/default.nix index da4359d4de..09619b69ab 100644 --- a/distros/humble/rviz2/default.nix +++ b/distros/humble/rviz2/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-lint-cmake, ament-cmake-uncrustify, ament-cmake-xmllint, ament-lint-auto, geometry-msgs, qt5, rclcpp, rviz-common, rviz-default-plugins, rviz-ogre-vendor, sensor-msgs }: buildRosPackage { pname = "ros-humble-rviz2"; - version = "11.2.4-r1"; + version = "11.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/humble/rviz2/11.2.4-1.tar.gz"; - name = "11.2.4-1.tar.gz"; - sha256 = "63e57973b77873fcb0384b267659577248cfb47e59151d2d84072221db9620c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/humble/rviz2/11.2.5-1"; + sha256 = "sha256-/0MDIFyihGISIQ2cO6ZpolNcRTromiFH6B93TWoAWOY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/humble/sdformat-test-files/default.nix b/distros/humble/sdformat-test-files/default.nix index 9eceec7411..1b5e5b13d9 100644 --- a/distros/humble/sdformat-test-files/default.nix +++ b/distros/humble/sdformat-test-files/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-sdformat-test-files"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/sdformat_urdf-release/archive/release/humble/sdformat_test_files/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "864a5bcab04762e47305d3e33b7feb6437e8b79443aad0077fc0ee813350b559"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "sdformat_urdf-release"; + rev = "release/humble/sdformat_test_files/1.0.1-1"; + sha256 = "sha256-+3nL+Njboe0apHQrf0wM7r53YuOAoG8MjCOOoyhCG1c="; + }; buildType = "cmake"; propagatedBuildInputs = [ cmake ]; diff --git a/distros/humble/sdl2-vendor/default.nix b/distros/humble/sdl2-vendor/default.nix index b3ac1a5aeb..18e8ad93c1 100644 --- a/distros/humble/sdl2-vendor/default.nix +++ b/distros/humble/sdl2-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-sdl2-vendor"; version = "3.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/humble/sdl2_vendor/3.1.0-3.tar.gz"; - name = "3.1.0-3.tar.gz"; - sha256 = "9ce70b671242ae4b9b05b1d4e1a2a832dcfa360eaa27d0a0428ad4b80152abf6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/humble/sdl2_vendor/3.1.0-3"; + sha256 = "sha256-yK9/I8H81uj13ica+FzxQlDpD4xNsbe3+OtP4FWAv1M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/self-test/default.nix b/distros/humble/self-test/default.nix index a1217e3e37..da47eb76dd 100644 --- a/distros/humble/self-test/default.nix +++ b/distros/humble/self-test/default.nix @@ -2,25 +2,29 @@ # Copyright 2023 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, diagnostic-msgs, diagnostic-updater, rclcpp }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, diagnostic-msgs, diagnostic-updater, rclcpp, ros-environment }: buildRosPackage { pname = "ros-humble-self-test"; - version = "3.0.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/humble/self_test/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "8acb8d00b7710ecd2f1a5e0242c132953f85934edde4f7c41ca39774fbfda3dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/humble/self_test/3.1.0-1"; + sha256 = "sha256-1wNulwlhDpJbtfsi74Fq0lbouCl5TKsL3+ynHZAxyew="; + }; buildType = "ament_cmake"; - buildInputs = [ ament-cmake ]; + buildInputs = [ ament-cmake ros-environment ]; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ diagnostic-msgs diagnostic-updater rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { description = ''self_test''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/humble/sensor-msgs-py/default.nix b/distros/humble/sensor-msgs-py/default.nix index 2ffee33386..357efc886d 100644 --- a/distros/humble/sensor-msgs-py/default.nix +++ b/distros/humble/sensor-msgs-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, python3Packages, pythonPackages, sensor-msgs }: buildRosPackage { pname = "ros-humble-sensor-msgs-py"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/sensor_msgs_py/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "9da5fe5a5d41c49e891055641aabd827ff1a585c39d7fe6fc59bf33de8fc595f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/sensor_msgs_py/4.2.3-1"; + sha256 = "sha256-ApL5C8rpZlz76B3Y1ZaaqagK0goEqg7qipbMhzu1vIY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/sensor-msgs/default.nix b/distros/humble/sensor-msgs/default.nix index a7e8c1af45..7d9ac3275e 100644 --- a/distros/humble/sensor-msgs/default.nix +++ b/distros/humble/sensor-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-sensor-msgs"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/sensor_msgs/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "3bb8483d4dc50cb595019cbb24aa8ccdc29e01ca7935ccb551e5d3f6181a0efb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/sensor_msgs/4.2.3-1"; + sha256 = "sha256-YCmkHQQTZ+/WRvTAAuLWLxS+PlLcBQyCOS0YI/thGjk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/septentrio-gnss-driver/default.nix b/distros/humble/septentrio-gnss-driver/default.nix index 43eab9bd06..55f3cc8402 100644 --- a/distros/humble/septentrio-gnss-driver/default.nix +++ b/distros/humble/septentrio-gnss-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-septentrio-gnss-driver"; version = "1.2.3-r1"; - src = fetchurl { - url = "https://github.com/septentrio-users/septentrio_gnss_driver_ros2-release/archive/release/humble/septentrio_gnss_driver/1.2.3-1.tar.gz"; - name = "1.2.3-1.tar.gz"; - sha256 = "e9491556e95a5479e791883ce8487055c38ccd9c19fdda56c3fd8fc1d25d5404"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "septentrio-users"; + repo = "septentrio_gnss_driver_ros2-release"; + rev = "release/humble/septentrio_gnss_driver/1.2.3-1"; + sha256 = "sha256-kCTbqq1KzuGhmwyJcXz5kKbZ7+9maCG6AATdtFnvZ8Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/serial-driver/default.nix b/distros/humble/serial-driver/default.nix index 027cb9c076..1c94ee7693 100644 --- a/distros/humble/serial-driver/default.nix +++ b/distros/humble/serial-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-serial-driver"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/humble/serial_driver/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "be898c4e7146a88141857f7372ee224524ce12b418f0f8214225670f76f214b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "transport_drivers-release"; + rev = "release/humble/serial_driver/1.2.0-2"; + sha256 = "sha256-1Oc6jtsGEX0Jaxqs7jdlxu/nZJxZPxvagRST+L9bdwI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/humble/shape-msgs/default.nix b/distros/humble/shape-msgs/default.nix index 6c55cc28a1..abf8c31f4b 100644 --- a/distros/humble/shape-msgs/default.nix +++ b/distros/humble/shape-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, geometry-msgs, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-humble-shape-msgs"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/shape_msgs/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "43f3b9856264e4c2b7755fd416f0e18c9b220a0a78a11945099df4cbbab0e6d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/shape_msgs/4.2.3-1"; + sha256 = "sha256-7UIZKyqBF4YI36rk/hIpkP9dSbQdAYcHctiInohfO+s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/shared-queues-vendor/default.nix b/distros/humble/shared-queues-vendor/default.nix index 2a04baf0db..9f972f15da 100644 --- a/distros/humble/shared-queues-vendor/default.nix +++ b/distros/humble/shared-queues-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake }: buildRosPackage { pname = "ros-humble-shared-queues-vendor"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/shared_queues_vendor/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "cbc389c6492bc6ed2a35a14fe43d31ed23f475797edc5ba15335be7e3d2e9c5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/shared_queues_vendor/0.15.4-2"; + sha256 = "sha256-8sZMUBQEsRzKah5K32umNOAy2ZOcup2XJ8aQN7VJHaY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/sick-safetyscanners-base/default.nix b/distros/humble/sick-safetyscanners-base/default.nix index e36f686513..a75c61dca0 100644 --- a/distros/humble/sick-safetyscanners-base/default.nix +++ b/distros/humble/sick-safetyscanners-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-sick-safetyscanners-base"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_safetyscanners_base-release/archive/release/humble/sick_safetyscanners_base/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "76d51b27367cd21ae26243c1708211816868ed939079158785594fae3fe35486"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_safetyscanners_base-release"; + rev = "release/humble/sick_safetyscanners_base/1.0.2-1"; + sha256 = "sha256-L5mOmHZbzAUgiusdWoORLFj9p10N8/yCVxxs38YM8sw="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/sick-safetyscanners2-interfaces/default.nix b/distros/humble/sick-safetyscanners2-interfaces/default.nix index acdc80088f..0b1500d62d 100644 --- a/distros/humble/sick-safetyscanners2-interfaces/default.nix +++ b/distros/humble/sick-safetyscanners2-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-sick-safetyscanners2-interfaces"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_safetyscanners2_interfaces-release/archive/release/humble/sick_safetyscanners2_interfaces/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "1fb6b3dd93f0e5dd909963e75c254915785554b6b0cdd8f2f54e9801ad373fcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_safetyscanners2_interfaces-release"; + rev = "release/humble/sick_safetyscanners2_interfaces/1.0.0-2"; + sha256 = "sha256-FFsjwMwXpIDUcZce2QdkhLAspn9kJgyNkvTQ8UhjUYQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/sick-safetyscanners2/default.nix b/distros/humble/sick-safetyscanners2/default.nix index ce60d76e59..63fd3b0e63 100644 --- a/distros/humble/sick-safetyscanners2/default.nix +++ b/distros/humble/sick-safetyscanners2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-sick-safetyscanners2"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_safetyscanners2-release/archive/release/humble/sick_safetyscanners2/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "067552406896f93c603177816048db9d818e84bd2d81880e2ba42b1ddbdfb40c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_safetyscanners2-release"; + rev = "release/humble/sick_safetyscanners2/1.0.3-1"; + sha256 = "sha256-i4ny7pd9nYqJwSKfiQE8KX/oMcPBPmXtcxUGiw3cx6g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/simple-actions/default.nix b/distros/humble/simple-actions/default.nix index b5759ad7ef..0de1ca5fd0 100644 --- a/distros/humble/simple-actions/default.nix +++ b/distros/humble/simple-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-simple-actions"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/DLu/simple_actions-release/archive/release/humble/simple_actions/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "e2aa0228b96ceba99435d31820f0802cd986ff6bb06e8bc53cd27abc92b349ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "simple_actions-release"; + rev = "release/humble/simple_actions/0.2.1-1"; + sha256 = "sha256-NwJn4jspMkn8bZdj3z4bwQmkm017B0FXkjiGFfIl+cY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/simple-launch/default.nix b/distros/humble/simple-launch/default.nix index e909e3e4e2..8885b9fd86 100644 --- a/distros/humble/simple-launch/default.nix +++ b/distros/humble/simple-launch/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-python, ament-index-python, launch, launch-ros, xacro }: buildRosPackage { pname = "ros-humble-simple-launch"; - version = "1.6.1-r1"; + version = "1.6.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/simple_launch-release/archive/release/humble/simple_launch/1.6.1-1.tar.gz"; - name = "1.6.1-1.tar.gz"; - sha256 = "541b0f07c2a11d3d45a6b57884b64e7744a828faa01e7167a4c3418e97515240"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "simple_launch-release"; + rev = "release/humble/simple_launch/1.6.2-1"; + sha256 = "sha256-mTdpp9QdRapkSJ5ElRJHiiDhAQKp9/ggLFQa+iXtTu0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/humble/simple-term-menu-vendor/default.nix b/distros/humble/simple-term-menu-vendor/default.nix index d13cf877dc..9f28a33ec7 100644 --- a/distros/humble/simple-term-menu-vendor/default.nix +++ b/distros/humble/simple-term-menu-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-simple-term-menu-vendor"; version = "1.5.7-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/simple_term_menu_vendor-release/archive/release/humble/simple_term_menu_vendor/1.5.7-1.tar.gz"; - name = "1.5.7-1.tar.gz"; - sha256 = "f4e8e4a75bbe5e87372fa093968765b32034e4e2e7729381c6d291ec51344e6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "simple_term_menu_vendor-release"; + rev = "release/humble/simple_term_menu_vendor/1.5.7-1"; + sha256 = "sha256-toTrUyUqy7ijNOnTyHXXDtn+mvXcO8izZRsbIFv9Szw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/simulation/default.nix b/distros/humble/simulation/default.nix index 2755ad5026..9466975408 100644 --- a/distros/humble/simulation/default.nix +++ b/distros/humble/simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-simulation"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/humble/simulation/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "5d874be3abec3ce39ca9b6708b339d729ea3dcbc2acaa1cd4b3cd295c4ad7e61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/humble/simulation/0.10.0-1"; + sha256 = "sha256-bvicFtHnIqmwZPfpdtNprdkWQWqSKGs+cezebLL0sUs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/slam-toolbox/default.nix b/distros/humble/slam-toolbox/default.nix index 0081bccab6..e8a54ec776 100644 --- a/distros/humble/slam-toolbox/default.nix +++ b/distros/humble/slam-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-slam-toolbox"; version = "2.6.4-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/slam_toolbox-release/archive/release/humble/slam_toolbox/2.6.4-1.tar.gz"; - name = "2.6.4-1.tar.gz"; - sha256 = "347a14b83e8e5c073f244ba0daf4b3d0d9927e2d964310e49040da53a1213df9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "slam_toolbox-release"; + rev = "release/humble/slam_toolbox/2.6.4-1"; + sha256 = "sha256-BwXIT8gE53+KjJdipL7KTwqHtW6Q0gCpIRFNVmi+W5E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/slider-publisher/default.nix b/distros/humble/slider-publisher/default.nix index b55f2a610f..5148680e36 100644 --- a/distros/humble/slider-publisher/default.nix +++ b/distros/humble/slider-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-slider-publisher"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/slider_publisher-release/archive/release/humble/slider_publisher/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "81dd7d7a0e224143cb3c2019e4999b448ca41c96becc69183ee1f0df066fda51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "slider_publisher-release"; + rev = "release/humble/slider_publisher/2.2.1-1"; + sha256 = "sha256-szAUkWe0eQFk40CMBvoSKEw/Ut9x17ULIwx90BhW/TY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/smacc2-msgs/default.nix b/distros/humble/smacc2-msgs/default.nix index 71552aff05..e3880b9909 100644 --- a/distros/humble/smacc2-msgs/default.nix +++ b/distros/humble/smacc2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-smacc2-msgs"; version = "0.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/SMACC2-release/archive/release/humble/smacc2_msgs/0.4.0-2.tar.gz"; - name = "0.4.0-2.tar.gz"; - sha256 = "1fd514408f13d7816cd6362a3dac350c494b5858e919d9fce7d02d4e0718a11c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "SMACC2-release"; + rev = "release/humble/smacc2_msgs/0.4.0-2"; + sha256 = "sha256-tY/UoVoVSZ2FyHW7T+eKrXBqfK1KVQiZatRamEO/K6M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/smacc2/default.nix b/distros/humble/smacc2/default.nix index 5a0aae4d47..fb70c525de 100644 --- a/distros/humble/smacc2/default.nix +++ b/distros/humble/smacc2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-smacc2"; version = "0.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/SMACC2-release/archive/release/humble/smacc2/0.4.0-2.tar.gz"; - name = "0.4.0-2.tar.gz"; - sha256 = "4270c7884e70cd9c3f050da6959fd2f9eb87a416698b5ee910155ef5e6733afe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "SMACC2-release"; + rev = "release/humble/smacc2/0.4.0-2"; + sha256 = "sha256-yI0OXFGrQ42OcS1v1pv7VdeoqmflWYkFqHfGbacMe+Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/smclib/default.nix b/distros/humble/smclib/default.nix index 6b052abd5e..982180de6a 100644 --- a/distros/humble/smclib/default.nix +++ b/distros/humble/smclib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-smclib"; version = "3.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/humble/smclib/3.0.2-3.tar.gz"; - name = "3.0.2-3.tar.gz"; - sha256 = "b0caf26c1e49a1c1dae37f382723b283006a8fadb584f89e88953e88ae4adde1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/humble/smclib/3.0.2-3"; + sha256 = "sha256-6jstxd7gq/43o7r44ZhV7FknaUqCjiBvrckicrj2Xl8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/snowbot-operating-system/default.nix b/distros/humble/snowbot-operating-system/default.nix index 4938e4ccbf..ade794639e 100644 --- a/distros/humble/snowbot-operating-system/default.nix +++ b/distros/humble/snowbot-operating-system/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-snowbot-operating-system"; version = "0.1.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/snowbot_release/archive/release/humble/snowbot_operating_system/0.1.2-3.tar.gz"; - name = "0.1.2-3.tar.gz"; - sha256 = "061b695db8610f6c7470112c46772925fe29aabbda12699da78b4be879f442d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "snowbot_release"; + rev = "release/humble/snowbot_operating_system/0.1.2-3"; + sha256 = "sha256-jsc6W+E4XVtTLGd+ZSn45ChfZmV6/c9nUg1FpqA6d8s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/soccer-interfaces/default.nix b/distros/humble/soccer-interfaces/default.nix index 31aa3abd20..62b1bddcef 100644 --- a/distros/humble/soccer-interfaces/default.nix +++ b/distros/humble/soccer-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-soccer-interfaces"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_interfaces-release/archive/release/humble/soccer_interfaces/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "eebcf5e4c80c4f01480092b62b2d478737c77e8c8cc5403e55536dea91f35177"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_interfaces-release"; + rev = "release/humble/soccer_interfaces/0.1.0-1"; + sha256 = "sha256-4lOFn2p0uaDcS/4mDfWG/Q1OGsw8t1EAYJWVsHD6k+M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/soccer-marker-generation/default.nix b/distros/humble/soccer-marker-generation/default.nix index 045420b825..02f989160f 100644 --- a/distros/humble/soccer-marker-generation/default.nix +++ b/distros/humble/soccer-marker-generation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-soccer-marker-generation"; version = "0.0.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_visualization-release/archive/release/humble/soccer_marker_generation/0.0.2-3.tar.gz"; - name = "0.0.2-3.tar.gz"; - sha256 = "8adeb8ff078beabdf8c53b381dbf919ff8beabaf591e414745b6b22905b52382"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_visualization-release"; + rev = "release/humble/soccer_marker_generation/0.0.2-3"; + sha256 = "0000000000000000000000000000000000000000000000000000"; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/swri-roscpp/default.nix b/distros/humble/swri-roscpp/default.nix index 8df4159a17..8382652c79 100644 --- a/distros/humble/swri-roscpp/default.nix +++ b/distros/humble/swri-roscpp/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, boost, diagnostic-updater, gtest, marti-common-msgs, nav-msgs, rclcpp, rosidl-cmake, rosidl-default-generators, rosidl-default-runtime, std-msgs, std-srvs }: buildRosPackage { pname = "ros-humble-swri-roscpp"; - version = "3.5.0-r1"; + version = "3.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/humble/swri_roscpp/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "acb2a6e33f25a5f2989ce8e2405362d025e4e80210d18f02bb440144c6280905"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/humble/swri_roscpp/3.5.1-2"; + sha256 = "sha256-14bRXIz/76iO3n+15Wef3nu3AQ2EFky++nDsPtad4rA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-cmake rosidl-default-generators ]; diff --git a/distros/humble/swri-route-util/default.nix b/distros/humble/swri-route-util/default.nix index fd72343dc0..0d08e96700 100644 --- a/distros/humble/swri-route-util/default.nix +++ b/distros/humble/swri-route-util/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, boost, marti-common-msgs, marti-nav-msgs, rclcpp, swri-geometry-util, swri-math-util, swri-roscpp, swri-transform-util, tf2-geometry-msgs, visualization-msgs }: buildRosPackage { pname = "ros-humble-swri-route-util"; - version = "3.5.0-r1"; + version = "3.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/humble/swri_route_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "64d8597fc4b67b81a8aa4cadfa2b0555998756c5f519d9e36aab6d742590c492"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/humble/swri_route_util/3.5.1-2"; + sha256 = "sha256-cOdL5x9OxxwwKnc4v2c91ZTknuJipZli6KXzQf3eJWE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/swri-serial-util/default.nix b/distros/humble/swri-serial-util/default.nix index d1fdcbf2ab..4fb4674d0c 100644 --- a/distros/humble/swri-serial-util/default.nix +++ b/distros/humble/swri-serial-util/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, boost }: buildRosPackage { pname = "ros-humble-swri-serial-util"; - version = "3.5.0-r1"; + version = "3.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/humble/swri_serial_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "1e35059959f6af2fbcac73610d56cb9adb6bbd2bbefe778bd78e004b4fbeae04"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/humble/swri_serial_util/3.5.1-2"; + sha256 = "sha256-5WYFkS8lxtzfkxt0i1LrHgDmTnBotcjfDZgOrpWLLP8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/swri-system-util/default.nix b/distros/humble/swri-system-util/default.nix index 59359f9f10..73e2f81dde 100644 --- a/distros/humble/swri-system-util/default.nix +++ b/distros/humble/swri-system-util/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-cpp, boost, rclcpp }: buildRosPackage { pname = "ros-humble-swri-system-util"; - version = "3.5.0-r1"; + version = "3.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/humble/swri_system_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "d6bbd6c32d85ac4aa6ea8c940114ea7bf2523680b33adc6bd52d6e5584cfb999"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/humble/swri_system_util/3.5.1-2"; + sha256 = "sha256-RVmxXs9fUTGh2ThWFQDsPbWr9g20i2rCG1CjqusayX4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/swri-transform-util/default.nix b/distros/humble/swri-transform-util/default.nix index 7347441da8..91912a9c75 100644 --- a/distros/humble/swri-transform-util/default.nix +++ b/distros/humble/swri-transform-util/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, boost, cv-bridge, diagnostic-msgs, diagnostic-updater, geographic-msgs, geometry-msgs, geos, gps-msgs, launch-xml, libyamlcpp, marti-nav-msgs, pkg-config, proj, python3Packages, rcl-interfaces, rclcpp, rclcpp-components, rclpy, sensor-msgs, swri-math-util, swri-roscpp, tf2, tf2-geometry-msgs, tf2-py, tf2-ros }: buildRosPackage { pname = "ros-humble-swri-transform-util"; - version = "3.5.0-r1"; + version = "3.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/humble/swri_transform_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "0d4bcbb07ce015b36b0b356c880ad03c235c11c6ce7e5a08bc8d8d6d182422e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/humble/swri_transform_util/3.5.1-2"; + sha256 = "sha256-JZrEbYFoFAgDSJCYxRmTEujv2o8bEw0DmnKY4Zgsobg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python pkg-config ]; diff --git a/distros/humble/system-fingerprint/default.nix b/distros/humble/system-fingerprint/default.nix index 37bf1e1669..548a6bf250 100644 --- a/distros/humble/system-fingerprint/default.nix +++ b/distros/humble/system-fingerprint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-system-fingerprint"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/MetroRobots/ros_system_fingerprint-release/archive/release/humble/system_fingerprint/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "70ee7502ad02e86f9a0282425e090f693f854e4eb0c408b9f59982d7b07f3751"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MetroRobots"; + repo = "ros_system_fingerprint-release"; + rev = "release/humble/system_fingerprint/0.7.0-1"; + sha256 = "sha256-swG8fwjiFc0LXSlbA6Lml0jlh/VyNS//insRqM01fr0="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.GitPython rcl-interfaces rclpy ros2action ros2cli ros2node ros2param ros2topic ]; diff --git a/distros/humble/system-modes-examples/default.nix b/distros/humble/system-modes-examples/default.nix index 153a938c5b..797e648121 100644 --- a/distros/humble/system-modes-examples/default.nix +++ b/distros/humble/system-modes-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-system-modes-examples"; version = "0.9.0-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/system_modes-release/archive/release/humble/system_modes_examples/0.9.0-6.tar.gz"; - name = "0.9.0-6.tar.gz"; - sha256 = "88167b2336320f4d2bcb26a1ad18dcf2d195989c11794381ebf0d3096fcc6f00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "system_modes-release"; + rev = "release/humble/system_modes_examples/0.9.0-6"; + sha256 = "sha256-0kfAi8ExAnUicuzTFtWKNQwRZP8qipcdbz4XUrg7EQM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/system-modes-msgs/default.nix b/distros/humble/system-modes-msgs/default.nix index 9bf593ce86..5a838e7ca3 100644 --- a/distros/humble/system-modes-msgs/default.nix +++ b/distros/humble/system-modes-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-system-modes-msgs"; version = "0.9.0-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/system_modes-release/archive/release/humble/system_modes_msgs/0.9.0-6.tar.gz"; - name = "0.9.0-6.tar.gz"; - sha256 = "a79256d64ed5e8e94936e03207cb854c0896a6c56d8760ce6d51c00a07f11fb1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "system_modes-release"; + rev = "release/humble/system_modes_msgs/0.9.0-6"; + sha256 = "sha256-UcVnvMWo1lcz8PljlXg4m53YoUKsphq4TbfgB7Z3dgw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/system-modes/default.nix b/distros/humble/system-modes/default.nix index 88163c7313..e1655b0489 100644 --- a/distros/humble/system-modes/default.nix +++ b/distros/humble/system-modes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-system-modes"; version = "0.9.0-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/system_modes-release/archive/release/humble/system_modes/0.9.0-6.tar.gz"; - name = "0.9.0-6.tar.gz"; - sha256 = "cfcabeb98f57f4ff39667000f4652a482d0bd0fe0049874a1d4429a3fe355504"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "system_modes-release"; + rev = "release/humble/system_modes/0.9.0-6"; + sha256 = "sha256-0KjnR6c32kc4yM0vwAGYI1LgRZn4tLfIZSO+UE2llbM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tango-icons-vendor/default.nix b/distros/humble/tango-icons-vendor/default.nix index 3ead164f7c..7de5a386d6 100644 --- a/distros/humble/tango-icons-vendor/default.nix +++ b/distros/humble/tango-icons-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tango-icons-vendor"; version = "0.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tango_icons_vendor-release/archive/release/humble/tango_icons_vendor/0.1.1-3.tar.gz"; - name = "0.1.1-3.tar.gz"; - sha256 = "4b7c65a3e74f2f8bc3cfeea5a129b83e94da7440ef3bca1898d32348f97f7d02"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tango_icons_vendor-release"; + rev = "release/humble/tango_icons_vendor/0.1.1-3"; + sha256 = "sha256-W3FsRXSDdse1uyGMIWSNAcAyiWYLQ6heM2+2/WTta4s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tcb-span/default.nix b/distros/humble/tcb-span/default.nix index 002894b936..81e1c1497a 100644 --- a/distros/humble/tcb-span/default.nix +++ b/distros/humble/tcb-span/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tcb-span"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/cpp_polyfills-release/archive/release/humble/tcb_span/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "2a506d5ed3e043fcd5e81ae931a53553c7583137cb5ca0de9fe63e3c5f85b5b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "cpp_polyfills-release"; + rev = "release/humble/tcb_span/1.0.2-2"; + sha256 = "sha256-61JrUYgWw+LJJmryzDfZte0H+hhzDbHqOY1wEyk996Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/teleop-tools-msgs/default.nix b/distros/humble/teleop-tools-msgs/default.nix index 13ec3d80ee..515596c7bf 100644 --- a/distros/humble/teleop-tools-msgs/default.nix +++ b/distros/humble/teleop-tools-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-teleop-tools-msgs"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/humble/teleop_tools_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "b07ab2bc1877ba5074813f6434a832ab84ba43df14fb0a51c27db8e1cf4a6261"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/humble/teleop_tools_msgs/1.3.0-1"; + sha256 = "sha256-aJPfIXQj3fiXkpH0V5nGEywzdRvtnKtp2K1qWb/fw30="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/teleop-tools/default.nix b/distros/humble/teleop-tools/default.nix index 820f66f0d6..ebff18decd 100644 --- a/distros/humble/teleop-tools/default.nix +++ b/distros/humble/teleop-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-teleop-tools"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/humble/teleop_tools/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "506610ea71b4046aa2b77fd9c2d3d4f6c79d1d55da7e428afab1f370d90c17dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/humble/teleop_tools/1.3.0-1"; + sha256 = "sha256-48SoF+QzzXtlB3WMrx9sEvMiaOJa+/JBmdQQBKMuTKg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/teleop-twist-joy/default.nix b/distros/humble/teleop-twist-joy/default.nix index 3a4d6607d9..4c3e5e2037 100644 --- a/distros/humble/teleop-twist-joy/default.nix +++ b/distros/humble/teleop-twist-joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-teleop-twist-joy"; version = "2.4.3-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_twist_joy-release/archive/release/humble/teleop_twist_joy/2.4.3-4.tar.gz"; - name = "2.4.3-4.tar.gz"; - sha256 = "94d0c3b58e74dffb249faea5f797e94128b917d81deec516e02e1f8cf621112c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_twist_joy-release"; + rev = "release/humble/teleop_twist_joy/2.4.3-4"; + sha256 = "sha256-dL2vcoGwprRfLIcvS2fa9spvG3HHSGWWI8YYjmC5MVo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/teleop-twist-keyboard/default.nix b/distros/humble/teleop-twist-keyboard/default.nix index 9dc0f35801..a4a1aeafda 100644 --- a/distros/humble/teleop-twist-keyboard/default.nix +++ b/distros/humble/teleop-twist-keyboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-teleop-twist-keyboard"; version = "2.3.2-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_twist_keyboard-release/archive/release/humble/teleop_twist_keyboard/2.3.2-4.tar.gz"; - name = "2.3.2-4.tar.gz"; - sha256 = "74c1b9d9105826029bf614c66abd1414ec1f7b87697c5d97e286e0740123718a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_twist_keyboard-release"; + rev = "release/humble/teleop_twist_keyboard/2.3.2-4"; + sha256 = "sha256-lxwiaJp3eRsvCIRQzNZmogFEOdO5fLDA35rX8PgLx4s="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ]; diff --git a/distros/humble/tensorrt-cmake-module/default.nix b/distros/humble/tensorrt-cmake-module/default.nix index 6580c4da03..1d47ccc0e1 100644 --- a/distros/humble/tensorrt-cmake-module/default.nix +++ b/distros/humble/tensorrt-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tensorrt-cmake-module"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tensorrt_cmake_module-release/archive/release/humble/tensorrt_cmake_module/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "88f160087413626acfae816787221f5e9f5afe5b11fb478808645c5892d7f838"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tensorrt_cmake_module-release"; + rev = "release/humble/tensorrt_cmake_module/0.0.3-1"; + sha256 = "sha256-S620gK89qsxhq1mo2yFSZCD1LP45mJBLXJbCTiT5VZk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/test-apex-test-tools/default.nix b/distros/humble/test-apex-test-tools/default.nix index a2eea34b80..512ef87fb5 100644 --- a/distros/humble/test-apex-test-tools/default.nix +++ b/distros/humble/test-apex-test-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-test-apex-test-tools"; version = "0.0.2-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/apex_test_tools-release/archive/release/humble/test_apex_test_tools/0.0.2-6.tar.gz"; - name = "0.0.2-6.tar.gz"; - sha256 = "24fc13f4add51fec0476d5d394e8ec62bf919fc3176db498138e22bea3d0d5f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apex_test_tools-release"; + rev = "release/humble/test_apex_test_tools/0.0.2-6"; + sha256 = "sha256-ZB2lhFknuQ+9fA1s+tCKrhHEUOnSLF2ogSsE0tVMrjE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/test-interface-files/default.nix b/distros/humble/test-interface-files/default.nix index 8f946a5bb7..eca6937569 100644 --- a/distros/humble/test-interface-files/default.nix +++ b/distros/humble/test-interface-files/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-test-interface-files"; version = "0.9.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/test_interface_files-release/archive/release/humble/test_interface_files/0.9.1-2.tar.gz"; - name = "0.9.1-2.tar.gz"; - sha256 = "d679abe08969464aad372b28f86d13953175f1346e3c42cca9f6651d9eed4430"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "test_interface_files-release"; + rev = "release/humble/test_interface_files/0.9.1-2"; + sha256 = "sha256-QNZlkUZcUAHAOEUnh0h7Ba8nKb7O6zH6wj36lqQKQSo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/humble/test-msgs/default.nix b/distros/humble/test-msgs/default.nix index 2f088c0e52..c5ef14af4a 100644 --- a/distros/humble/test-msgs/default.nix +++ b/distros/humble/test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-test-msgs"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/humble/test_msgs/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "ba935f195a08b1460c00610c4bec3f84852ee1cbff4d872ae0f2e6c83b323ae5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/humble/test_msgs/1.2.1-1"; + sha256 = "sha256-k66Etl4hgxk54Angntcz/T4ISPLrnJcam2cbBWFEeyw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators test-interface-files ]; diff --git a/distros/humble/tf-transformations/default.nix b/distros/humble/tf-transformations/default.nix index 1b0034d1ad..80df97d522 100644 --- a/distros/humble/tf-transformations/default.nix +++ b/distros/humble/tf-transformations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tf-transformations"; version = "1.0.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tf_transformations_release/archive/release/humble/tf_transformations/1.0.1-3.tar.gz"; - name = "1.0.1-3.tar.gz"; - sha256 = "6ad1074611765e9513c6afda5f08c704ba04b0202700d0aa689fde6375d85717"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tf_transformations_release"; + rev = "release/humble/tf_transformations/1.0.1-3"; + sha256 = "sha256-ZpntCNRY//B8eLWdIgouelBtxzP77cHw4dIl0MVnAig="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/tf2-bullet/default.nix b/distros/humble/tf2-bullet/default.nix index eb0f19623b..64e455f1c1 100644 --- a/distros/humble/tf2-bullet/default.nix +++ b/distros/humble/tf2-bullet/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, bullet, geometry-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-humble-tf2-bullet"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_bullet/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "93905b41fcbcf9a94779f786850062cdf806d7a2342a2fb66386dafa158ed27f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_bullet/0.25.2-1"; + sha256 = "sha256-N+iirFfxN29bQu1b2n4F8D41ccp74eQcigMLBmSnoNU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tf2-eigen-kdl/default.nix b/distros/humble/tf2-eigen-kdl/default.nix index 74929ff034..2a257a559d 100644 --- a/distros/humble/tf2-eigen-kdl/default.nix +++ b/distros/humble/tf2-eigen-kdl/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, eigen, orocos-kdl-vendor, tf2 }: buildRosPackage { pname = "ros-humble-tf2-eigen-kdl"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_eigen_kdl/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "59b707152061d6072cc6ee2e5e314f1911892fff7f88dbec5c58597058a6b18e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_eigen_kdl/0.25.2-1"; + sha256 = "sha256-O5OpO45mz5MuJXKnES7VI/oUQvdmFX+aYv+ruxn4iqI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tf2-eigen/default.nix b/distros/humble/tf2-eigen/default.nix index 1ecdf901b3..6c4c59db14 100644 --- a/distros/humble/tf2-eigen/default.nix +++ b/distros/humble/tf2-eigen/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, eigen, geometry-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-humble-tf2-eigen"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_eigen/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "9ee97213f9c91d21ce8a1a975a85416598ec44edc11aa34574bb745036f209fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_eigen/0.25.2-1"; + sha256 = "sha256-FUXjV1Iwd4QuUKGKWo1C/7rh8/l7E8j5MFvzPdwD0AU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tf2-geometry-msgs/default.nix b/distros/humble/tf2-geometry-msgs/default.nix index 3bee8a7c51..a2c1c6d7f5 100644 --- a/distros/humble/tf2-geometry-msgs/default.nix +++ b/distros/humble/tf2-geometry-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-cmake-pytest, ament-lint-auto, ament-lint-common, geometry-msgs, orocos-kdl-vendor, python-cmake-module, python3Packages, rclcpp, tf2, tf2-ros, tf2-ros-py }: buildRosPackage { pname = "ros-humble-tf2-geometry-msgs"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_geometry_msgs/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "f019603ebb3c2579231c8f879d40213f87a00f8eab00e701c50ecd2c0838bb6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_geometry_msgs/0.25.2-1"; + sha256 = "sha256-ZNuBaLmAOD6G/GINo42ZPfetKZdd7WUyKt/jgSo1lkQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python-cmake-module ]; diff --git a/distros/humble/tf2-kdl/default.nix b/distros/humble/tf2-kdl/default.nix index 36a4a985de..28a05f550f 100644 --- a/distros/humble/tf2-kdl/default.nix +++ b/distros/humble/tf2-kdl/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, builtin-interfaces, geometry-msgs, orocos-kdl-vendor, rclcpp, tf2, tf2-msgs, tf2-ros, tf2-ros-py }: buildRosPackage { pname = "ros-humble-tf2-kdl"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_kdl/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "3e691886bb095d4b7b1d4740a3de1d32a3cad3b1b04c8c0dae19332e9f2ed5bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_kdl/0.25.2-1"; + sha256 = "sha256-IlBvLKL+7gL2C1zyTYWU1Or1DoUn9Z/d7Ve9lt0UPpg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tf2-msgs/default.nix b/distros/humble/tf2-msgs/default.nix index b36e0b87d9..c8ab0fda38 100644 --- a/distros/humble/tf2-msgs/default.nix +++ b/distros/humble/tf2-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-msgs, ament-cmake, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-humble-tf2-msgs"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_msgs/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "9ce32b44eb4b289854ba0434dd19b96dff7e8dc33404499dc673427d83e08779"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_msgs/0.25.2-1"; + sha256 = "sha256-wM0b8qKs64hduNm5/etethiXsl702mAVfdORqtyGPg0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/tf2-py/default.nix b/distros/humble/tf2-py/default.nix index 0361eb13da..c6da152f3b 100644 --- a/distros/humble/tf2-py/default.nix +++ b/distros/humble/tf2-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-pytest, ament-lint-auto, ament-lint-common, builtin-interfaces, geometry-msgs, python-cmake-module, rclpy, rpyutils, tf2 }: buildRosPackage { pname = "ros-humble-tf2-py"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_py/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "28900084eba229098f2fdd3acc79843982d73c4406e8ba4aca67fa109ce35fc2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_py/0.25.2-1"; + sha256 = "sha256-/KGHqwRT8tYzrPsQUUOlJaROQDxxeBRXymToz5TRs10="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python-cmake-module ]; diff --git a/distros/humble/tf2-ros-py/default.nix b/distros/humble/tf2-ros-py/default.nix index fc698dbb59..3535a13d5d 100644 --- a/distros/humble/tf2-ros-py/default.nix +++ b/distros/humble/tf2-ros-py/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, geometry-msgs, pythonPackages, rclpy, sensor-msgs, std-msgs, tf2-msgs, tf2-py }: buildRosPackage { pname = "ros-humble-tf2-ros-py"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_ros_py/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "c846e18c1ce00bebf875f2c450687541f8e017d008c44f4d00b09d3054ddfbc0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_ros_py/0.25.2-1"; + sha256 = "sha256-/VrEqCQJiYcb4ubhPzRTAJthEd313aB8AeBQyOtZSQo="; + }; buildType = "ament_python"; checkInputs = [ pythonPackages.pytest sensor-msgs ]; diff --git a/distros/humble/tf2-ros/default.nix b/distros/humble/tf2-ros/default.nix index 23070b02a1..1e9d635d1f 100644 --- a/distros/humble/tf2-ros/default.nix +++ b/distros/humble/tf2-ros/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, geometry-msgs, message-filters, rcl-interfaces, rclcpp, rclcpp-action, rclcpp-components, rosgraph-msgs, tf2, tf2-msgs }: buildRosPackage { pname = "ros-humble-tf2-ros"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_ros/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "3d7d2624849c032a5018c5acc79115da62d9bd0406d466bf0b6df0c9a5c48a53"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_ros/0.25.2-1"; + sha256 = "sha256-hewBtYF3xFuGSD3TrM0RtprHcH/85YkmVqfVRqoL8sk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tf2-sensor-msgs/default.nix b/distros/humble/tf2-sensor-msgs/default.nix index 9124c91e2a..80ac9f4d69 100644 --- a/distros/humble/tf2-sensor-msgs/default.nix +++ b/distros/humble/tf2-sensor-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-gtest, ament-lint-auto, ament-lint-common, eigen, eigen3-cmake-module, rclcpp, sensor-msgs, tf2, tf2-ros, tf2-ros-py }: buildRosPackage { pname = "ros-humble-tf2-sensor-msgs"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_sensor_msgs/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "92efb7f9a81400b441069c9fee904f6e2b20ee2e89c5f02817a0fa94b5b846cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_sensor_msgs/0.25.2-1"; + sha256 = "sha256-VI5PuuqSX4OoE0fZZuz5KrPpITQ4ujhgBGw3og2/hRk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/tf2-tools/default.nix b/distros/humble/tf2-tools/default.nix index 97d9434a48..9a3c156df4 100644 --- a/distros/humble/tf2-tools/default.nix +++ b/distros/humble/tf2-tools/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, graphviz, python3Packages, rclpy, tf2-msgs, tf2-py, tf2-ros-py }: buildRosPackage { pname = "ros-humble-tf2-tools"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2_tools/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "e78b6d8bc7892588e864fe1deedf38a550bb67867a1d82583da3c4f93d164168"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2_tools/0.25.2-1"; + sha256 = "sha256-gw2JhVFIgWfaqaUUCT0zM9tLkMUdojstG7lqf3LSGdk="; + }; buildType = "ament_python"; propagatedBuildInputs = [ graphviz python3Packages.pyyaml rclpy tf2-msgs tf2-py tf2-ros-py ]; diff --git a/distros/humble/tf2/default.nix b/distros/humble/tf2/default.nix index 2eae36ad18..b5c2317da9 100644 --- a/distros/humble/tf2/default.nix +++ b/distros/humble/tf2/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-copyright, ament-cmake-cppcheck, ament-cmake-cpplint, ament-cmake-gtest, ament-cmake-lint-cmake, ament-cmake-uncrustify, ament-cmake-xmllint, builtin-interfaces, console-bridge, console-bridge-vendor, geometry-msgs, rcutils, rosidl-runtime-cpp }: buildRosPackage { pname = "ros-humble-tf2"; - version = "0.25.1-r1"; + version = "0.25.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/humble/tf2/0.25.1-1.tar.gz"; - name = "0.25.1-1.tar.gz"; - sha256 = "71db8e8d02d5ca97bcfdcfa22f15d7264e3bbd1f4fbdf6d73f585eaa7a45df6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/humble/tf2/0.25.2-1"; + sha256 = "sha256-pf/qSEQIIEMP4f9Y7LfG13jFJ+sPoQ0VfbK/hokTURk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tiago-2dnav/default.nix b/distros/humble/tiago-2dnav/default.nix index a8b6ddcd54..4e5363e6bc 100644 --- a/distros/humble/tiago-2dnav/default.nix +++ b/distros/humble/tiago-2dnav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-2dnav"; version = "4.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_navigation-release/archive/release/humble/tiago_2dnav/4.0.2-1.tar.gz"; - name = "4.0.2-1.tar.gz"; - sha256 = "55a10605194143d22212f4c7447125392d3a6187800474758423bd95a677e4fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_navigation-release"; + rev = "release/humble/tiago_2dnav/4.0.2-1"; + sha256 = "sha256-oP6oDB3Y0dSgLoK+1+0IEvdkRTkigcPz2682vMGbjLg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/tiago-bringup/default.nix b/distros/humble/tiago-bringup/default.nix index 22cbfb67c9..7400fa283a 100644 --- a/distros/humble/tiago-bringup/default.nix +++ b/distros/humble/tiago-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-bringup"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_robot-release/archive/release/humble/tiago_bringup/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "75481da17bcd49b6cec9c4574ddc3e04b415de5230889be65803dd02c2ccddf4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_robot-release"; + rev = "release/humble/tiago_bringup/4.0.1-1"; + sha256 = "sha256-VqAjgBteNjH4NqYWBQwwl3wljc5/d4Cnb/n3fLTIRjc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/tiago-controller-configuration/default.nix b/distros/humble/tiago-controller-configuration/default.nix index af37611cfe..fa82716339 100644 --- a/distros/humble/tiago-controller-configuration/default.nix +++ b/distros/humble/tiago-controller-configuration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-controller-configuration"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_robot-release/archive/release/humble/tiago_controller_configuration/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "b03dccd2268a99bc75b899a171c1d3e661e3757114cd76211cef831b8cbda68d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_robot-release"; + rev = "release/humble/tiago_controller_configuration/4.0.1-1"; + sha256 = "sha256-etmuuy/z14V1jEFDX3anB+WGPsiEv+ajNxKui+cXZOk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/tiago-description/default.nix b/distros/humble/tiago-description/default.nix index 5600221b66..98fdaa15e2 100644 --- a/distros/humble/tiago-description/default.nix +++ b/distros/humble/tiago-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-description"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_robot-release/archive/release/humble/tiago_description/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "6b34f0467a25c466df3502f50dcf9141ddfc171eea6e68cfe7848f7ac324270f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_robot-release"; + rev = "release/humble/tiago_description/4.0.1-1"; + sha256 = "sha256-SW3tEIV+jvJAjV55IKH6Qg10EtESmCjU6SkT2PPn9qM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ament-cmake-python ]; diff --git a/distros/humble/tiago-gazebo/default.nix b/distros/humble/tiago-gazebo/default.nix index dcf3e05a78..fa0430e657 100644 --- a/distros/humble/tiago-gazebo/default.nix +++ b/distros/humble/tiago-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-gazebo"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_simulation-release/archive/release/humble/tiago_gazebo/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "dc24fd9202946c91d8733cc60727a2bbc0445f272923417ac40c7f44d23e2ee5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_simulation-release"; + rev = "release/humble/tiago_gazebo/4.0.0-1"; + sha256 = "sha256-l621c0DbnjnZh63X5f1KaVrcw5oT1fahRxPHrE3mEDk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/tiago-moveit-config/default.nix b/distros/humble/tiago-moveit-config/default.nix index 74ba5b2a60..2cbd49dc46 100644 --- a/distros/humble/tiago-moveit-config/default.nix +++ b/distros/humble/tiago-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-moveit-config"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_moveit_config-release/archive/release/humble/tiago_moveit_config/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "c7835ca1c9b0cb1cec9eb8169c352e7f36bb8892fcbf20a3fb38bc4dde87d20e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_moveit_config-release"; + rev = "release/humble/tiago_moveit_config/3.0.0-1"; + sha256 = "sha256-FWuKJTtxYj3SFnefnduSuiD+8SfbQep3NlF5wpmAzcM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tiago-navigation/default.nix b/distros/humble/tiago-navigation/default.nix index c3475ab05b..8c89162be6 100644 --- a/distros/humble/tiago-navigation/default.nix +++ b/distros/humble/tiago-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-navigation"; version = "4.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_navigation-release/archive/release/humble/tiago_navigation/4.0.2-1.tar.gz"; - name = "4.0.2-1.tar.gz"; - sha256 = "fcd59cbb3c58ea337123bcf32c029179f05d16ce44e9c598bec3cc31f54582d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_navigation-release"; + rev = "release/humble/tiago_navigation/4.0.2-1"; + sha256 = "sha256-pxhRA39eZM3HlGeM490qFiNo1YZ3QBrD8HWli7ssP3Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/tiago-robot/default.nix b/distros/humble/tiago-robot/default.nix index e39eb57b74..752b8d69f8 100644 --- a/distros/humble/tiago-robot/default.nix +++ b/distros/humble/tiago-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-robot"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_robot-release/archive/release/humble/tiago_robot/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "66e6fda09df3afc1e804d6b80bd6534b1b34c798b00a9be3590ca2a321cefdd2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_robot-release"; + rev = "release/humble/tiago_robot/4.0.1-1"; + sha256 = "sha256-TJ4o/IVPAoJfYiAUDCZLts4LovHFnlYxbjNaXTfsm2Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tiago-simulation/default.nix b/distros/humble/tiago-simulation/default.nix index 55294b8127..054fc620eb 100644 --- a/distros/humble/tiago-simulation/default.nix +++ b/distros/humble/tiago-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tiago-simulation"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/tiago_simulation-release/archive/release/humble/tiago_simulation/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "e7aa5db9bc41a3394ad2ee514b60af9d6ab6f8ed9cc2d25de217031283762c9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "tiago_simulation-release"; + rev = "release/humble/tiago_simulation/4.0.0-1"; + sha256 = "sha256-CCFztISmrnIJgFLfTGVqoEY4STOtF06QESFYDk9Cvm8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tile-map/default.nix b/distros/humble/tile-map/default.nix new file mode 100644 index 0000000000..397a572b9d --- /dev/null +++ b/distros/humble/tile-map/default.nix @@ -0,0 +1,31 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, glew, jsoncpp, libyamlcpp, mapviz, pluginlib, qt5, rclcpp, swri-math-util, swri-transform-util, tf2 }: +buildRosPackage { + pname = "ros-humble-tile-map"; + version = "2.2.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mapviz-release"; + rev = "release/humble/tile_map/2.2.0-1"; + sha256 = "sha256-ECQRF0Ip6ulf/qrYRGDXYExWNYjsbiDZqfhh0ImQfC8="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ glew jsoncpp libyamlcpp mapviz pluginlib qt5.qtbase rclcpp swri-math-util swri-transform-util tf2 ]; + nativeBuildInputs = [ ament-cmake qt5.qtbase ]; + + meta = { + description = ''Tile map provides a slippy map style interface for visualizing + OpenStreetMap and GoogleMap tiles. A mapviz visualization plug-in is also + implemented''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/humble/tinyxml-vendor/default.nix b/distros/humble/tinyxml-vendor/default.nix index 2a71ac431d..777ce4f23f 100644 --- a/distros/humble/tinyxml-vendor/default.nix +++ b/distros/humble/tinyxml-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tinyxml-vendor"; version = "0.8.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tinyxml_vendor-release/archive/release/humble/tinyxml_vendor/0.8.3-2.tar.gz"; - name = "0.8.3-2.tar.gz"; - sha256 = "a3568b28e4dae03b9bb4793b2dd5377d5be556d941ccce57c21838fb1fbb129c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tinyxml_vendor-release"; + rev = "release/humble/tinyxml_vendor/0.8.3-2"; + sha256 = "sha256-RlXNKAUDO4E63XC+Ghp1xYDhrVSCpu8qPx/YgCtQUbk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tinyxml2-vendor/default.nix b/distros/humble/tinyxml2-vendor/default.nix index 3c212c8f3b..189870fefc 100644 --- a/distros/humble/tinyxml2-vendor/default.nix +++ b/distros/humble/tinyxml2-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tinyxml2-vendor"; version = "0.7.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tinyxml2_vendor-release/archive/release/humble/tinyxml2_vendor/0.7.5-2.tar.gz"; - name = "0.7.5-2.tar.gz"; - sha256 = "6ff5abce57a08bacbc4852b9a593e6be2e2bbd3ae23a5cba1a0ed61c97da883f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tinyxml2_vendor-release"; + rev = "release/humble/tinyxml2_vendor/0.7.5-2"; + sha256 = "sha256-P4ml9KbmfmMhanthISA933YwSgwGROeKGEB5j2vuRKM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tl-expected/default.nix b/distros/humble/tl-expected/default.nix index 18325717e6..ad0b214955 100644 --- a/distros/humble/tl-expected/default.nix +++ b/distros/humble/tl-expected/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tl-expected"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/cpp_polyfills-release/archive/release/humble/tl_expected/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "c7ee1c7e16aea04c2da0c93bf41f9a2570f0d2ff987b2a25ea423f0d702821f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "cpp_polyfills-release"; + rev = "release/humble/tl_expected/1.0.2-2"; + sha256 = "sha256-MRDjBU0WqHHPomrtLuNox0zVGvy6aMGTGO8WBV04bF8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tlsf-cpp/default.nix b/distros/humble/tlsf-cpp/default.nix index 5bf9bea29f..6ef01d6180 100644 --- a/distros/humble/tlsf-cpp/default.nix +++ b/distros/humble/tlsf-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tlsf-cpp"; version = "0.13.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/realtime_support-release/archive/release/humble/tlsf_cpp/0.13.0-2.tar.gz"; - name = "0.13.0-2.tar.gz"; - sha256 = "015d2c8320af94d7a05954ff7b3de18d98791f774b0654e902d4117a555e5e19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "realtime_support-release"; + rev = "release/humble/tlsf_cpp/0.13.0-2"; + sha256 = "sha256-hFBDZgnV3zbkfn2UU+rDhfvVOEVwnA+uEZzeSaxBjY4="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common rmw-implementation-cmake ]; diff --git a/distros/humble/tlsf/default.nix b/distros/humble/tlsf/default.nix index 998f5372c4..b0960a35c9 100644 --- a/distros/humble/tlsf/default.nix +++ b/distros/humble/tlsf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tlsf"; version = "0.7.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tlsf-release/archive/release/humble/tlsf/0.7.0-2.tar.gz"; - name = "0.7.0-2.tar.gz"; - sha256 = "5529e9e5b73a5800f4ec58d218f1d6c336f33ad153f258f9b379fbd44e28c6e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tlsf-release"; + rev = "release/humble/tlsf/0.7.0-2"; + sha256 = "sha256-Gaa53l1Yew9zgTyLFtPie+iQ4w68RsHQ1lJQhVNX6EI="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/humble/topic-monitor/default.nix b/distros/humble/topic-monitor/default.nix index b3fb88ee26..5602e39daa 100644 --- a/distros/humble/topic-monitor/default.nix +++ b/distros/humble/topic-monitor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-flake8, ament-pep257, launch, launch-ros, pythonPackages, rclpy, std-msgs }: buildRosPackage { pname = "ros-humble-topic-monitor"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/topic_monitor/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "3c1b6d734e0602c443d99f3356a4965cace4d9b491eaa4933f03879cd42fe463"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/topic_monitor/0.20.3-1"; + sha256 = "sha256-z1Ks2T3sjDMOmjP9upOr1d5fZ4QB3aTgc5sIS4o3Sos="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/topic-statistics-demo/default.nix b/distros/humble/topic-statistics-demo/default.nix index 2191617856..a2706d8c0f 100644 --- a/distros/humble/topic-statistics-demo/default.nix +++ b/distros/humble/topic-statistics-demo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rclcpp, rcutils, sensor-msgs, statistics-msgs }: buildRosPackage { pname = "ros-humble-topic-statistics-demo"; - version = "0.20.2-r1"; + version = "0.20.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/humble/topic_statistics_demo/0.20.2-1.tar.gz"; - name = "0.20.2-1.tar.gz"; - sha256 = "85a97b428f77c40407de436602de5ea39b304ad7dadd4449299d96e99c36421d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/humble/topic_statistics_demo/0.20.3-1"; + sha256 = "sha256-0vv4vR7gkP9x8Yhat0PVXfPoV5KA4WTpnYi+AMVgezE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/topic-tools-interfaces/default.nix b/distros/humble/topic-tools-interfaces/default.nix index 169375cba4..dd25a7a739 100644 --- a/distros/humble/topic-tools-interfaces/default.nix +++ b/distros/humble/topic-tools-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-topic-tools-interfaces"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/topic_tools-release/archive/release/humble/topic_tools_interfaces/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "6e68d8fee9e39482da8aa56ba90086f41f79500ab073bc260216f5b6afb38676"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "topic_tools-release"; + rev = "release/humble/topic_tools_interfaces/1.0.0-2"; + sha256 = "sha256-jgnfd+kmIaH/wQmVa5MUEaJ9j+SDBphMz9LbGAr2uIA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto rosidl-default-generators ]; diff --git a/distros/humble/topic-tools/default.nix b/distros/humble/topic-tools/default.nix index c91e64a07d..4c940d2675 100644 --- a/distros/humble/topic-tools/default.nix +++ b/distros/humble/topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-topic-tools"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/topic_tools-release/archive/release/humble/topic_tools/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "1b98ac197a1ecd10a6d4209635987fce44a93a3e052d05cd9050a80af43732e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "topic_tools-release"; + rev = "release/humble/topic_tools/1.0.0-2"; + sha256 = "sha256-FKDmeNP+ucx8c0/wK+m+jHfA3Z/uF5ea6w7yeYPbJMo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ament-cmake-python rosidl-default-generators ]; diff --git a/distros/humble/tracetools-acceleration/default.nix b/distros/humble/tracetools-acceleration/default.nix index fd593534a9..aaa3472657 100644 --- a/distros/humble/tracetools-acceleration/default.nix +++ b/distros/humble/tracetools-acceleration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tracetools-acceleration"; version = "0.4.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tracetools_acceleration-release/archive/release/humble/tracetools_acceleration/0.4.1-2.tar.gz"; - name = "0.4.1-2.tar.gz"; - sha256 = "b69b9fd608fcfff8501d1432eb19cc99501b2984763eafeb2e5d6a566d7d403f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tracetools_acceleration-release"; + rev = "release/humble/tracetools_acceleration/0.4.1-2"; + sha256 = "sha256-8S7qrZQ1ohJoEVhAiMPHVKAD4lCTHCfRb1CD5hu4VWg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros pkg-config ]; diff --git a/distros/humble/tracetools-analysis/default.nix b/distros/humble/tracetools-analysis/default.nix index 96d9dc7145..abf1c64c10 100644 --- a/distros/humble/tracetools-analysis/default.nix +++ b/distros/humble/tracetools-analysis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tracetools-analysis"; version = "3.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tracetools_analysis-release/archive/release/humble/tracetools_analysis/3.0.0-4.tar.gz"; - name = "3.0.0-4.tar.gz"; - sha256 = "f2c261ab9e97233d32ab2c6654fca868fae3ff3a0afb3f3098834816023e4f45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tracetools_analysis-release"; + rev = "release/humble/tracetools_analysis/3.0.0-4"; + sha256 = "sha256-DPKjLLYf07C3NN4cCJqYVc28MZaOWmDTrLO+g2oyGwA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/humble/tracetools-image-pipeline/default.nix b/distros/humble/tracetools-image-pipeline/default.nix index 1a4401e7cd..081e2d899b 100644 --- a/distros/humble/tracetools-image-pipeline/default.nix +++ b/distros/humble/tracetools-image-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tracetools-image-pipeline"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/humble/tracetools_image_pipeline/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "3f88211d7b02bd6cf6fd2f23701efa92e5f49851ac8ba568b7942700e4501aaf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/humble/tracetools_image_pipeline/3.0.0-1"; + sha256 = "sha256-k1CdLEhMoCf1hmBuWQjjcBoSWyhwPf6etpFrr8zNqQA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros pkg-config ]; diff --git a/distros/humble/tracetools-launch/default.nix b/distros/humble/tracetools-launch/default.nix index b0528d2b5b..5c4ee0fc04 100644 --- a/distros/humble/tracetools-launch/default.nix +++ b/distros/humble/tracetools-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tracetools-launch"; version = "4.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/humble/tracetools_launch/4.1.1-1.tar.gz"; - name = "4.1.1-1.tar.gz"; - sha256 = "4112ff73186f86ffd03f8f0ae8d388a54afc279215633c4525bbf84a0b79eb06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/humble/tracetools_launch/4.1.1-1"; + sha256 = "sha256-Bdbc+UqCjEUnzO3oI+u7Wf0bRpxuaoGVSIhpl5mgw20="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/humble/tracetools-test/default.nix b/distros/humble/tracetools-test/default.nix index 938d32d4d2..ccd897af16 100644 --- a/distros/humble/tracetools-test/default.nix +++ b/distros/humble/tracetools-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tracetools-test"; version = "4.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/humble/tracetools_test/4.1.1-1.tar.gz"; - name = "4.1.1-1.tar.gz"; - sha256 = "78ef19510f297837af388cf9b630d58bc6fcc4b512c52ad01c361894f3d9fe26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/humble/tracetools_test/4.1.1-1"; + sha256 = "sha256-8nCkrsV/VFYy1st5spOxIpYzsa3Iq2oFGNz/Rj5a61o="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/humble/tracetools/default.nix b/distros/humble/tracetools/default.nix index 1666bf2afa..9285a2cf46 100644 --- a/distros/humble/tracetools/default.nix +++ b/distros/humble/tracetools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-tracetools"; version = "4.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/humble/tracetools/4.1.1-1.tar.gz"; - name = "4.1.1-1.tar.gz"; - sha256 = "012ea02ea2c1fccb864e27f73f9e2d1d8245c7dbc7a28bf299b3c46fc2f3aea4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/humble/tracetools/4.1.1-1"; + sha256 = "sha256-5yEHJJerQKfeVscgc1q6TKv2aH0xf3KhAcATgLapYnQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros pkg-config ]; diff --git a/distros/humble/trajectory-msgs/default.nix b/distros/humble/trajectory-msgs/default.nix index 9db4ee6760..03bb93ca76 100644 --- a/distros/humble/trajectory-msgs/default.nix +++ b/distros/humble/trajectory-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-humble-trajectory-msgs"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/trajectory_msgs/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "9f22be694225674ad211d4a21e6adb936c80a5a347493e58ea4065bbe941f145"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/trajectory_msgs/4.2.3-1"; + sha256 = "sha256-suV0sWZPrtjHrP7eHIIG8aNz6tAAo9Iw49GI3xaQQNE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/transmission-interface/default.nix b/distros/humble/transmission-interface/default.nix index a8840eeca0..02023f62eb 100644 --- a/distros/humble/transmission-interface/default.nix +++ b/distros/humble/transmission-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, hardware-interface, pluginlib }: buildRosPackage { pname = "ros-humble-transmission-interface"; - version = "2.18.0-r1"; + version = "2.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/humble/transmission_interface/2.18.0-1.tar.gz"; - name = "2.18.0-1.tar.gz"; - sha256 = "d0baa1cee4e7219d2108563176f2972645acf02cf6d204165ef60b19a239091a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/humble/transmission_interface/2.21.0-1"; + sha256 = "sha256-P8I3wuHDwIIlwzac7gClJaqTmGymDSum+1FJUoUf4xA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/tricycle-controller/default.nix b/distros/humble/tricycle-controller/default.nix index 32bef21723..9e69adf4a6 100644 --- a/distros/humble/tricycle-controller/default.nix +++ b/distros/humble/tricycle-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ackermann-msgs, ament-cmake, ament-cmake-gmock, controller-interface, controller-manager, geometry-msgs, hardware-interface, nav-msgs, pluginlib, rclcpp, rclcpp-lifecycle, rcpputils, realtime-tools, ros2-control-test-assets, std-srvs, tf2, tf2-msgs }: +{ lib, buildRosPackage, fetchurl, ackermann-msgs, ament-cmake, ament-cmake-gmock, backward-ros, controller-interface, controller-manager, geometry-msgs, hardware-interface, nav-msgs, pluginlib, rclcpp, rclcpp-lifecycle, rcpputils, realtime-tools, ros2-control-test-assets, std-srvs, tf2, tf2-msgs }: buildRosPackage { pname = "ros-humble-tricycle-controller"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/tricycle_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "c8d7a4c7a63b7fa55a5f2c0b374dd5b0b2bfe9dba10ff5213a03370cd43c3d3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/tricycle_controller/2.16.0-1"; + sha256 = "sha256-wCKQVKuXcsXWmepaqMz5a1/Ttz2DVXkSmC10scHzpfA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ ackermann-msgs controller-interface geometry-msgs hardware-interface nav-msgs rclcpp rclcpp-lifecycle rcpputils realtime-tools std-srvs tf2 tf2-msgs ]; + propagatedBuildInputs = [ ackermann-msgs backward-ros controller-interface geometry-msgs hardware-interface nav-msgs rclcpp rclcpp-lifecycle rcpputils realtime-tools std-srvs tf2 tf2-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/turbojpeg-compressed-image-transport/default.nix b/distros/humble/turbojpeg-compressed-image-transport/default.nix index e07efed736..0e5846deda 100644 --- a/distros/humble/turbojpeg-compressed-image-transport/default.nix +++ b/distros/humble/turbojpeg-compressed-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turbojpeg-compressed-image-transport"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turbojpeg_compressed_image_transport-release/archive/release/humble/turbojpeg_compressed_image_transport/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "556f7afedd8d86dd7d21bba16a7bb2b2c8ba2b6623a7fab87c44cd09ae5ab881"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turbojpeg_compressed_image_transport-release"; + rev = "release/humble/turbojpeg_compressed_image_transport/0.1.3-1"; + sha256 = "sha256-wQ29hHJAn0G7oYS1sPqomyz/MYlPqvthqiK9e0hLN6o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtle-tf2-cpp/default.nix b/distros/humble/turtle-tf2-cpp/default.nix index fd445fdffe..16ee0648da 100644 --- a/distros/humble/turtle-tf2-cpp/default.nix +++ b/distros/humble/turtle-tf2-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtle-tf2-cpp"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/humble/turtle_tf2_cpp/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "7e6780b17f099f7fdc2169506b4474df31949054e73fc8bc3f70604e81452969"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/humble/turtle_tf2_cpp/0.3.6-1"; + sha256 = "sha256-/+vZZp6tpMuKd5xAZHma9sMN5Q0aWVwbu5ZnKW6t2nQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtle-tf2-py/default.nix b/distros/humble/turtle-tf2-py/default.nix index 0e47f72a06..cee1a2975e 100644 --- a/distros/humble/turtle-tf2-py/default.nix +++ b/distros/humble/turtle-tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtle-tf2-py"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/humble/turtle_tf2_py/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "f7d8d6a6c26c57053f89d4d98267ae10495da9f4370efdc7c6242e8d21896d9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/humble/turtle_tf2_py/0.3.6-1"; + sha256 = "sha256-KyrTt9hvh28k8MJ6EaD2AnuC3cH+nNMX5fYPjXkz6AA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/turtlebot3-bringup/default.nix b/distros/humble/turtlebot3-bringup/default.nix index 009fc8b3f5..d5ee796206 100644 --- a/distros/humble/turtlebot3-bringup/default.nix +++ b/distros/humble/turtlebot3-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-bringup"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/humble/turtlebot3_bringup/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "a977ec054028a87f8e21ce5e44dae3fe7ffb4e23b78e181644317539075c9c06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/humble/turtlebot3_bringup/2.1.5-1"; + sha256 = "sha256-0m2+/8Oye5Qk19fp/cOQkyo72vulfnZKi0Gmq9DIJcg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlebot3-cartographer/default.nix b/distros/humble/turtlebot3-cartographer/default.nix index 4434231e44..8d4a4a81a5 100644 --- a/distros/humble/turtlebot3-cartographer/default.nix +++ b/distros/humble/turtlebot3-cartographer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-cartographer"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/humble/turtlebot3_cartographer/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "e4c91424a42e773b3f6bf41c56cb43bd4e975ca039cc7a72ae4ea64ab431ef35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/humble/turtlebot3_cartographer/2.1.5-1"; + sha256 = "sha256-PofMNoCLZpgvcxyB7i4wWaFlRC4VMzsOMK+L97MmVVU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlebot3-description/default.nix b/distros/humble/turtlebot3-description/default.nix index 03f88128b8..82c7e2e6e0 100644 --- a/distros/humble/turtlebot3-description/default.nix +++ b/distros/humble/turtlebot3-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-description"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/humble/turtlebot3_description/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "28ac59116690e5f0c57bde8c74578c1727788dd995cfe207bd65ef93f4ae5db7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/humble/turtlebot3_description/2.1.5-1"; + sha256 = "sha256-YByZlr7CVSBBqtq25m1R6GLZEX1i+iFvVk+KlAyKAxU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlebot3-example/default.nix b/distros/humble/turtlebot3-example/default.nix index d10af8ada3..9b32d3710c 100644 --- a/distros/humble/turtlebot3-example/default.nix +++ b/distros/humble/turtlebot3-example/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-example"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/humble/turtlebot3_example/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "22e2c299d1330b74a496a92129cd7821413b02d9fabeb8128680e5c16b753e34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/humble/turtlebot3_example/2.1.5-1"; + sha256 = "sha256-MAQcSWCJsds74ow4ACPsaQKi3ui6ktaBN0VkHNOUrZY="; + }; buildType = "ament_python"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlebot3-fake-node/default.nix b/distros/humble/turtlebot3-fake-node/default.nix index 1f9fd114ab..442b49e1f5 100644 --- a/distros/humble/turtlebot3-fake-node/default.nix +++ b/distros/humble/turtlebot3-fake-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-fake-node"; version = "2.2.5-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turtlebot3_simulations-release/archive/release/humble/turtlebot3_fake_node/2.2.5-3.tar.gz"; - name = "2.2.5-3.tar.gz"; - sha256 = "24a1b429e5aa4b9a506665fa696a16cb88ba9426e6c301ada28d2ded1196561c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turtlebot3_simulations-release"; + rev = "release/humble/turtlebot3_fake_node/2.2.5-3"; + sha256 = "sha256-RC56Xh4EBNwDvXTRDOIw1kV2Q9fZB4veFuXoOZI3KZA="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake geometry-msgs nav-msgs rclcpp robot-state-publisher sensor-msgs tf2 tf2-msgs turtlebot3-msgs ]; diff --git a/distros/humble/turtlebot3-gazebo/default.nix b/distros/humble/turtlebot3-gazebo/default.nix index 64c31ee5db..25ff80945b 100644 --- a/distros/humble/turtlebot3-gazebo/default.nix +++ b/distros/humble/turtlebot3-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-gazebo"; version = "2.2.5-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turtlebot3_simulations-release/archive/release/humble/turtlebot3_gazebo/2.2.5-3.tar.gz"; - name = "2.2.5-3.tar.gz"; - sha256 = "b4bc672bfbd384f46db90b999ea87a120a4104929eab564348d13e40fde0701f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turtlebot3_simulations-release"; + rev = "release/humble/turtlebot3_gazebo/2.2.5-3"; + sha256 = "sha256-v6xnRm6M8asU/HVNlinmuyhrm7cTaIuA3aSHJzPeX6c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlebot3-msgs/default.nix b/distros/humble/turtlebot3-msgs/default.nix index 2f434e89c3..1cb3dbd085 100644 --- a/distros/humble/turtlebot3-msgs/default.nix +++ b/distros/humble/turtlebot3-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-msgs"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turtlebot3_msgs-release/archive/release/humble/turtlebot3_msgs/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "d460ea8afe21446f242c8fedb27fc0a23fb0c76d1944a31654cb36680c239ea3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turtlebot3_msgs-release"; + rev = "release/humble/turtlebot3_msgs/2.2.3-1"; + sha256 = "sha256-pyrS0ZJEAld/gKSXtW5IKrw3YI0fJ2/tnfGULpKNpuE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/turtlebot3-navigation2/default.nix b/distros/humble/turtlebot3-navigation2/default.nix index 2e5ef1149c..2573b0b1f6 100644 --- a/distros/humble/turtlebot3-navigation2/default.nix +++ b/distros/humble/turtlebot3-navigation2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-navigation2"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/humble/turtlebot3_navigation2/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "d86c6480db51e1e321baac1d7438d157f1dcb3f8116a478e0a7f23f871c96726"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/humble/turtlebot3_navigation2/2.1.5-1"; + sha256 = "sha256-BOZRX36RPGrZsyRH5fGt4Ri6cjmJBoi7TGP1Z7Dnz4Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlebot3-node/default.nix b/distros/humble/turtlebot3-node/default.nix index 63bc3612c5..2b13237b43 100644 --- a/distros/humble/turtlebot3-node/default.nix +++ b/distros/humble/turtlebot3-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-node"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/humble/turtlebot3_node/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "9269171788c34a5a8baa58bc9dc89845520d93da5a40274ef1eaffe263610bb3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/humble/turtlebot3_node/2.1.5-1"; + sha256 = "sha256-PAzdvdC18y6A9MZLdbE4GlHHg/3Nq4JUyC3NdimcKEk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlebot3-simulations/default.nix b/distros/humble/turtlebot3-simulations/default.nix index 865a8baf6b..22f9d4d170 100644 --- a/distros/humble/turtlebot3-simulations/default.nix +++ b/distros/humble/turtlebot3-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-simulations"; version = "2.2.5-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turtlebot3_simulations-release/archive/release/humble/turtlebot3_simulations/2.2.5-3.tar.gz"; - name = "2.2.5-3.tar.gz"; - sha256 = "53dc19595737492ef5eef59517e16a701ced59ce1e84db7a7e851ad50289a109"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turtlebot3_simulations-release"; + rev = "release/humble/turtlebot3_simulations/2.2.5-3"; + sha256 = "sha256-W+h1Fb5Y9PXr/M12d+YOfwxWR1QaArnZtIDmkpQ95xI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlebot3-teleop/default.nix b/distros/humble/turtlebot3-teleop/default.nix index 706037d6b0..46ce662120 100644 --- a/distros/humble/turtlebot3-teleop/default.nix +++ b/distros/humble/turtlebot3-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3-teleop"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/humble/turtlebot3_teleop/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "13b92dbda7241dcaa188416f813bcb14676f8e8abc908d72903d2594a3cc2896"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/humble/turtlebot3_teleop/2.1.5-1"; + sha256 = "sha256-g2o2do3Pff546eAO8T1/8RdgBrfKXVW410BtaBoAb8s="; + }; buildType = "ament_python"; propagatedBuildInputs = [ geometry-msgs rclpy ]; diff --git a/distros/humble/turtlebot3/default.nix b/distros/humble/turtlebot3/default.nix index 53f832ce24..372ccc7953 100644 --- a/distros/humble/turtlebot3/default.nix +++ b/distros/humble/turtlebot3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlebot3"; version = "2.1.5-r1"; - src = fetchurl { - url = "https://github.com/robotis-ros2-release/turtlebot3-release/archive/release/humble/turtlebot3/2.1.5-1.tar.gz"; - name = "2.1.5-1.tar.gz"; - sha256 = "6d86273def64bcfd3e07449a7662ca9a971abd37be209a327455da3bd0b3b1ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotis-ros2-release"; + repo = "turtlebot3-release"; + rev = "release/humble/turtlebot3/2.1.5-1"; + sha256 = "sha256-5WW81vedE+7+MsKMisI1ZM6QoVOzzSkkA9NClEgd+qk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/turtlesim/default.nix b/distros/humble/turtlesim/default.nix index abea8a9db5..8e4da53dc9 100644 --- a/distros/humble/turtlesim/default.nix +++ b/distros/humble/turtlesim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-turtlesim"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_tutorials-release/archive/release/humble/turtlesim/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "e259c12d06533fe5943d8b5c5606cb215d2b2cfb309e0aaae263f51f5147d6f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_tutorials-release"; + rev = "release/humble/turtlesim/1.4.2-1"; + sha256 = "sha256-aasLRqKCjuLL2lV4bWgYs/teS/UyiGhEVpy5P+fKXt4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/twist-mux/default.nix b/distros/humble/twist-mux/default.nix index d865b6f10a..36525453ad 100644 --- a/distros/humble/twist-mux/default.nix +++ b/distros/humble/twist-mux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-twist-mux"; version = "4.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/twist_mux-release/archive/release/humble/twist_mux/4.1.0-3.tar.gz"; - name = "4.1.0-3.tar.gz"; - sha256 = "c1b49bb229fb409e6c698f2fa29ce5dda9fc5234e8a8b31461270948f058465f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "twist_mux-release"; + rev = "release/humble/twist_mux/4.1.0-3"; + sha256 = "sha256-BoZjLes6uwKLIV+Tt84oPmHntg1LPbq87iB0fQUKtm8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/twist-stamper/default.nix b/distros/humble/twist-stamper/default.nix index df498f3642..c3a31a901f 100644 --- a/distros/humble/twist-stamper/default.nix +++ b/distros/humble/twist-stamper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-twist-stamper"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/twist_stamper-release/archive/release/humble/twist_stamper/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "e91fabf0b36836ae94e29706d8e875b62ef1c96ad06dbc31776ead5af2939c4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "twist_stamper-release"; + rev = "release/humble/twist_stamper/0.0.3-1"; + sha256 = "sha256-AE3PKMNhcFfc7nbMllXSYBoKhQmRVHLCirRpDAEknEQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/ublox-dgnss-node/default.nix b/distros/humble/ublox-dgnss-node/default.nix index 5a14d555af..8c2f43edfe 100644 --- a/distros/humble/ublox-dgnss-node/default.nix +++ b/distros/humble/ublox-dgnss-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ublox-dgnss-node"; version = "0.3.5-r4"; - src = fetchurl { - url = "https://github.com/aussierobots/ublox_dgnss-release/archive/release/humble/ublox_dgnss_node/0.3.5-4.tar.gz"; - name = "0.3.5-4.tar.gz"; - sha256 = "633667e4147582fb9fce8f11a1baed9ce39ad4cead4598c4b7bcbd1b8cc98614"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aussierobots"; + repo = "ublox_dgnss-release"; + rev = "release/humble/ublox_dgnss_node/0.3.5-4"; + sha256 = "sha256-dgX6n6jvaBL2uHtDfImzoDMIddLnQMleaf0VMdCrpTk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/humble/ublox-dgnss/default.nix b/distros/humble/ublox-dgnss/default.nix index e4b3dba4a6..2822edd85a 100644 --- a/distros/humble/ublox-dgnss/default.nix +++ b/distros/humble/ublox-dgnss/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ublox-dgnss"; version = "0.3.5-r4"; - src = fetchurl { - url = "https://github.com/aussierobots/ublox_dgnss-release/archive/release/humble/ublox_dgnss/0.3.5-4.tar.gz"; - name = "0.3.5-4.tar.gz"; - sha256 = "755410df72e030ee202be2ecb818a99d58066fd6a5bfca595851be30ba580291"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aussierobots"; + repo = "ublox_dgnss-release"; + rev = "release/humble/ublox_dgnss/0.3.5-4"; + sha256 = "sha256-J3Q7I3WLW0elfgK+8If2tGBuxll769RKvn278cNuhpI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ublox-gps/default.nix b/distros/humble/ublox-gps/default.nix index 2c6b8ae3b1..08a005de05 100644 --- a/distros/humble/ublox-gps/default.nix +++ b/distros/humble/ublox-gps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ublox-gps"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/humble/ublox_gps/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "a57315ef0ebff9d8cb780627c8fbd30d9c907d2c1c118d51657ec042809305c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/humble/ublox_gps/2.3.0-2"; + sha256 = "sha256-reZXChxPuNCtJNjWaATs7ozW63ldzYenGz4KQv8rJ1M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/ublox-msgs/default.nix b/distros/humble/ublox-msgs/default.nix index ac2ce0d54a..110f05136c 100644 --- a/distros/humble/ublox-msgs/default.nix +++ b/distros/humble/ublox-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ublox-msgs"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/humble/ublox_msgs/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "00bfad4532c3ce6f235da6c44828c85c6cf4f4f18ac6e68b0fce6be8ab730f1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/humble/ublox_msgs/2.3.0-2"; + sha256 = "sha256-y+4Wac/LAoobvoFcSIJ2PGoih6+tPbrMnRKVg6BxUgM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-default-generators ]; diff --git a/distros/humble/ublox-serialization/default.nix b/distros/humble/ublox-serialization/default.nix index cedf62c095..f644223dc2 100644 --- a/distros/humble/ublox-serialization/default.nix +++ b/distros/humble/ublox-serialization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ublox-serialization"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/humble/ublox_serialization/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "91809609411efbee1acb843064f1ee697335cc3a03d45385077f11dc45551f68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/humble/ublox_serialization/2.3.0-2"; + sha256 = "sha256-b2kP01irILk8Ct0RNRYsczUU7sgdAugMNejSpNFPdGE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ublox-ubx-interfaces/default.nix b/distros/humble/ublox-ubx-interfaces/default.nix index 7ec492e637..363db69d3f 100644 --- a/distros/humble/ublox-ubx-interfaces/default.nix +++ b/distros/humble/ublox-ubx-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ublox-ubx-interfaces"; version = "0.3.5-r4"; - src = fetchurl { - url = "https://github.com/aussierobots/ublox_dgnss-release/archive/release/humble/ublox_ubx_interfaces/0.3.5-4.tar.gz"; - name = "0.3.5-4.tar.gz"; - sha256 = "cb92c32296b59aa14e6562cf5711c28fec16b79e10c0fa87c0954f7466b9c59f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aussierobots"; + repo = "ublox_dgnss-release"; + rev = "release/humble/ublox_ubx_interfaces/0.3.5-4"; + sha256 = "sha256-LVY7sODWICiAO2EZPOmt5aTlu0ZqjHH4bIgAZfFKbpQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ublox-ubx-msgs/default.nix b/distros/humble/ublox-ubx-msgs/default.nix index 54fbe1cd14..75bd57408c 100644 --- a/distros/humble/ublox-ubx-msgs/default.nix +++ b/distros/humble/ublox-ubx-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ublox-ubx-msgs"; version = "0.3.5-r4"; - src = fetchurl { - url = "https://github.com/aussierobots/ublox_dgnss-release/archive/release/humble/ublox_ubx_msgs/0.3.5-4.tar.gz"; - name = "0.3.5-4.tar.gz"; - sha256 = "5fe4ec759a8893153e1b13331e26fe44e79cae67074ed288c4ecdc2daba41816"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aussierobots"; + repo = "ublox_dgnss-release"; + rev = "release/humble/ublox_ubx_msgs/0.3.5-4"; + sha256 = "sha256-rPeG/k/7UAr25C9ghUPya7+ZwS9svz66lkGJCDlEi6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ublox/default.nix b/distros/humble/ublox/default.nix index e567863cf9..c0f1ff4125 100644 --- a/distros/humble/ublox/default.nix +++ b/distros/humble/ublox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ublox"; version = "2.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/humble/ublox/2.3.0-2.tar.gz"; - name = "2.3.0-2.tar.gz"; - sha256 = "39313bac51fc2660b4e9605506015343544575a3c0dec148e8670b96abe77417"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/humble/ublox/2.3.0-2"; + sha256 = "sha256-tCPY6Wu0TQ0Auvkx3xW6yyreMV7K0GruiyS4AZ29LtI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/udp-driver/default.nix b/distros/humble/udp-driver/default.nix index 875655f842..b9385590ad 100644 --- a/distros/humble/udp-driver/default.nix +++ b/distros/humble/udp-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-udp-driver"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/humble/udp_driver/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "26c1f3eb0952857d22041f36426c511aacbbe9eec297b1bb7959ab5ec2df57b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "transport_drivers-release"; + rev = "release/humble/udp_driver/1.2.0-2"; + sha256 = "sha256-ufshq3ku5f0OLD1L+CJhsfg8tSqLiOzmXueZGXDO9+4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/humble/udp-msgs/default.nix b/distros/humble/udp-msgs/default.nix index 0967d125df..32e503e327 100644 --- a/distros/humble/udp-msgs/default.nix +++ b/distros/humble/udp-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-udp-msgs"; version = "0.0.3-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/udp_msgs-release/archive/release/humble/udp_msgs/0.0.3-5.tar.gz"; - name = "0.0.3-5.tar.gz"; - sha256 = "ccecdb5df2ee885e2e3c2968edda71db4f3d3729be201a4be9c00061152a43ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "udp_msgs-release"; + rev = "release/humble/udp_msgs/0.0.3-5"; + sha256 = "sha256-g0Gi+BMs9cMS5t5Fh+epx+fKUhebhUczapOPMz9Bg5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/uncrustify-vendor/default.nix b/distros/humble/uncrustify-vendor/default.nix index 6fdb8cea50..62c5cbbb99 100644 --- a/distros/humble/uncrustify-vendor/default.nix +++ b/distros/humble/uncrustify-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-uncrustify-vendor"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/uncrustify_vendor-release/archive/release/humble/uncrustify_vendor/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "4703e6e84fe877004ad85d8439c13eb4032bd0b3f43d906f64dfc86537591241"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "uncrustify_vendor-release"; + rev = "release/humble/uncrustify_vendor/2.0.2-2"; + sha256 = "sha256-1oT+X1kC2I2bIsLMlfVIhm5D+Arco2V57zY3i08gUII="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/unique-identifier-msgs/default.nix b/distros/humble/unique-identifier-msgs/default.nix index 337f0c8b8d..2fcf9da289 100644 --- a/distros/humble/unique-identifier-msgs/default.nix +++ b/distros/humble/unique-identifier-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-unique-identifier-msgs"; version = "2.2.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/unique_identifier_msgs-release/archive/release/humble/unique_identifier_msgs/2.2.1-3.tar.gz"; - name = "2.2.1-3.tar.gz"; - sha256 = "82378ab13722ccbea3849ebe46bdb0c9d5327b595df8e92594faa4378456f7d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "unique_identifier_msgs-release"; + rev = "release/humble/unique_identifier_msgs/2.2.1-3"; + sha256 = "sha256-bC/ZqwXMkI4Fgqlw4fDPwVAl9QkWnU5BOc2oQ9oa+Ac="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/ur-bringup/default.nix b/distros/humble/ur-bringup/default.nix index 07498a184e..60e14b8a96 100644 --- a/distros/humble/ur-bringup/default.nix +++ b/distros/humble/ur-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-bringup"; version = "2.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/humble/ur_bringup/2.2.6-1.tar.gz"; - name = "2.2.6-1.tar.gz"; - sha256 = "255296aad45bf6486fb62afc5ec47665c739691763e2a7e898b5d66c6f921845"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/humble/ur_bringup/2.2.6-1"; + sha256 = "sha256-KP0OKseEWwnfj5o0zoi7vyI6jAuIq2dEa6w+m20fxH0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/ur-calibration/default.nix b/distros/humble/ur-calibration/default.nix index 26bbec3797..49a7a40282 100644 --- a/distros/humble/ur-calibration/default.nix +++ b/distros/humble/ur-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-calibration"; version = "2.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/humble/ur_calibration/2.2.6-1.tar.gz"; - name = "2.2.6-1.tar.gz"; - sha256 = "72099f1a1d5e81bbb9aafa2723afc8c4df8381d222e7e1d8becdbc6c82f865cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/humble/ur_calibration/2.2.6-1"; + sha256 = "sha256-FghWg2RfgaDEa4uVHnjwVXLbV7JnZfK8ZLAlbTROfpk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ur-client-library/default.nix b/distros/humble/ur-client-library/default.nix index d935efba04..5ff5421df6 100644 --- a/distros/humble/ur-client-library/default.nix +++ b/distros/humble/ur-client-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-client-library"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_Client_Library-release/archive/release/humble/ur_client_library/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "8ba1486cb7439abba2290242b5d67264947c579afd46830d3faca65bfc0fe57b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_Client_Library-release"; + rev = "release/humble/ur_client_library/1.3.1-1"; + sha256 = "sha256-AYfd94IM+Etv+B7ZUeZWVMNr98mHHmGlCi5CUh8hhWo="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/ur-controllers/default.nix b/distros/humble/ur-controllers/default.nix index 2eded8e657..00c295f3fa 100644 --- a/distros/humble/ur-controllers/default.nix +++ b/distros/humble/ur-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-controllers"; version = "2.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/humble/ur_controllers/2.2.6-1.tar.gz"; - name = "2.2.6-1.tar.gz"; - sha256 = "4572d3cd93db455c077776284ef66c00224f39a35ff610e9f31b224a377c2652"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/humble/ur_controllers/2.2.6-1"; + sha256 = "sha256-2gss+0MpLdC8TYybb8sQeV8OLsb5QzTGLgSnvJFFskI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ur-dashboard-msgs/default.nix b/distros/humble/ur-dashboard-msgs/default.nix index 022b3d3949..24b199c89a 100644 --- a/distros/humble/ur-dashboard-msgs/default.nix +++ b/distros/humble/ur-dashboard-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-dashboard-msgs"; version = "2.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/humble/ur_dashboard_msgs/2.2.6-1.tar.gz"; - name = "2.2.6-1.tar.gz"; - sha256 = "31a5898f0ce072a55959b6b571f251386acb1facf9183e7a17393ca0f1f02b41"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/humble/ur_dashboard_msgs/2.2.6-1"; + sha256 = "sha256-S/ps9CEFmAipT5YPn2T4VqvbYcWQ/hVQGxj+E4bVeaA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/ur-description/default.nix b/distros/humble/ur-description/default.nix index 9caf523cd7..e0fadaa65d 100644 --- a/distros/humble/ur-description/default.nix +++ b/distros/humble/ur-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-description"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ur_description-release/archive/release/humble/ur_description/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "815cdd2721d37d9d4749645170b00707a64e6bcc78ddabce6c411a75dcaff948"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ur_description-release"; + rev = "release/humble/ur_description/2.0.1-1"; + sha256 = "sha256-HwCYUYhBBqglRndb1m6f+bgCzr6kJDUZRw43YvYOhMA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/ur-moveit-config/default.nix b/distros/humble/ur-moveit-config/default.nix index 5b8eb70e5e..5ba9413709 100644 --- a/distros/humble/ur-moveit-config/default.nix +++ b/distros/humble/ur-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-moveit-config"; version = "2.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/humble/ur_moveit_config/2.2.6-1.tar.gz"; - name = "2.2.6-1.tar.gz"; - sha256 = "2c097afafe3e0af9baf6b4396421589c5138cd482bf4af6ce95462a6b3cf533e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/humble/ur_moveit_config/2.2.6-1"; + sha256 = "sha256-DACR6Dp8eP3GS7pGy2xG2n3Ug1UL3yZ5Rfucx5OHcE0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/ur-msgs/default.nix b/distros/humble/ur-msgs/default.nix index 3bd1867c25..1a4fe5322f 100644 --- a/distros/humble/ur-msgs/default.nix +++ b/distros/humble/ur-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-msgs"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ur_msgs-release/archive/release/humble/ur_msgs/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "9d6f6e4d5f6a20293562660e60d1c2ec7a631a89d01752cfb7b1a9f5d3cb312b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ur_msgs-release"; + rev = "release/humble/ur_msgs/2.0.0-2"; + sha256 = "sha256-JsglE/PolObyk2tuC9viw8JYmRlBJ8Ym7pjb5k+2EyQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/ur-robot-driver/default.nix b/distros/humble/ur-robot-driver/default.nix index e143929ad1..0ac28f3d5e 100644 --- a/distros/humble/ur-robot-driver/default.nix +++ b/distros/humble/ur-robot-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur-robot-driver"; version = "2.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/humble/ur_robot_driver/2.2.6-1.tar.gz"; - name = "2.2.6-1.tar.gz"; - sha256 = "5209a28a6e88d08e42edd8121ae2f470597272075aa3d62adeaae036f2521de7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/humble/ur_robot_driver/2.2.6-1"; + sha256 = "sha256-ZCTA/VzHxhiSRkitrPdoJQE0itfAQdIv3Yd+tniZYtE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/ur/default.nix b/distros/humble/ur/default.nix index aa28398cab..47d5b5d433 100644 --- a/distros/humble/ur/default.nix +++ b/distros/humble/ur/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-ur"; version = "2.2.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/humble/ur/2.2.6-1.tar.gz"; - name = "2.2.6-1.tar.gz"; - sha256 = "73b105f99684877b62ceecfd938d5c440f018ed57ef1c4681cf97cc8a25033f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/humble/ur/2.2.6-1"; + sha256 = "sha256-4sEizjMRDe3wToi7LpbVlKDhQVNs+aetRrDaq85ODjE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/urdf-parser-plugin/default.nix b/distros/humble/urdf-parser-plugin/default.nix index 038aad307d..97823473d8 100644 --- a/distros/humble/urdf-parser-plugin/default.nix +++ b/distros/humble/urdf-parser-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urdf-parser-plugin"; version = "2.6.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdf-release/archive/release/humble/urdf_parser_plugin/2.6.0-2.tar.gz"; - name = "2.6.0-2.tar.gz"; - sha256 = "e02835634341dfbfc9221ec0bd9aadebca530b12d810f3de1e98eecf0989d0ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdf-release"; + rev = "release/humble/urdf_parser_plugin/2.6.0-2"; + sha256 = "sha256-IndBEHqwYnUahPk9aQnJETRqOPeKT7zRR2upZN3pWR4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/urdf-test/default.nix b/distros/humble/urdf-test/default.nix index ae64cf9b61..9e5d595e15 100644 --- a/distros/humble/urdf-test/default.nix +++ b/distros/humble/urdf-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urdf-test"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/urdf_test-ros2-gbp/archive/release/humble/urdf_test/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "3f4333444bb8c5434ce9f1ede17b8ac7d74d7c7f44ddd8154152f09ee3e141a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "urdf_test-ros2-gbp"; + rev = "release/humble/urdf_test/2.0.1-1"; + sha256 = "sha256-ssrgEuCQG/OC0F3/tDO0Z7FEcsmbIQmETR5jVBKkBNc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/humble/urdf-tutorial/default.nix b/distros/humble/urdf-tutorial/default.nix index 27f68d2466..15e102489e 100644 --- a/distros/humble/urdf-tutorial/default.nix +++ b/distros/humble/urdf-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urdf-tutorial"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdf_tutorial-release/archive/release/humble/urdf_tutorial/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "fe14125ca9decf3111e771750242b1fc0bb7a7b51adff32896bce34a4258b2b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdf_tutorial-release"; + rev = "release/humble/urdf_tutorial/1.0.0-3"; + sha256 = "sha256-dhLNYIbCsYEAiIdUFEka1ZMyW/sJOgJ3xw1t8xI4rhw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/urdf/default.nix b/distros/humble/urdf/default.nix index 98540435c7..289295e972 100644 --- a/distros/humble/urdf/default.nix +++ b/distros/humble/urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urdf"; version = "2.6.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdf-release/archive/release/humble/urdf/2.6.0-2.tar.gz"; - name = "2.6.0-2.tar.gz"; - sha256 = "c0e066600c68989333766241f68dda8038107107989ed642e4cb28e6f7fa50b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdf-release"; + rev = "release/humble/urdf/2.6.0-2"; + sha256 = "sha256-DxZFo62YkmnvyCroP3Uvy96UDa1SIvLux0t/YDchw6I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/urdfdom-headers/default.nix b/distros/humble/urdfdom-headers/default.nix index 92847abb30..8a24206f95 100644 --- a/distros/humble/urdfdom-headers/default.nix +++ b/distros/humble/urdfdom-headers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urdfdom-headers"; version = "1.0.6-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom_headers-release/archive/release/humble/urdfdom_headers/1.0.6-2.tar.gz"; - name = "1.0.6-2.tar.gz"; - sha256 = "4a57a0e852a257a6fd54183e628b980e5a09db35926df8f8450e728e78f1f6b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom_headers-release"; + rev = "release/humble/urdfdom_headers/1.0.6-2"; + sha256 = "sha256-FwQz8cyzDFlLKwRPe2ouUp3T2Vbqq6xs8W4QokL1u9U="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/urdfdom-py/default.nix b/distros/humble/urdfdom-py/default.nix index 7b2cb0904b..d940e1af06 100644 --- a/distros/humble/urdfdom-py/default.nix +++ b/distros/humble/urdfdom-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urdfdom-py"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom_py-release/archive/release/humble/urdfdom_py/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "1c62c19081d02de1431c1375bb868008be69361f7b08e4580a9313c9fa2e06e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom_py-release"; + rev = "release/humble/urdfdom_py/1.2.0-2"; + sha256 = "sha256-Wqb94XN1fUWXLJ5rwzsmePzwagB+j2D66m2gHM+RIx4="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.mock ]; diff --git a/distros/humble/urdfdom/default.nix b/distros/humble/urdfdom/default.nix index d74dd4c310..c3c6966edc 100644 --- a/distros/humble/urdfdom/default.nix +++ b/distros/humble/urdfdom/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urdfdom"; version = "3.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom-release/archive/release/humble/urdfdom/3.0.2-2.tar.gz"; - name = "3.0.2-2.tar.gz"; - sha256 = "1156de83e0fc73b429680ac811a2b7ec97e7405afb88bdd3c1d1a6eb5a8eca04"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom-release"; + rev = "release/humble/urdfdom/3.0.2-2"; + sha256 = "sha256-mxUV23F0tO2GutjNSB1FCaDqCRshrntM+uBBiqUZweg="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/urg-c/default.nix b/distros/humble/urg-c/default.nix index 2fbe1c4d5f..4ec5686091 100644 --- a/distros/humble/urg-c/default.nix +++ b/distros/humble/urg-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urg-c"; version = "1.0.4001-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_c-release/archive/release/humble/urg_c/1.0.4001-4.tar.gz"; - name = "1.0.4001-4.tar.gz"; - sha256 = "b1a02cbbf09cd596d6fbf16f9bd691cf600cbe1e8ee613005b48d8d914ac1bfa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_c-release"; + rev = "release/humble/urg_c/1.0.4001-4"; + sha256 = "sha256-d1sMppxyaGt43L2i5Eplkfen4tHz1t6hkC42mCbg0EM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/urg-node-msgs/default.nix b/distros/humble/urg-node-msgs/default.nix index c70d9f3107..bcca1a0917 100644 --- a/distros/humble/urg-node-msgs/default.nix +++ b/distros/humble/urg-node-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urg-node-msgs"; version = "1.0.1-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_node_msgs-release/archive/release/humble/urg_node_msgs/1.0.1-6.tar.gz"; - name = "1.0.1-6.tar.gz"; - sha256 = "6f093d4f66a1f40d99280b6417ccc07045227e84ae8e85e45a8d3b29339d624f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_node_msgs-release"; + rev = "release/humble/urg_node_msgs/1.0.1-6"; + sha256 = "sha256-IBl7J8akPgn5ni5/8kPGDOh4Fklto+RggWCIxGald/w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/urg-node/default.nix b/distros/humble/urg-node/default.nix index 0c36267a2d..09bd64e2da 100644 --- a/distros/humble/urg-node/default.nix +++ b/distros/humble/urg-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-urg-node"; version = "1.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_node-release/archive/release/humble/urg_node/1.1.0-3.tar.gz"; - name = "1.1.0-3.tar.gz"; - sha256 = "0d3965a91c2f7b84ef7ef9fd43b43469dafe0597c9226966faa73bdee70d995f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_node-release"; + rev = "release/humble/urg_node/1.1.0-3"; + sha256 = "sha256-5I3MgR4LgAZZ1J5KC5KZBkdkC3dIOB3B+0br1tfGtTc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/usb-cam/default.nix b/distros/humble/usb-cam/default.nix index f4f7737085..9e9dfe152e 100644 --- a/distros/humble/usb-cam/default.nix +++ b/distros/humble/usb-cam/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 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, camera-info-manager, ffmpeg, image-transport, image-transport-plugins, rclcpp, rclcpp-components, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, v4l-utils }: +{ lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, camera-info-manager, cv-bridge, ffmpeg, image-transport, image-transport-plugins, rclcpp, rclcpp-components, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, v4l-utils }: buildRosPackage { pname = "ros-humble-usb-cam"; - version = "0.4.2-r1"; + version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/usb_cam-release/archive/release/humble/usb_cam/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "d393c849c4c3d18ff61151d7a8770f5ef5420b6f582e46ad2c2c38d72314bc73"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "usb_cam-release"; + rev = "release/humble/usb_cam/0.5.0-1"; + sha256 = "sha256-3wjtz8DMgg4mlm03YkmbNjtz/1KJoliSegTaaLLLuRw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto rosidl-default-generators ]; - checkInputs = [ ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ builtin-interfaces camera-info-manager ffmpeg image-transport image-transport-plugins rclcpp rclcpp-components rosidl-default-runtime sensor-msgs std-msgs std-srvs v4l-utils ]; + checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ builtin-interfaces camera-info-manager cv-bridge ffmpeg image-transport image-transport-plugins rclcpp rclcpp-components rosidl-default-runtime sensor-msgs std-msgs std-srvs v4l-utils ]; nativeBuildInputs = [ ament-cmake-auto rosidl-default-generators ]; meta = { diff --git a/distros/humble/v4l2-camera/default.nix b/distros/humble/v4l2-camera/default.nix index 2a854a9eb5..7896ec1baf 100644 --- a/distros/humble/v4l2-camera/default.nix +++ b/distros/humble/v4l2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-v4l2-camera"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_v4l2_camera-release/archive/release/humble/v4l2_camera/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "c551af6c9c6f8c2997942a2db02fe2745feb9b273beeebdd1736958c4e90d1bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_v4l2_camera-release"; + rev = "release/humble/v4l2_camera/0.6.0-1"; + sha256 = "sha256-x3tbjd5OUe5Sp4DiehI4Oa4patHeBnmgZqtF0arkUxc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/velocity-controllers/default.nix b/distros/humble/velocity-controllers/default.nix index 3fec9b7540..b128c96745 100644 --- a/distros/humble/velocity-controllers/default.nix +++ b/distros/humble/velocity-controllers/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-manager, forward-command-controller, hardware-interface, pluginlib, rclcpp, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-manager, forward-command-controller, hardware-interface, pluginlib, rclcpp, ros2-control-test-assets }: buildRosPackage { pname = "ros-humble-velocity-controllers"; - version = "2.15.0-r1"; + version = "2.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/humble/velocity_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "bd38190600bf47ec1ce03373fb343bb50444b3e90ddddbc5b4776821caf4be95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/humble/velocity_controllers/2.16.0-1"; + sha256 = "sha256-XIbF/HpYYUvRijZvixIj+Wn39uXFoZ82u0mLAB0FlLc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager hardware-interface ros2-control-test-assets ]; - propagatedBuildInputs = [ forward-command-controller rclcpp ]; + propagatedBuildInputs = [ backward-ros forward-command-controller rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/humble/velodyne-description/default.nix b/distros/humble/velodyne-description/default.nix index 6fa4f3ef6c..7de53df9eb 100644 --- a/distros/humble/velodyne-description/default.nix +++ b/distros/humble/velodyne-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-velodyne-description"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/humble/velodyne_description/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "c6657575746a060883eb32ddd93cd27d5d65f7fc853b811037b70883c4ea5224"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/humble/velodyne_description/2.0.3-1"; + sha256 = "sha256-vYig3j3DqPeSuEmGlDfvaH64IGdK8x/Yxx40R/Sv5j4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/velodyne-driver/default.nix b/distros/humble/velodyne-driver/default.nix index 7b25513eea..205b029e18 100644 --- a/distros/humble/velodyne-driver/default.nix +++ b/distros/humble/velodyne-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-velodyne-driver"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/humble/velodyne_driver/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "6644989f62b15fe9466eaccbf4732c0ca066bc256e1d1e746a614e071adee5ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/humble/velodyne_driver/2.3.0-1"; + sha256 = "sha256-9ysVDD9seg0Ss+VilOfbSs7ysVE2cxvVHaHR3kj+yKQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/velodyne-gazebo-plugins/default.nix b/distros/humble/velodyne-gazebo-plugins/default.nix index 4d38ccf92a..57c5f70e85 100644 --- a/distros/humble/velodyne-gazebo-plugins/default.nix +++ b/distros/humble/velodyne-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-velodyne-gazebo-plugins"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/humble/velodyne_gazebo_plugins/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "ef8832b9dbd976c159da2efbdd62f55478131ce9ac770538f07b617bb664f10a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/humble/velodyne_gazebo_plugins/2.0.3-1"; + sha256 = "sha256-TFxh7d/7+m5z05amlR634rbaqZYAHs06SxUx3ZlM/NI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/velodyne-laserscan/default.nix b/distros/humble/velodyne-laserscan/default.nix index 9cf88d5cf9..820072dbec 100644 --- a/distros/humble/velodyne-laserscan/default.nix +++ b/distros/humble/velodyne-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-velodyne-laserscan"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/humble/velodyne_laserscan/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "9aea61bf55a6472f5a4a00eef32030d629693578687b9142d75295461d261823"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/humble/velodyne_laserscan/2.3.0-1"; + sha256 = "sha256-rSKlfJVrsBMOdfguEVxqRmL3bNJiRLJsyy6iTcxdfKY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/velodyne-msgs/default.nix b/distros/humble/velodyne-msgs/default.nix index ee3be9f0c8..577d59fd44 100644 --- a/distros/humble/velodyne-msgs/default.nix +++ b/distros/humble/velodyne-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-velodyne-msgs"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/humble/velodyne_msgs/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "9d8ca6f3b6140078f6a83def16ba1a147d9812097e6bf0743c255b868323eb9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/humble/velodyne_msgs/2.3.0-1"; + sha256 = "sha256-5Ak6A/tW8O/xY1B8LoKlY6GJfvga1cnajGYEKb7eKFo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/velodyne-pointcloud/default.nix b/distros/humble/velodyne-pointcloud/default.nix index 130d6465a6..23a3f78b2a 100644 --- a/distros/humble/velodyne-pointcloud/default.nix +++ b/distros/humble/velodyne-pointcloud/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-velodyne-pointcloud"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/humble/velodyne_pointcloud/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "2a84eaaf7b0435550cc89b4e8624f63477a071ee82bd375b8d8b345e565280f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/humble/velodyne_pointcloud/2.3.0-1"; + sha256 = "sha256-hkvzuZw8cF8+XSVnSmlVOPLOTlg7vhtPoqd1gNK0mo8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/velodyne-simulator/default.nix b/distros/humble/velodyne-simulator/default.nix index 6ae637b9ef..dd88fe2faf 100644 --- a/distros/humble/velodyne-simulator/default.nix +++ b/distros/humble/velodyne-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-velodyne-simulator"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/humble/velodyne_simulator/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "6e77d5c80e0a6df40350038fc4fb7be3700fb11fda4049f1b62a67e5af246f1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/humble/velodyne_simulator/2.0.3-1"; + sha256 = "sha256-Cu17nhMENoRv3E5+1HvQyw35oWBdZXPr9BQ3APt4Q0c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/velodyne/default.nix b/distros/humble/velodyne/default.nix index 370c8d1833..7963924d4a 100644 --- a/distros/humble/velodyne/default.nix +++ b/distros/humble/velodyne/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-velodyne"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/humble/velodyne/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "e30613ff99d96ec03c47047920fda2473a0b73e8ebcb805a005584b09fa30956"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/humble/velodyne/2.3.0-1"; + sha256 = "sha256-Wr9qH+muZay+hoPYPI7pJRs11jWr4I26LKKsmaWL/4A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/vision-msgs-layers/default.nix b/distros/humble/vision-msgs-layers/default.nix index 0a7d24ff33..3fedc0b858 100644 --- a/distros/humble/vision-msgs-layers/default.nix +++ b/distros/humble/vision-msgs-layers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-vision-msgs-layers"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_msgs_layers-release/archive/release/humble/vision_msgs_layers/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "a5fc25c03b5a3fa1565c6c3446500327d45f79d9c49e2df418d7762389f45810"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_msgs_layers-release"; + rev = "release/humble/vision_msgs_layers/0.1.0-1"; + sha256 = "sha256-9W1+3cqmKRRcPA7B/3CZRu9TEpO7FvqXZdO/pL9M79o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/humble/vision-msgs/default.nix b/distros/humble/vision-msgs/default.nix index c414c6c627..26d98c34db 100644 --- a/distros/humble/vision-msgs/default.nix +++ b/distros/humble/vision-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-vision-msgs"; version = "4.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_msgs-release/archive/release/humble/vision_msgs/4.0.0-2.tar.gz"; - name = "4.0.0-2.tar.gz"; - sha256 = "e55b534da7dc4e01ab989080bf1252086ea9b1a48bc80f320dedd697258a8d9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_msgs-release"; + rev = "release/humble/vision_msgs/4.0.0-2"; + sha256 = "sha256-eow1ZEywd5gzzb1zifOk/GXuWnmCrFL4gM1Iq7qN7wo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/vision-opencv/default.nix b/distros/humble/vision-opencv/default.nix index 78a052aa57..8a27c15b2e 100644 --- a/distros/humble/vision-opencv/default.nix +++ b/distros/humble/vision-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-vision-opencv"; version = "3.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/humble/vision_opencv/3.2.1-1.tar.gz"; - name = "3.2.1-1.tar.gz"; - sha256 = "f5b4ac334b2b9cf1e6fe9ca81db359137edae8b86d9fbeaf8ea450cce7859bf4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/humble/vision_opencv/3.2.1-1"; + sha256 = "sha256-epbel3Hxg9Q9tWVLF7QtxHcIVPP8B2wwO3QD9+v+WUw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/visp/default.nix b/distros/humble/visp/default.nix index f2accd8da1..e72939087e 100644 --- a/distros/humble/visp/default.nix +++ b/distros/humble/visp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-visp"; version = "3.5.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/visp-release/archive/release/humble/visp/3.5.0-2.tar.gz"; - name = "3.5.0-2.tar.gz"; - sha256 = "1f56f0c4737eedf78e935c759e5ebe8f877f52912445f1a670adcaf1395c90a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "visp-release"; + rev = "release/humble/visp/3.5.0-2"; + sha256 = "sha256-nMrdYB+RessgluLVeY69cP1jA4ucoAfcxyaNk1gyiSQ="; + }; buildType = "cmake"; buildInputs = [ bzip2 cmake doxygen ]; diff --git a/distros/humble/visualization-msgs/default.nix b/distros/humble/visualization-msgs/default.nix index 36dd91f4af..f3356a09e8 100644 --- a/distros/humble/visualization-msgs/default.nix +++ b/distros/humble/visualization-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-humble-visualization-msgs"; - version = "4.2.2-r1"; + version = "4.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/humble/visualization_msgs/4.2.2-1.tar.gz"; - name = "4.2.2-1.tar.gz"; - sha256 = "007af17748b9b3989e872a0d538ac361b7f5654f7363472b4cfdb01692db59e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/humble/visualization_msgs/4.2.3-1"; + sha256 = "sha256-GlJ47WaYHcdSPifWTtgEiiKWG7Oc1mzAs03yblrEv1k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/vrpn/default.nix b/distros/humble/vrpn/default.nix index 5de9c50640..0bcf6afded 100644 --- a/distros/humble/vrpn/default.nix +++ b/distros/humble/vrpn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-vrpn"; version = "7.35.0-r11"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vrpn-release/archive/release/humble/vrpn/7.35.0-11.tar.gz"; - name = "7.35.0-11.tar.gz"; - sha256 = "70327fe398c88fd84af4117ae83f84c60cc6646560c370c5895445c5ec1ce422"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vrpn-release"; + rev = "release/humble/vrpn/7.35.0-11"; + sha256 = "sha256-gVABNgsOIA99lKIlrcjjsnCvXMYzmJtNB/5AH1Im0Wc="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/humble/warehouse-ros-sqlite/default.nix b/distros/humble/warehouse-ros-sqlite/default.nix index 64775c8a59..758e98417c 100644 --- a/distros/humble/warehouse-ros-sqlite/default.nix +++ b/distros/humble/warehouse-ros-sqlite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-warehouse-ros-sqlite"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/warehouse_ros_sqlite-release/archive/release/humble/warehouse_ros_sqlite/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "3ab3f10028d9b9f61bec18ca63e3dba6d828e0476488773291b6d34f67517b4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "warehouse_ros_sqlite-release"; + rev = "release/humble/warehouse_ros_sqlite/1.0.3-1"; + sha256 = "sha256-JavUpzsS5NkJHqZj/lSXLsAOzHX5D/KrEHOhGM/AgLc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake boost sqlite3-vendor ]; diff --git a/distros/humble/warehouse-ros/default.nix b/distros/humble/warehouse-ros/default.nix index da360017ac..d2b1e2220c 100644 --- a/distros/humble/warehouse-ros/default.nix +++ b/distros/humble/warehouse-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-warehouse-ros"; version = "2.0.4-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/warehouse_ros-release/archive/release/humble/warehouse_ros/2.0.4-3.tar.gz"; - name = "2.0.4-3.tar.gz"; - sha256 = "72418e8ec9e688e179d88454bdd13cb7b8c0439bb67ae4fa331401d56d4cd5fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "warehouse_ros-release"; + rev = "release/humble/warehouse_ros/2.0.4-3"; + sha256 = "sha256-89Ku8Zth68EgdS2DXIeyBjbm75ZItsbMZ0ZbKGlw6Fw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/webots-ros2-control/default.nix b/distros/humble/webots-ros2-control/default.nix index 7fab38a508..536718eda5 100644 --- a/distros/humble/webots-ros2-control/default.nix +++ b/distros/humble/webots-ros2-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, controller-manager, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, ros-environment, webots-ros2-driver }: buildRosPackage { pname = "ros-humble-webots-ros2-control"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_control/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "14fb35e629d20d6c27abefc8f4e4d021fb15ca3eaf391e9e197ecd97765a6027"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_control/2023.0.1-1"; + sha256 = "sha256-SM/EQUSPfLDsUAKMxiDclz2mOrICDzzifBh2mcsYkkQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/humble/webots-ros2-driver/default.nix b/distros/humble/webots-ros2-driver/default.nix index 13783b5e80..04264cf652 100644 --- a/distros/humble/webots-ros2-driver/default.nix +++ b/distros/humble/webots-ros2-driver/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, ament-lint-auto, ament-lint-common, geometry-msgs, pluginlib, python-cmake-module, rclcpp, rclpy, ros-environment, sensor-msgs, std-msgs, tf2-geometry-msgs, tf2-ros, tinyxml2-vendor, vision-msgs, webots-ros2-importer, webots-ros2-msgs }: buildRosPackage { pname = "ros-humble-webots-ros2-driver"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_driver/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "0b21f2daeceef04e005877f58875809b93a5f0ae3776775f7fb1894cd87efc89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_driver/2023.0.1-1"; + sha256 = "sha256-cGbN+t3wzKf69CSiaHXDIKrCXGt169XkVBz35UVgpOY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python python-cmake-module ros-environment ]; diff --git a/distros/humble/webots-ros2-epuck/default.nix b/distros/humble/webots-ros2-epuck/default.nix index c75f5b1138..3baac5b8b1 100644 --- a/distros/humble/webots-ros2-epuck/default.nix +++ b/distros/humble/webots-ros2-epuck/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, geometry-msgs, joint-state-broadcaster, nav-msgs, pythonPackages, rclpy, robot-state-publisher, rviz2, sensor-msgs, std-msgs, tf2-ros, webots-ros2-control, webots-ros2-driver, webots-ros2-msgs }: buildRosPackage { pname = "ros-humble-webots-ros2-epuck"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_epuck/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "1d3952324165410d376a2aaf8c91d08558948e115ddc3f244a7ff420d3ad9350"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_epuck/2023.0.1-1"; + sha256 = "sha256-BjZSzpiGfYr8DnNk9Vsqbf1kSB2Yu1uLi+BozXj9esM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/webots-ros2-importer/default.nix b/distros/humble/webots-ros2-importer/default.nix index 34631e3364..012ae57f8a 100644 --- a/distros/humble/webots-ros2-importer/default.nix +++ b/distros/humble/webots-ros2-importer/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, python3Packages, pythonPackages, xacro }: buildRosPackage { pname = "ros-humble-webots-ros2-importer"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_importer/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "8ad0905f7a8780c25f788935c08ab828cac805c2c43be5328cbc6f3b5b6e0ad1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_importer/2023.0.1-1"; + sha256 = "sha256-IBlBrHZwPwyVdg6JNxe62ePHR18YugJysO0Tj1IpF54="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 python3Packages.numpy python3Packages.pillow python3Packages.pycodestyle pythonPackages.pytest ]; diff --git a/distros/humble/webots-ros2-mavic/default.nix b/distros/humble/webots-ros2-mavic/default.nix index 3254823839..ac01dfe35a 100644 --- a/distros/humble/webots-ros2-mavic/default.nix +++ b/distros/humble/webots-ros2-mavic/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, pythonPackages, rclpy, webots-ros2-driver }: buildRosPackage { pname = "ros-humble-webots-ros2-mavic"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_mavic/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "075c7de4d4c8a0d8484f9975f3a69dc196e4e101713bea9430cfbd06f43edcf0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_mavic/2023.0.1-1"; + sha256 = "sha256-7yYbTKp0l3xBdOTQ507AzzgUdMeAXb9IqUsJrzmMi6g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/webots-ros2-msgs/default.nix b/distros/humble/webots-ros2-msgs/default.nix index f23f7227a3..7d84faa3be 100644 --- a/distros/humble/webots-ros2-msgs/default.nix +++ b/distros/humble/webots-ros2-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs, vision-msgs }: buildRosPackage { pname = "ros-humble-webots-ros2-msgs"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_msgs/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "a4682e2637540f6d4f030f6ba943873f9aa6a104a6793282046692028eaa8f9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_msgs/2023.0.1-1"; + sha256 = "sha256-iu6eAQ1PiJ375beMsfM6eWJrynXiZaWP7m5Qo9zGhbA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/humble/webots-ros2-tesla/default.nix b/distros/humble/webots-ros2-tesla/default.nix index 219fff83a6..5c6981f420 100644 --- a/distros/humble/webots-ros2-tesla/default.nix +++ b/distros/humble/webots-ros2-tesla/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ackermann-msgs, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, python3Packages, pythonPackages, rclpy, webots-ros2-driver }: buildRosPackage { pname = "ros-humble-webots-ros2-tesla"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_tesla/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "6045ccefcc4428651c163ebf8e15072625b6ba936f77695cc1739a1cce4e4c02"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_tesla/2023.0.1-1"; + sha256 = "sha256-ExnlF/FXLh6KhkMekyuMXzd6+Xj+Umqh/KgcWZEb4Fg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/webots-ros2-tests/default.nix b/distros/humble/webots-ros2-tests/default.nix index 42f9025a90..b2429ff9ee 100644 --- a/distros/humble/webots-ros2-tests/default.nix +++ b/distros/humble/webots-ros2-tests/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, geometry-msgs, launch, launch-testing, launch-testing-ament-cmake, launch-testing-ros, pythonPackages, rclpy, ros2bag, rosbag2-storage-default-plugins, sensor-msgs, std-msgs, std-srvs, tf2-ros, webots-ros2-driver, webots-ros2-epuck, webots-ros2-mavic, webots-ros2-tesla, webots-ros2-tiago, webots-ros2-turtlebot, webots-ros2-universal-robot }: buildRosPackage { pname = "ros-humble-webots-ros2-tests"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_tests/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "ff0af7323912b1d14f10ba8770e9383fff4ded3524239fde27357c15210d1a2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_tests/2023.0.1-1"; + sha256 = "sha256-G4fCYbkt7CFYrvblNCbmbPHftEI7DANBT+de3OKx2L4="; + }; buildType = "ament_python"; buildInputs = [ rclpy ros2bag rosbag2-storage-default-plugins webots-ros2-driver ]; diff --git a/distros/humble/webots-ros2-tiago/default.nix b/distros/humble/webots-ros2-tiago/default.nix index f8704951e6..acf16dfec0 100644 --- a/distros/humble/webots-ros2-tiago/default.nix +++ b/distros/humble/webots-ros2-tiago/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, geometry-msgs, joint-state-broadcaster, pythonPackages, rclpy, robot-state-publisher, rviz2, tf2-ros, webots-ros2-control, webots-ros2-driver }: buildRosPackage { pname = "ros-humble-webots-ros2-tiago"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_tiago/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "aec6f1111f3fd964e1dbb60e3e09151cc57703eb54946e963c8157640b806132"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_tiago/2023.0.1-1"; + sha256 = "sha256-DIeE3GdW11x3tV1eygCv/wGQFQ9kQYE/OTOs7h930HM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/webots-ros2-turtlebot/default.nix b/distros/humble/webots-ros2-turtlebot/default.nix index 810e90ad8b..f975eaf84d 100644 --- a/distros/humble/webots-ros2-turtlebot/default.nix +++ b/distros/humble/webots-ros2-turtlebot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, joint-state-broadcaster, pythonPackages, rclpy, robot-state-publisher, rviz2, tf2-ros, webots-ros2-control, webots-ros2-driver }: buildRosPackage { pname = "ros-humble-webots-ros2-turtlebot"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_turtlebot/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "5fdee0488f7dca719480666813b3fccc96727bc260f884655543bdb1ebfee942"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_turtlebot/2023.0.1-1"; + sha256 = "sha256-HgqpqoYT1hvAjoFRmb0Q0hpGDTc0UaGTfBYnhG+FRaw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/webots-ros2-universal-robot/default.nix b/distros/humble/webots-ros2-universal-robot/default.nix index 7b0713ace2..730d235a9f 100644 --- a/distros/humble/webots-ros2-universal-robot/default.nix +++ b/distros/humble/webots-ros2-universal-robot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, control-msgs, controller-manager, joint-state-broadcaster, joint-trajectory-controller, pythonPackages, rclpy, robot-state-publisher, rviz2, trajectory-msgs, webots-ros2-control, webots-ros2-driver, xacro }: buildRosPackage { pname = "ros-humble-webots-ros2-universal-robot"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2_universal_robot/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "bf6533d8af5722b5a4424ebc615f8b6f82554284163675b1f61c6aab89ad0080"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2_universal_robot/2023.0.1-1"; + sha256 = "sha256-2f5hfF2f1jSIUgifFrAFNdhBGbbVLMijz5WZm5udcWA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/humble/webots-ros2/default.nix b/distros/humble/webots-ros2/default.nix index ebe7bca240..0098560804 100644 --- a/distros/humble/webots-ros2/default.nix +++ b/distros/humble/webots-ros2/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, pythonPackages, rclpy, std-msgs, webots-ros2-control, webots-ros2-driver, webots-ros2-epuck, webots-ros2-importer, webots-ros2-mavic, webots-ros2-msgs, webots-ros2-tesla, webots-ros2-tests, webots-ros2-tiago, webots-ros2-turtlebot, webots-ros2-universal-robot }: buildRosPackage { pname = "ros-humble-webots-ros2"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/humble/webots_ros2/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "e6ceceb0918b9d62ab181e3bb6999425353aa150a1b512d940a447bb9d26231e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/humble/webots_ros2/2023.0.1-1"; + sha256 = "sha256-qI4kmyOLqwwHbHNjhcO59V7MW2hTRVKCma8v1h4GUds="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest webots-ros2-tests ]; diff --git a/distros/humble/wiimote-msgs/default.nix b/distros/humble/wiimote-msgs/default.nix index 2513b56d52..20c1ce177c 100644 --- a/distros/humble/wiimote-msgs/default.nix +++ b/distros/humble/wiimote-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-wiimote-msgs"; version = "3.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/humble/wiimote_msgs/3.1.0-3.tar.gz"; - name = "3.1.0-3.tar.gz"; - sha256 = "33663c760a07fbdb0145efec5ee3f64846a97d5403c7046fbae7696190e8f7b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/humble/wiimote_msgs/3.1.0-3"; + sha256 = "sha256-KavdFBcL1SCgiOn8dA8NfytenhAUvYfbx6ij02ufZyE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto rosidl-default-generators ]; diff --git a/distros/humble/wiimote/default.nix b/distros/humble/wiimote/default.nix index 2feb2fb646..fbdfaade52 100644 --- a/distros/humble/wiimote/default.nix +++ b/distros/humble/wiimote/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-wiimote"; version = "3.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/humble/wiimote/3.1.0-3.tar.gz"; - name = "3.1.0-3.tar.gz"; - sha256 = "b87130711f3b06a7725a553040595a98a0ac9ccbfc64a6a91cb6582c2e1c4797"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/humble/wiimote/3.1.0-3"; + sha256 = "sha256-tmTuJsuid0a70I48V0kdL+odWCPg4/C6sdR519Ur1LE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/humble/xacro/default.nix b/distros/humble/xacro/default.nix index 36029c7370..95372762e6 100644 --- a/distros/humble/xacro/default.nix +++ b/distros/humble/xacro/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-xacro"; version = "2.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/xacro-release/archive/release/humble/xacro/2.0.8-1.tar.gz"; - name = "2.0.8-1.tar.gz"; - sha256 = "c22d190f937583558590106b7047cd1207b7a38b7b09032e3598c230bed5fc00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "xacro-release"; + rev = "release/humble/xacro/2.0.8-1"; + sha256 = "sha256-eAuqlK08Wgyt7c0NWvvi60x2oEt++k2Ppnn8YOQoufc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/humble/yaml-cpp-vendor/default.nix b/distros/humble/yaml-cpp-vendor/default.nix index 469e9e1ea3..70e3f44367 100644 --- a/distros/humble/yaml-cpp-vendor/default.nix +++ b/distros/humble/yaml-cpp-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, libyamlcpp }: buildRosPackage { pname = "ros-humble-yaml-cpp-vendor"; - version = "8.0.1-r2"; + version = "8.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/yaml_cpp_vendor-release/archive/release/humble/yaml_cpp_vendor/8.0.1-2.tar.gz"; - name = "8.0.1-2.tar.gz"; - sha256 = "95c715d7a2445fd1a582367fc1678a7ec40a8ab8931288849800991246b2bd40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "yaml_cpp_vendor-release"; + rev = "release/humble/yaml_cpp_vendor/8.0.2-1"; + sha256 = "sha256-PiPc5JP1OmVVsMQFHxj/YXtoYgw5Qrf8fU5SED9Rr14="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/zbar-ros/default.nix b/distros/humble/zbar-ros/default.nix index 0daf9917f5..1b14dc9e69 100644 --- a/distros/humble/zbar-ros/default.nix +++ b/distros/humble/zbar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-zbar-ros"; version = "0.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/zbar_ros-release/archive/release/humble/zbar_ros/0.4.0-2.tar.gz"; - name = "0.4.0-2.tar.gz"; - sha256 = "b3ce37987801cb34086090f304b8b111991460f46ee22cb06348c61b7deb26b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "zbar_ros-release"; + rev = "release/humble/zbar_ros/0.4.0-2"; + sha256 = "sha256-JmBj10Hz3ZE/INAmcLBzMSkGG9axl7gNDMBMFvZr3sw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/humble/zenoh-bridge-dds/default.nix b/distros/humble/zenoh-bridge-dds/default.nix index 1bf455109b..913a504204 100644 --- a/distros/humble/zenoh-bridge-dds/default.nix +++ b/distros/humble/zenoh-bridge-dds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-zenoh-bridge-dds"; version = "0.5.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/zenoh_bridge_dds-release/archive/release/humble/zenoh_bridge_dds/0.5.0-3.tar.gz"; - name = "0.5.0-3.tar.gz"; - sha256 = "59d609c97faf07682c563c837f9ae4bbf4f0219a9bbf81c17a919600a40e5abb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "zenoh_bridge_dds-release"; + rev = "release/humble/zenoh_bridge_dds/0.5.0-3"; + sha256 = "sha256-f7l+qyV5vSYtTVBV57bVQUV49odL51NPVkvmo00gimY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake cargo clang ]; diff --git a/distros/humble/zmqpp-vendor/default.nix b/distros/humble/zmqpp-vendor/default.nix index 7146ddfa0d..628ad4c614 100644 --- a/distros/humble/zmqpp-vendor/default.nix +++ b/distros/humble/zmqpp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-humble-zmqpp-vendor"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/tier4/zmqpp_vendor-release/archive/release/humble/zmqpp_vendor/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "f77068948950a7d57ba92fc60aa661493ecbce98be5dd20ac28fc7e8fd3fb550"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tier4"; + repo = "zmqpp_vendor-release"; + rev = "release/humble/zmqpp_vendor/0.0.2-1"; + sha256 = "sha256-OHJpSJAua016kXvKxcD1ay55wprlXnqSL19uzz/el6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/humble/zstd-vendor/default.nix b/distros/humble/zstd-vendor/default.nix index cb3288594d..f174eb5316 100644 --- a/distros/humble/zstd-vendor/default.nix +++ b/distros/humble/zstd-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, git, zstd }: buildRosPackage { pname = "ros-humble-zstd-vendor"; - version = "0.15.3-r1"; + version = "0.15.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/humble/zstd_vendor/0.15.3-1.tar.gz"; - name = "0.15.3-1.tar.gz"; - sha256 = "f1b6c8fbdc355ad8e015ae58e0f0ebf77abdbe737fa9f22ed5374319020837ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/humble/zstd_vendor/0.15.4-2"; + sha256 = "sha256-Gi99DK+9M/62FahqRx/AeeSUj864QNCYfVu1/Mjv9TQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/melodic/abb-driver/default.nix b/distros/melodic/abb-driver/default.nix index f335db595b..5fd7e6feed 100644 --- a/distros/melodic/abb-driver/default.nix +++ b/distros/melodic/abb-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-driver"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_driver-release/archive/release/melodic/abb_driver/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "a578c118e57d80d4c506097b2a14f750a82a680506f8e7acc1e555db4b5112b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_driver-release"; + rev = "release/melodic/abb_driver/1.4.0-1"; + sha256 = "sha256-QCPnvlFdvkk7nnewpvTTdBl4WKl1+Ze5Vjz5oQ69ANk="; + }; buildType = "catkin"; buildInputs = [ catkin simple-message ]; diff --git a/distros/melodic/abb-egm-msgs/default.nix b/distros/melodic/abb-egm-msgs/default.nix index ca21a4644b..8b4688032c 100644 --- a/distros/melodic/abb-egm-msgs/default.nix +++ b/distros/melodic/abb-egm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-egm-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_robot_driver_interfaces-release/archive/release/melodic/abb_egm_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "0193c267d74b75267b6eb5259506506b8ff2d98187946e41bccb06416a391ee5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_robot_driver_interfaces-release"; + rev = "release/melodic/abb_egm_msgs/0.5.2-1"; + sha256 = "sha256-7NOYqs9MtuQ82tQDExABpBC/B/VhiB5fOqGZ7LKr4yc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abb-irb2400-moveit-config/default.nix b/distros/melodic/abb-irb2400-moveit-config/default.nix index 74eb2226f6..15656df1fb 100644 --- a/distros/melodic/abb-irb2400-moveit-config/default.nix +++ b/distros/melodic/abb-irb2400-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-irb2400-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_irb2400_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "cb059c41a63c0ed80fc4cdc039db24a661e627cef5ea0ff97b060896f8fcd8f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_irb2400_moveit_config/1.3.1-1"; + sha256 = "sha256-lUNU0ivQwUdW5xRizDGtDdl1kj6XH4AcwH4I3m0Vwj4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abb-irb2400-moveit-plugins/default.nix b/distros/melodic/abb-irb2400-moveit-plugins/default.nix index dcf1d83423..10ac81098b 100644 --- a/distros/melodic/abb-irb2400-moveit-plugins/default.nix +++ b/distros/melodic/abb-irb2400-moveit-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-irb2400-moveit-plugins"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_irb2400_moveit_plugins/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "40310f77bef824f956946c9f344dc50f62cee49d64ef9af8084c5fadf67a3445"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_irb2400_moveit_plugins/1.3.1-1"; + sha256 = "sha256-2axj+H2sHPZOQhrz60zitsGJpO4g4E4dB07pfVA/gLM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abb-irb2400-support/default.nix b/distros/melodic/abb-irb2400-support/default.nix index 740cb36658..e89b5cdd41 100644 --- a/distros/melodic/abb-irb2400-support/default.nix +++ b/distros/melodic/abb-irb2400-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-irb2400-support"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_irb2400_support/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "12b36abb6dcc94cad69c818ec407455ceeb2411ee95d44f476af4679920e3091"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_irb2400_support/1.3.1-1"; + sha256 = "sha256-RpcDQcRu0hZkIjAY4ti7J9zPifonrg8yjFkVQXXfNWY="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/abb-irb4400-support/default.nix b/distros/melodic/abb-irb4400-support/default.nix index 636e34e6f2..8325d10f0e 100644 --- a/distros/melodic/abb-irb4400-support/default.nix +++ b/distros/melodic/abb-irb4400-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-irb4400-support"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_irb4400_support/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "49a2d88c75c80ea8234b1e32f6d0307a2a1c4f6d570255c1eb66f8945314ab6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_irb4400_support/1.3.1-1"; + sha256 = "sha256-o1q1Q3Dwd1Qm1w/EbLjYdaR2jEZnhJl1ylYI7d1LpGM="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/abb-irb5400-support/default.nix b/distros/melodic/abb-irb5400-support/default.nix index 56ee0472cc..e9bdb58512 100644 --- a/distros/melodic/abb-irb5400-support/default.nix +++ b/distros/melodic/abb-irb5400-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-irb5400-support"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_irb5400_support/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "6755bde5b9794edba2c80fcfc27fc7c5eb8e3cdd992d8da9bbc4a8c907139f5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_irb5400_support/1.3.1-1"; + sha256 = "sha256-EjPl+MXMG3pAqhpa2CPH7HHPyRwCO9ewgpvvrRvtpLw="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/abb-irb6600-support/default.nix b/distros/melodic/abb-irb6600-support/default.nix index f61d54468a..fe69e4aca5 100644 --- a/distros/melodic/abb-irb6600-support/default.nix +++ b/distros/melodic/abb-irb6600-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-irb6600-support"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_irb6600_support/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "716570b9fc635318552ee21e2c6fa50287d700464f7790a09e8fb812f8be880b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_irb6600_support/1.3.1-1"; + sha256 = "sha256-Up2ypOHqfOHDrYr6WqtOEBad4lzsWOFcrcxYeVR8de0="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/abb-irb6640-moveit-config/default.nix b/distros/melodic/abb-irb6640-moveit-config/default.nix index 51e36cfd74..6b4efaf2d8 100644 --- a/distros/melodic/abb-irb6640-moveit-config/default.nix +++ b/distros/melodic/abb-irb6640-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-irb6640-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_irb6640_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "d682a66da0b4bee804900df9e877fb3543824e3b8eb4bf46bea001066894152e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_irb6640_moveit_config/1.3.1-1"; + sha256 = "sha256-TvETZlu5H0SndIZCZ/vH9s4ZwuANTWsEmrSL10x1bXQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abb-irb6640-support/default.nix b/distros/melodic/abb-irb6640-support/default.nix index 9f7921784c..48ed1f66de 100644 --- a/distros/melodic/abb-irb6640-support/default.nix +++ b/distros/melodic/abb-irb6640-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-irb6640-support"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_irb6640_support/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "d17461d90cb90812a3dd31ee5389a91ead91212c235b534e5a5512c684e04464"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_irb6640_support/1.3.1-1"; + sha256 = "sha256-LX6rexy0VxuO4UJ9kiUhJaHst6yFYhyCadQ1L/GHZAI="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/abb-rapid-msgs/default.nix b/distros/melodic/abb-rapid-msgs/default.nix index df9fbf19e2..17b1b75c4a 100644 --- a/distros/melodic/abb-rapid-msgs/default.nix +++ b/distros/melodic/abb-rapid-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-rapid-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_robot_driver_interfaces-release/archive/release/melodic/abb_rapid_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "23f94a15cb051b38585e1c097ce8d2645704a21ebf333f63b185dff936ee2497"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_robot_driver_interfaces-release"; + rev = "release/melodic/abb_rapid_msgs/0.5.2-1"; + sha256 = "sha256-JEaaBwJgjTm8YdevLdMx5hnzOEVUO5IhemIKHW6eeh4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abb-rapid-sm-addin-msgs/default.nix b/distros/melodic/abb-rapid-sm-addin-msgs/default.nix index a7fc642479..7f82ed1551 100644 --- a/distros/melodic/abb-rapid-sm-addin-msgs/default.nix +++ b/distros/melodic/abb-rapid-sm-addin-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-rapid-sm-addin-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_robot_driver_interfaces-release/archive/release/melodic/abb_rapid_sm_addin_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "6c371084e3fe7aa9c285cf486415cc18fa8781846212e5162c1f85aa2bc9dece"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_robot_driver_interfaces-release"; + rev = "release/melodic/abb_rapid_sm_addin_msgs/0.5.2-1"; + sha256 = "sha256-ZAZUq1W0+r5nOaUZNkiT8goHvJ2LFDQZC5i/aOGCq90="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abb-resources/default.nix b/distros/melodic/abb-resources/default.nix index 6a3e00179a..334ce30f99 100644 --- a/distros/melodic/abb-resources/default.nix +++ b/distros/melodic/abb-resources/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-resources"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb_resources/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "e21bc080006c798014a924a0974d6e6af9e375c76a336651316936af4231d825"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb_resources/1.3.1-1"; + sha256 = "sha256-vFZefdbj4LjTmcpGSNDAi8bp+XMVyG2UyO0aEow3zsE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abb-robot-msgs/default.nix b/distros/melodic/abb-robot-msgs/default.nix index 6ee57f5a7a..4778fb9ed3 100644 --- a/distros/melodic/abb-robot-msgs/default.nix +++ b/distros/melodic/abb-robot-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb-robot-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_robot_driver_interfaces-release/archive/release/melodic/abb_robot_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "d85ff175388dd0693ecfe34db524d156a56b0920c404893b7758ccf98188d76d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_robot_driver_interfaces-release"; + rev = "release/melodic/abb_robot_msgs/0.5.2-1"; + sha256 = "sha256-DWW0KNFYO80EHowJZF5XABykmf2ksQ/Z22fvPSSPaGQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abb/default.nix b/distros/melodic/abb/default.nix index 1abbf267b4..c8a933eb19 100644 --- a/distros/melodic/abb/default.nix +++ b/distros/melodic/abb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abb"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb-release/archive/release/melodic/abb/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "f49d38c78c44f523f9a2067ffb2bbd1c25663a7d16ec57b529f4167c45429fb0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb-release"; + rev = "release/melodic/abb/1.3.1-1"; + sha256 = "sha256-A4Wwmyft9EkeduJmSKDn8MplENCB0ApYuhFKCvHHuNc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/abseil-cpp/default.nix b/distros/melodic/abseil-cpp/default.nix index a0961c9dd6..34fd6f1847 100644 --- a/distros/melodic/abseil-cpp/default.nix +++ b/distros/melodic/abseil-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-abseil-cpp"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/Eurecat/abseil_cpp-release/archive/release/melodic/abseil_cpp/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "828ee69c9a7e77d6b31d4cdf1b12e02960ec26f2a79571bf25d4f7f060177b4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Eurecat"; + repo = "abseil_cpp-release"; + rev = "release/melodic/abseil_cpp/0.4.2-1"; + sha256 = "sha256-UE4G+28s6BGpOJD3QiTA1uY2nfl+hm5/ql5+kYLM8mY="; + }; buildType = "catkin"; buildInputs = [ catkin rsync ]; diff --git a/distros/melodic/acado/default.nix b/distros/melodic/acado/default.nix index b0b125c6c3..400e671d17 100644 --- a/distros/melodic/acado/default.nix +++ b/distros/melodic/acado/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-acado"; version = "1.2.3"; - src = fetchurl { - url = "https://github.com/tud-cor/acado-release/archive/release/melodic/acado/1.2.3-0.tar.gz"; - name = "1.2.3-0.tar.gz"; - sha256 = "2d84945378a8f8b6c9d8667b4e1aa02a0001130853e6bb04e29dc1906582598e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tud-cor"; + repo = "acado-release"; + rev = "release/melodic/acado/1.2.3-0"; + sha256 = "sha256-wloIaH1LRfaOdPNfmFwwmC+R/bv+8E47YQn7h1LJcJg="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/access-point-control/default.nix b/distros/melodic/access-point-control/default.nix index b2d001ef34..7493760c6a 100644 --- a/distros/melodic/access-point-control/default.nix +++ b/distros/melodic/access-point-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-access-point-control"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/access_point_control/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "17dff1b9389eb82ad17d285128dd8039c26ecf8d914810ada5dd86ec99d25a42"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/access_point_control/1.0.16-1"; + sha256 = "sha256-TgR7jHhA3eaRbstNTemluppasQHsGNp61+AaJQMWic8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ackermann-msgs/default.nix b/distros/melodic/ackermann-msgs/default.nix index 87c3b70619..f40393044b 100644 --- a/distros/melodic/ackermann-msgs/default.nix +++ b/distros/melodic/ackermann-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ackermann-msgs"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/ackermann_msgs-release/archive/release/melodic/ackermann_msgs/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "2696633432ef72489b77e8ff6b0d4782e2e526a62fda01c92d984348b4b0e13b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "ackermann_msgs-release"; + rev = "release/melodic/ackermann_msgs/1.0.1-0"; + sha256 = "sha256-tefTnCEdaCyYC5/ICUZRq8um+9tyzDlSCiifxQzPBoc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ackermann-steering-controller/default.nix b/distros/melodic/ackermann-steering-controller/default.nix index 42f514f8f1..21586be563 100644 --- a/distros/melodic/ackermann-steering-controller/default.nix +++ b/distros/melodic/ackermann-steering-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ackermann-steering-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/ackermann_steering_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "ef28b520da2cd4076e270ecf5d77c4d6672ad6fea02314fdf818134b24313c68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/ackermann_steering_controller/0.17.2-1"; + sha256 = "sha256-jUL+gwu9iYVkNWKMXaI3E5rVWo1CjcGAoe3QenJ8u5c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/actionlib-lisp/default.nix b/distros/melodic/actionlib-lisp/default.nix index 069b4b35c8..aa2aac1aa5 100644 --- a/distros/melodic/actionlib-lisp/default.nix +++ b/distros/melodic/actionlib-lisp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-actionlib-lisp"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/actionlib_lisp/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "2a3d66692e70cd32ac8761c52744dcdfef0faa17f0ee8e8c1f49b985fc6e5f85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/actionlib_lisp/0.2.13-1"; + sha256 = "sha256-R75GiJU4j+LfOFC0uzJNOlg8tVW+AYaOlYgNbKHRlU4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/actionlib-msgs/default.nix b/distros/melodic/actionlib-msgs/default.nix index eb64a4436e..3ad641bf76 100644 --- a/distros/melodic/actionlib-msgs/default.nix +++ b/distros/melodic/actionlib-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-actionlib-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/actionlib_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "a3f0988bbc95c105177a455c4a50864fe578210703a591eab085f7684047b636"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/actionlib_msgs/1.12.8-1"; + sha256 = "sha256-oqc/PapJAPLrWxNn+pAiadVHMJW/pFP0BvOuUp+d0Ig="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/actionlib-tutorials/default.nix b/distros/melodic/actionlib-tutorials/default.nix index 536ce07e71..b3d3751044 100644 --- a/distros/melodic/actionlib-tutorials/default.nix +++ b/distros/melodic/actionlib-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-actionlib-tutorials"; version = "0.1.11"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/melodic/actionlib_tutorials/0.1.11-0.tar.gz"; - name = "0.1.11-0.tar.gz"; - sha256 = "202b1bd5a2d7cde96dcd20fa54fb6fc017ec6e1252575b5413618310c536163e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/melodic/actionlib_tutorials/0.1.11-0"; + sha256 = "sha256-E5m1k0SYBt45HseD9/JZ56DVnxDIB4ROcsdL/vcsfeU="; + }; buildType = "catkin"; buildInputs = [ actionlib-msgs catkin message-generation std-msgs ]; diff --git a/distros/melodic/actionlib/default.nix b/distros/melodic/actionlib/default.nix index 09f9f96075..2a38670695 100644 --- a/distros/melodic/actionlib/default.nix +++ b/distros/melodic/actionlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-actionlib"; version = "1.12.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/actionlib-release/archive/release/melodic/actionlib/1.12.1-1.tar.gz"; - name = "1.12.1-1.tar.gz"; - sha256 = "1c564f0186928a554d30a74c1bdffcbc52292ff93d7a5c8140ec4bce342ae020"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "actionlib-release"; + rev = "release/melodic/actionlib/1.12.1-1"; + sha256 = "sha256-jsP7NCNDo2VR3KCIwBhWyY5/7o0Xw82P0N2Cy6a8lyc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/adi-driver/default.nix b/distros/melodic/adi-driver/default.nix index 6c925598ef..163580e782 100644 --- a/distros/melodic/adi-driver/default.nix +++ b/distros/melodic/adi-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-adi-driver"; version = "1.0.3"; - src = fetchurl { - url = "https://github.com/tork-a/adi_driver-release/archive/release/melodic/adi_driver/1.0.3-0.tar.gz"; - name = "1.0.3-0.tar.gz"; - sha256 = "6f2b565c98396653f9364c57fddafa0ca244781c27edd5b5467502fa77dafc9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "adi_driver-release"; + rev = "release/melodic/adi_driver/1.0.3-0"; + sha256 = "sha256-eYVgBCUyp5Zqz3lv84kv8goFGGAL+4FK1/oS+bSxxBk="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/agni-tf-tools/default.nix b/distros/melodic/agni-tf-tools/default.nix index b24a1e73a4..4622d19718 100644 --- a/distros/melodic/agni-tf-tools/default.nix +++ b/distros/melodic/agni-tf-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-agni-tf-tools"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/ubi-agni-gbp/agni_tf_tools-release/archive/release/melodic/agni_tf_tools/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "f5d19d9f1dc379c8c62bda3e4a624f18271250442ee76d32fb8d2fe9a9c0f2f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ubi-agni-gbp"; + repo = "agni_tf_tools-release"; + rev = "release/melodic/agni_tf_tools/0.1.6-1"; + sha256 = "sha256-ANse47fGab2q9ILqK5dUHib1zRpQOvNxAKBNsp6zy10="; + }; buildType = "catkin"; buildInputs = [ catkin eigen qt5.qtbase ]; diff --git a/distros/melodic/ainstein-radar-drivers/default.nix b/distros/melodic/ainstein-radar-drivers/default.nix index c92bb96abd..caf4931641 100644 --- a/distros/melodic/ainstein-radar-drivers/default.nix +++ b/distros/melodic/ainstein-radar-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ainstein-radar-drivers"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/AinsteinAI/ainstein_radar-release/archive/release/melodic/ainstein_radar_drivers/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "de0bffb6af0b60b2508065ca674f88aa04f332107cfd6d96b6725017afb8fda1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AinsteinAI"; + repo = "ainstein_radar-release"; + rev = "release/melodic/ainstein_radar_drivers/2.0.2-1"; + sha256 = "sha256-izDGHSvfY7TyxCdefRchqhudQVBVZsmxe+SqkDPFCyc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ainstein-radar-filters/default.nix b/distros/melodic/ainstein-radar-filters/default.nix index adefcdddc8..edd35a48cc 100644 --- a/distros/melodic/ainstein-radar-filters/default.nix +++ b/distros/melodic/ainstein-radar-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ainstein-radar-filters"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/AinsteinAI/ainstein_radar-release/archive/release/melodic/ainstein_radar_filters/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "6924545d6ca9563ea3035d935a4614287718e1989ff412f1f09656e30e18abbd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AinsteinAI"; + repo = "ainstein_radar-release"; + rev = "release/melodic/ainstein_radar_filters/2.0.2-1"; + sha256 = "sha256-cHikDl/bjgP3xpQGu8zUCKlHGxpbOE+V1EhCYdMt2q0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ainstein-radar-gazebo-plugins/default.nix b/distros/melodic/ainstein-radar-gazebo-plugins/default.nix index 0855e82abe..0576923b66 100644 --- a/distros/melodic/ainstein-radar-gazebo-plugins/default.nix +++ b/distros/melodic/ainstein-radar-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ainstein-radar-gazebo-plugins"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/AinsteinAI/ainstein_radar-release/archive/release/melodic/ainstein_radar_gazebo_plugins/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "a9b7e22b72584d76cf0e62c37ea5f3723f3e36faaf81151d27ddc38e7b4b64a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AinsteinAI"; + repo = "ainstein_radar-release"; + rev = "release/melodic/ainstein_radar_gazebo_plugins/2.0.2-1"; + sha256 = "sha256-7hvkmVsg6cvLQ2veTXSVWlarl4D4vmQd04grZggyehM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ainstein-radar-msgs/default.nix b/distros/melodic/ainstein-radar-msgs/default.nix index 5cd119be17..a9e7618b6e 100644 --- a/distros/melodic/ainstein-radar-msgs/default.nix +++ b/distros/melodic/ainstein-radar-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ainstein-radar-msgs"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/AinsteinAI/ainstein_radar-release/archive/release/melodic/ainstein_radar_msgs/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "0b7dcd915b866597f9457ac0f1e15188bcb4309b7043f932378d041830f261d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AinsteinAI"; + repo = "ainstein_radar-release"; + rev = "release/melodic/ainstein_radar_msgs/2.0.2-1"; + sha256 = "sha256-s40ZRBXvy+pif95Wx8nKb1BGqn2nJBxA+9PEsJcwgKA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ainstein-radar-rviz-plugins/default.nix b/distros/melodic/ainstein-radar-rviz-plugins/default.nix index 2f1f990b27..6785bb0f73 100644 --- a/distros/melodic/ainstein-radar-rviz-plugins/default.nix +++ b/distros/melodic/ainstein-radar-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ainstein-radar-rviz-plugins"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/AinsteinAI/ainstein_radar-release/archive/release/melodic/ainstein_radar_rviz_plugins/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "e55ca73701363e257bdd186d2d355076015b7e3832ec9b1ac4a49088774b4a8a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AinsteinAI"; + repo = "ainstein_radar-release"; + rev = "release/melodic/ainstein_radar_rviz_plugins/2.0.2-1"; + sha256 = "sha256-fBQazkhloznCkdQvhFgGq1FvveGVvYUfah0aNcewuDo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ainstein-radar-tools/default.nix b/distros/melodic/ainstein-radar-tools/default.nix index edb403e51f..cad93c9472 100644 --- a/distros/melodic/ainstein-radar-tools/default.nix +++ b/distros/melodic/ainstein-radar-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ainstein-radar-tools"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/AinsteinAI/ainstein_radar-release/archive/release/melodic/ainstein_radar_tools/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "edd663b4d4fccb71e7ed6e87fe55f0847752f09e5923b6f89551d5b944223626"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AinsteinAI"; + repo = "ainstein_radar-release"; + rev = "release/melodic/ainstein_radar_tools/2.0.2-1"; + sha256 = "sha256-wOdOFkLTZt5jkSyXwNS6ZpxajpsJmBx5347rcae7LN8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ainstein-radar/default.nix b/distros/melodic/ainstein-radar/default.nix index 1339bbb0c9..dacc150e36 100644 --- a/distros/melodic/ainstein-radar/default.nix +++ b/distros/melodic/ainstein-radar/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ainstein-radar"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/AinsteinAI/ainstein_radar-release/archive/release/melodic/ainstein_radar/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "8f47d68abd970c72ed9de890d8e1dc78cc89a6403493420ebd102fa18a577d11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AinsteinAI"; + repo = "ainstein_radar-release"; + rev = "release/melodic/ainstein_radar/2.0.2-1"; + sha256 = "sha256-el4EKN6SijPFh0qnPEjh+GKSaR92fEC/OATN6gmIMSY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/allocators/default.nix b/distros/melodic/allocators/default.nix index dd78e610e4..59c3bd113e 100644 --- a/distros/melodic/allocators/default.nix +++ b/distros/melodic/allocators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-allocators"; version = "1.0.25"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/melodic/allocators/1.0.25-0.tar.gz"; - name = "1.0.25-0.tar.gz"; - sha256 = "585ef0525e4b0613ee2b9aca41a692dc9efab13c0a8e78ffe36e8efc03bd8810"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/melodic/allocators/1.0.25-0"; + sha256 = "sha256-kh95NO/roS12CTvVD5hRxNh9+JqxX+s+LmK3hUfGHJY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/amcl/default.nix b/distros/melodic/amcl/default.nix index 6410b24913..9a40b6b645 100644 --- a/distros/melodic/amcl/default.nix +++ b/distros/melodic/amcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-amcl"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/amcl/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "6fd7ab1b09d32006685ea8b71d1bd8071a207ddbc8ba7aca4c150d4debf62cb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/amcl/1.16.7-1"; + sha256 = "sha256-RDDYHchgWckv1O9U1m6d2pyLjfs+Pjqw+KdIdOntZOA="; + }; buildType = "catkin"; buildInputs = [ catkin message-filters tf2-geometry-msgs ]; diff --git a/distros/melodic/angles/default.nix b/distros/melodic/angles/default.nix index f310f8f33d..771ec4c25e 100644 --- a/distros/melodic/angles/default.nix +++ b/distros/melodic/angles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-angles"; version = "1.9.12-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry_angles_utils-release/archive/release/melodic/angles/1.9.12-1.tar.gz"; - name = "1.9.12-1.tar.gz"; - sha256 = "db7a41b9e761db8f81c749170e1b949366a0a125b50d37617a7bac34058a1a58"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry_angles_utils-release"; + rev = "release/melodic/angles/1.9.12-1"; + sha256 = "sha256-0R/ls1VpdHmebP8T7v6F2vnC7G7ZjvFu1oGVYuRM9t0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/app-manager/default.nix b/distros/melodic/app-manager/default.nix index 1ee1e9bc43..9ede03b638 100644 --- a/distros/melodic/app-manager/default.nix +++ b/distros/melodic/app-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-app-manager"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/app_manager-release/archive/release/melodic/app_manager/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "610e295d284a0d08ae2f21236ae6679832a9cffb677f60abbe33da80848d78f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "app_manager-release"; + rev = "release/melodic/app_manager/1.3.0-1"; + sha256 = "sha256-+YOee0TOcGlubrysiHNh2ahnfWlFkFAfjvXE8XC7sb0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.setuptools ]; diff --git a/distros/melodic/apriltag-ros/default.nix b/distros/melodic/apriltag-ros/default.nix index 5e254cc029..2119d1520a 100644 --- a/distros/melodic/apriltag-ros/default.nix +++ b/distros/melodic/apriltag-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-apriltag-ros"; version = "3.2.1-r1"; - src = fetchurl { - url = "https://github.com/AprilRobotics/apriltag_ros-release/archive/release/melodic/apriltag_ros/3.2.1-1.tar.gz"; - name = "3.2.1-1.tar.gz"; - sha256 = "f3ca9ce2dccc9169f47f78e6e591e4daad245e508ef63d1636809ab07ca72296"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AprilRobotics"; + repo = "apriltag_ros-release"; + rev = "release/melodic/apriltag_ros/3.2.1-1"; + sha256 = "sha256-RVlsQgytlz/UF1NgJDC+KrxYIIwmst7rX5+iuP+8DPE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/apriltag/default.nix b/distros/melodic/apriltag/default.nix index 7dabefd0e9..e2c998174a 100644 --- a/distros/melodic/apriltag/default.nix +++ b/distros/melodic/apriltag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-apriltag"; version = "3.2.0-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AprilRobotics"; + repo = "apriltag-release"; + rev = "release/melodic/apriltag/3.2.0-1"; + sha256 = "sha256-6kUYVWACrNDZBeDwDanrR3mgspXi5sPGKoy4chT7IrM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/aques-talk/default.nix b/distros/melodic/aques-talk/default.nix index 1ea5953891..6e10f56413 100644 --- a/distros/melodic/aques-talk/default.nix +++ b/distros/melodic/aques-talk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aques-talk"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/aques_talk/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "7191cc0e6140068f22c72a4b7e86b33bdcbce88621a32d2d0acdee3139638533"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/aques_talk/2.1.24-2"; + sha256 = "sha256-CSwCalsW3yN+V+JNXuOGKmobf4ZjyBJ9MvefrB2CgtI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ar-track-alvar-msgs/default.nix b/distros/melodic/ar-track-alvar-msgs/default.nix index 248782617e..534d70a8dc 100644 --- a/distros/melodic/ar-track-alvar-msgs/default.nix +++ b/distros/melodic/ar-track-alvar-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ar-track-alvar-msgs"; version = "0.7.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ar_track_alvar-release/archive/release/melodic/ar_track_alvar_msgs/0.7.1-0.tar.gz"; - name = "0.7.1-0.tar.gz"; - sha256 = "0c39c3c9732ca3712a78f43bcc2545f90b846aff2559de8a5fc7a9b4a6efb27f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ar_track_alvar-release"; + rev = "release/melodic/ar_track_alvar_msgs/0.7.1-0"; + sha256 = "sha256-nriMXkCoZIyzCSRxmRIZmUSrBuilV5HkxbQsH0UfQPM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ar-track-alvar/default.nix b/distros/melodic/ar-track-alvar/default.nix index 0fc6f54b19..69e87af5e1 100644 --- a/distros/melodic/ar-track-alvar/default.nix +++ b/distros/melodic/ar-track-alvar/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ar-track-alvar"; version = "0.7.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ar_track_alvar-release/archive/release/melodic/ar_track_alvar/0.7.1-0.tar.gz"; - name = "0.7.1-0.tar.gz"; - sha256 = "7b822678ef7330b5a3ecf5fd63547162178335534caf6bf4a739ad35c73d91ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ar_track_alvar-release"; + rev = "release/melodic/ar_track_alvar/0.7.1-0"; + sha256 = "sha256-7bD2j66pf4POAYagS0g7nyE7R6klOWQTCgRd9sFCfsc="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/arbotix-controllers/default.nix b/distros/melodic/arbotix-controllers/default.nix index 9f39768091..059c9a8f97 100644 --- a/distros/melodic/arbotix-controllers/default.nix +++ b/distros/melodic/arbotix-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-arbotix-controllers"; version = "0.10.0"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/melodic/arbotix_controllers/0.10.0-0.tar.gz"; - name = "0.10.0-0.tar.gz"; - sha256 = "32d41d26b0bddb10e801e02195bd604400fddb7aef4bddde8c917a62cecc6028"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/melodic/arbotix_controllers/0.10.0-0"; + sha256 = "sha256-5XJtEPpN251GvOjtQhUsozjyiqja9VfHxLzRIEVmEIw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/arbotix-firmware/default.nix b/distros/melodic/arbotix-firmware/default.nix index edac8403ba..233f90b551 100644 --- a/distros/melodic/arbotix-firmware/default.nix +++ b/distros/melodic/arbotix-firmware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-arbotix-firmware"; version = "0.10.0"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/melodic/arbotix_firmware/0.10.0-0.tar.gz"; - name = "0.10.0-0.tar.gz"; - sha256 = "c588a11ade8ae7118deec36d4619c9328a748439456671b39bb41fce43a8d382"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/melodic/arbotix_firmware/0.10.0-0"; + sha256 = "sha256-hL6qjnmws9fWzuCeQM/SLHuBXmF9RdfDgl6JlKVq2/4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/arbotix-msgs/default.nix b/distros/melodic/arbotix-msgs/default.nix index c500cb0402..5df5d6ad48 100644 --- a/distros/melodic/arbotix-msgs/default.nix +++ b/distros/melodic/arbotix-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-arbotix-msgs"; version = "0.10.0"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/melodic/arbotix_msgs/0.10.0-0.tar.gz"; - name = "0.10.0-0.tar.gz"; - sha256 = "4c30092a42cad55c7ed008b877d72fa55f90fd899352daa35e4e1bf64797c092"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/melodic/arbotix_msgs/0.10.0-0"; + sha256 = "sha256-bfIXo20LMggGb/xutXREtyw6hUDGuefDBjk2LTWAmi4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/arbotix-python/default.nix b/distros/melodic/arbotix-python/default.nix index 89e5113f87..f128828454 100644 --- a/distros/melodic/arbotix-python/default.nix +++ b/distros/melodic/arbotix-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-arbotix-python"; version = "0.10.0"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/melodic/arbotix_python/0.10.0-0.tar.gz"; - name = "0.10.0-0.tar.gz"; - sha256 = "cef79742fd412330d7bf8982775ca8aac8ddc936b1ebe0744ac07a47375a5469"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/melodic/arbotix_python/0.10.0-0"; + sha256 = "sha256-t/IUBIX2qvZDISkci1C9FySNFB7+n6Knh5oHs6ACkYk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/arbotix-sensors/default.nix b/distros/melodic/arbotix-sensors/default.nix index 19946b17d3..0d34bea2c4 100644 --- a/distros/melodic/arbotix-sensors/default.nix +++ b/distros/melodic/arbotix-sensors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-arbotix-sensors"; version = "0.10.0"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/melodic/arbotix_sensors/0.10.0-0.tar.gz"; - name = "0.10.0-0.tar.gz"; - sha256 = "2c7dcfa8c133915b15eb77783282f2be0b01ac676239daefba4285885e58f722"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/melodic/arbotix_sensors/0.10.0-0"; + sha256 = "sha256-QB6Mvmoov4hFjIgRaHPuG0dDUgWVYInr8J9lPsLajNo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/arbotix/default.nix b/distros/melodic/arbotix/default.nix index a92de31556..b57260312a 100644 --- a/distros/melodic/arbotix/default.nix +++ b/distros/melodic/arbotix/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-arbotix"; version = "0.10.0"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/melodic/arbotix/0.10.0-0.tar.gz"; - name = "0.10.0-0.tar.gz"; - sha256 = "3e72d718f9b9129b8537614cc5ae68e696b97def92315b859a5d2f00219f09e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/melodic/arbotix/0.10.0-0"; + sha256 = "sha256-PPz7LiMkTjo5XqQ0oZhipOH7tB6lv2acJmPSYXfQXPk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ariles-ros/default.nix b/distros/melodic/ariles-ros/default.nix index 7cb13b6fd0..002afaf883 100644 --- a/distros/melodic/ariles-ros/default.nix +++ b/distros/melodic/ariles-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ariles-ros"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/asherikov/ariles-release/archive/release/melodic/ariles_ros/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "7a898961b24ccb4b8974efe590485869432b9f5471596a6e3ce735a9d0f71c2e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "asherikov"; + repo = "ariles-release"; + rev = "release/melodic/ariles_ros/1.3.2-1"; + sha256 = "sha256-dqfxCK+sGn97jKoq62fQV5ap9rjyNg9jSk3xVtDotYA="; + }; buildType = "cmake"; buildInputs = [ catkin ]; diff --git a/distros/melodic/aruco-detect/default.nix b/distros/melodic/aruco-detect/default.nix index 8e38aaad54..2e4526f35a 100644 --- a/distros/melodic/aruco-detect/default.nix +++ b/distros/melodic/aruco-detect/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aruco-detect"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/fiducials-release/archive/release/melodic/aruco_detect/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "850fff672ee87b14935c5dc431a7a77ce2e5cf8cf71e7f8dc326d224862a0abe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "fiducials-release"; + rev = "release/melodic/aruco_detect/0.11.0-1"; + sha256 = "sha256-J+hYNgtw+PNrJbmHuBJRT+bictsIyCSEHIh38y1Yu+A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/aruco-msgs/default.nix b/distros/melodic/aruco-msgs/default.nix index cbc172922b..a8aa00e942 100644 --- a/distros/melodic/aruco-msgs/default.nix +++ b/distros/melodic/aruco-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aruco-msgs"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/aruco_ros-release/archive/release/melodic/aruco_msgs/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "6656c736a9ae940515cf11eb01f4050ad369b4aff892f215bab02008a65912eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "aruco_ros-release"; + rev = "release/melodic/aruco_msgs/2.2.2-1"; + sha256 = "sha256-wIVki0ZvgCi2re4l6/4vXcq7IM6MStVbgoJ9u41cysg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/aruco-pose/default.nix b/distros/melodic/aruco-pose/default.nix index 89fe62cd2c..2f2aa919da 100644 --- a/distros/melodic/aruco-pose/default.nix +++ b/distros/melodic/aruco-pose/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aruco-pose"; version = "0.21.2-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/clover-release/archive/release/melodic/aruco_pose/0.21.2-1.tar.gz"; - name = "0.21.2-1.tar.gz"; - sha256 = "2506649647c6e2372fe659fe72c03888aefe3fa5a395c765a4d381def7be84ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "clover-release"; + rev = "release/melodic/aruco_pose/0.21.2-1"; + sha256 = "sha256-YQna+5/hJHU8tefG6ZyHsvRdj8oWDD6mMbsZ/ISzWm0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/aruco-ros/default.nix b/distros/melodic/aruco-ros/default.nix index 9465403e12..b2074b49c6 100644 --- a/distros/melodic/aruco-ros/default.nix +++ b/distros/melodic/aruco-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aruco-ros"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/aruco_ros-release/archive/release/melodic/aruco_ros/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "9a23036d9b6a65a9a75b3182776a3184a5d22ba31d1608d7ef478f237a9beb6d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "aruco_ros-release"; + rev = "release/melodic/aruco_ros/2.2.2-1"; + sha256 = "sha256-bV9ZrCzUaMTGCgl5F3x0V1HCokpB73m9lbS7paN6C6A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/aruco/default.nix b/distros/melodic/aruco/default.nix index 95fd1c9234..b1a67588e1 100644 --- a/distros/melodic/aruco/default.nix +++ b/distros/melodic/aruco/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aruco"; version = "2.2.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/aruco_ros-release/archive/release/melodic/aruco/2.2.2-1.tar.gz"; - name = "2.2.2-1.tar.gz"; - sha256 = "b4d7149feba62c53f6f2737ec8c0083cb01cb3aaeec24684196a13c0e78ca53e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "aruco_ros-release"; + rev = "release/melodic/aruco/2.2.2-1"; + sha256 = "sha256-TQwA+XM6fyGGrhLAwycFmbLjAlgwMBLkcVVm1NsWMuk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/asmach-tutorials/default.nix b/distros/melodic/asmach-tutorials/default.nix index 04b4181000..0b161f6bca 100644 --- a/distros/melodic/asmach-tutorials/default.nix +++ b/distros/melodic/asmach-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-asmach-tutorials"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/asmach_tutorials/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "d4a5d35e1424c9a9e17f9a66b1bbea3de63f71d037df9cc932cf28f62c00f69e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/asmach_tutorials/1.0.16-1"; + sha256 = "sha256-bnUU2cISKX229nx7qN1XY6rqxszIbDgNjNRiBfLDSZY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/asmach/default.nix b/distros/melodic/asmach/default.nix index af6390152a..042512951b 100644 --- a/distros/melodic/asmach/default.nix +++ b/distros/melodic/asmach/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-asmach"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/asmach/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "b7eeea554c6038f5c55ebb8a91973c24e8cdb3e20d71ceac5b7d6617b5316952"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/asmach/1.0.16-1"; + sha256 = "sha256-ChdnDNcg//cY4aCVbTWSSwCz2pJVXZxn678dR65zVSI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/asr-msgs/default.nix b/distros/melodic/asr-msgs/default.nix index e16b1f45f8..6d1937976a 100644 --- a/distros/melodic/asr-msgs/default.nix +++ b/distros/melodic/asr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-asr-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/asr-ros/asr_msgs-release/archive/release/melodic/asr_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "ea5f3bfcc30e4036c5ae3a033262477d2f7f6998819a564a82137de15a9341d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "asr-ros"; + repo = "asr_msgs-release"; + rev = "release/melodic/asr_msgs/1.0.0-1"; + sha256 = "sha256-D028UaK630H8PEnRQs3Cilp1LxEemIF7ai1NTdfij3g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/assimp-devel/default.nix b/distros/melodic/assimp-devel/default.nix index dd9a71c0a9..86a030bb16 100644 --- a/distros/melodic/assimp-devel/default.nix +++ b/distros/melodic/assimp-devel/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-assimp-devel"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/assimp_devel/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "eadd07bbf3ac87aebd166a7972f6a81786d77d6e859310dccb21f248821ccf44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/assimp_devel/2.1.24-2"; + sha256 = "sha256-MOh1rLGJFikv0/6p/MsDCAUJPT1YO8ekIMA5Wc9U3Is="; + }; buildType = "catkin"; buildInputs = [ cacert catkin git mk openssl rosboost-cfg rosbuild unzip ]; diff --git a/distros/melodic/assisted-teleop/default.nix b/distros/melodic/assisted-teleop/default.nix index 0330747345..7cbf030dec 100644 --- a/distros/melodic/assisted-teleop/default.nix +++ b/distros/melodic/assisted-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-assisted-teleop"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/melodic/assisted_teleop/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "8c14bee07b65c46e88f2d955a18d3b116db10f02f4266963072950077b8aab2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/melodic/assisted_teleop/0.3.6-1"; + sha256 = "sha256-BeFG5HMTx2dpSiXgDVRRJEK20Yd3/pITRUoWnPMmsms="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/astuff-sensor-msgs/default.nix b/distros/melodic/astuff-sensor-msgs/default.nix index 8f1ff396aa..43fb05109e 100644 --- a/distros/melodic/astuff-sensor-msgs/default.nix +++ b/distros/melodic/astuff-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-astuff-sensor-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/astuff_sensor_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "a96b19f4f23210692d87fdc878b65082a2fab92235461559b586608338996dbe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/astuff_sensor_msgs/3.0.2-1"; + sha256 = "sha256-uXhgGVk+kYEkPn4WslTVHJrw8DigEKyFpPHBxhd8fz0="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/melodic/async-comm/default.nix b/distros/melodic/async-comm/default.nix index 68f386d1e7..5d925622a9 100644 --- a/distros/melodic/async-comm/default.nix +++ b/distros/melodic/async-comm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-async-comm"; version = "0.2.1-r2"; - src = fetchurl { - url = "https://github.com/dpkoch/async_comm-release/archive/release/melodic/async_comm/0.2.1-2.tar.gz"; - name = "0.2.1-2.tar.gz"; - sha256 = "9cc4a16ea07097a37952f076d5fe82b9cc452f56e75b4bfa7c12786ca1c59926"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dpkoch"; + repo = "async_comm-release"; + rev = "release/melodic/async_comm/0.2.1-2"; + sha256 = "sha256-MdiwNzQGrXD3qJY2PCrpJJapB/vVvxbq7tf01owqm2Q="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/async-web-server-cpp/default.nix b/distros/melodic/async-web-server-cpp/default.nix index ff52431438..7c90f8ffef 100644 --- a/distros/melodic/async-web-server-cpp/default.nix +++ b/distros/melodic/async-web-server-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-async-web-server-cpp"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/fkie-release/async_web_server_cpp-release/archive/release/melodic/async_web_server_cpp/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "f1094d659202fb2ed57ef45efe72c8748e7086c122be0f064e3804657c14d630"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "async_web_server_cpp-release"; + rev = "release/melodic/async_web_server_cpp/1.0.3-1"; + sha256 = "sha256-S72a09saKwNEGbxvzKD79vbsvzC1mjhbHQU2YtkoKOw="; + }; buildType = "catkin"; buildInputs = [ catkin openssl ]; diff --git a/distros/melodic/ati-force-torque/default.nix b/distros/melodic/ati-force-torque/default.nix index af346c26ca..c6cd4a69fc 100644 --- a/distros/melodic/ati-force-torque/default.nix +++ b/distros/melodic/ati-force-torque/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ati-force-torque"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/KITrobotics/ati_force_torque-release/archive/release/melodic/ati_force_torque/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "ab56ef07e73679565c0e42290e449c0c3fd2531b8c77eb99e290c8b88c65717d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KITrobotics"; + repo = "ati_force_torque-release"; + rev = "release/melodic/ati_force_torque/1.1.1-3"; + sha256 = "sha256-/FA6D2V/hyrWdD7gyLDxm7T0jK8DVDA3K2X0aDU4PwU="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/audibot-description/default.nix b/distros/melodic/audibot-description/default.nix index 4279632fc5..292ce2fe94 100644 --- a/distros/melodic/audibot-description/default.nix +++ b/distros/melodic/audibot-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audibot-description"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/robustify/audibot-release/archive/release/melodic/audibot_description/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "4327222ddf9b627ef6b9463c32cb15b769d25bcf0f54a4375910f6f6fab541de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "audibot-release"; + rev = "release/melodic/audibot_description/0.2.2-1"; + sha256 = "sha256-CXKnvtJseo0vtFTI5yjsYrxVmaWNyjc7Aqs4DHQB6/Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/audibot-gazebo/default.nix b/distros/melodic/audibot-gazebo/default.nix index 9d8070ba96..22cb52559a 100644 --- a/distros/melodic/audibot-gazebo/default.nix +++ b/distros/melodic/audibot-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audibot-gazebo"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/robustify/audibot-release/archive/release/melodic/audibot_gazebo/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "c46de662b9a72968b3aa93d21b4f1c26ccdba4352fe96869f3590f0d8246d73a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "audibot-release"; + rev = "release/melodic/audibot_gazebo/0.2.2-1"; + sha256 = "sha256-kLudYnhJaw9x3YAGfujkERcI6069582ssOGyp/PLk5M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/audibot/default.nix b/distros/melodic/audibot/default.nix index acd6765501..5d884f38f3 100644 --- a/distros/melodic/audibot/default.nix +++ b/distros/melodic/audibot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audibot"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/robustify/audibot-release/archive/release/melodic/audibot/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "789a89794b7ff76ad7a76156d7c048a04ecf00d0c07f9cd17f4ff84df06463c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "audibot-release"; + rev = "release/melodic/audibot/0.2.2-1"; + sha256 = "sha256-yLsqwt2iM4LLdIvmxcEbaUB0qqS5FzpxGPi1qqwFT0E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/audio-capture/default.nix b/distros/melodic/audio-capture/default.nix index a1f203b9aa..9931b0e7aa 100644 --- a/distros/melodic/audio-capture/default.nix +++ b/distros/melodic/audio-capture/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audio-capture"; version = "0.3.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/audio_common-release/archive/release/melodic/audio_capture/0.3.16-1.tar.gz"; - name = "0.3.16-1.tar.gz"; - sha256 = "da958c6fce2f2d3cd9d8bc28220da9697e79199df8dd0b68ad44915ce8cf8a5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "audio_common-release"; + rev = "release/melodic/audio_capture/0.3.16-1"; + sha256 = "sha256-cGFx7OG950YwKE6O5tEKDxSCpfI2ituNXsRJ588n9n0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/audio-common-msgs/default.nix b/distros/melodic/audio-common-msgs/default.nix index 79ad216436..cb7ab559aa 100644 --- a/distros/melodic/audio-common-msgs/default.nix +++ b/distros/melodic/audio-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audio-common-msgs"; version = "0.3.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/audio_common-release/archive/release/melodic/audio_common_msgs/0.3.16-1.tar.gz"; - name = "0.3.16-1.tar.gz"; - sha256 = "2ad80a113ec7b20553936d7847940ba60b94c93ec97b2c4e16bcbd25d153255f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "audio_common-release"; + rev = "release/melodic/audio_common_msgs/0.3.16-1"; + sha256 = "sha256-o6EnHxlRGOHFGpg6HtNjRjrlbe6hUvRyH4Rxhv5ghmQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/audio-common/default.nix b/distros/melodic/audio-common/default.nix index 331923c4e5..c0f15b35cc 100644 --- a/distros/melodic/audio-common/default.nix +++ b/distros/melodic/audio-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audio-common"; version = "0.3.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/audio_common-release/archive/release/melodic/audio_common/0.3.16-1.tar.gz"; - name = "0.3.16-1.tar.gz"; - sha256 = "1a2ab0b4192ce074b57f4a7ee13ce82bb7a865d680d27bf942f6f1a59ba8ce6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "audio_common-release"; + rev = "release/melodic/audio_common/0.3.16-1"; + sha256 = "sha256-tiuvSCP9y4tImZv5qRMTKI+r/sUB6hur5sWDlq7s6Hc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/audio-play/default.nix b/distros/melodic/audio-play/default.nix index bdf7176a3d..6c8efbf0f1 100644 --- a/distros/melodic/audio-play/default.nix +++ b/distros/melodic/audio-play/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audio-play"; version = "0.3.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/audio_common-release/archive/release/melodic/audio_play/0.3.16-1.tar.gz"; - name = "0.3.16-1.tar.gz"; - sha256 = "282a8b82c28a44d3c6b753097c945fdba98f656edad5ce86f4fce41e89ffdda9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "audio_common-release"; + rev = "release/melodic/audio_play/0.3.16-1"; + sha256 = "sha256-KGvZAZzm90e0WEboyJcRVI4XaGeJ6yg8BxrCsvxBhzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/audio-to-spectrogram/default.nix b/distros/melodic/audio-to-spectrogram/default.nix index 3aadceb49c..fbb30453f8 100644 --- a/distros/melodic/audio-to-spectrogram/default.nix +++ b/distros/melodic/audio-to-spectrogram/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audio-to-spectrogram"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/audio_to_spectrogram/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "eb131626efa97d8fd7ad1c1cc3a6b071cac03f0e746aeae6b3b7b2bf4cf06e28"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/audio_to_spectrogram/1.2.15-1"; + sha256 = "sha256-3JZL2ciRG8aecL9sBrfEGNYlAcdP0xrezuHrdZKswMw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/audio-video-recorder/default.nix b/distros/melodic/audio-video-recorder/default.nix index 5049e9bcfb..f01930e934 100644 --- a/distros/melodic/audio-video-recorder/default.nix +++ b/distros/melodic/audio-video-recorder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-audio-video-recorder"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/audio_video_recorder/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "40d2a21e729bf8d97a9126d03e1120ffaf62f2053d48a9eaa4390f193c243ecf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/audio_video_recorder/2.2.12-1"; + sha256 = "sha256-qUBSWrRNFP01zJz0aclbPO/bM7CITaupTR0eGuvwZJI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/automotive-autonomy-msgs/default.nix b/distros/melodic/automotive-autonomy-msgs/default.nix index 409d5a2b7c..511fe5d7fd 100644 --- a/distros/melodic/automotive-autonomy-msgs/default.nix +++ b/distros/melodic/automotive-autonomy-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-automotive-autonomy-msgs"; version = "3.0.4-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/melodic/automotive_autonomy_msgs/3.0.4-1.tar.gz"; - name = "3.0.4-1.tar.gz"; - sha256 = "2899316eab20c57ab7bcc0d5d8bdb46da42c9a66d94200376ead64b7ca74d6b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/melodic/automotive_autonomy_msgs/3.0.4-1"; + sha256 = "sha256-R/GduU+VD3B9INpzOpa84Bl42xFAtGthn8PEt8iYmpw="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/melodic/automotive-navigation-msgs/default.nix b/distros/melodic/automotive-navigation-msgs/default.nix index b1e58a9f83..3a5cb040ab 100644 --- a/distros/melodic/automotive-navigation-msgs/default.nix +++ b/distros/melodic/automotive-navigation-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-automotive-navigation-msgs"; version = "3.0.4-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/melodic/automotive_navigation_msgs/3.0.4-1.tar.gz"; - name = "3.0.4-1.tar.gz"; - sha256 = "b1e197ff14c2d36b74e3a178147299f8b4edef50728854eed3198021e0849bdd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/melodic/automotive_navigation_msgs/3.0.4-1"; + sha256 = "sha256-N+QDJUyFWyIto9hqSOYNMPTrVLJR+tIO2J4ExUZ27+0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/automotive-platform-msgs/default.nix b/distros/melodic/automotive-platform-msgs/default.nix index 9465bd8cc9..eabdefc22b 100644 --- a/distros/melodic/automotive-platform-msgs/default.nix +++ b/distros/melodic/automotive-platform-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-automotive-platform-msgs"; version = "3.0.4-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/melodic/automotive_platform_msgs/3.0.4-1.tar.gz"; - name = "3.0.4-1.tar.gz"; - sha256 = "11b418be3ec5eb3c715e835c951d207cd632499e9a0fd4ca4ab740028e248905"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/melodic/automotive_platform_msgs/3.0.4-1"; + sha256 = "sha256-HMhXhLS41h9P1STIbuEdhOgxNORj/YJrfDldGKeMKfA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/autoware-can-msgs/default.nix b/distros/melodic/autoware-can-msgs/default.nix index eb49fad07f..a89214cc0b 100644 --- a/distros/melodic/autoware-can-msgs/default.nix +++ b/distros/melodic/autoware-can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-autoware-can-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/autoware_can_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "1e50f649b44dc8ad43ccada6bec907f06e81e1568b12ae5141f2e0ff3967f8e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/autoware_can_msgs/1.14.0-1"; + sha256 = "sha256-cYR5wQOEsFuNLRn5Lo9gFdPZCkE/sM0MM/Eh0sD/tXk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/autoware-config-msgs/default.nix b/distros/melodic/autoware-config-msgs/default.nix index 8dfa0b0627..55747ff361 100644 --- a/distros/melodic/autoware-config-msgs/default.nix +++ b/distros/melodic/autoware-config-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-autoware-config-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/autoware_config_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "d60ba3433659548c626d654074c19395ac5ec153efc98ae862fdd521170a950a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/autoware_config_msgs/1.14.0-1"; + sha256 = "sha256-LnjiFHp8RAOybuiYvaB7dQNLh6hWlsNqj5EXRHZEcHk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/autoware-external-msgs/default.nix b/distros/melodic/autoware-external-msgs/default.nix index 30ea50346b..87a3dc3d8a 100644 --- a/distros/melodic/autoware-external-msgs/default.nix +++ b/distros/melodic/autoware-external-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-autoware-external-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/autoware_external_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "7c79c2c05eccebce61b3be3fd3c13d440c9014b5e1425d752732ff557e402543"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/autoware_external_msgs/1.14.0-1"; + sha256 = "sha256-oA7G2JChxlLR6VtW3innvM4XLOtdyfy6c7j7zZUJrCU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/autoware-lanelet2-msgs/default.nix b/distros/melodic/autoware-lanelet2-msgs/default.nix index 0c48bda311..0b6d2fe709 100644 --- a/distros/melodic/autoware-lanelet2-msgs/default.nix +++ b/distros/melodic/autoware-lanelet2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-autoware-lanelet2-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/autoware_lanelet2_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "499647b4641b7b3894314e2b1855809983b2c25787db20187b41cdb0d2cd5c12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/autoware_lanelet2_msgs/1.14.0-1"; + sha256 = "sha256-TE9EkqOEUSUa7lmZRTxUGB1jF5iToF7To+fqLBCMiL4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/autoware-map-msgs/default.nix b/distros/melodic/autoware-map-msgs/default.nix index db2db2c736..c6010d90df 100644 --- a/distros/melodic/autoware-map-msgs/default.nix +++ b/distros/melodic/autoware-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-autoware-map-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/autoware_map_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "657e98a615e03cabd4a43531f59636f763b69c1ed17e083bdcba0cb54f756967"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/autoware_map_msgs/1.14.0-1"; + sha256 = "sha256-RZDcJO2vJJLEolC+3+XSRwT5Snm7bjNGSsAoE0do4xY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/autoware-msgs/default.nix b/distros/melodic/autoware-msgs/default.nix index 7681b53d84..1931f8a8bf 100644 --- a/distros/melodic/autoware-msgs/default.nix +++ b/distros/melodic/autoware-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-autoware-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/autoware_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "565ea9d118130516a2c35ef6a701b65b72ea89941c21349544dc57be3ebe782b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/autoware_msgs/1.14.0-1"; + sha256 = "sha256-ENK+9lpQNKoVWYST4JEG/7gZyY4SNwkqlrRg1I6m4E8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/autoware-system-msgs/default.nix b/distros/melodic/autoware-system-msgs/default.nix index cca403350a..2fca801ef8 100644 --- a/distros/melodic/autoware-system-msgs/default.nix +++ b/distros/melodic/autoware-system-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-autoware-system-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/autoware_system_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "45baf85696feee43e02e8d82ddc2ee9e75199c6996b7635f68c78074be0b25f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/autoware_system_msgs/1.14.0-1"; + sha256 = "sha256-SIEfTLBAP2uML4EY0BlOP14wFdi7FHjb29c79rzNEkU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/auv-msgs/default.nix b/distros/melodic/auv-msgs/default.nix index a34cd9f1b6..43f45984e5 100644 --- a/distros/melodic/auv-msgs/default.nix +++ b/distros/melodic/auv-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-auv-msgs"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/oceansystemslab/auv_msgs-release/archive/release/melodic/auv_msgs/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "773b034a505af916981ca2116c387d65004a1cbe4a55296cf81ac9517a75f21d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "oceansystemslab"; + repo = "auv_msgs-release"; + rev = "release/melodic/auv_msgs/0.1.1-1"; + sha256 = "sha256-cs5oRlyiuV6Es/pjqEwJdiKfwE83/1Ii28Cw1RU5pMg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/avt-vimba-camera/default.nix b/distros/melodic/avt-vimba-camera/default.nix index 71e534ea53..743f6bf9b7 100644 --- a/distros/melodic/avt-vimba-camera/default.nix +++ b/distros/melodic/avt-vimba-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-avt-vimba-camera"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/avt_vimba_camera-release/archive/release/melodic/avt_vimba_camera/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "74b42283532f9c9c2b19646b0d4138cbd1aa95a2755191027fb72923070be070"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "avt_vimba_camera-release"; + rev = "release/melodic/avt_vimba_camera/1.2.0-1"; + sha256 = "sha256-Ykrkl50T1YM/nw8eIdpcqvFcdKnNh828nL+np0TlbEA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/aws-common/default.nix b/distros/melodic/aws-common/default.nix index 770857146e..459ae5fcd2 100644 --- a/distros/melodic/aws-common/default.nix +++ b/distros/melodic/aws-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aws-common"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/aws_common-release/archive/release/melodic/aws_common/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "ca6b356a24bbfc7851da14716f3f90cdc751ce5d7620f5eda2401cdfebdddbfe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "aws_common-release"; + rev = "release/melodic/aws_common/2.2.0-1"; + sha256 = "sha256-1RDpsiryF7yJ4e24yRk9U7xr3RHn9LYYqjKjLWtxT08="; + }; buildType = "cmake"; buildInputs = [ catkin cmake ros-environment ]; diff --git a/distros/melodic/aws-robomaker-simulation-ros-pkgs/default.nix b/distros/melodic/aws-robomaker-simulation-ros-pkgs/default.nix index 4bc2636bae..120682f36a 100644 --- a/distros/melodic/aws-robomaker-simulation-ros-pkgs/default.nix +++ b/distros/melodic/aws-robomaker-simulation-ros-pkgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aws-robomaker-simulation-ros-pkgs"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/aws-gbp/aws_robomaker_simulation_ros_pkgs-release/archive/release/melodic/aws_robomaker_simulation_ros_pkgs/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "5e0601fa00843ff7ac138fe81b6a8f97242aaaf2648aee4a870b21bc9055ae8e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "aws_robomaker_simulation_ros_pkgs-release"; + rev = "release/melodic/aws_robomaker_simulation_ros_pkgs/1.1.1-2"; + sha256 = "sha256-50jWSYADy5oEJIDPCbB3I79MQ/7tSiTueRonVcT5pEk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/aws-ros1-common/default.nix b/distros/melodic/aws-ros1-common/default.nix index bd5c8bd326..a4973058f0 100644 --- a/distros/melodic/aws-ros1-common/default.nix +++ b/distros/melodic/aws-ros1-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-aws-ros1-common"; version = "2.0.1-r2"; - src = fetchurl { - url = "https://github.com/aws-gbp/aws_ros1_common-release/archive/release/melodic/aws_ros1_common/2.0.1-2.tar.gz"; - name = "2.0.1-2.tar.gz"; - sha256 = "6ce3c5da6d51c25b2c8453af0a780dbeaa94561baf086346a2fdc2b3ed27caac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "aws_ros1_common-release"; + rev = "release/melodic/aws_ros1_common/2.0.1-2"; + sha256 = "sha256-gfX+MXg0KqRJBaeqGzMO8vpz1h0uSfU4r/bvaiwmCkM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/axis-camera/default.nix b/distros/melodic/axis-camera/default.nix index ba4efde196..ea4359afcd 100644 --- a/distros/melodic/axis-camera/default.nix +++ b/distros/melodic/axis-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-axis-camera"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/axis_camera-release/archive/release/melodic/axis_camera/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "e7dfcbd5f77efc2f9a132bd2b8cd35315c323cb4db3a160a70694873d90868be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "axis_camera-release"; + rev = "release/melodic/axis_camera/0.3.2-1"; + sha256 = "sha256-wamh90sv2PS7hR8+rlYiYvcPS89B8Cpi36YzsCTniEM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/azure-iot-sdk-c/default.nix b/distros/melodic/azure-iot-sdk-c/default.nix index 0c3456037e..6c5256cced 100644 --- a/distros/melodic/azure-iot-sdk-c/default.nix +++ b/distros/melodic/azure-iot-sdk-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-azure-iot-sdk-c"; version = "1.9.0-r1"; - src = fetchurl { - url = "https://github.com/nobleo/azure-iot-sdk-c-release/archive/release/melodic/azure-iot-sdk-c/1.9.0-1.tar.gz"; - name = "1.9.0-1.tar.gz"; - sha256 = "378723320c229afa2d043f87d3be5710f6b6eaaaf732990b9114840fe1fe6009"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "azure-iot-sdk-c-release"; + rev = "release/melodic/azure-iot-sdk-c/1.9.0-1"; + sha256 = "sha256-d8dX0Z2z3vMQ/F+rB3jNFNJJhRnNpbP5jBgmBuQ/pBY="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/backward-ros/default.nix b/distros/melodic/backward-ros/default.nix index ce4918ed34..1699f55426 100644 --- a/distros/melodic/backward-ros/default.nix +++ b/distros/melodic/backward-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-backward-ros"; version = "0.1.7"; - src = fetchurl { - url = "https://github.com/pal-gbp/backward_ros-release/archive/release/melodic/backward_ros/0.1.7-0.tar.gz"; - name = "0.1.7-0.tar.gz"; - sha256 = "3cec255db3ff1af9bfc80b31ca88a9be50f11d663d9213edf457b0a7ed7eb967"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "backward_ros-release"; + rev = "release/melodic/backward_ros/0.1.7-0"; + sha256 = "sha256-MolJFqHoajXdXEJBQR2LBa37fiXOh7IY1nSLt4/OMKw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/bagger/default.nix b/distros/melodic/bagger/default.nix index 397f693700..aa04ccb355 100644 --- a/distros/melodic/bagger/default.nix +++ b/distros/melodic/bagger/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bagger"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/squarerobot/bagger-release/archive/release/melodic/bagger/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "417cbd4e7a43e72355430d0608a328aa14091eb94650d4f28910ada5e68c664f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "squarerobot"; + repo = "bagger-release"; + rev = "release/melodic/bagger/0.1.4-1"; + sha256 = "sha256-NgFl84O/lN157zxxPcg4scJK3+O0FnUe9W5+kyk6ACE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/melodic/baldor/default.nix b/distros/melodic/baldor/default.nix index 71ed31d90f..ab2483e19a 100644 --- a/distros/melodic/baldor/default.nix +++ b/distros/melodic/baldor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-baldor"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/crigroup/baldor-release/archive/release/melodic/baldor/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "9be26171300296c42581caf9a732d6671529768f61c1a6fc8895197a1e6d0969"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "crigroup"; + repo = "baldor-release"; + rev = "release/melodic/baldor/0.1.2-1"; + sha256 = "sha256-wMqIybt7BOmdKbRUhqPTUROXV8x6YqApIo38Wze15Ew="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/base-local-planner/default.nix b/distros/melodic/base-local-planner/default.nix index f85e3441ab..69b70b02af 100644 --- a/distros/melodic/base-local-planner/default.nix +++ b/distros/melodic/base-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-base-local-planner"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/base_local_planner/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "51ee2f7a40c5041648f1bb6735562a801b986e7f01f6a0fd7a600aa73c56c6b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/base_local_planner/1.16.7-1"; + sha256 = "sha256-sqq7Roc0Sa7wHLs0gHW3rfqUp4q3E6a+1OehbXHNVQg="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation tf2-geometry-msgs ]; diff --git a/distros/melodic/bayesian-belief-networks/default.nix b/distros/melodic/bayesian-belief-networks/default.nix index 5ed48104ef..7ae3454421 100644 --- a/distros/melodic/bayesian-belief-networks/default.nix +++ b/distros/melodic/bayesian-belief-networks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bayesian-belief-networks"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/bayesian_belief_networks/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "6d1673ffd1144446dd32eda73d25e4885dccce3f4c922e4a2ec9fb9214310af8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/bayesian_belief_networks/2.1.24-2"; + sha256 = "sha256-oJqMKKsU0839UQ+91U3SZUHADm0li5ma0Ec28vNZ2CQ="; + }; buildType = "catkin"; buildInputs = [ catkin git message-generation mk unzip ]; diff --git a/distros/melodic/bcap-core/default.nix b/distros/melodic/bcap-core/default.nix index 70538aa522..7e83f04ef0 100644 --- a/distros/melodic/bcap-core/default.nix +++ b/distros/melodic/bcap-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bcap-core"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/bcap_core/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "1d0c1bb6201fd6f52a542770b9fa39ac14aa86dbaeebac2384afbeb8315ff940"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/bcap_core/3.2.0-1"; + sha256 = "sha256-talzEGu7zC8O/W3mb8pvoELSOno9nl1wIJmaGWsZTeM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/bcap-service-test/default.nix b/distros/melodic/bcap-service-test/default.nix index 8a02505816..7238963241 100644 --- a/distros/melodic/bcap-service-test/default.nix +++ b/distros/melodic/bcap-service-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bcap-service-test"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/bcap_service_test/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "233a8c354d27ea11be4749ef1a1f759b906cc931585019115a913f685b42d87c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/bcap_service_test/3.2.0-1"; + sha256 = "sha256-qI2GWnrnY0FMlBsSx6P93n3bUD/9V5WsZN6QXtXqsVM="; + }; buildType = "catkin"; buildInputs = [ bcap-service catkin ]; diff --git a/distros/melodic/bcap-service/default.nix b/distros/melodic/bcap-service/default.nix index 9e71aa0e22..21bfea82bf 100644 --- a/distros/melodic/bcap-service/default.nix +++ b/distros/melodic/bcap-service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bcap-service"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/bcap_service/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "efe083be1456bd1c3ac217153fbdffe51dae85a3927497d7d59691595e996ae6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/bcap_service/3.2.0-1"; + sha256 = "sha256-iQz7RYpfb1ele/vf5atJLtOnSZZs9LrkF5UyAK1Q00A="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/behaviortree-cpp-v3/default.nix b/distros/melodic/behaviortree-cpp-v3/default.nix index 03e1572b97..c7302045ab 100644 --- a/distros/melodic/behaviortree-cpp-v3/default.nix +++ b/distros/melodic/behaviortree-cpp-v3/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cppzmq, ncurses, ros-environment, roslib }: buildRosPackage { pname = "ros-melodic-behaviortree-cpp-v3"; - version = "3.8.1-r1"; + version = "3.8.2-r1"; - src = fetchurl { - url = "https://github.com/BehaviorTree/behaviortree_cpp_v3-release/archive/release/melodic/behaviortree_cpp_v3/3.8.1-1.tar.gz"; - name = "3.8.1-1.tar.gz"; - sha256 = "b056eacd996357643632a49ff6a940704edc2febb0145ac93e19325c53621a57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BehaviorTree"; + repo = "behaviortree_cpp_v3-release"; + rev = "release/melodic/behaviortree_cpp_v3/3.8.2-1"; + sha256 = "sha256-KuS/C9quRgq4cnqiu7BeZt1GD2vayxHHdnFZtvQBnck="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/melodic/behaviortree-cpp/default.nix b/distros/melodic/behaviortree-cpp/default.nix index dd76f82554..d5381f3ba5 100644 --- a/distros/melodic/behaviortree-cpp/default.nix +++ b/distros/melodic/behaviortree-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-behaviortree-cpp"; version = "2.5.1"; - src = fetchurl { - url = "https://github.com/BehaviorTree/behaviortree_cpp-release/archive/release/melodic/behaviortree_cpp/2.5.1-0.tar.gz"; - name = "2.5.1-0.tar.gz"; - sha256 = "cd1af27ccb2e5763fa4e9f02e23edf77fca7d1894d013a0d932e7f5ad05d337c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BehaviorTree"; + repo = "behaviortree_cpp-release"; + rev = "release/melodic/behaviortree_cpp/2.5.1-0"; + sha256 = "sha256-0zmtXVWficoB3G4ZPBijEZPgzWqPtCNIH7CCLS3z/90="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/bfl/default.nix b/distros/melodic/bfl/default.nix index 1687a165b0..a11bf58ac0 100644 --- a/distros/melodic/bfl/default.nix +++ b/distros/melodic/bfl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bfl"; version = "0.8.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bfl-release/archive/release/melodic/bfl/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "7c4c61c15768d1cd276cdaaf9a9f5e3088f478383789ffec9fdee325dafc0990"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bfl-release"; + rev = "release/melodic/bfl/0.8.0-1"; + sha256 = "sha256-5Cit/FQaF/R9jb/T9HxA6IF+3xzRcJFZolEotoE7+uY="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/blender-gazebo/default.nix b/distros/melodic/blender-gazebo/default.nix index 51bf0d7750..ebd875292c 100644 --- a/distros/melodic/blender-gazebo/default.nix +++ b/distros/melodic/blender-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-blender-gazebo"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/david0429-gbp/blender_gazebo_gbp/archive/release/melodic/blender_gazebo/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "ca41a7b8fbb299e647314ea3aefbca8b162617487784140646726df92a8909f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "david0429-gbp"; + repo = "blender_gazebo_gbp"; + rev = "release/melodic/blender_gazebo/0.0.4-1"; + sha256 = "sha256-fFBi+usLcfPYmYW+qOyP8XIbhiAa4A2PSh7/75bA8XI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/bond-core/default.nix b/distros/melodic/bond-core/default.nix index 8089cb5cce..9c23b7fe80 100644 --- a/distros/melodic/bond-core/default.nix +++ b/distros/melodic/bond-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bond-core"; version = "1.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/melodic/bond_core/1.8.5-1.tar.gz"; - name = "1.8.5-1.tar.gz"; - sha256 = "83964bcfc9dc0c3d10b95142fb6b6d41792c74178704380bf7ea76c0eb130751"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/melodic/bond_core/1.8.5-1"; + sha256 = "sha256-HN8PX39mzJTN/MVttVqXAxW9bUehlFGgmVxq+n81urE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/bond/default.nix b/distros/melodic/bond/default.nix index 9031455360..538c794add 100644 --- a/distros/melodic/bond/default.nix +++ b/distros/melodic/bond/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bond"; version = "1.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/melodic/bond/1.8.5-1.tar.gz"; - name = "1.8.5-1.tar.gz"; - sha256 = "00cca5d8b5846117fbee1ea21357699472208d690f6acbb1510500c7a4980af7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/melodic/bond/1.8.5-1"; + sha256 = "sha256-lNkm0wR4bKzS/p4ZuV1+g2h2F+MiH0a91oPiVv3Rf1w="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/bondcpp/default.nix b/distros/melodic/bondcpp/default.nix index 26a229a766..e1e395cf72 100644 --- a/distros/melodic/bondcpp/default.nix +++ b/distros/melodic/bondcpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bondcpp"; version = "1.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/melodic/bondcpp/1.8.5-1.tar.gz"; - name = "1.8.5-1.tar.gz"; - sha256 = "f889b4bbeb494215d8ea3aba0080c775a87bce44e94fc184b3359c39874a0968"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/melodic/bondcpp/1.8.5-1"; + sha256 = "sha256-OkR7SzujB+qZ/uUMZb6rrdb78spbzTqffFAXX4IMuHQ="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/bondpy/default.nix b/distros/melodic/bondpy/default.nix index 5c154c387a..1a1e175d8d 100644 --- a/distros/melodic/bondpy/default.nix +++ b/distros/melodic/bondpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-bondpy"; version = "1.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/melodic/bondpy/1.8.5-1.tar.gz"; - name = "1.8.5-1.tar.gz"; - sha256 = "715a74c4e9e51b449dbc01ecda2952e09bea6e1f60bd98e9d3d20c97c0fb5ed4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/melodic/bondpy/1.8.5-1"; + sha256 = "sha256-puD1x5qGkQe6/yOP5x9IlssFrsx+sYqq7+PZk0jwzIE="; + }; buildType = "catkin"; buildInputs = [ bond catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/boost-sml/default.nix b/distros/melodic/boost-sml/default.nix index e6d72bb3a4..47f29914e7 100644 --- a/distros/melodic/boost-sml/default.nix +++ b/distros/melodic/boost-sml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-boost-sml"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/boost_sml-release/archive/release/melodic/boost_sml/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "e98ea8d0a8064f30a76842a435fc4b87a5547fe2f28001582173a21ebca65326"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "boost_sml-release"; + rev = "release/melodic/boost_sml/0.1.2-1"; + sha256 = "sha256-U5JdTzaA7FImbwM2qRa+mZT4NTqGb7cYCUNfiulQNQI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/brics-actuator/default.nix b/distros/melodic/brics-actuator/default.nix index 3900cd88af..a53bef0262 100644 --- a/distros/melodic/brics-actuator/default.nix +++ b/distros/melodic/brics-actuator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-brics-actuator"; version = "0.7.0"; - src = fetchurl { - url = "https://github.com/wnowak/brics_actuator-release/archive/release/melodic/brics_actuator/0.7.0-0.tar.gz"; - name = "0.7.0-0.tar.gz"; - sha256 = "20a7643aa378c2f934d712eb798a3ad3a89e86728e22da9debfae0c62eb6294f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wnowak"; + repo = "brics_actuator-release"; + rev = "release/melodic/brics_actuator/0.7.0-0"; + sha256 = "sha256-ubbpm+3hE8o/b9m5SnvJ5Ut5KOLmSoPgqWa/mrhnqfg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/calibration-estimation/default.nix b/distros/melodic/calibration-estimation/default.nix index db5a6e54cf..c793063fef 100644 --- a/distros/melodic/calibration-estimation/default.nix +++ b/distros/melodic/calibration-estimation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-calibration-estimation"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/calibration_estimation/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "b6d902974beb94a2868f04a7c820517a153083bf0c316b91036a746a411a2970"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/calibration_estimation/0.10.14-0"; + sha256 = "sha256-2WpVp6ZScp1/bYAZgL50txdPS7J3+AxWYlz2j/6z7cQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/calibration-launch/default.nix b/distros/melodic/calibration-launch/default.nix index 05882432a5..1ad91f2d35 100644 --- a/distros/melodic/calibration-launch/default.nix +++ b/distros/melodic/calibration-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-calibration-launch"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/calibration_launch/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "eaf7a65341c7be0665741f2d6f22d3e9d6a5a50deb004ffd402434fc2ae715b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/calibration_launch/0.10.14-0"; + sha256 = "sha256-Vzs6YSu1MGKAAHWQNV+6ccC6o+Zr6J4/oSxlG3YT1zQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/calibration-msgs/default.nix b/distros/melodic/calibration-msgs/default.nix index c9653b595d..282f32837c 100644 --- a/distros/melodic/calibration-msgs/default.nix +++ b/distros/melodic/calibration-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-calibration-msgs"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/calibration_msgs/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "f85ef3c769ab6d3c7dd2b91cd681c2364657302db08d2107b5d3eb1f29ac1bdf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/calibration_msgs/0.10.14-0"; + sha256 = "sha256-rNAQwYMeKi1BRA3p2yQGNjDSfhWx7z+buiNnChIoYLs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/calibration-setup-helper/default.nix b/distros/melodic/calibration-setup-helper/default.nix index 7134b7fbb4..7e09ce8739 100644 --- a/distros/melodic/calibration-setup-helper/default.nix +++ b/distros/melodic/calibration-setup-helper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-calibration-setup-helper"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/calibration_setup_helper/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "860ae9436ebb32f82961749186b07d6d8c5f2885897baf629226b5e0db51b588"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/calibration_setup_helper/0.10.14-0"; + sha256 = "sha256-ujYVVLKHFJhoI2njRdKEsaEGMk6hB2dvmt466IZlV4s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/calibration/default.nix b/distros/melodic/calibration/default.nix index 7db9a07937..89d2d09df3 100644 --- a/distros/melodic/calibration/default.nix +++ b/distros/melodic/calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-calibration"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/calibration/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "7a248b88469868131a91a2f1894aef35a0012d9027cdf3532e39849f560268d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/calibration/0.10.14-0"; + sha256 = "sha256-dRPU4pjdJhjPoccIc1AgBZu+nxDE9AHTTrE5wbuYVwM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/camera-calibration-parsers/default.nix b/distros/melodic/camera-calibration-parsers/default.nix index 9fa013d94c..fd45ed867a 100644 --- a/distros/melodic/camera-calibration-parsers/default.nix +++ b/distros/melodic/camera-calibration-parsers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-camera-calibration-parsers"; version = "1.11.13"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/melodic/camera_calibration_parsers/1.11.13-0.tar.gz"; - name = "1.11.13-0.tar.gz"; - sha256 = "dd350061b03da5dba0315515f603daa31204e71c43389cf9e57bf09c06d8d3ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/melodic/camera_calibration_parsers/1.11.13-0"; + sha256 = "sha256-dXYfQVjiHRm0PQslj+wCGNAKqyUYAjI0gqesgiV7Org="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config rosconsole ]; diff --git a/distros/melodic/camera-calibration/default.nix b/distros/melodic/camera-calibration/default.nix index dcbb8df2b4..8f0edef930 100644 --- a/distros/melodic/camera-calibration/default.nix +++ b/distros/melodic/camera-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-camera-calibration"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/camera_calibration/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "f383771fde50848fb35e7dacc89351e9ac856f5b50c7c15d02d5b69dec321e04"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/melodic/camera_calibration/1.15.2-1"; + sha256 = "sha256-izwg2Zaq9j7VTE1zFVdpMIzS9XCAeCXaXjCH0CDwZqk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/camera-info-manager-py/default.nix b/distros/melodic/camera-info-manager-py/default.nix index 9943d3f7ce..279c80a34f 100644 --- a/distros/melodic/camera-info-manager-py/default.nix +++ b/distros/melodic/camera-info-manager-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-camera-info-manager-py"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/camera_info_manager_py-release/archive/release/melodic/camera_info_manager_py/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "6087f6e31da07de3fc73755de6dac341afdb28eaf48e375cd0519addefe2dce1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "camera_info_manager_py-release"; + rev = "release/melodic/camera_info_manager_py/0.2.3-1"; + sha256 = "sha256-H51Vb8gRMdJHThOQz8WW5sWbo8W2ABnu46tWJi1KR9U="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/camera-info-manager/default.nix b/distros/melodic/camera-info-manager/default.nix index b5a5b31313..833d51aa8c 100644 --- a/distros/melodic/camera-info-manager/default.nix +++ b/distros/melodic/camera-info-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-camera-info-manager"; version = "1.11.13"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/melodic/camera_info_manager/1.11.13-0.tar.gz"; - name = "1.11.13-0.tar.gz"; - sha256 = "c24f43db36b8922346fb722119850fdd6a0fafe87fa38521edba5c8c6ed4e98d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/melodic/camera_info_manager/1.11.13-0"; + sha256 = "sha256-UkvCqoIGF7wJsR9axRmvCf7IqiPhDF3BbhNXzNC57Ww="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/camera-umd/default.nix b/distros/melodic/camera-umd/default.nix index 25c44c1ccf..9099b872ca 100644 --- a/distros/melodic/camera-umd/default.nix +++ b/distros/melodic/camera-umd/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-camera-umd"; version = "0.2.7"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/camera_umd-release/archive/release/melodic/camera_umd/0.2.7-0.tar.gz"; - name = "0.2.7-0.tar.gz"; - sha256 = "fb6705f080d0f3add72ec01a70dfb7e3efd9f264c9294a4a2ced40f9415597ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "camera_umd-release"; + rev = "release/melodic/camera_umd/0.2.7-0"; + sha256 = "sha256-U4PFLyVXtuURGMK6J1rOuBHm67pqkFbzVsEW11d9DHM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/can-dbc-parser/default.nix b/distros/melodic/can-dbc-parser/default.nix index bab8de6d5d..66d09e3de5 100644 --- a/distros/melodic/can-dbc-parser/default.nix +++ b/distros/melodic/can-dbc-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-can-dbc-parser"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/nobleo/raptor-dbw-ros-release/archive/release/melodic/can_dbc_parser/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "e2c1cf7aab65cc2a69c0bced65d590a220263dcfdca4af126fdf21855c93e33a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "raptor-dbw-ros-release"; + rev = "release/melodic/can_dbc_parser/1.0.0-3"; + sha256 = "sha256-6BAZH71AnTRtkkW03VDGUQaGXXk2jKPOPTWzjr4DeJI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/can-msgs/default.nix b/distros/melodic/can-msgs/default.nix index 569cb1b5ef..6f0c128d53 100644 --- a/distros/melodic/can-msgs/default.nix +++ b/distros/melodic/can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-can-msgs"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/melodic/can_msgs/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "f5066e557bf533243631fef24b5e63c507eb24b44bb883b77017c674cb4f2d90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/melodic/can_msgs/0.8.5-1"; + sha256 = "sha256-4pRolBZC1J+7Zggo2u/QMQb+iATTX7QceeXgRRIJB0c="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/canopen-402/default.nix b/distros/melodic/canopen-402/default.nix index 1f35a5caf1..3479b8737b 100644 --- a/distros/melodic/canopen-402/default.nix +++ b/distros/melodic/canopen-402/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-canopen-402"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/melodic/canopen_402/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "a280899651921c85855889860b3a5fc54dad9b77c7f8e7ad66c2b855affc6d84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/melodic/canopen_402/0.8.5-1"; + sha256 = "sha256-ayRBz0+Ikxjluz1EbD7/5sE0ls47EQXFZwdRG8x6OLg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/canopen-chain-node/default.nix b/distros/melodic/canopen-chain-node/default.nix index 0761f55e45..7150bf22b9 100644 --- a/distros/melodic/canopen-chain-node/default.nix +++ b/distros/melodic/canopen-chain-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-canopen-chain-node"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/melodic/canopen_chain_node/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "59762bd71cb671c446d85fbafe22b93c33f4d51eb9fa5e4248c869543af30085"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/melodic/canopen_chain_node/0.8.5-1"; + sha256 = "sha256-GVUHL4gKOePn64morrMeQqAurcRx9TkMFq9XLDxAWHM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/canopen-master/default.nix b/distros/melodic/canopen-master/default.nix index afef7c7ea9..c06c62bf18 100644 --- a/distros/melodic/canopen-master/default.nix +++ b/distros/melodic/canopen-master/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-canopen-master"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/melodic/canopen_master/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "83ce5c79c6a4f19aa0b594aad47879846831f8afa357845e732f7999b37aba1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/melodic/canopen_master/0.8.5-1"; + sha256 = "sha256-89qyDBshOPfP6Bi0UJD0BxOCW6t4dIzEPuOutk6AOJQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/canopen-motor-node/default.nix b/distros/melodic/canopen-motor-node/default.nix index af780836f5..04d0d215d1 100644 --- a/distros/melodic/canopen-motor-node/default.nix +++ b/distros/melodic/canopen-motor-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-canopen-motor-node"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/melodic/canopen_motor_node/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "136e40e5bb384756d447943ef6e7924dd3cc12da8a2847fcfc2d29b3e83cbffa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/melodic/canopen_motor_node/0.8.5-1"; + sha256 = "sha256-Ixrnh1WkXt2VF0R2Ffc4IMemiq+eMXCE+x6z8OwEIWg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/capabilities/default.nix b/distros/melodic/capabilities/default.nix index d292babe31..b83a3a55f8 100644 --- a/distros/melodic/capabilities/default.nix +++ b/distros/melodic/capabilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-capabilities"; version = "0.2.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/capabilities-release/archive/release/melodic/capabilities/0.2.0-0.tar.gz"; - name = "0.2.0-0.tar.gz"; - sha256 = "adfb1e8a3002fcfc90f654c8def944f6cd7a8753b3e908b5760eca786b1546ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "capabilities-release"; + rev = "release/melodic/capabilities/0.2.0-0"; + sha256 = "sha256-gsQu49rMCXcnnxjiResH//6LKotvU0/C0e037Htp5H0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/melodic/carla-msgs/default.nix b/distros/melodic/carla-msgs/default.nix index 10ef0f4b05..415bf75546 100644 --- a/distros/melodic/carla-msgs/default.nix +++ b/distros/melodic/carla-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-carla-msgs"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/carla-simulator/ros-carla-msgs-release/archive/release/melodic/carla_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "e765f300aa110bc528f6bfad420849d5e88421e4014286efac4646db936a53cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carla-simulator"; + repo = "ros-carla-msgs-release"; + rev = "release/melodic/carla_msgs/1.3.0-1"; + sha256 = "sha256-NTgm6pRu+Vv0vfOcZJd3y+UUP4VS3rzyU+ZdNre+prE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/carrot-planner/default.nix b/distros/melodic/carrot-planner/default.nix index b3589fe8ee..1563f97504 100644 --- a/distros/melodic/carrot-planner/default.nix +++ b/distros/melodic/carrot-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-carrot-planner"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/carrot_planner/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "ae0f4723d870c16faa721ef984db47a514932f2e26b054b63eea6ff0ea204582"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/carrot_planner/1.16.7-1"; + sha256 = "sha256-7Czrg0nEkMGVPamuH7QtKzwf8vdjIf8XQgBZeG73Ugc="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-geometry-msgs ]; diff --git a/distros/melodic/cartesian-control-msgs/default.nix b/distros/melodic/cartesian-control-msgs/default.nix index 528ee33e29..ca259f5c5e 100644 --- a/distros/melodic/cartesian-control-msgs/default.nix +++ b/distros/melodic/cartesian-control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartesian-control-msgs"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_cartesian_control_msgs-release/archive/release/melodic/cartesian_control_msgs/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "b950b93403f3867d3b7f1dd634183deb6ebee6b25a4d5b9c87398edc17b3c46c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_cartesian_control_msgs-release"; + rev = "release/melodic/cartesian_control_msgs/0.1.0-1"; + sha256 = "sha256-uPW2h5O83C0HDN+7KJPJyMYjI3+bCHV9PPDf2bqI1ys="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cartesian-interface/default.nix b/distros/melodic/cartesian-interface/default.nix index 02d9d4741e..612196ef45 100644 --- a/distros/melodic/cartesian-interface/default.nix +++ b/distros/melodic/cartesian-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartesian-interface"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/melodic/cartesian_interface/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "cfa1e2ef5420f957e9bfe4c23e983cdab82ef908f1e617e666ce6f696800935f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/melodic/cartesian_interface/0.1.5-1"; + sha256 = "sha256-VkxVF/nJmrMeNzLiErhvriN6kgiYZPmJj0U2RzYfsrQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cartesian-msgs/default.nix b/distros/melodic/cartesian-msgs/default.nix index e50b8e730c..a5a9b0ed57 100644 --- a/distros/melodic/cartesian-msgs/default.nix +++ b/distros/melodic/cartesian-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartesian-msgs"; version = "0.0.3"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/cartesian_msgs-release/archive/release/melodic/cartesian_msgs/0.0.3-0.tar.gz"; - name = "0.0.3-0.tar.gz"; - sha256 = "25a7fcf876ffdfc7ee4515d150b777726bca7090c6aa689268643c4dc8d4eb73"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "cartesian_msgs-release"; + rev = "release/melodic/cartesian_msgs/0.0.3-0"; + sha256 = "sha256-EsIPvtidY69PT/bIxbUcJNoD47MXWgg/pXQ+qfIvSEQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cartesian-trajectory-controller/default.nix b/distros/melodic/cartesian-trajectory-controller/default.nix index 0997308284..6da97ea9fa 100644 --- a/distros/melodic/cartesian-trajectory-controller/default.nix +++ b/distros/melodic/cartesian-trajectory-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartesian-trajectory-controller"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/melodic/cartesian_trajectory_controller/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "3a184907ecc3236d3bd4fe482503eecd78d764c2071ad79bdca58b0a3f9ba9fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/melodic/cartesian_trajectory_controller/0.1.5-1"; + sha256 = "sha256-KziRZFtLlZqRl2iEHIxDap2ARaDjT/HzNz7E11n4QJc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cartesian-trajectory-interpolation/default.nix b/distros/melodic/cartesian-trajectory-interpolation/default.nix index 3943961289..f9ab41f5c0 100644 --- a/distros/melodic/cartesian-trajectory-interpolation/default.nix +++ b/distros/melodic/cartesian-trajectory-interpolation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartesian-trajectory-interpolation"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/melodic/cartesian_trajectory_interpolation/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "050821f108081fe72ce6bf58ae02ebb96721283d8eed13f4f8658a2995038e17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/melodic/cartesian_trajectory_interpolation/0.1.5-1"; + sha256 = "sha256-8ouZUJgN/V7WjqMEQjumV2Q8h11bF2/jF0V/Byz26cU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cartographer-ros-msgs/default.nix b/distros/melodic/cartographer-ros-msgs/default.nix index aa6131dcf9..a0243d4f76 100644 --- a/distros/melodic/cartographer-ros-msgs/default.nix +++ b/distros/melodic/cartographer-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartographer-ros-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/cartographer_ros-release/archive/release/melodic/cartographer_ros_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "f4572cb110370abc6059493e41532e143142c3ee974c6737c6a42aa7811d11d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "cartographer_ros-release"; + rev = "release/melodic/cartographer_ros_msgs/1.0.0-1"; + sha256 = "sha256-K/vu0b8XLBcpDKyiwpMrv8ljuGhXWY64wHcTiJCk/wA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cartographer-ros/default.nix b/distros/melodic/cartographer-ros/default.nix index 59f0d1f453..7f2f5ac17e 100644 --- a/distros/melodic/cartographer-ros/default.nix +++ b/distros/melodic/cartographer-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartographer-ros"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/cartographer_ros-release/archive/release/melodic/cartographer_ros/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "9e734459067f4d18a9458ad47b0b647c937521e650865a9d68380d4adca57c3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "cartographer_ros-release"; + rev = "release/melodic/cartographer_ros/1.0.0-1"; + sha256 = "sha256-jFiotq9OvKbCC15VSEauYoE0SFVLS1+lDX5yzAQ3qdU="; + }; buildType = "catkin"; buildInputs = [ catkin gtest protobuf pythonPackages.sphinx ]; diff --git a/distros/melodic/cartographer-rviz/default.nix b/distros/melodic/cartographer-rviz/default.nix index be66802431..83d6b2dcaf 100644 --- a/distros/melodic/cartographer-rviz/default.nix +++ b/distros/melodic/cartographer-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartographer-rviz"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/cartographer_ros-release/archive/release/melodic/cartographer_rviz/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "4eeb8e97c9723d89c14718afc7d81ce1a0a47d41cd5e1d73a8144865840dc523"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "cartographer_ros-release"; + rev = "release/melodic/cartographer_rviz/1.0.0-1"; + sha256 = "sha256-0RLwBRA5FTm0JAzvTS4eRYjxrO/nemLOC47lJOnR6Ac="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cartographer/default.nix b/distros/melodic/cartographer/default.nix index ad12e36fe4..f1cf8c5616 100644 --- a/distros/melodic/cartographer/default.nix +++ b/distros/melodic/cartographer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cartographer"; version = "1.0.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/cartographer-release/archive/release/melodic/cartographer/1.0.0-0.tar.gz"; - name = "1.0.0-0.tar.gz"; - sha256 = "899b883a05a2644553c5b5347b650f30cca59a3388fe14b6728486b0dcb77924"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "cartographer-release"; + rev = "release/melodic/cartographer/1.0.0-0"; + sha256 = "sha256-6439JUY2T7ZPbCMhVgUTGhkxC16l80u0vy/ohE24EAc="; + }; buildType = "cmake"; buildInputs = [ catkin gtest pythonPackages.sphinx ]; diff --git a/distros/melodic/catch-ros/default.nix b/distros/melodic/catch-ros/default.nix index 46cd6c331e..aee2703f58 100644 --- a/distros/melodic/catch-ros/default.nix +++ b/distros/melodic/catch-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-catch-ros"; version = "0.3.0"; - src = fetchurl { - url = "https://github.com/AIS-Bonn/catch_ros-release/archive/release/melodic/catch_ros/0.3.0-0.tar.gz"; - name = "0.3.0-0.tar.gz"; - sha256 = "186ec627d219a896f681446242ce546c8595429ac4f058fab5ac4aebec4f261b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AIS-Bonn"; + repo = "catch_ros-release"; + rev = "release/melodic/catch_ros/0.3.0-0"; + sha256 = "sha256-w7geNKZz8cgPardce/aeYppBO9j5I2eR4ikgF3PCx4E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/catkin-pip/default.nix b/distros/melodic/catkin-pip/default.nix index 75311c10d9..ccb2c16705 100644 --- a/distros/melodic/catkin-pip/default.nix +++ b/distros/melodic/catkin-pip/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-catkin-pip"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/pyros-dev/catkin_pip-release/archive/release/melodic/catkin_pip/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "195b4747147d7d36eea1f1c5398e532289984d6d690dd58e04acf556462deda4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pyros-dev"; + repo = "catkin_pip-release"; + rev = "release/melodic/catkin_pip/0.2.3-1"; + sha256 = "sha256-iVgRZSsaLIm6kSZekQ+DJI4+x4DfJ9p9TayNQ1BZJ28="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/catkin-virtualenv/default.nix b/distros/melodic/catkin-virtualenv/default.nix index 131cf18976..3ad46582ad 100644 --- a/distros/melodic/catkin-virtualenv/default.nix +++ b/distros/melodic/catkin-virtualenv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-catkin-virtualenv"; version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/catkin_virtualenv-release/archive/release/melodic/catkin_virtualenv/0.6.1-1.tar.gz"; - name = "0.6.1-1.tar.gz"; - sha256 = "0d7e3edfe443345b2c79aaf4b6b58604ecefb7581d2ddd5311d6cb5ec5113673"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "catkin_virtualenv-release"; + rev = "release/melodic/catkin_virtualenv/0.6.1-1"; + sha256 = "sha256-nu9aKuMCPIrm23vZshhs2WHT41X7QgkgqHgwsxxpXvk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/catkin/default.nix b/distros/melodic/catkin/default.nix index 6c53783f7c..c301f42285 100644 --- a/distros/melodic/catkin/default.nix +++ b/distros/melodic/catkin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-catkin"; version = "0.7.29-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin/0.7.29-1.tar.gz"; - name = "0.7.29-1.tar.gz"; - sha256 = "cf21bd28d21965b04fc86c969c8558371b29e4e89bae08b193fa6f90902399ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "catkin-release"; + rev = "release/melodic/catkin/0.7.29-1"; + sha256 = "sha256-lgEIfXBmb8x4v83Cwx1C1svTXoq+eIM34kQ3vQajX2A="; + }; buildType = "catkin"; buildInputs = [ pythonPackages.setuptools ]; diff --git a/distros/melodic/chaplus-ros/default.nix b/distros/melodic/chaplus-ros/default.nix index 0457a71954..16345e8fbb 100644 --- a/distros/melodic/chaplus-ros/default.nix +++ b/distros/melodic/chaplus-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-chaplus-ros"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/chaplus_ros/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "d606d591bf48e7447ed61a3141dfd244bdc9c1560d81648504a05ca8de8fcfb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/chaplus_ros/2.1.24-2"; + sha256 = "sha256-at7PCuV0eISV4p0rZGI2XPA9FJrEkcPKQq7LZZB0NZ8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/checkerboard-detector/default.nix b/distros/melodic/checkerboard-detector/default.nix index b418d43a4e..cdcd12601e 100644 --- a/distros/melodic/checkerboard-detector/default.nix +++ b/distros/melodic/checkerboard-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-checkerboard-detector"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/checkerboard_detector/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "34c7c73bb0c67ecd93858903b15f0aed4e3e40788ef4b6e6a6b763b094370eef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/checkerboard_detector/1.2.15-1"; + sha256 = "sha256-iX6S82etL1rz97KfvrS8FJhqcF4VEEPY4NiXZRWNUUA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/chomp-motion-planner/default.nix b/distros/melodic/chomp-motion-planner/default.nix index 2791718a95..818c73b8b4 100644 --- a/distros/melodic/chomp-motion-planner/default.nix +++ b/distros/melodic/chomp-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-chomp-motion-planner"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/chomp_motion_planner/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "66e6881e0eddf747e96533fefd988c0ccf60697564de6b02f80618297e981ed5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/chomp_motion_planner/1.0.11-1"; + sha256 = "sha256-sP+E51MjLI3B2O3b1CD7o8v7VTqlBZtvyN30gnnXYdg="; + }; buildType = "catkin"; buildInputs = [ catkin moveit-core roscpp ]; diff --git a/distros/melodic/cis-camera/default.nix b/distros/melodic/cis-camera/default.nix index 20c79c88c6..b3642fbb5c 100644 --- a/distros/melodic/cis-camera/default.nix +++ b/distros/melodic/cis-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cis-camera"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/cis_camera-release/archive/release/melodic/cis_camera/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "5f4a44afefb77a6887cd8531b450cf19f18d5e9159d2a3b4a1ad272c6b678841"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "cis_camera-release"; + rev = "release/melodic/cis_camera/0.0.4-1"; + sha256 = "sha256-eqxJ/bCY3Z4nFQcrsrLtvVZIHpjiJTqccmdE21+U6Fk="; + }; buildType = "catkin"; buildInputs = [ catkin roslint rostest ]; diff --git a/distros/melodic/cl-tf/default.nix b/distros/melodic/cl-tf/default.nix index 8e5316c564..c1b2121c1f 100644 --- a/distros/melodic/cl-tf/default.nix +++ b/distros/melodic/cl-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cl-tf"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/cl_tf/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "55f40c96b372a6be8a05277f034e5f465ea5bcf5038cfb8a0ddbc6c3046d43d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/cl_tf/0.2.13-1"; + sha256 = "sha256-7I21v541KUAnMd1JnSPxcloKoQMiXVQXtyXufNLqs64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cl-tf2/default.nix b/distros/melodic/cl-tf2/default.nix index 672c9b6c2d..f0b2370b1f 100644 --- a/distros/melodic/cl-tf2/default.nix +++ b/distros/melodic/cl-tf2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cl-tf2"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/cl_tf2/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "79a0f1f28598841bfb2d752b6229cee11aa0edb6e379f7e20607a3a682533ba3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/cl_tf2/0.2.13-1"; + sha256 = "sha256-yKI5YR5knDQbcsJI0KR4OWzkcaqNgyMnBO2J0dkoBiA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cl-transforms-stamped/default.nix b/distros/melodic/cl-transforms-stamped/default.nix index 7aa8f91150..b648a5ef8a 100644 --- a/distros/melodic/cl-transforms-stamped/default.nix +++ b/distros/melodic/cl-transforms-stamped/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cl-transforms-stamped"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/cl_transforms_stamped/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "9cda9c3c92d59bf3de21f68f1da5f9c3e5babb07772be97bc033f6f26cde80ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/cl_transforms_stamped/0.2.13-1"; + sha256 = "sha256-gfjS1+QLmXO/pj3VMvOBshq5Ik/2pwkDnPfCU2gVJXE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cl-transforms/default.nix b/distros/melodic/cl-transforms/default.nix index fa3a418816..e370b9b006 100644 --- a/distros/melodic/cl-transforms/default.nix +++ b/distros/melodic/cl-transforms/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cl-transforms"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/cl_transforms/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "2644bf9a6b816b70ca216290676f58e6d0b7d49c9b0d5f182928936f3aca9bd6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/cl_transforms/0.2.13-1"; + sha256 = "sha256-n3LLEOkCC3WqL1qUBSgzqVkmxdlOx8SRuhMjaFLBGvE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cl-urdf/default.nix b/distros/melodic/cl-urdf/default.nix index c6d84c04ad..f74a87db3d 100644 --- a/distros/melodic/cl-urdf/default.nix +++ b/distros/melodic/cl-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cl-urdf"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/cl_urdf/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "e674017e0a9183139ef8f5de07c0e5464116b3c85b8b3dba21b0c514a46682d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/cl_urdf/0.2.13-1"; + sha256 = "sha256-Dpci9nI0ytAW4qOwrdNYcjQ4kyk/dWY8BvoXy6oT/sk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cl-utils/default.nix b/distros/melodic/cl-utils/default.nix index 9e8e85afe4..065307c570 100644 --- a/distros/melodic/cl-utils/default.nix +++ b/distros/melodic/cl-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cl-utils"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/cl_utils/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "ea2af3623291b7e4e5b9a3f1b267cb13f27e474bebfe33d2da138992233500b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/cl_utils/0.2.13-1"; + sha256 = "sha256-dEZqz7sV+7h1yCIY63gldi0gPcEn6GUkzVNqpd1wXk0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/class-loader/default.nix b/distros/melodic/class-loader/default.nix index 579ac530e8..a96f051b9b 100644 --- a/distros/melodic/class-loader/default.nix +++ b/distros/melodic/class-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-class-loader"; version = "0.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/class_loader-release/archive/release/melodic/class_loader/0.4.1-0.tar.gz"; - name = "0.4.1-0.tar.gz"; - sha256 = "09c3d35e5afb806c612e843ef15078b97a0a6051174a45712d38c38345eae4a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "class_loader-release"; + rev = "release/melodic/class_loader/0.4.1-0"; + sha256 = "sha256-RtmKBbuwxZzyMoCCZmblQdfDYUWSjnVaVAdWF1H/gFc="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/clear-costmap-recovery/default.nix b/distros/melodic/clear-costmap-recovery/default.nix index bf9ab794b1..cc98780500 100644 --- a/distros/melodic/clear-costmap-recovery/default.nix +++ b/distros/melodic/clear-costmap-recovery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-clear-costmap-recovery"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/clear_costmap_recovery/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "b34345caec1b8f4cbefd5d724a3750d63e26380625eb9b9ad6a7c924ac2d100c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/clear_costmap_recovery/1.16.7-1"; + sha256 = "sha256-2Ruc+KK5BWE7vPrhKirD50zAYzS04yARY8Ad6P5oPp8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/clock-relay/default.nix b/distros/melodic/clock-relay/default.nix index 7cddce1405..06a7f443b0 100644 --- a/distros/melodic/clock-relay/default.nix +++ b/distros/melodic/clock-relay/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-clock-relay"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/cpr_multimaster_tools-release/archive/release/melodic/clock_relay/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "a140af11ea9143aa079d55b89c5513c147715041e024fa1cf6f35cd43b1a6fff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "cpr_multimaster_tools-release"; + rev = "release/melodic/clock_relay/0.0.2-1"; + sha256 = "sha256-6J8QQkdKB5ouMar70htnIfX3BjT0/M7U+JGnqxD7zZw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cloudwatch-logger/default.nix b/distros/melodic/cloudwatch-logger/default.nix index 14ec1b9a5c..1463cc2710 100644 --- a/distros/melodic/cloudwatch-logger/default.nix +++ b/distros/melodic/cloudwatch-logger/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cloudwatch-logger"; version = "2.3.1-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/cloudwatch_logger-release/archive/release/melodic/cloudwatch_logger/2.3.1-1.tar.gz"; - name = "2.3.1-1.tar.gz"; - sha256 = "b76d61d2863ba0edb061c39e0b0722df5a54f62d0f215dc7f5152fe4850fc871"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "cloudwatch_logger-release"; + rev = "release/melodic/cloudwatch_logger/2.3.1-1"; + sha256 = "sha256-G2vK4ALqJTArJ7NClwecLNAMLuxv0WhOn94mOJeuCZ8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cloudwatch-logs-common/default.nix b/distros/melodic/cloudwatch-logs-common/default.nix index 7c6ec1f8cb..1ce3da1cc7 100644 --- a/distros/melodic/cloudwatch-logs-common/default.nix +++ b/distros/melodic/cloudwatch-logs-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cloudwatch-logs-common"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/cloudwatch_common-release/archive/release/melodic/cloudwatch_logs_common/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "34f60d17cd9747fc6f691ab0da37a5ae48f19d60e03e21fdf9e30582f625199c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "cloudwatch_common-release"; + rev = "release/melodic/cloudwatch_logs_common/1.1.5-1"; + sha256 = "sha256-mgQ2ayxQj1yo0qlyptd6vdJFAiUpC5Qxi6/N/Uue/Gc="; + }; buildType = "cmake"; buildInputs = [ catkin cmake ]; diff --git a/distros/melodic/cloudwatch-metrics-collector/default.nix b/distros/melodic/cloudwatch-metrics-collector/default.nix index bf7813655e..4e6d9c69d6 100644 --- a/distros/melodic/cloudwatch-metrics-collector/default.nix +++ b/distros/melodic/cloudwatch-metrics-collector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cloudwatch-metrics-collector"; version = "2.2.1-r2"; - src = fetchurl { - url = "https://github.com/aws-gbp/cloudwatch_metrics_collector-release/archive/release/melodic/cloudwatch_metrics_collector/2.2.1-2.tar.gz"; - name = "2.2.1-2.tar.gz"; - sha256 = "1c8d20e04ea8096f94cf510c3624385a2b1f8effc03276fe4a0fcd6f6b3fb3f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "cloudwatch_metrics_collector-release"; + rev = "release/melodic/cloudwatch_metrics_collector/2.2.1-2"; + sha256 = "sha256-6uoWIOMxs3gAXwpdkaD4OQgE3jnisC9Ml/OGQnU/lpI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cloudwatch-metrics-common/default.nix b/distros/melodic/cloudwatch-metrics-common/default.nix index ae199e3ab8..98fc76c2fc 100644 --- a/distros/melodic/cloudwatch-metrics-common/default.nix +++ b/distros/melodic/cloudwatch-metrics-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cloudwatch-metrics-common"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/cloudwatch_common-release/archive/release/melodic/cloudwatch_metrics_common/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "5bf53ce407e01c6461fb30d1cbb09721c2e452f52751c7bbf3fb0e80f6e10ed7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "cloudwatch_common-release"; + rev = "release/melodic/cloudwatch_metrics_common/1.1.5-1"; + sha256 = "sha256-TW+kBEFv0QV/SVyNlyOtPCcCaYvGeONoIRbgA58xXfI="; + }; buildType = "cmake"; buildInputs = [ catkin cmake ]; diff --git a/distros/melodic/clover-blocks/default.nix b/distros/melodic/clover-blocks/default.nix index 17a716af2c..16345d41ad 100644 --- a/distros/melodic/clover-blocks/default.nix +++ b/distros/melodic/clover-blocks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-clover-blocks"; version = "0.21.2-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/clover-release/archive/release/melodic/clover_blocks/0.21.2-1.tar.gz"; - name = "0.21.2-1.tar.gz"; - sha256 = "e239ebc11090127ed61030db7fa8c71e9218c00dadfb86328d0204ee0412a651"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "clover-release"; + rev = "release/melodic/clover_blocks/0.21.2-1"; + sha256 = "sha256-rPEyRO2L63MwHbWadw8T6iEM8Gc0SDpiV+ac79H+iGU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/clover-description/default.nix b/distros/melodic/clover-description/default.nix index 3784221b0c..5c2cd568fa 100644 --- a/distros/melodic/clover-description/default.nix +++ b/distros/melodic/clover-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-clover-description"; version = "0.21.2-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/clover-release/archive/release/melodic/clover_description/0.21.2-1.tar.gz"; - name = "0.21.2-1.tar.gz"; - sha256 = "343e10bb269be05deb36111a2ca4bbdb6adde31de38df4ff7d660bd35a2fa77e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "clover-release"; + rev = "release/melodic/clover_description/0.21.2-1"; + sha256 = "sha256-XRyIMMjkm2gtJ/Tpz2mGCz5opDHBzHmTUIJRWRJOF4g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/clover-simulation/default.nix b/distros/melodic/clover-simulation/default.nix index 15822007a7..9667450c96 100644 --- a/distros/melodic/clover-simulation/default.nix +++ b/distros/melodic/clover-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-clover-simulation"; version = "0.21.2-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/clover-release/archive/release/melodic/clover_simulation/0.21.2-1.tar.gz"; - name = "0.21.2-1.tar.gz"; - sha256 = "a3ae1cd0f1898d8b65411101dd012b63f7441b3e8b948ef3b3b6acfdf1b77f39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "clover-release"; + rev = "release/melodic/clover_simulation/0.21.2-1"; + sha256 = "sha256-4Fuc96dKDviBfg14HQX002Kau0e4mcZ1S4uejf/GyIQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/clover/default.nix b/distros/melodic/clover/default.nix index 31b0bff821..2e2a7e4632 100644 --- a/distros/melodic/clover/default.nix +++ b/distros/melodic/clover/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-clover"; version = "0.21.2-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/clover-release/archive/release/melodic/clover/0.21.2-1.tar.gz"; - name = "0.21.2-1.tar.gz"; - sha256 = "778f01196b1c57d7b4b622146a5e72757fc97d1dda17fbc0bca67c2b11a6465b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "clover-release"; + rev = "release/melodic/clover/0.21.2-1"; + sha256 = "sha256-2aVGAaeH3hoXp44Yq9uSGE2VRhGp1gcK0Arz5eZjIj8="; + }; buildType = "catkin"; buildInputs = [ catkin catkin-virtualenv ]; diff --git a/distros/melodic/cmake-modules/default.nix b/distros/melodic/cmake-modules/default.nix index 45de3c276d..1d303ee89f 100644 --- a/distros/melodic/cmake-modules/default.nix +++ b/distros/melodic/cmake-modules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cmake-modules"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/cmake_modules-release/archive/release/melodic/cmake_modules/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "3598bda2ce4a55fdbe097c3d5c16cee1735b180cf234fea89628d78ea88da0bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "cmake_modules-release"; + rev = "release/melodic/cmake_modules/0.4.2-0"; + sha256 = "sha256-kV48QZeY9ecmSIWtlA5sHrphaXsywZ+/fN25VMAXcIY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cmd-vel-smoother/default.nix b/distros/melodic/cmd-vel-smoother/default.nix index 785a3df2e3..0ab2154492 100644 --- a/distros/melodic/cmd-vel-smoother/default.nix +++ b/distros/melodic/cmd-vel-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cmd-vel-smoother"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/cmd_vel_smoother/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "46de3de6015c0e6c57d48e631bcae846dbce6b01f5cd8d2770c56220ae66206f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/cmd_vel_smoother/0.1.16-1"; + sha256 = "sha256-raT83xBHWrvsxU4lGvHZTWOzLgTTlOzSanrfyPD+VcQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-3d-mapping-msgs/default.nix b/distros/melodic/cob-3d-mapping-msgs/default.nix index 195356f750..8aa2779b99 100644 --- a/distros/melodic/cob-3d-mapping-msgs/default.nix +++ b/distros/melodic/cob-3d-mapping-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-3d-mapping-msgs"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/cob_3d_mapping_msgs/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "84bd7383d9f1ff63587e00b8c65ed83bc5c7b013dfc3882d5a5cddf6c64cf928"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/cob_3d_mapping_msgs/0.6.17-1"; + sha256 = "sha256-GzdcKi8/9IunJlG3793gWAp0eLJJWIQ1OTipVVmRdRc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-actions/default.nix b/distros/melodic/cob-actions/default.nix index a938aaa7fa..174a02f9c9 100644 --- a/distros/melodic/cob-actions/default.nix +++ b/distros/melodic/cob-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-actions"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/melodic/cob_actions/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "10baa556f3b7c8487b811b66d0bd41bccabdaad26002ec03517dc5a48b9adb5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/melodic/cob_actions/0.7.4-1"; + sha256 = "sha256-koDSe17l4SHaLmX6xDkOprEffxhXYy40xY24Xb/DZYo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-android-msgs/default.nix b/distros/melodic/cob-android-msgs/default.nix index a81db0796b..944c0d4a65 100644 --- a/distros/melodic/cob-android-msgs/default.nix +++ b/distros/melodic/cob-android-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-android-msgs"; version = "0.1.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/melodic/cob_android_msgs/0.1.8-1.tar.gz"; - name = "0.1.8-1.tar.gz"; - sha256 = "eee9619f0b8b8b5bf17fc8f9058b608dd3fb3f3fd3a389f14369c65f38389017"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/melodic/cob_android_msgs/0.1.8-1"; + sha256 = "sha256-HhtbxW22D9iGr9ZZjgrq7RFmzvA/5f15I12uTN+l0dQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-android-resource-server/default.nix b/distros/melodic/cob-android-resource-server/default.nix index f038206182..b3adf9a8ed 100644 --- a/distros/melodic/cob-android-resource-server/default.nix +++ b/distros/melodic/cob-android-resource-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-android-resource-server"; version = "0.1.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/melodic/cob_android_resource_server/0.1.8-1.tar.gz"; - name = "0.1.8-1.tar.gz"; - sha256 = "1a772d4b0a80badcc4482cb321e4be9ff680ec6ba1caa56997df8a2d335b5dcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/melodic/cob_android_resource_server/0.1.8-1"; + sha256 = "sha256-c8wx5s9f/niMpzcf3vQwAAweHgu48gQqryfc+fpiX1I="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-android-script-server/default.nix b/distros/melodic/cob-android-script-server/default.nix index 6fea1fc795..0333dc5c0b 100644 --- a/distros/melodic/cob-android-script-server/default.nix +++ b/distros/melodic/cob-android-script-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-android-script-server"; version = "0.1.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/melodic/cob_android_script_server/0.1.8-1.tar.gz"; - name = "0.1.8-1.tar.gz"; - sha256 = "2942404063c08cb80590ee840c2b270a0c3df984770f795c364393c342ca5073"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/melodic/cob_android_script_server/0.1.8-1"; + sha256 = "sha256-wwXMp1KYUF5GdIxGOoeiHkpkA6u6XVWy5+Of5rNrA8g="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-android-settings/default.nix b/distros/melodic/cob-android-settings/default.nix index dc08a938fb..7cd1985004 100644 --- a/distros/melodic/cob-android-settings/default.nix +++ b/distros/melodic/cob-android-settings/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-android-settings"; version = "0.1.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/melodic/cob_android_settings/0.1.8-1.tar.gz"; - name = "0.1.8-1.tar.gz"; - sha256 = "f5bc6c6814ac7f13819b975977b2f7b43312f03895c77ccc1405f202d600107d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/melodic/cob_android_settings/0.1.8-1"; + sha256 = "sha256-77mpy29bRRjdLMtnR80ub/LYc3o5zw8EsuAD5wj+mPc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-android/default.nix b/distros/melodic/cob-android/default.nix index 2c51a8e1e4..ceafa2f9ef 100644 --- a/distros/melodic/cob-android/default.nix +++ b/distros/melodic/cob-android/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-android"; version = "0.1.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/melodic/cob_android/0.1.8-1.tar.gz"; - name = "0.1.8-1.tar.gz"; - sha256 = "997fbbb881d6d168f51a75a2f1444d9178b7b34f33e0d2276651cd3f9e744da7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/melodic/cob_android/0.1.8-1"; + sha256 = "sha256-xprUK3k4NcCNtWAMOqnVu5dZDiyNvnVLMcC1ee3GXX4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-base-controller-utils/default.nix b/distros/melodic/cob-base-controller-utils/default.nix index 566e68f59a..96df806b74 100644 --- a/distros/melodic/cob-base-controller-utils/default.nix +++ b/distros/melodic/cob-base-controller-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-base-controller-utils"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_base_controller_utils/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "b37d260e4cd882bb0caa72e0c73f1d9fc25869c0e91e2f046a79b1141cd29ab6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_base_controller_utils/0.8.12-1"; + sha256 = "sha256-yndE517fN0Arnm1FNKhwic/EGxJlMR8vcmFzafVXR2w="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-base-drive-chain/default.nix b/distros/melodic/cob-base-drive-chain/default.nix index b5f6ffe492..ff03cbee87 100644 --- a/distros/melodic/cob-base-drive-chain/default.nix +++ b/distros/melodic/cob-base-drive-chain/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-base-drive-chain"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_base_drive_chain/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "1d5a3b1bbd6a839847b365076bbaf0d24f03c19c20f35d6eb9b1619e6ec3f661"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_base_drive_chain/0.7.4-1"; + sha256 = "sha256-GFgik5G1Uq3rlopiOZZQpbYlKwTAXgurA/u96ZmiGCc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-base-velocity-smoother/default.nix b/distros/melodic/cob-base-velocity-smoother/default.nix index a5140db01c..c46df26d00 100644 --- a/distros/melodic/cob-base-velocity-smoother/default.nix +++ b/distros/melodic/cob-base-velocity-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-base-velocity-smoother"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_base_velocity_smoother/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "13be84692b2b926f21237c439e0ed560779daa14bd6d239b3e9ea681b1873b27"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_base_velocity_smoother/0.8.12-1"; + sha256 = "sha256-q9NYH5Z9vWs02pVu3JN3NrX3HnXKhX0tv+VDXwCAliE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-bms-driver/default.nix b/distros/melodic/cob-bms-driver/default.nix index 66dfb6cd17..c27b71b86f 100644 --- a/distros/melodic/cob-bms-driver/default.nix +++ b/distros/melodic/cob-bms-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-bms-driver"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_bms_driver/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "3003906b6a8e7225ecae4ae4ccfd47aee13252303f34f1c7fd7571def6f1a95a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_bms_driver/0.7.4-1"; + sha256 = "sha256-5IdDHIUMrtK9KY9lZww1M3hC5jA4Ex9mgaC3Wg0WdxA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-calibration-data/default.nix b/distros/melodic/cob-calibration-data/default.nix index 963d1ebdd0..3b9416bcad 100644 --- a/distros/melodic/cob-calibration-data/default.nix +++ b/distros/melodic/cob-calibration-data/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-calibration-data"; version = "0.6.15-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_calibration_data-release/archive/release/melodic/cob_calibration_data/0.6.15-1.tar.gz"; - name = "0.6.15-1.tar.gz"; - sha256 = "f925041939348aab3ac92d230694d07168cbdbea95b193ba6856b8dc57c4bbb7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_calibration_data-release"; + rev = "release/melodic/cob_calibration_data/0.6.15-1"; + sha256 = "sha256-NIWh8akvDbL1gnTHx/PlH3Ma8FDJ45NO96SWzccE9SI="; + }; buildType = "catkin"; buildInputs = [ catkin cob-supported-robots ]; diff --git a/distros/melodic/cob-cam3d-throttle/default.nix b/distros/melodic/cob-cam3d-throttle/default.nix index a7590a7720..d160887639 100644 --- a/distros/melodic/cob-cam3d-throttle/default.nix +++ b/distros/melodic/cob-cam3d-throttle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-cam3d-throttle"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/cob_cam3d_throttle/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "44ce788452e0f58be019c49c62190a3cbc6eeb928d582345d73cf622650f3530"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/cob_cam3d_throttle/0.6.17-1"; + sha256 = "sha256-OfpO7sBDU2dtWdVuLQ71mEMqrMAg2D/cEqMllLiZjeY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-canopen-motor/default.nix b/distros/melodic/cob-canopen-motor/default.nix index 46d10ab51f..f5dac5ba4d 100644 --- a/distros/melodic/cob-canopen-motor/default.nix +++ b/distros/melodic/cob-canopen-motor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-canopen-motor"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_canopen_motor/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "6ce9cd2b162e853b67b70b9ef1dece0b6586b026eaffb40e6704c1563dd0c027"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_canopen_motor/0.7.4-1"; + sha256 = "sha256-A4iNC9hRfqWAibWNNZY/E4jj2BW1nVMPjdJvZ45sqYQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-cartesian-controller/default.nix b/distros/melodic/cob-cartesian-controller/default.nix index fc4b7d1b58..9e6716e2b5 100644 --- a/distros/melodic/cob-cartesian-controller/default.nix +++ b/distros/melodic/cob-cartesian-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-cartesian-controller"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_cartesian_controller/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "1a5c70f3dea95b302d3c3b2e53348c8a38e01f76495dd8aa0d8593a43b366b6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_cartesian_controller/0.8.12-1"; + sha256 = "sha256-fBbWfw9qK2sDCtwKXEPARBKjKLIb0RNuJYdv4iG6caU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.setuptools roslint ]; diff --git a/distros/melodic/cob-collision-monitor/default.nix b/distros/melodic/cob-collision-monitor/default.nix index 7bca7fe309..ca8e41a3f3 100644 --- a/distros/melodic/cob-collision-monitor/default.nix +++ b/distros/melodic/cob-collision-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-collision-monitor"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/melodic/cob_collision_monitor/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "1095a9e4d8b1e2b577ab94190e85df65888a9d96878263ebe64ac5097cf022d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/melodic/cob_collision_monitor/0.7.5-1"; + sha256 = "sha256-9vtDarYDuVQn0vcwJYaqOvR1qPuURr6enzLhxlINR5A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-collision-velocity-filter/default.nix b/distros/melodic/cob-collision-velocity-filter/default.nix index d8d69a6097..f848ba0f5b 100644 --- a/distros/melodic/cob-collision-velocity-filter/default.nix +++ b/distros/melodic/cob-collision-velocity-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-collision-velocity-filter"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_collision_velocity_filter/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "fc77a971c82992d0922169e348e563f09242860032d8981d67c42c3463d12fd6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_collision_velocity_filter/0.8.12-1"; + sha256 = "sha256-9LocyhWleCd27Tw6tJGufevHk2OpegU8ZRVKlZ+E0kA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-command-gui/default.nix b/distros/melodic/cob-command-gui/default.nix index cebcc4881b..cf37e32cec 100644 --- a/distros/melodic/cob-command-gui/default.nix +++ b/distros/melodic/cob-command-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-command-gui"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/cob_command_gui/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "1701a98d3b1a973455546a20f86ece15cb2ef964f1f8a98c49fea4675f1d69a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/cob_command_gui/0.6.19-1"; + sha256 = "sha256-ADmeqfH8Lpqv9PKvGmoaShVWS9oWF2TVKa02750d3hQ="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-command-tools/default.nix b/distros/melodic/cob-command-tools/default.nix index 7b6751f716..2436db5a41 100644 --- a/distros/melodic/cob-command-tools/default.nix +++ b/distros/melodic/cob-command-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-command-tools"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/cob_command_tools/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "37e4b6b0e085c9446c8a929ae6bbbd33fcb63d63b6b89506a1b48083021f2962"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/cob_command_tools/0.6.19-1"; + sha256 = "sha256-sha0Yezwk9AN8Ug81JxmUDs44MgCRqEEQML8ispa4wc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-common/default.nix b/distros/melodic/cob-common/default.nix index 823e50ba87..c369cb466e 100644 --- a/distros/melodic/cob-common/default.nix +++ b/distros/melodic/cob-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-common"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/melodic/cob_common/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "9c8380ce9eca1a4a28d86b6119124f1643396753f14e8a4e051f106f3886ed1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/melodic/cob_common/0.7.4-1"; + sha256 = "sha256-fG7fdBEL6DNNfJeAsoZfASAK7d1e7vY8QVMlJJGiXyE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-control-mode-adapter/default.nix b/distros/melodic/cob-control-mode-adapter/default.nix index e973181266..765a0830cf 100644 --- a/distros/melodic/cob-control-mode-adapter/default.nix +++ b/distros/melodic/cob-control-mode-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-control-mode-adapter"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_control_mode_adapter/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "b43d7499e4e2344b298515a83c4b9a9398c490af6762b5d01865d0a4294b4244"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_control_mode_adapter/0.8.12-1"; + sha256 = "sha256-ghexdgRo2f/SfUv9HrLIbsX6m4y3xRxB6wxy8LiG2Zc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-control-msgs/default.nix b/distros/melodic/cob-control-msgs/default.nix index 68dedd3e66..970a55cd8e 100644 --- a/distros/melodic/cob-control-msgs/default.nix +++ b/distros/melodic/cob-control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-control-msgs"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_control_msgs/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "f68fa8e5451d4533f99c97131eea4854b45b4e1d27d42384e0e3112638d4c55f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_control_msgs/0.8.12-1"; + sha256 = "sha256-p8IPn6ShmNLD9suGuZ29F58B+AP5iJPAGhPpZz8X8wY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-control/default.nix b/distros/melodic/cob-control/default.nix index 3fbae1688e..6088c420fc 100644 --- a/distros/melodic/cob-control/default.nix +++ b/distros/melodic/cob-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-control"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_control/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "7d5f6592c6d284fd0d57ec5a0842a7b1cedd2a3a4b915328f4ec0da27f147828"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_control/0.8.12-1"; + sha256 = "sha256-uFrVfGb1CdBKkniGJcZugt6EZip+5cD5oyZqbIdCvxg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-dashboard/default.nix b/distros/melodic/cob-dashboard/default.nix index b540f80f34..79608addab 100644 --- a/distros/melodic/cob-dashboard/default.nix +++ b/distros/melodic/cob-dashboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-dashboard"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/cob_dashboard/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "391fc6b2b090dd041adf963954984b6e5503a682f72e784317e10513a0bf27f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/cob_dashboard/0.6.19-1"; + sha256 = "sha256-lEWAqyOKR16LLxLdM4wLmiuJv/cQEN7Lse/nYqFIbAY="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-default-env-config/default.nix b/distros/melodic/cob-default-env-config/default.nix index 3841cc8d2e..1fc63d867f 100644 --- a/distros/melodic/cob-default-env-config/default.nix +++ b/distros/melodic/cob-default-env-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-default-env-config"; version = "0.6.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_environments-release/archive/release/melodic/cob_default_env_config/0.6.12-1.tar.gz"; - name = "0.6.12-1.tar.gz"; - sha256 = "3de9a24f6d3fdcc549cafcebd7695f8fee6f43bff9db64de341c8f147e31e401"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_environments-release"; + rev = "release/melodic/cob_default_env_config/0.6.12-1"; + sha256 = "sha256-tYji/+cHKWaAsjNSh8qhORVbHDGWmjDRLQv8WUrVezU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-default-robot-behavior/default.nix b/distros/melodic/cob-default-robot-behavior/default.nix index 8df963069c..4d4d87c0fd 100644 --- a/distros/melodic/cob-default-robot-behavior/default.nix +++ b/distros/melodic/cob-default-robot-behavior/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-default-robot-behavior"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/melodic/cob_default_robot_behavior/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "1c2e20933ba2952e461a7248d7495fb3bdec8e85b58d8db35d37b6e7de2e542f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/melodic/cob_default_robot_behavior/0.7.5-1"; + sha256 = "sha256-ZKbjFcNfRU/ETZHybU0DJICtdQ/IVoPEx9WVJtOUDvo="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-default-robot-config/default.nix b/distros/melodic/cob-default-robot-config/default.nix index db13f5f182..d2023a51d1 100644 --- a/distros/melodic/cob-default-robot-config/default.nix +++ b/distros/melodic/cob-default-robot-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-default-robot-config"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/melodic/cob_default_robot_config/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "e8cf707b6672708a10ca906865ab0c48ed7ad6c340eb38a6c5c9c9cc46dc6186"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/melodic/cob_default_robot_config/0.7.5-1"; + sha256 = "sha256-w9GxNGf1dI2Qblm3OhCHc3iI5DGT356EZH6ga3QwrCs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-description/default.nix b/distros/melodic/cob-description/default.nix index 5479581c52..bb8afa6516 100644 --- a/distros/melodic/cob-description/default.nix +++ b/distros/melodic/cob-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-description"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/melodic/cob_description/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "5fc24c5c6e13237a65a5b61659039d602e6619928f193b48cc5d59153b65b13c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/melodic/cob_description/0.7.4-1"; + sha256 = "sha256-BPjNW5Zde6abK/5yiir25Qm7dkcTKxcK1KwQcsOnPL8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-docker-control/default.nix b/distros/melodic/cob-docker-control/default.nix index a67421fbbe..71ea73c0e0 100644 --- a/distros/melodic/cob-docker-control/default.nix +++ b/distros/melodic/cob-docker-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-docker-control"; version = "0.6.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/melodic/cob_docker_control/0.6.10-1.tar.gz"; - name = "0.6.10-1.tar.gz"; - sha256 = "73b049b93bec31c24a686391f0710e09faaf49e6057a1bff979ad0a106d2891c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/melodic/cob_docker_control/0.6.10-1"; + sha256 = "sha256-u4Uaa2k6kaTL5hGnFkw3/jTjoSxHAxc3u7jqJ7t3+H4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-driver/default.nix b/distros/melodic/cob-driver/default.nix index 6851efddbf..2f850028c8 100644 --- a/distros/melodic/cob-driver/default.nix +++ b/distros/melodic/cob-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-driver"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_driver/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "51fc2e657fdcb160cd7472c37a090b0e8e8e3bf5c161a2416a3e3d60841d9f6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_driver/0.7.4-1"; + sha256 = "sha256-kknWe/3bKOzR9E3cQ8RyAxM+oMPLD4qEjc0sh5SG7hE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-elmo-homing/default.nix b/distros/melodic/cob-elmo-homing/default.nix index 979850937b..3d3cce929a 100644 --- a/distros/melodic/cob-elmo-homing/default.nix +++ b/distros/melodic/cob-elmo-homing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-elmo-homing"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_elmo_homing/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "4b22a0fdcea4126557b430ed56076a6eafab834a22115483f983912457e7f5e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_elmo_homing/0.7.4-1"; + sha256 = "sha256-4nvfb418GL66c56bH2wM/4X6OK+iUqJjcYsSsBxkqiQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-environments/default.nix b/distros/melodic/cob-environments/default.nix index 9f205ae023..04d70333e8 100644 --- a/distros/melodic/cob-environments/default.nix +++ b/distros/melodic/cob-environments/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-environments"; version = "0.6.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_environments-release/archive/release/melodic/cob_environments/0.6.12-1.tar.gz"; - name = "0.6.12-1.tar.gz"; - sha256 = "ba9245a590fe7f3804ca97a203c4c23ab1ad46064c6f382f1f0d0cee72766e2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_environments-release"; + rev = "release/melodic/cob_environments/0.6.12-1"; + sha256 = "sha256-Eemou2FKSPMpPJnEcKx+h7DiVal7JtxS0yfVvIwJnlc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-extern/default.nix b/distros/melodic/cob-extern/default.nix index b70674eef6..bf9fdd1e2a 100644 --- a/distros/melodic/cob-extern/default.nix +++ b/distros/melodic/cob-extern/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-extern"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/melodic/cob_extern/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "b553ab87584e4a72347ee7149936c66d3c297f093dddd78f24c5da33bb3d8763"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/melodic/cob_extern/0.6.17-1"; + sha256 = "sha256-VGJDF5L3vH+NDAmHr0DYp5YT8MEj8eNb9YJYxQD7JBo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-footprint-observer/default.nix b/distros/melodic/cob-footprint-observer/default.nix index 1e58fac924..1080810a6f 100644 --- a/distros/melodic/cob-footprint-observer/default.nix +++ b/distros/melodic/cob-footprint-observer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-footprint-observer"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_footprint_observer/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "b190f7141097e5d3c62622eb0026e8acb0dc0dbb7f96d030d073399a48464458"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_footprint_observer/0.8.12-1"; + sha256 = "sha256-LudbcczNs8XLBI5/eAYFjcGu/hjIOHUCAv6cUtKFO5M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-frame-tracker/default.nix b/distros/melodic/cob-frame-tracker/default.nix index 3a18fa599e..6d89edd403 100644 --- a/distros/melodic/cob-frame-tracker/default.nix +++ b/distros/melodic/cob-frame-tracker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-frame-tracker"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_frame_tracker/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "8171d33f9bdc9c259664ec235b913a22b6c5efa3424360995cc0a1dbc2cfc45c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_frame_tracker/0.8.12-1"; + sha256 = "sha256-TIkXuRBWwgu/eiOum4T2j5j1z5lF4XyMsZejJs5STVo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-gazebo-objects/default.nix b/distros/melodic/cob-gazebo-objects/default.nix index 604f72ef29..b2422425e0 100644 --- a/distros/melodic/cob-gazebo-objects/default.nix +++ b/distros/melodic/cob-gazebo-objects/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-gazebo-objects"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/melodic/cob_gazebo_objects/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "445dea4e7fe1c1759edb0ac2263788cfc15c6ebe775f03f8de913917af503629"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/melodic/cob_gazebo_objects/0.7.5-1"; + sha256 = "sha256-lLWcjzp/wON6JgMU2OMhpyvoAXfIFbVtmEqEq+ETnzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-gazebo-plugins/default.nix b/distros/melodic/cob-gazebo-plugins/default.nix index 4900897ef5..5182863d56 100644 --- a/distros/melodic/cob-gazebo-plugins/default.nix +++ b/distros/melodic/cob-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-gazebo-plugins"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_gazebo_plugins-release/archive/release/melodic/cob_gazebo_plugins/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "3fd936371180f27deb11d052aac705b5173f85c13d30599e70c0e1a6533f20ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_gazebo_plugins-release"; + rev = "release/melodic/cob_gazebo_plugins/0.7.5-1"; + sha256 = "sha256-DmD6eeD2uw9AesG8JK8AOwYITEAbwcnt3U/ZM/BW05M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-gazebo-ros-control/default.nix b/distros/melodic/cob-gazebo-ros-control/default.nix index a8b2868dfd..c25829e557 100644 --- a/distros/melodic/cob-gazebo-ros-control/default.nix +++ b/distros/melodic/cob-gazebo-ros-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-gazebo-ros-control"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_gazebo_plugins-release/archive/release/melodic/cob_gazebo_ros_control/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "5687adf479333067e28462c6d0de6df49a1542e58cb2fbc18cf5d094b20a3747"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_gazebo_plugins-release"; + rev = "release/melodic/cob_gazebo_ros_control/0.7.5-1"; + sha256 = "sha256-M6n2CL5kQz9BXrqlo31/lzjegdKP/W1Jdt3uBMZEsbY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-gazebo-tools/default.nix b/distros/melodic/cob-gazebo-tools/default.nix index b92194cff7..287a2063a0 100644 --- a/distros/melodic/cob-gazebo-tools/default.nix +++ b/distros/melodic/cob-gazebo-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-gazebo-tools"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/melodic/cob_gazebo_tools/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "aafbd2b79973119b34e683196ae40bb5b41a6cbb1ff74a8816e892fa868f24fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/melodic/cob_gazebo_tools/0.7.5-1"; + sha256 = "sha256-OVriUzBqz78F09rLJ3tCZrFOjRaIspOw9gCp0ElUasQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-gazebo-worlds/default.nix b/distros/melodic/cob-gazebo-worlds/default.nix index 8e0a393f0c..3ac93cb503 100644 --- a/distros/melodic/cob-gazebo-worlds/default.nix +++ b/distros/melodic/cob-gazebo-worlds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-gazebo-worlds"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/melodic/cob_gazebo_worlds/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "5c5456aaf0d831da9a530b08077d577c92bee86d343d84694ace70d3b3c90744"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/melodic/cob_gazebo_worlds/0.7.5-1"; + sha256 = "sha256-abItAEdjIKEUxme2Hc/wPagWlrtSyTDziVebhPIrSFc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-generic-can/default.nix b/distros/melodic/cob-generic-can/default.nix index c0180d3920..c46bacf666 100644 --- a/distros/melodic/cob-generic-can/default.nix +++ b/distros/melodic/cob-generic-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-generic-can"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_generic_can/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "4c51b85c313eb57e34959a02a67669cdbdc8d173d6d924758aee89cf0fe0d769"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_generic_can/0.7.4-1"; + sha256 = "sha256-b/85kJwXUocbHjdxuw45b3elIHmEIg0WYAQfSCD9blo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-grasp-generation/default.nix b/distros/melodic/cob-grasp-generation/default.nix index f7cb797173..fb00a8430c 100644 --- a/distros/melodic/cob-grasp-generation/default.nix +++ b/distros/melodic/cob-grasp-generation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-grasp-generation"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/melodic/cob_grasp_generation/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "09554012e54949f6aae959bd4247b657bd81280c0c4e2595f24277534ea90a2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/melodic/cob_grasp_generation/0.7.5-1"; + sha256 = "sha256-rmELLrQCFvZuknYw6c4dRaA5nuWx8UOAT/hKuqd/tg8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-hand-bridge/default.nix b/distros/melodic/cob-hand-bridge/default.nix index 7a314594e2..d1b630146c 100644 --- a/distros/melodic/cob-hand-bridge/default.nix +++ b/distros/melodic/cob-hand-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-hand-bridge"; version = "0.6.9-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_hand-release/archive/release/melodic/cob_hand_bridge/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "8cb176ebb7ab1009ba7c56332b74c2e5d09b01aed47696935d908262ba06f0dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_hand-release"; + rev = "release/melodic/cob_hand_bridge/0.6.9-1"; + sha256 = "sha256-1Hx1LBeorDSBil3X9EkWg+4w75npadxtZl0wGBfM9kY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-hand/default.nix b/distros/melodic/cob-hand/default.nix index 17db25a89e..3ac47376d7 100644 --- a/distros/melodic/cob-hand/default.nix +++ b/distros/melodic/cob-hand/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-hand"; version = "0.6.9-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_hand-release/archive/release/melodic/cob_hand/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "2a8a2a1e8f89cdc66ba4d91edd7384208ec45f145fbc4d3ddc71f4e25b900cef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_hand-release"; + rev = "release/melodic/cob_hand/0.6.9-1"; + sha256 = "sha256-pPNYD0te7Tnzwfqxx07NyXbTZccIZSOuiBHfQxliHV8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-hardware-config/default.nix b/distros/melodic/cob-hardware-config/default.nix index af26d9a99c..0fb6792c84 100644 --- a/distros/melodic/cob-hardware-config/default.nix +++ b/distros/melodic/cob-hardware-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-hardware-config"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/melodic/cob_hardware_config/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "670e53bb3aace81f68898cd7c466bc28752bd4f166e38dfc3470ed0f89e25b41"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/melodic/cob_hardware_config/0.7.5-1"; + sha256 = "sha256-o7MpnnWMyaT7SIYrry49sj7bECcS6jUCfBymU15IW9k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-hardware-emulation/default.nix b/distros/melodic/cob-hardware-emulation/default.nix index 38aa7e2470..b3cc41bac5 100644 --- a/distros/melodic/cob-hardware-emulation/default.nix +++ b/distros/melodic/cob-hardware-emulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-hardware-emulation"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_hardware_emulation/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "dc242894bd6d8ddc0faa8fef2b87dbc326b68ed75580893f15c89e716e963dee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_hardware_emulation/0.8.12-1"; + sha256 = "sha256-UzDi9hhYKDeF2akHsYaBP1Oiw631ZnXxmIF4Zxb9zXA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-helper-tools/default.nix b/distros/melodic/cob-helper-tools/default.nix index 5ce0133e08..18901d22d4 100644 --- a/distros/melodic/cob-helper-tools/default.nix +++ b/distros/melodic/cob-helper-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-helper-tools"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/cob_helper_tools/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "d48b5faa1b1aee73e0895f2db42161713b77fcd770b316c6d423297c6d2db24f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/cob_helper_tools/0.6.19-1"; + sha256 = "sha256-EvyHQndqUeo5+S0KDNn3CH9rEDvYAFwPJw5G7Ow/Axk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-image-flip/default.nix b/distros/melodic/cob-image-flip/default.nix index 07f48053bb..2b034d3878 100644 --- a/distros/melodic/cob-image-flip/default.nix +++ b/distros/melodic/cob-image-flip/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-image-flip"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/cob_image_flip/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "613810e32dc7aa20543979f92aeb6bfa7fc799c72b863b6dc344b992a5ee8d66"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/cob_image_flip/0.6.17-1"; + sha256 = "sha256-uSxZ6joIcLQg9xHFmUTDeusvb6Wv46DqieQD/MCZ/mc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-interactive-teleop/default.nix b/distros/melodic/cob-interactive-teleop/default.nix index 56f3566ee3..4968231f5d 100644 --- a/distros/melodic/cob-interactive-teleop/default.nix +++ b/distros/melodic/cob-interactive-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-interactive-teleop"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/cob_interactive_teleop/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "87319de4d52daae6213a7726d5df6053752891695644408093d348e983187bae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/cob_interactive_teleop/0.6.19-1"; + sha256 = "sha256-2Yq3eun5L+pqi3AW+z/tIJkC+Uvs2or6CNQHEqwrHiw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-light/default.nix b/distros/melodic/cob-light/default.nix index 8796aa9142..9ba8563342 100644 --- a/distros/melodic/cob-light/default.nix +++ b/distros/melodic/cob-light/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-light"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_light/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "76ea0a101f5b1cdd773e18bbab05c64143c5f2173d5aad55ed18b4db9d51d1eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_light/0.7.4-1"; + sha256 = "sha256-oeE/93u3EIIFjzDcmjS4iPDlxT046cgv7KfRgWu7X1A="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-linear-nav/default.nix b/distros/melodic/cob-linear-nav/default.nix index 395b5a72cb..fcf996b516 100644 --- a/distros/melodic/cob-linear-nav/default.nix +++ b/distros/melodic/cob-linear-nav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-linear-nav"; version = "0.6.11-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/melodic/cob_linear_nav/0.6.11-1.tar.gz"; - name = "0.6.11-1.tar.gz"; - sha256 = "c034ee13d9b2ef122e599e79b7056e8e2f6de33b1705808ac6ec08d747033e2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/melodic/cob_linear_nav/0.6.11-1"; + sha256 = "sha256-tkqxecoFf7zg0Z6qccp1DFBYDzG2TYXMD4yKb4LgYOE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-lookat-action/default.nix b/distros/melodic/cob-lookat-action/default.nix index 584ac1e398..de8f4a09e6 100644 --- a/distros/melodic/cob-lookat-action/default.nix +++ b/distros/melodic/cob-lookat-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-lookat-action"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/melodic/cob_lookat_action/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "e38d9ae68a3777750dee9593bdc83ceaf1c6550870f9749e82759a3dfb83737a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/melodic/cob_lookat_action/0.7.5-1"; + sha256 = "sha256-Qw5eGw2GhtNP7xVDr+WCfTJYIEXiceiDVs38Y+vv6CY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-manipulation/default.nix b/distros/melodic/cob-manipulation/default.nix index 1abed5153b..3feef525ad 100644 --- a/distros/melodic/cob-manipulation/default.nix +++ b/distros/melodic/cob-manipulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-manipulation"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/melodic/cob_manipulation/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "374ab9c4e076862262a217de94016b55a2523e11052f063eadb5b474104b6d77"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/melodic/cob_manipulation/0.7.5-1"; + sha256 = "sha256-I9OtkTOHeLdobZ7K2fAkQ0WcmH2AGJ3GP065+LlfVvw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-map-accessibility-analysis/default.nix b/distros/melodic/cob-map-accessibility-analysis/default.nix index 0793665520..69a06a90b2 100644 --- a/distros/melodic/cob-map-accessibility-analysis/default.nix +++ b/distros/melodic/cob-map-accessibility-analysis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-map-accessibility-analysis"; version = "0.6.11-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/melodic/cob_map_accessibility_analysis/0.6.11-1.tar.gz"; - name = "0.6.11-1.tar.gz"; - sha256 = "23d57e3828714a20e3eeb4ea87c17137bd49ca6c53733ef4942f2e8f8f4c0b95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/melodic/cob_map_accessibility_analysis/0.6.11-1"; + sha256 = "sha256-cRMBZT8lS/Fdsm75dtCDxATrM4SRGeT10SDlcMfqw7Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-mapping-slam/default.nix b/distros/melodic/cob-mapping-slam/default.nix index 533a4352ca..bcf45467fd 100644 --- a/distros/melodic/cob-mapping-slam/default.nix +++ b/distros/melodic/cob-mapping-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-mapping-slam"; version = "0.6.11-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/melodic/cob_mapping_slam/0.6.11-1.tar.gz"; - name = "0.6.11-1.tar.gz"; - sha256 = "3800c528217deab7559398d3ee66748b3df1b697fe51de66603b4adce6a63f95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/melodic/cob_mapping_slam/0.6.11-1"; + sha256 = "sha256-Ge25/wzaKuof9ee+1bPLMXvWOy+m/wuLYJXSQPsZUBU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-mecanum-controller/default.nix b/distros/melodic/cob-mecanum-controller/default.nix index a4bf6f426c..6f0019e49e 100644 --- a/distros/melodic/cob-mecanum-controller/default.nix +++ b/distros/melodic/cob-mecanum-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-mecanum-controller"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_mecanum_controller/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "ab44a926e2dcda6cd6f79a0748a1954ced404f32c83a170f64e42a8e4888aaf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_mecanum_controller/0.8.12-1"; + sha256 = "sha256-qHnEAsasDgbGzgHu4vAhINIv6BizetuBIlx8fwbmc+o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-mimic/default.nix b/distros/melodic/cob-mimic/default.nix index 2fa57fd7d3..1ff2076e18 100644 --- a/distros/melodic/cob-mimic/default.nix +++ b/distros/melodic/cob-mimic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-mimic"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_mimic/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "52deccb87076d8c78fc281e5fb2fd12cd16e09dfc332daaeb5cc6d286c98f9c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_mimic/0.7.4-1"; + sha256 = "sha256-X+jDgumtzfIFnVsO3WrrLKmn9KoekFsWByQL0/09os4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-model-identifier/default.nix b/distros/melodic/cob-model-identifier/default.nix index c619405cb0..61ff03aba5 100644 --- a/distros/melodic/cob-model-identifier/default.nix +++ b/distros/melodic/cob-model-identifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-model-identifier"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_model_identifier/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "1aa0c42757faa7b250f4811b0382dbc5cebca1faa5c9f7e8b26e5af8294ace19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_model_identifier/0.8.12-1"; + sha256 = "sha256-s+WzKcnAAWWph/n19RoKpElkzHuo8ELVBy0jF/H9I3Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-monitoring/default.nix b/distros/melodic/cob-monitoring/default.nix index bbd6d312aa..bf97e736db 100644 --- a/distros/melodic/cob-monitoring/default.nix +++ b/distros/melodic/cob-monitoring/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-monitoring"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/cob_monitoring/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "18bbc3984c4a485a6e2d723bc0c6202d1afd71437928b6b5d3941f8c956cab0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/cob_monitoring/0.6.19-1"; + sha256 = "sha256-sgOkXbApupVeKjnYvCMDc7IeJ4Qeo0CsidM+ok5gboA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-moveit-bringup/default.nix b/distros/melodic/cob-moveit-bringup/default.nix index f8fbe4c523..f6703242be 100644 --- a/distros/melodic/cob-moveit-bringup/default.nix +++ b/distros/melodic/cob-moveit-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-moveit-bringup"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/melodic/cob_moveit_bringup/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "863ad6c879f02892c944b4c3c7c1318f89e20d3dccc1f70fdf7ee625acf68feb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/melodic/cob_moveit_bringup/0.7.5-1"; + sha256 = "sha256-izQy9ikOyoSefrAzEfgj3ClZBbcHibgWNLEpQwVN38o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-moveit-config/default.nix b/distros/melodic/cob-moveit-config/default.nix index aa5fbe1275..01590a8960 100644 --- a/distros/melodic/cob-moveit-config/default.nix +++ b/distros/melodic/cob-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-moveit-config"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/melodic/cob_moveit_config/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "e1052a445e6d6cd30165a2c6e7b097447547d7043f5947615d27391403ef25bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/melodic/cob_moveit_config/0.7.5-1"; + sha256 = "sha256-A1u7M8FoRy8SeRCpDex0sEPOKBR5fmMEkKFO0mc8Xqs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-moveit-interface/default.nix b/distros/melodic/cob-moveit-interface/default.nix index 56461eea52..b2c5ce4be8 100644 --- a/distros/melodic/cob-moveit-interface/default.nix +++ b/distros/melodic/cob-moveit-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-moveit-interface"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/melodic/cob_moveit_interface/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "8c00e6fcdfd34bd2d104c8f7ffbc0771411c0528de7bf7dbd2e27d89aea8bf42"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/melodic/cob_moveit_interface/0.7.5-1"; + sha256 = "sha256-EbHyQGDZwoWIY0LD2T2v8rE3OgwhMkQgsoDKUpgYVWA="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-msgs/default.nix b/distros/melodic/cob-msgs/default.nix index 1267b62a43..cc254cff4f 100644 --- a/distros/melodic/cob-msgs/default.nix +++ b/distros/melodic/cob-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-msgs"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/melodic/cob_msgs/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "83d426ec8f29bbdf4106d832985c4bf29cadbb133b135e8336a3c01974294b03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/melodic/cob_msgs/0.7.4-1"; + sha256 = "sha256-UckLOwnooTQP1eLoinuGVONKP2GZ+zU1nVaX/oaYq40="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-navigation-config/default.nix b/distros/melodic/cob-navigation-config/default.nix index e1b03daf34..818e8074b6 100644 --- a/distros/melodic/cob-navigation-config/default.nix +++ b/distros/melodic/cob-navigation-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-navigation-config"; version = "0.6.11-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/melodic/cob_navigation_config/0.6.11-1.tar.gz"; - name = "0.6.11-1.tar.gz"; - sha256 = "2c60787864535045ad0d1755efea2bc0223a97d12b2819ca20465d18c06fe4e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/melodic/cob_navigation_config/0.6.11-1"; + sha256 = "sha256-hYUxqi1VCahaDzZnPOuXVNBL++I6HFNKMSYkXqgUS34="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-navigation-global/default.nix b/distros/melodic/cob-navigation-global/default.nix index 4e220f7a56..88846b70e7 100644 --- a/distros/melodic/cob-navigation-global/default.nix +++ b/distros/melodic/cob-navigation-global/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-navigation-global"; version = "0.6.11-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/melodic/cob_navigation_global/0.6.11-1.tar.gz"; - name = "0.6.11-1.tar.gz"; - sha256 = "4c719949bcb1accc76b18e1b190c3b53e127af23f0dfc2630b31e5857ba73fde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/melodic/cob_navigation_global/0.6.11-1"; + sha256 = "sha256-vUWdDKZNqpKZ6eQ9BZtvCzOL4VedPhGezpD2M0dhWo8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-navigation-local/default.nix b/distros/melodic/cob-navigation-local/default.nix index 132e692640..14203fd41b 100644 --- a/distros/melodic/cob-navigation-local/default.nix +++ b/distros/melodic/cob-navigation-local/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-navigation-local"; version = "0.6.11-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/melodic/cob_navigation_local/0.6.11-1.tar.gz"; - name = "0.6.11-1.tar.gz"; - sha256 = "0997db3825bcdc36ceed01868d5f491b77eaf5597f47142db292ff8d0058b4a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/melodic/cob_navigation_local/0.6.11-1"; + sha256 = "sha256-gI1u8c5V7J54VzXXxtvIDz6RTqw+mQTGqkkiMgwizbo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-navigation-slam/default.nix b/distros/melodic/cob-navigation-slam/default.nix index ae883b30ed..e1de8cf19a 100644 --- a/distros/melodic/cob-navigation-slam/default.nix +++ b/distros/melodic/cob-navigation-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-navigation-slam"; version = "0.6.11-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/melodic/cob_navigation_slam/0.6.11-1.tar.gz"; - name = "0.6.11-1.tar.gz"; - sha256 = "e96ad95d7167f0e1c1a07ca019eb4b7a7813d562629793f6cd709dfeb43eaae2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/melodic/cob_navigation_slam/0.6.11-1"; + sha256 = "sha256-ZOM+AmUZ2RpHsNbm7mYn/bzX6hh/G+P8og7uLL33KDQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-navigation/default.nix b/distros/melodic/cob-navigation/default.nix index a35729c420..dc9f5048bb 100644 --- a/distros/melodic/cob-navigation/default.nix +++ b/distros/melodic/cob-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-navigation"; version = "0.6.11-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/melodic/cob_navigation/0.6.11-1.tar.gz"; - name = "0.6.11-1.tar.gz"; - sha256 = "93c0c92d65b898b57dfa81ad59444cb9e551a7a416f562cdc396319c1f092355"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/melodic/cob_navigation/0.6.11-1"; + sha256 = "sha256-qZmdfSdzgWImaxHZJufqInPxSiUtekq6COizkVBDIXw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-object-detection-msgs/default.nix b/distros/melodic/cob-object-detection-msgs/default.nix index 43a689fbba..0bdac0c7ea 100644 --- a/distros/melodic/cob-object-detection-msgs/default.nix +++ b/distros/melodic/cob-object-detection-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-object-detection-msgs"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/cob_object_detection_msgs/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "ea7db215b747fe3a14e99c761c40dfbf084cf4df381fa4ec9da18f5c9f803285"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/cob_object_detection_msgs/0.6.17-1"; + sha256 = "sha256-XvJTXHrWpUK9449KccniebE1V8gpwmC2G2DaC65c1q0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-object-detection-visualizer/default.nix b/distros/melodic/cob-object-detection-visualizer/default.nix index fa30a25d50..51b5ae4665 100644 --- a/distros/melodic/cob-object-detection-visualizer/default.nix +++ b/distros/melodic/cob-object-detection-visualizer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-object-detection-visualizer"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/cob_object_detection_visualizer/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "b616a544cbaabd629714203815df751738be745aa3196887288e2a9e4396fa48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/cob_object_detection_visualizer/0.6.17-1"; + sha256 = "sha256-/Jy4M83WIX8c0PuRXgtnG/tNUWQadzH4n4GU5+vrpyU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-obstacle-distance-moveit/default.nix b/distros/melodic/cob-obstacle-distance-moveit/default.nix index 61759b03cb..83794ab3c9 100644 --- a/distros/melodic/cob-obstacle-distance-moveit/default.nix +++ b/distros/melodic/cob-obstacle-distance-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-obstacle-distance-moveit"; version = "0.7.5-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/melodic/cob_obstacle_distance_moveit/0.7.5-1.tar.gz"; - name = "0.7.5-1.tar.gz"; - sha256 = "0b60c877eb05d3a1e1e22d33a456688a018bef984bdcb3d4ca173f4850730a3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/melodic/cob_obstacle_distance_moveit/0.7.5-1"; + sha256 = "sha256-ZCpIqsFnjwQ02Yi2zKbF8LN34Kgkj6phCISJdYze+78="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-obstacle-distance/default.nix b/distros/melodic/cob-obstacle-distance/default.nix index 683a0f0db7..d3a29ebb4b 100644 --- a/distros/melodic/cob-obstacle-distance/default.nix +++ b/distros/melodic/cob-obstacle-distance/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-obstacle-distance"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_obstacle_distance/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "43d7557c2aebc1f283ca06f26b4f53a8631489927921c56e317416c295f48936"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_obstacle_distance/0.8.12-1"; + sha256 = "sha256-7K8cGlW0ipd++Mn8Z64Z7s2PikNQd+PVc3JYNdu5kgE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-omni-drive-controller/default.nix b/distros/melodic/cob-omni-drive-controller/default.nix index e470ceec62..f8e68ae8ac 100644 --- a/distros/melodic/cob-omni-drive-controller/default.nix +++ b/distros/melodic/cob-omni-drive-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-omni-drive-controller"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_omni_drive_controller/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "1a967d7535858271000c108996885f45a62ecdbe5d48437310ca6406f817ffa0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_omni_drive_controller/0.8.12-1"; + sha256 = "sha256-eBwdKXe07zKH6/QA3Dm0FgLds7EB+3QGoHJGIF5USz0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-perception-common/default.nix b/distros/melodic/cob-perception-common/default.nix index 6bf5d034f2..077ae3ecd6 100644 --- a/distros/melodic/cob-perception-common/default.nix +++ b/distros/melodic/cob-perception-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-perception-common"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/cob_perception_common/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "a2ff2398b452ff71c341e93e5803198ed5835fca680625c6fd032565b030a42b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/cob_perception_common/0.6.17-1"; + sha256 = "sha256-XKbzorLAeuFjJ0553UPiRHc2tbnqi7d7l5k8lceTIII="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-perception-msgs/default.nix b/distros/melodic/cob-perception-msgs/default.nix index 062d29315b..1a99c7b8bd 100644 --- a/distros/melodic/cob-perception-msgs/default.nix +++ b/distros/melodic/cob-perception-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-perception-msgs"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/cob_perception_msgs/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "8297efd9fe88077dd93c645e7d0076e40756ea4974911900be57631af8beb464"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/cob_perception_msgs/0.6.17-1"; + sha256 = "sha256-pU4+cg74XtkbrxjjAzB8nrtMJ7yqg/mDRgxmZRIsBsI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-phidget-em-state/default.nix b/distros/melodic/cob-phidget-em-state/default.nix index 9150934fd7..2698c915c6 100644 --- a/distros/melodic/cob-phidget-em-state/default.nix +++ b/distros/melodic/cob-phidget-em-state/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-phidget-em-state"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_phidget_em_state/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "e04e78b1130e6b2a25a905a94ee78719b4b3a37acc22763df165de4f9b842bc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_phidget_em_state/0.7.4-1"; + sha256 = "sha256-sP1VcDkrOjLjlnCdFw22rmhIAmrZTeu+mbWaGLZw808="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-phidget-power-state/default.nix b/distros/melodic/cob-phidget-power-state/default.nix index 32562d23db..55f000479b 100644 --- a/distros/melodic/cob-phidget-power-state/default.nix +++ b/distros/melodic/cob-phidget-power-state/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-phidget-power-state"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_phidget_power_state/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "f6c71dab345af2aaaa0410b1525175fecee3986cb0816cbced54536bad66d47a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_phidget_power_state/0.7.4-1"; + sha256 = "sha256-QRuGN3DiWdhbjvW6e9SOwkQrp3bdEw+E6ELIMqIe4vs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-phidgets/default.nix b/distros/melodic/cob-phidgets/default.nix index 3672e0842f..7b29c12085 100644 --- a/distros/melodic/cob-phidgets/default.nix +++ b/distros/melodic/cob-phidgets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-phidgets"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_phidgets/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "35474500e6a5d8852d96341fde60a8f92a55638d806e29f7939a9f3ba9ab7d34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_phidgets/0.7.4-1"; + sha256 = "sha256-1KQLfjE4ax1Bi84vEfOzHFgYxOq0vbJmLvIoaJUexqw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-reflector-referencing/default.nix b/distros/melodic/cob-reflector-referencing/default.nix index b0eb8f9bef..ea3aee712c 100644 --- a/distros/melodic/cob-reflector-referencing/default.nix +++ b/distros/melodic/cob-reflector-referencing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-reflector-referencing"; version = "0.6.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/melodic/cob_reflector_referencing/0.6.10-1.tar.gz"; - name = "0.6.10-1.tar.gz"; - sha256 = "3a0c2f550773912566aca81e6b098f2dc81a0fa94a9f3fc03af4fecd07527338"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/melodic/cob_reflector_referencing/0.6.10-1"; + sha256 = "sha256-ctKCT0Fq1j6IasYdH2EMAf/7RmKamlUxTqKuLfhHe6Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-relayboard/default.nix b/distros/melodic/cob-relayboard/default.nix index 2d30383f49..49edd58ff9 100644 --- a/distros/melodic/cob-relayboard/default.nix +++ b/distros/melodic/cob-relayboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-relayboard"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_relayboard/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "e235947658ce54f6c7852549a3cf64a4c6a1a02e40c51f6ecc8322f0829d6506"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_relayboard/0.7.4-1"; + sha256 = "sha256-Woz8ByVSjYpcYyITfB7N+UaBOl1iXJ902NHkYxbQeVU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-safety-controller/default.nix b/distros/melodic/cob-safety-controller/default.nix index 35d0dc497b..6cb4e490f2 100644 --- a/distros/melodic/cob-safety-controller/default.nix +++ b/distros/melodic/cob-safety-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-safety-controller"; version = "0.6.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/melodic/cob_safety_controller/0.6.10-1.tar.gz"; - name = "0.6.10-1.tar.gz"; - sha256 = "872949bbd94f84f82e69b83d52faed8dc58fec7732e85e846a39e7a1f14ddb13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/melodic/cob_safety_controller/0.6.10-1"; + sha256 = "sha256-BENKD4B+fD1zTAQ4SomDu0tORxYxlVYv2DKwjB0gQYk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-scan-unifier/default.nix b/distros/melodic/cob-scan-unifier/default.nix index dec4b6b6fd..993b475e22 100644 --- a/distros/melodic/cob-scan-unifier/default.nix +++ b/distros/melodic/cob-scan-unifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-scan-unifier"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_scan_unifier/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "41bca060537e0874148a4b2b195f8575cfa80c19ed0f5be0e3fed816c5bcf956"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_scan_unifier/0.7.4-1"; + sha256 = "sha256-vNtsxF7d0akCrRjlLdiGXsQ1pQU5sLQhwa938eO3QYc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-script-server/default.nix b/distros/melodic/cob-script-server/default.nix index 73d0a6543e..64674555ea 100644 --- a/distros/melodic/cob-script-server/default.nix +++ b/distros/melodic/cob-script-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-script-server"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/cob_script_server/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "1293a0a87ec7cbb6b13c720cf22ab9e44d19e0a5c1ac2da06c93ab443014a74d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/cob_script_server/0.6.19-1"; + sha256 = "sha256-tQLHWdRIk9/UpIJsYK2oPAFHbKXldLjWL6kqxPx9+pY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.setuptools ]; diff --git a/distros/melodic/cob-sick-lms1xx/default.nix b/distros/melodic/cob-sick-lms1xx/default.nix index 54859af55a..9da2bb51f8 100644 --- a/distros/melodic/cob-sick-lms1xx/default.nix +++ b/distros/melodic/cob-sick-lms1xx/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-sick-lms1xx"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_sick_lms1xx/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "cb563dc4bd92e5eb48a853b39c20fd700e3f8a0f1f8059cb6eb58a39ea8d500a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_sick_lms1xx/0.7.4-1"; + sha256 = "sha256-Yg8qi8c9ghGkTEs1mghH6AWzY5t7Vmrh2ylSkN1bsmU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-sick-s300/default.nix b/distros/melodic/cob-sick-s300/default.nix index 315b5c3d60..62adf39d26 100644 --- a/distros/melodic/cob-sick-s300/default.nix +++ b/distros/melodic/cob-sick-s300/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-sick-s300"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_sick_s300/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "a43b43c4a04322af2449d415ac9a5ceaa7a05d4fcebafe66649222481a76ddfb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_sick_s300/0.7.4-1"; + sha256 = "sha256-JZQ+9yh1M9wuWwjD79mW/PH56tVMSC5BzVKxmX7P2vs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-sound/default.nix b/distros/melodic/cob-sound/default.nix index df11ac2ffc..3da239f8e5 100644 --- a/distros/melodic/cob-sound/default.nix +++ b/distros/melodic/cob-sound/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-sound"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_sound/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "7763ff01e16900f9d4d9a8b23846e3488a4714f10d5da54c9282b00d76702fce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_sound/0.7.4-1"; + sha256 = "sha256-IYvANW4+nNZ1QN9TsAbXjZTZ7GCoyS8M07IHBFh75Hk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-srvs/default.nix b/distros/melodic/cob-srvs/default.nix index df50cc6dd2..cfc3689b59 100644 --- a/distros/melodic/cob-srvs/default.nix +++ b/distros/melodic/cob-srvs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-srvs"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/melodic/cob_srvs/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "4308c67ff0ffb08c74e3b9eceee32548ba151e9bfce450bc8b989172a8fac450"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/melodic/cob_srvs/0.7.4-1"; + sha256 = "sha256-xJr7wwUgdPP2tueg1w93RhvM/0SD8Z2PgJG2oKsv/Xw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cob-substitute/default.nix b/distros/melodic/cob-substitute/default.nix index 9631c63d47..396a67236e 100644 --- a/distros/melodic/cob-substitute/default.nix +++ b/distros/melodic/cob-substitute/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-substitute"; version = "0.6.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/melodic/cob_substitute/0.6.10-1.tar.gz"; - name = "0.6.10-1.tar.gz"; - sha256 = "c280eb7a66e9e9070755652adf36fb7e38e15bfcdc7e99fc1b2b94ae79705448"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/melodic/cob_substitute/0.6.10-1"; + sha256 = "sha256-vzopiKJx1bK+TR/4T04ZDmDuHJtxgi7Aq9upQdEbp64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-supported-robots/default.nix b/distros/melodic/cob-supported-robots/default.nix index a3ec23fce4..9e058dd1ac 100644 --- a/distros/melodic/cob-supported-robots/default.nix +++ b/distros/melodic/cob-supported-robots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-supported-robots"; version = "0.6.15-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_supported_robots-release/archive/release/melodic/cob_supported_robots/0.6.15-1.tar.gz"; - name = "0.6.15-1.tar.gz"; - sha256 = "ed78423a62385277880ea1d93f3adde5e1652422ebfefbd6352af188e12b2322"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_supported_robots-release"; + rev = "release/melodic/cob_supported_robots/0.6.15-1"; + sha256 = "sha256-NEOfbZeVn6UgG/vjagSnFUYRhB4hyxj+YgsFBuwBy28="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-teleop/default.nix b/distros/melodic/cob-teleop/default.nix index a3b00c1af6..52ff77b2a1 100644 --- a/distros/melodic/cob-teleop/default.nix +++ b/distros/melodic/cob-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-teleop"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/cob_teleop/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "5d1b2c1290e9cfc36f5a80d965d50557754de1c773e7f4f346bc9ed7e63b48d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/cob_teleop/0.6.19-1"; + sha256 = "sha256-Vge0fVi4UAmbDAbqB5n+ng0GhChBKba99R9mm4RNweM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-trajectory-controller/default.nix b/distros/melodic/cob-trajectory-controller/default.nix index 91303823ed..e83e0f8602 100644 --- a/distros/melodic/cob-trajectory-controller/default.nix +++ b/distros/melodic/cob-trajectory-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-trajectory-controller"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_trajectory_controller/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "048ff51469f4331f28d37dda5522ef4fbafa2ae0a3c3c4014e82dab26aa3f2c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_trajectory_controller/0.8.12-1"; + sha256 = "sha256-dEoJrVN4uZUtUbWnpCe/BQrnGhhzKFFPNGJBCmXEEvY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-tricycle-controller/default.nix b/distros/melodic/cob-tricycle-controller/default.nix index 7f55d7067d..e4a0f69070 100644 --- a/distros/melodic/cob-tricycle-controller/default.nix +++ b/distros/melodic/cob-tricycle-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-tricycle-controller"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_tricycle_controller/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "52c61e342f79f4570746b440ee02c64346066a01a9b31457826c2d026ad6674e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_tricycle_controller/0.8.12-1"; + sha256 = "sha256-oNWBcrI+tbE9pcNSD2ki4MQpMP0jTvNpJkGeyofZkzk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-twist-controller/default.nix b/distros/melodic/cob-twist-controller/default.nix index 30d125e1c3..d55eb34587 100644 --- a/distros/melodic/cob-twist-controller/default.nix +++ b/distros/melodic/cob-twist-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-twist-controller"; version = "0.8.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/melodic/cob_twist_controller/0.8.12-1.tar.gz"; - name = "0.8.12-1.tar.gz"; - sha256 = "92ce2a81a770ae09b3e348e0742850139cbd569546d2a49d06112953a65f5673"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/melodic/cob_twist_controller/0.8.12-1"; + sha256 = "sha256-sdIrv3jnbi80FHjERl5dvlGpsUQv/XNXDsJk9az9Q3c="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools roslint ]; diff --git a/distros/melodic/cob-undercarriage-ctrl/default.nix b/distros/melodic/cob-undercarriage-ctrl/default.nix index 8fbe0cef01..ae22718dd0 100644 --- a/distros/melodic/cob-undercarriage-ctrl/default.nix +++ b/distros/melodic/cob-undercarriage-ctrl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-undercarriage-ctrl"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_undercarriage_ctrl/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "49d269b1a9fd3828f89f52d1bacf8ec3738a034f943b51a60b424a2725dd1312"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_undercarriage_ctrl/0.7.4-1"; + sha256 = "sha256-UmfZcvp1cJ2ZZW0jRa90G49TofwGA/bg9K9TAwa82oo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-utilities/default.nix b/distros/melodic/cob-utilities/default.nix index 0b9234f658..7b1738f070 100644 --- a/distros/melodic/cob-utilities/default.nix +++ b/distros/melodic/cob-utilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-utilities"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_utilities/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "2414d5e8f2303fe05fb3a2c46d9850c2ac9fb6b97666022ebcbec94c4be48fbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_utilities/0.7.4-1"; + sha256 = "sha256-M6h9ysorCGqXJXBEiQr2lEq2MdDfBpPiZ0wzaejGSfY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-vision-utils/default.nix b/distros/melodic/cob-vision-utils/default.nix index 18b73288cc..3181ef4e4b 100644 --- a/distros/melodic/cob-vision-utils/default.nix +++ b/distros/melodic/cob-vision-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-vision-utils"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/cob_vision_utils/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "daca617cb07fd45d5cefd25dcbe5ddd06ee6a91edf323f709ce565b92f604340"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/cob_vision_utils/0.6.17-1"; + sha256 = "sha256-7RZeCQ3/ZNPkMAvwGgOiYfmr9mbH8UMIpuVONjRhNHI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cob-voltage-control/default.nix b/distros/melodic/cob-voltage-control/default.nix index b2a2910db7..d2c197a14f 100644 --- a/distros/melodic/cob-voltage-control/default.nix +++ b/distros/melodic/cob-voltage-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cob-voltage-control"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/cob_voltage_control/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "a3614687544a37eda6433f6b38c1afb75c509c85bd751391323b70f1ef61e326"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/cob_voltage_control/0.7.4-1"; + sha256 = "sha256-aCByjPz1Nij2BGLl0ip14QrHTCh7SkstXFQVCYuvmA0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/code-coverage/default.nix b/distros/melodic/code-coverage/default.nix index 8984d80def..3d46416f9f 100644 --- a/distros/melodic/code-coverage/default.nix +++ b/distros/melodic/code-coverage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-code-coverage"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/code_coverage-gbp/archive/release/melodic/code_coverage/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "a8e6b0962b8cfef29afa011cb598103589c5806e704124d1ed0f4484317412de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "code_coverage-gbp"; + rev = "release/melodic/code_coverage/0.4.3-1"; + sha256 = "sha256-tuHXMWMwV9LKW6amsHtyAwFUGtRItqzC3r5jCiLJsk4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/codec-image-transport/default.nix b/distros/melodic/codec-image-transport/default.nix index 7645d0baaa..1852507243 100644 --- a/distros/melodic/codec-image-transport/default.nix +++ b/distros/melodic/codec-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-codec-image-transport"; version = "0.0.4"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/codec_image_transport-release/archive/release/melodic/codec_image_transport/0.0.4-0.tar.gz"; - name = "0.0.4-0.tar.gz"; - sha256 = "13bb8181da621d6d7bff7f97900b2bc744a93a4e2c8f5e92030a3e50da2a578c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "codec_image_transport-release"; + rev = "release/melodic/codec_image_transport/0.0.4-0"; + sha256 = "sha256-5+wOPFiWbYxwDeMxHxun513K5P2hddJuiR16C+5L8Bc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/collada-parser/default.nix b/distros/melodic/collada-parser/default.nix index 9c62c01819..5ef7ca0fac 100644 --- a/distros/melodic/collada-parser/default.nix +++ b/distros/melodic/collada-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-collada-parser"; version = "1.12.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/collada_urdf-release/archive/release/melodic/collada_parser/1.12.13-1.tar.gz"; - name = "1.12.13-1.tar.gz"; - sha256 = "bdcdbf33d3121ac98b74357a573fbb75dec755f579a341aa1ddeaa9bdcd625c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "collada_urdf-release"; + rev = "release/melodic/collada_parser/1.12.13-1"; + sha256 = "sha256-7NP/MTNf2aRw5QAwXjBXPaJHgmeNi8hjqUBoHt6xK2w="; + }; buildType = "catkin"; buildInputs = [ catkin urdfdom-headers ]; diff --git a/distros/melodic/collada-urdf/default.nix b/distros/melodic/collada-urdf/default.nix index 8e76c622f5..57872907fc 100644 --- a/distros/melodic/collada-urdf/default.nix +++ b/distros/melodic/collada-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-collada-urdf"; version = "1.12.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/collada_urdf-release/archive/release/melodic/collada_urdf/1.12.13-1.tar.gz"; - name = "1.12.13-1.tar.gz"; - sha256 = "f7d6164dbb2c9a92a9e9c80887c9b78b0cb9160d18273f8a4eba3c0d56eed363"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "collada_urdf-release"; + rev = "release/melodic/collada_urdf/1.12.13-1"; + sha256 = "sha256-wCc+mgNvgIJrdphObUrPAAyUhSO2eGhpUNVD0vT9DdU="; + }; buildType = "catkin"; buildInputs = [ angles catkin cmake-modules eigen ]; diff --git a/distros/melodic/color-util/default.nix b/distros/melodic/color-util/default.nix index 97640a1569..69955ed405 100644 --- a/distros/melodic/color-util/default.nix +++ b/distros/melodic/color-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-color-util"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/color_util/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "9a1ea5d2c51cbc78a4e9eddc30a0385eb31ca834638c3ad6a3423057f1adf27c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/color_util/0.3.0-1"; + sha256 = "sha256-/KNetcsaFZ+yC9UBoDkeDAM4O5/ja/xGduN2dKaPrVs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/combined-robot-hw-tests/default.nix b/distros/melodic/combined-robot-hw-tests/default.nix index d6a6b67466..5edace5dcc 100644 --- a/distros/melodic/combined-robot-hw-tests/default.nix +++ b/distros/melodic/combined-robot-hw-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-combined-robot-hw-tests"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/combined_robot_hw_tests/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "69832526f9f047fbd4241bfd9bcfb67123cb1ffed88383bbc44dba805a51dc0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/combined_robot_hw_tests/0.18.4-1"; + sha256 = "sha256-3OAJphOG24HvlXQnE4U1NIYPycrjsZoTgL0/RNNc3Eg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/combined-robot-hw/default.nix b/distros/melodic/combined-robot-hw/default.nix index 4f4eefb12a..11637d91fd 100644 --- a/distros/melodic/combined-robot-hw/default.nix +++ b/distros/melodic/combined-robot-hw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-combined-robot-hw"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/combined_robot_hw/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "d09031bea3b3d2d8d5b496f3856e4ea059a585bd2be9cb2f6703750c999560ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/combined_robot_hw/0.18.4-1"; + sha256 = "sha256-g++6yJnKfHcPep1hpApsLbkbpVANCLblXAYUTYzXw2I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/common-msgs/default.nix b/distros/melodic/common-msgs/default.nix index 9f5c97cd33..1d045f584a 100644 --- a/distros/melodic/common-msgs/default.nix +++ b/distros/melodic/common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-common-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/common_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "3fb881e489b9ea887e468e37e6ddd2d7d23873819b021dc1e4a3b43735ded897"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/common_msgs/1.12.8-1"; + sha256 = "sha256-o/LXEbkfOodVSAkNbaY15VS1buIK80Aezq+0hUdH2tc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/common-tutorials/default.nix b/distros/melodic/common-tutorials/default.nix index 86b3cbdaf8..f23fe5b47b 100644 --- a/distros/melodic/common-tutorials/default.nix +++ b/distros/melodic/common-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-common-tutorials"; version = "0.1.11"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/melodic/common_tutorials/0.1.11-0.tar.gz"; - name = "0.1.11-0.tar.gz"; - sha256 = "a74b72d318a6002dcee5e39472587f5fbe70741e93e71fac242b4ad60b78d9d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/melodic/common_tutorials/0.1.11-0"; + sha256 = "sha256-7mcLC7HyNMvEiafuBceHLd1direAJGq30wubjFMHggE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/compressed-depth-image-transport/default.nix b/distros/melodic/compressed-depth-image-transport/default.nix index 3b513bbdfa..90784d8cc4 100644 --- a/distros/melodic/compressed-depth-image-transport/default.nix +++ b/distros/melodic/compressed-depth-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-compressed-depth-image-transport"; version = "1.9.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_transport_plugins-release/archive/release/melodic/compressed_depth_image_transport/1.9.5-0.tar.gz"; - name = "1.9.5-0.tar.gz"; - sha256 = "344ba8616aae571668169db0759f432c049e9f2c272dbcbb2a82371ff285c212"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/melodic/compressed_depth_image_transport/1.9.5-0"; + sha256 = "sha256-nTeKF48+mc9CWS0BzrYELAQBn/TPt8UWFl8pRuM2W3Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/compressed-image-transport/default.nix b/distros/melodic/compressed-image-transport/default.nix index d4fcd3bf1b..51cf4c0331 100644 --- a/distros/melodic/compressed-image-transport/default.nix +++ b/distros/melodic/compressed-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-compressed-image-transport"; version = "1.9.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_transport_plugins-release/archive/release/melodic/compressed_image_transport/1.9.5-0.tar.gz"; - name = "1.9.5-0.tar.gz"; - sha256 = "b3f07ada5ec4f1e8335c95ded17dc75ba399b98d21c1a043fde96c3f974ba64d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/melodic/compressed_image_transport/1.9.5-0"; + sha256 = "sha256-CovfRoFEM/65lbLDWBQ1aJVDwD7lPWFGtRTuONN2qxE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/computer-status-msgs/default.nix b/distros/melodic/computer-status-msgs/default.nix index 8c1adc361d..4b3378e2f8 100644 --- a/distros/melodic/computer-status-msgs/default.nix +++ b/distros/melodic/computer-status-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-computer-status-msgs"; version = "2.1.0-r2"; - src = fetchurl { - url = "https://github.com/130s/computer_status_msgs-release/archive/release/melodic/computer_status_msgs/2.1.0-2.tar.gz"; - name = "2.1.0-2.tar.gz"; - sha256 = "ec7f20dd506aa760527208fe2765288f0362145aae7a9f1f2355ad7152618327"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "130s"; + repo = "computer_status_msgs-release"; + rev = "release/melodic/computer_status_msgs/2.1.0-2"; + sha256 = "sha256-FgVw4PNwtA2MUSIEBO2nWBt19mEMJ/1oGYnaf0BZfWw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/concert-msgs/default.nix b/distros/melodic/concert-msgs/default.nix index f0e738c5d0..e7d4e8fb29 100644 --- a/distros/melodic/concert-msgs/default.nix +++ b/distros/melodic/concert-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-concert-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/concert_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "2b90b553b2fc831b783dda1382fddbd81c507f33988189768ac44fc0106afac2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/concert_msgs/0.9.0-0"; + sha256 = "sha256-rVzgj8uhOJL2z8S2GwRtpXKd5aM3mbieGKvN0WacScE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/concert-service-msgs/default.nix b/distros/melodic/concert-service-msgs/default.nix index 079c62c822..c3cf02ff2c 100644 --- a/distros/melodic/concert-service-msgs/default.nix +++ b/distros/melodic/concert-service-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-concert-service-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/concert_service_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "6d75585b6bc21b04e3823b99a4e009572e37fd42a154351f34dd5d582d4502e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/concert_service_msgs/0.9.0-0"; + sha256 = "sha256-3qBfUnHpWemCZhJ4VXQGuIevmEvH+Re8itjTJYZDpAc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/concert-workflow-engine-msgs/default.nix b/distros/melodic/concert-workflow-engine-msgs/default.nix index ca95a76b27..a8bf19a10f 100644 --- a/distros/melodic/concert-workflow-engine-msgs/default.nix +++ b/distros/melodic/concert-workflow-engine-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-concert-workflow-engine-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/concert_workflow_engine_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "2911128ce6bda4648b1264133cbcd10cb6be12c413bd50523089ff9e93699a0a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/concert_workflow_engine_msgs/0.9.0-0"; + sha256 = "sha256-kiKrF8IJOwf1EoKLT0QJGi4iLAjV64Pf6S3iz3Jnmro="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/contact-states-observer/default.nix b/distros/melodic/contact-states-observer/default.nix index e24c988a85..750569acdc 100644 --- a/distros/melodic/contact-states-observer/default.nix +++ b/distros/melodic/contact-states-observer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-contact-states-observer"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/contact_states_observer/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "7753ed21e860b6a2a5c32dbedceb3854726856e6f7d224b09e6338f1bd0f8a4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/contact_states_observer/0.1.16-1"; + sha256 = "sha256-U8za93qS+G9b+3u2FnsN9yvZ0ScYyL+wDZvnULweex0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/control-msgs/default.nix b/distros/melodic/control-msgs/default.nix index 69b1868faf..bf428c7994 100644 --- a/distros/melodic/control-msgs/default.nix +++ b/distros/melodic/control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-control-msgs"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/control_msgs-release/archive/release/melodic/control_msgs/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "08d66f777fdd78e114a05c5319648382a35a2205e870f57ac96d05b567e645bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "control_msgs-release"; + rev = "release/melodic/control_msgs/1.5.1-1"; + sha256 = "sha256-pxsQYexh5u6aRww9kF/JNi6nJE445mMPdOYl/QS5AGI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/control-toolbox/default.nix b/distros/melodic/control-toolbox/default.nix index 5657bb10f6..d1f7331ff6 100644 --- a/distros/melodic/control-toolbox/default.nix +++ b/distros/melodic/control-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-control-toolbox"; version = "1.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/control_toolbox-release/archive/release/melodic/control_toolbox/1.19.0-1.tar.gz"; - name = "1.19.0-1.tar.gz"; - sha256 = "f1c7f00c8c9e32db695503d01ab129c915dd47cb1f1468535e2086dd6b9ecaf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "control_toolbox-release"; + rev = "release/melodic/control_toolbox/1.19.0-1"; + sha256 = "sha256-NqCiktyzf2fr20qocOQRAYRWDeHBjmB+vnXlPYU3INg="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/controller-interface/default.nix b/distros/melodic/controller-interface/default.nix index f528f3bf74..d782a0be2f 100644 --- a/distros/melodic/controller-interface/default.nix +++ b/distros/melodic/controller-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-controller-interface"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/controller_interface/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "05014247fbb6cd7ddd66595f36e61f12e2609cdcb791c6a9a1cbce955632c162"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/controller_interface/0.18.4-1"; + sha256 = "sha256-vEKfZvByaI5Iw+dM6d+JsdtI7wekWeZczt63z3tVkUU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/controller-manager-msgs/default.nix b/distros/melodic/controller-manager-msgs/default.nix index 0500dfac1f..0e47a8f7f1 100644 --- a/distros/melodic/controller-manager-msgs/default.nix +++ b/distros/melodic/controller-manager-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-controller-manager-msgs"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/controller_manager_msgs/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "6765242a3a7e2a1e92fe831d01d499286e677dea3f88bc7917c2c3375a96c125"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/controller_manager_msgs/0.18.4-1"; + sha256 = "sha256-ue10ohiOT6hBDltczxLVBdPWZd1ATxkPEyJhv6bOBDs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/controller-manager-tests/default.nix b/distros/melodic/controller-manager-tests/default.nix index 8a9653cddc..85cf94ddd0 100644 --- a/distros/melodic/controller-manager-tests/default.nix +++ b/distros/melodic/controller-manager-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-controller-manager-tests"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/controller_manager_tests/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "374371fe02df6f27e7e10309953988c02a2fa8470bb7e06f53abc6265717ba30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/controller_manager_tests/0.18.4-1"; + sha256 = "sha256-YlCS3ae7jrzAKk9hTqV7Aw3fQBKyaPhDZMa8qIn2BfU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/controller-manager/default.nix b/distros/melodic/controller-manager/default.nix index 2f85711d6f..5cd43b7f0b 100644 --- a/distros/melodic/controller-manager/default.nix +++ b/distros/melodic/controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-controller-manager"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/controller_manager/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "9fb65b2d3430380e5cc1a7cae9b328af060cbfa5ec8d7ffc75128e3ec5b41bb6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/controller_manager/0.18.4-1"; + sha256 = "sha256-58S1jzZhJ3rB/wiO5DE5miTz71O5Yv5d00ct0A/4Psw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/convex-decomposition/default.nix b/distros/melodic/convex-decomposition/default.nix index a86d1c6395..b8ac59db4a 100644 --- a/distros/melodic/convex-decomposition/default.nix +++ b/distros/melodic/convex-decomposition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-convex-decomposition"; version = "0.1.12"; - src = fetchurl { - url = "https://github.com/ros-gbp/convex_decomposition-release/archive/release/melodic/convex_decomposition/0.1.12-0.tar.gz"; - name = "0.1.12-0.tar.gz"; - sha256 = "853e052839ccfe26f6ae8d94e157ad06cfa7c520c3fe12cf33783107caeee369"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "convex_decomposition-release"; + rev = "release/melodic/convex_decomposition/0.1.12-0"; + sha256 = "sha256-GzzlVqeAQWWsiZq7qhDDtVI8i7bh/4pomZnPYy7SWHw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/copernicus-base/default.nix b/distros/melodic/copernicus-base/default.nix index 0b4800bf28..8e09090d15 100644 --- a/distros/melodic/copernicus-base/default.nix +++ b/distros/melodic/copernicus-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-copernicus-base"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/copernicus-release/archive/release/melodic/copernicus_base/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "cdd488a29f262e20e249e710e488cdd3dffb8bf78055aa322520431316eeac5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "copernicus-release"; + rev = "release/melodic/copernicus_base/1.1.0-1"; + sha256 = "sha256-mEhmB28IMJwzDcNUJDuKISHIeSNMIAg/88344nGzIj4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/copernicus-control/default.nix b/distros/melodic/copernicus-control/default.nix index 67a173386a..72089ed384 100644 --- a/distros/melodic/copernicus-control/default.nix +++ b/distros/melodic/copernicus-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-copernicus-control"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/copernicus-release/archive/release/melodic/copernicus_control/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "2784e62785f7ccc852a56b863c0be8a9f6c458afd8b7f619d7874e062ce68074"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "copernicus-release"; + rev = "release/melodic/copernicus_control/1.1.0-1"; + sha256 = "sha256-hnFwAM+JOTIw/v9SL+ZEwcnL5W0VqBS7vG8fT8EgG3o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/copernicus-description/default.nix b/distros/melodic/copernicus-description/default.nix index 7645505fe5..71ea4a9354 100644 --- a/distros/melodic/copernicus-description/default.nix +++ b/distros/melodic/copernicus-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-copernicus-description"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/copernicus-release/archive/release/melodic/copernicus_description/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "45755a8f02a7d84af410f684521f622839193ad68ca03a009c29c8df44d36182"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "copernicus-release"; + rev = "release/melodic/copernicus_description/1.1.0-1"; + sha256 = "sha256-Lh+JOgQSrgeowRHU27p3UCJ2L8JyLBYZ6B3/xywbVTw="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch velodyne-description ]; diff --git a/distros/melodic/copernicus-localization/default.nix b/distros/melodic/copernicus-localization/default.nix index 04d3692b8c..7ee084265d 100644 --- a/distros/melodic/copernicus-localization/default.nix +++ b/distros/melodic/copernicus-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-copernicus-localization"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/copernicus-release/archive/release/melodic/copernicus_localization/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "cfc491a7c55762b8ebd73ef2a3161ca650e1b49771e2f97548fe0ef5ab54e539"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "copernicus-release"; + rev = "release/melodic/copernicus_localization/1.1.0-1"; + sha256 = "sha256-pwzZbBlC0DHyvRhpO0cDz4sUv3GYc7lLovgiOwbEu/s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/copernicus-msgs/default.nix b/distros/melodic/copernicus-msgs/default.nix index 68023ee90d..1ae3bd9ee7 100644 --- a/distros/melodic/copernicus-msgs/default.nix +++ b/distros/melodic/copernicus-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-copernicus-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/copernicus-release/archive/release/melodic/copernicus_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "a78a7f39a5ab5918285b4b8e6f8d07db07c8da29ad5754410e28f8123ff70132"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "copernicus-release"; + rev = "release/melodic/copernicus_msgs/1.1.0-1"; + sha256 = "sha256-7cDt2VVAZMcMuJ3GSFG9rWMBAUqwHv32kJUOGA+mF30="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/copernicus-navigation/default.nix b/distros/melodic/copernicus-navigation/default.nix index 2b80457c5e..4141a9ac21 100644 --- a/distros/melodic/copernicus-navigation/default.nix +++ b/distros/melodic/copernicus-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-copernicus-navigation"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/copernicus-release/archive/release/melodic/copernicus_navigation/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "aea86ea189044f29f15e382e225901e0dc38d7862b5f7aae0bcb17797f021698"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "copernicus-release"; + rev = "release/melodic/copernicus_navigation/1.1.0-1"; + sha256 = "sha256-qOVq37k/4hI35J1mo2Vk3y/wnC675gkMXcDbVemUSoI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/copernicus-rules/default.nix b/distros/melodic/copernicus-rules/default.nix index 44b7e66c88..cc7c30948e 100644 --- a/distros/melodic/copernicus-rules/default.nix +++ b/distros/melodic/copernicus-rules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-copernicus-rules"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/copernicus-release/archive/release/melodic/copernicus_rules/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "48795a9fbeb822abda74d770993b82c9a8a58321824c8a048250c84fe2857f29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "copernicus-release"; + rev = "release/melodic/copernicus_rules/1.1.0-1"; + sha256 = "sha256-juYnCuJ8KrUZLRMv2Tnt2b7lMLiFkzCLvchbpmRTIYQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/copernicus-teleoperator/default.nix b/distros/melodic/copernicus-teleoperator/default.nix index f84213b1ae..c629ed0937 100644 --- a/distros/melodic/copernicus-teleoperator/default.nix +++ b/distros/melodic/copernicus-teleoperator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-copernicus-teleoperator"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/copernicus-release/archive/release/melodic/copernicus_teleoperator/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "7de39e838268a097a798978f1ebf21f70565ccba35e2ec9b4fbada41c98d6c43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "copernicus-release"; + rev = "release/melodic/copernicus_teleoperator/1.1.0-1"; + sha256 = "sha256-/EMo62mvz1ILZEeDf96kzGN15zy46o9Kb/HyfbAWz9A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/costmap-2d/default.nix b/distros/melodic/costmap-2d/default.nix index bb6f367fa7..a1ca2f7e56 100644 --- a/distros/melodic/costmap-2d/default.nix +++ b/distros/melodic/costmap-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-costmap-2d"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/costmap_2d/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "f32520730c2e9e45aa53325293431ae9909245bf7531902355e2713f54199780"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/costmap_2d/1.16.7-1"; + sha256 = "sha256-c0mPYsMXTQ0TG1YOK8JEdw8dn1DNvyu36jbIAboS1Hk="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation tf2-geometry-msgs tf2-sensor-msgs ]; diff --git a/distros/melodic/costmap-converter/default.nix b/distros/melodic/costmap-converter/default.nix index 9b56915af4..2a55996823 100644 --- a/distros/melodic/costmap-converter/default.nix +++ b/distros/melodic/costmap-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-costmap-converter"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/costmap_converter-release/archive/release/melodic/costmap_converter/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "1dfcb76c15596a6db7a4f16430c1c23fc0c89efe416c7c6605f5e770b10616fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "costmap_converter-release"; + rev = "release/melodic/costmap_converter/0.0.12-1"; + sha256 = "sha256-Vcu18wLF3GIxbt0v4bEmWUesm37RR/wRqqFnwPLOAK4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/costmap-cspace-msgs/default.nix b/distros/melodic/costmap-cspace-msgs/default.nix index 2a9bdb8c05..3f08777f2d 100644 --- a/distros/melodic/costmap-cspace-msgs/default.nix +++ b/distros/melodic/costmap-cspace-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-melodic-costmap-cspace-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/melodic/costmap_cspace_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "da79ed874b003e9f707cfa3973fe724b22fb2e11e893e96ae4c73bbc99278c40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/melodic/costmap_cspace_msgs/0.12.0-1"; + sha256 = "sha256-mE9VARUCs79SCPEdRtRYkrEE7kVcPjJ/dEYOo1pSP9c="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/costmap-cspace-rviz-plugins/default.nix b/distros/melodic/costmap-cspace-rviz-plugins/default.nix index 44ed2928ce..91c8264a0e 100644 --- a/distros/melodic/costmap-cspace-rviz-plugins/default.nix +++ b/distros/melodic/costmap-cspace-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-costmap-cspace-rviz-plugins"; version = "0.11.6-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_rviz_plugins-release/archive/release/melodic/costmap_cspace_rviz_plugins/0.11.6-1.tar.gz"; - name = "0.11.6-1.tar.gz"; - sha256 = "bcd73822b9dd77d03b425ddad5918adea6d64ac3e9b7bbe8f4605ef9048af760"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_rviz_plugins-release"; + rev = "release/melodic/costmap_cspace_rviz_plugins/0.11.6-1"; + sha256 = "sha256-AZXjHbkeKfD4qwfQ4109dCTQVvKOpA6QfPkrNsvaiOc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/costmap-cspace/default.nix b/distros/melodic/costmap-cspace/default.nix index d74de6bc0b..081509dd02 100644 --- a/distros/melodic/costmap-cspace/default.nix +++ b/distros/melodic/costmap-cspace/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-cspace-msgs, geometry-msgs, laser-geometry, nav-msgs, neonavigation-common, roscpp, roslint, rostest, sensor-msgs, tf2-geometry-msgs, tf2-ros, tf2-sensor-msgs, xmlrpcpp }: buildRosPackage { pname = "ros-melodic-costmap-cspace"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/costmap_cspace/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "7c917c353b17e528306a81197feee890b07b65e8aa230f4cb2ad8fc97473ecf9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/costmap_cspace/0.12.0-1"; + sha256 = "sha256-PKiGV8gzo5I0z6ieBPT96AvCR13n+uN3Bwy8ik/psw0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/costmap-queue/default.nix b/distros/melodic/costmap-queue/default.nix index 7cbe50b1d5..b09b31c5e1 100644 --- a/distros/melodic/costmap-queue/default.nix +++ b/distros/melodic/costmap-queue/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-costmap-queue"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/costmap_queue/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "d2cff3966f985060ab8a5a3b23c271d265d105a5ea3511b59d5717409cb91eab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/costmap_queue/0.3.0-1"; + sha256 = "sha256-YOv75uVBReU0ZJ5oRlaEOdfVxJvLs7AvCodJboRQFZQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/costmap-tf-layer/default.nix b/distros/melodic/costmap-tf-layer/default.nix index fe84eff0b7..e0e7b34b9f 100644 --- a/distros/melodic/costmap-tf-layer/default.nix +++ b/distros/melodic/costmap-tf-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-costmap-tf-layer"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/igorbanfi/costmap_tf_layer-release/archive/release/melodic/costmap_tf_layer/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "7b82e925dfd3d74c26f302a7fc3c213e33078aa9b670f7a68f6627d105f14c0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "igorbanfi"; + repo = "costmap_tf_layer-release"; + rev = "release/melodic/costmap_tf_layer/1.0.1-1"; + sha256 = "sha256-W1J+2viT+QDPxmoXP7wZ1N3BrxUZfgqYrqnbdco2p4s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cpp-common/default.nix b/distros/melodic/cpp-common/default.nix index b426f2d0dc..92708f7061 100644 --- a/distros/melodic/cpp-common/default.nix +++ b/distros/melodic/cpp-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cpp-common"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/cpp_common/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "c09132fa1409e4fcd1d779c38ecb90c7dd8fa737801c56d8a08c4fe67f64516d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/melodic/cpp_common/0.6.14-1"; + sha256 = "sha256-0Hyc3x3N0iubnyBB0YVm6eIwT4DUtUoC95060/A2M8A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cpr-common-core-msgs/default.nix b/distros/melodic/cpr-common-core-msgs/default.nix index b0139fdf21..88e652b3ce 100644 --- a/distros/melodic/cpr-common-core-msgs/default.nix +++ b/distros/melodic/cpr-common-core-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cpr-common-core-msgs"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/cpr_common_core-release/archive/release/melodic/cpr_common_core_msgs/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "82eeb5aeef199ad8543b8d7f6fe8087caa6fb4ce68936cfa30d96a01c2c5d6fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "cpr_common_core-release"; + rev = "release/melodic/cpr_common_core_msgs/0.1.0-1"; + sha256 = "sha256-yPOBs+VjDVMUls0Wlxta7cdW+eg48cY+38RoaRdvb8s="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/cpr-multimaster-tools/default.nix b/distros/melodic/cpr-multimaster-tools/default.nix index ad21347044..acb54b06f3 100644 --- a/distros/melodic/cpr-multimaster-tools/default.nix +++ b/distros/melodic/cpr-multimaster-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cpr-multimaster-tools"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/cpr_multimaster_tools-release/archive/release/melodic/cpr_multimaster_tools/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "4146b715489ee0a3271fe50e568ad19197b7f30c51bb7539cdee47cc0b8c5d32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "cpr_multimaster_tools-release"; + rev = "release/melodic/cpr_multimaster_tools/0.0.2-1"; + sha256 = "sha256-tqoHmf226UwnOMlPnqGGn9wLMFN19TcuY9zS7nvM5CQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cpu-temperature-diagnostics/default.nix b/distros/melodic/cpu-temperature-diagnostics/default.nix index 512e7b19c5..ee0c79ad6d 100644 --- a/distros/melodic/cpu-temperature-diagnostics/default.nix +++ b/distros/melodic/cpu-temperature-diagnostics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cpu-temperature-diagnostics"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/yotabits/cpu_temperature_diagnostics-release/archive/release/melodic/cpu_temperature_diagnostics/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "8d3218594e5c1ffcff59e590550b892ad1192987698156b748d5b344876daebc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yotabits"; + repo = "cpu_temperature_diagnostics-release"; + rev = "release/melodic/cpu_temperature_diagnostics/0.0.1-1"; + sha256 = "sha256-eDNECUYEyqoAmtQ7dqRgTQAV15XPfVgUmWg5tsfFRw4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/criutils/default.nix b/distros/melodic/criutils/default.nix index 9607a535e2..e0bdb0abbf 100644 --- a/distros/melodic/criutils/default.nix +++ b/distros/melodic/criutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-criutils"; version = "0.1.3-r2"; - src = fetchurl { - url = "https://github.com/crigroup/criutils-release/archive/release/melodic/criutils/0.1.3-2.tar.gz"; - name = "0.1.3-2.tar.gz"; - sha256 = "f6cd15555a09722265c91234ab0c3e46c501a052cce3979a5fde66d86f0a0c51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "crigroup"; + repo = "criutils-release"; + rev = "release/melodic/criutils/0.1.3-2"; + sha256 = "sha256-/E3IBkg47jW00hoghRE6Dj/OrvasZfxAg1yfi+ojBXg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/csm/default.nix b/distros/melodic/csm/default.nix index 1cf7970f00..70b56473fa 100644 --- a/distros/melodic/csm/default.nix +++ b/distros/melodic/csm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-csm"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/csm-release/archive/release/melodic/csm/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "16d77496d6da844ded1a368e4b723938d9c8cbc481a73c535c3eb266e3b23860"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "csm-release"; + rev = "release/melodic/csm/1.0.2-2"; + sha256 = "sha256-uZu+koOjuc9LuuyHpIZeKmDCo0yktDvLrFJeDr9diQg="; + }; buildType = "catkin"; buildInputs = [ cmake ]; diff --git a/distros/melodic/cv-bridge-python3/default.nix b/distros/melodic/cv-bridge-python3/default.nix index e2a46a6f56..ea488e1878 100644 --- a/distros/melodic/cv-bridge-python3/default.nix +++ b/distros/melodic/cv-bridge-python3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cv-bridge-python3"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/tork-a/vision_opencv_python3-release/archive/release/melodic/cv_bridge_python3/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "c1e18d1a33ff149385882ca616fdd8cc706b6dbf80f293e1962c63498c3a8d24"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "vision_opencv_python3-release"; + rev = "release/melodic/cv_bridge_python3/1.13.2-1"; + sha256 = "sha256-3TjMhxSJmyUSYxyIUALhzIDEeTfl3ciBxzHyMvmCtCc="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.catkin-pkg ]; diff --git a/distros/melodic/cv-bridge/default.nix b/distros/melodic/cv-bridge/default.nix index fb00378b67..fdd906aa8c 100644 --- a/distros/melodic/cv-bridge/default.nix +++ b/distros/melodic/cv-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cv-bridge"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vision_opencv-release/archive/release/melodic/cv_bridge/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "091604696d5f953a6ca0a1dab57d6762e24281378a64b4665a9b8c41e5f2b3d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vision_opencv-release"; + rev = "release/melodic/cv_bridge/1.13.1-1"; + sha256 = "sha256-b4OAdu9KXs5cynJt8w7pOyDs1JYI1P3UphcKGRoakfU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/cv-camera/default.nix b/distros/melodic/cv-camera/default.nix index 4dd22d141a..2b44df8d66 100644 --- a/distros/melodic/cv-camera/default.nix +++ b/distros/melodic/cv-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cv-camera"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/OTL/cv_camera-release/archive/release/melodic/cv_camera/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "7119fcb01b7e39953f38be82f00d3ddf63ce52c92732091df65239b7824044dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OTL"; + repo = "cv_camera-release"; + rev = "release/melodic/cv_camera/0.4.0-1"; + sha256 = "sha256-dSm9FBiw5d9k5ZkLG5sbrAW5vWXuLIv2OyxwqSxxc6U="; + }; buildType = "catkin"; buildInputs = [ catkin roslint rostest ]; diff --git a/distros/melodic/cvp-mesh-planner/default.nix b/distros/melodic/cvp-mesh-planner/default.nix index 2492ac2b24..f8d43379f8 100644 --- a/distros/melodic/cvp-mesh-planner/default.nix +++ b/distros/melodic/cvp-mesh-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-cvp-mesh-planner"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/melodic/cvp_mesh_planner/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "c9fddab14156e516e7f3006b6e2b97f5dd197ef85a0e2cf00f70434bde972708"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/melodic/cvp_mesh_planner/1.0.1-1"; + sha256 = "sha256-RbPYuvZiCDhgnFZuUBkYFtdpaiHRQcsby6m+UlFSoTs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dataflow-lite/default.nix b/distros/melodic/dataflow-lite/default.nix index c3f436d1e6..0e488bb70d 100644 --- a/distros/melodic/dataflow-lite/default.nix +++ b/distros/melodic/dataflow-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataflow-lite"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/cloudwatch_common-release/archive/release/melodic/dataflow_lite/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "6bd3d571380bb06623afd09ae46e1a0d95368ccafe14416a323fd79ac84e2bed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "cloudwatch_common-release"; + rev = "release/melodic/dataflow_lite/1.1.5-1"; + sha256 = "sha256-ukmR+DtC08qFCQFdiI8f04FiFNEV67HbX2rKe24sm4M="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/dataspeed-can-msg-filters/default.nix b/distros/melodic/dataspeed-can-msg-filters/default.nix index c059c2db41..fb0957b6c6 100644 --- a/distros/melodic/dataspeed-can-msg-filters/default.nix +++ b/distros/melodic/dataspeed-can-msg-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-can-msg-filters"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/melodic/dataspeed_can_msg_filters/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "e3a3bac07cceb049cd83ab91bdc6a5d4052bc325cbe2a28920fb68017b1c1248"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/melodic/dataspeed_can_msg_filters/1.0.16-1"; + sha256 = "sha256-ICPML442r6xLfVXCkHbtWQGBE3R+AFoblo0W9AoIKNc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dataspeed-can-tools/default.nix b/distros/melodic/dataspeed-can-tools/default.nix index 30fcb943a7..22c64beba7 100644 --- a/distros/melodic/dataspeed-can-tools/default.nix +++ b/distros/melodic/dataspeed-can-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-can-tools"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/melodic/dataspeed_can_tools/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "ecbc5514862e8d5eaf6407cace95e369a6dd770cb2853f81e267635e1c3cef87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/melodic/dataspeed_can_tools/1.0.16-1"; + sha256 = "sha256-jV9I06FAip4ro+A5Clp3HaznUCAJR3GEyAVolPulD+A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dataspeed-can-usb/default.nix b/distros/melodic/dataspeed-can-usb/default.nix index 64f4566ae9..b35a257893 100644 --- a/distros/melodic/dataspeed-can-usb/default.nix +++ b/distros/melodic/dataspeed-can-usb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-can-usb"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/melodic/dataspeed_can_usb/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "0e43215ea8a06c3f802321632f33e104c659b521f91b4f18a8067e2085aa887c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/melodic/dataspeed_can_usb/1.0.16-1"; + sha256 = "sha256-qDYokEGVgyvE1BoMRu80KFyjkZniJCpOysGOzLnaosk="; + }; buildType = "catkin"; buildInputs = [ catkin roslib ]; diff --git a/distros/melodic/dataspeed-can/default.nix b/distros/melodic/dataspeed-can/default.nix index 7354d1ab00..ed533d17d3 100644 --- a/distros/melodic/dataspeed-can/default.nix +++ b/distros/melodic/dataspeed-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-can"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/melodic/dataspeed_can/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "8015e12e78f9d3b328e1e9615ec32a986134c4ed429f6678e3fb82379feefbed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/melodic/dataspeed_can/1.0.16-1"; + sha256 = "sha256-GvbRVesJOGrwL3+VbE61M7y4gwE8DBFTqb59LzdwXxA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dataspeed-pds-can/default.nix b/distros/melodic/dataspeed-pds-can/default.nix index 3823e00379..81fc9697bb 100644 --- a/distros/melodic/dataspeed-pds-can/default.nix +++ b/distros/melodic/dataspeed-pds-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-pds-can"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/melodic/dataspeed_pds_can/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "b42f60bb65943a05e8c78a89fd67db3cd2fe7641cf3a29e52300dffa71b34965"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/melodic/dataspeed_pds_can/1.0.6-1"; + sha256 = "sha256-32FxGBWjrNSrWhFkPQ+nHTkmiDuYbUOX6FGTCgXZpaI="; + }; buildType = "catkin"; buildInputs = [ catkin dataspeed-can-msg-filters ]; diff --git a/distros/melodic/dataspeed-pds-msgs/default.nix b/distros/melodic/dataspeed-pds-msgs/default.nix index a77a90252b..9d41e14798 100644 --- a/distros/melodic/dataspeed-pds-msgs/default.nix +++ b/distros/melodic/dataspeed-pds-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-pds-msgs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/melodic/dataspeed_pds_msgs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "e2ad5cfa58bbe84eaef998882e1f513cd9d94096f20ab89fb49e51098a790891"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/melodic/dataspeed_pds_msgs/1.0.6-1"; + sha256 = "sha256-T6S2l2IuCi7rEupPJ3JZaLAqiNvD6+PRTUm+DOY3pjc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dataspeed-pds-rqt/default.nix b/distros/melodic/dataspeed-pds-rqt/default.nix index 889454ca2b..57b356a780 100644 --- a/distros/melodic/dataspeed-pds-rqt/default.nix +++ b/distros/melodic/dataspeed-pds-rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-pds-rqt"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/melodic/dataspeed_pds_rqt/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "45e42d4c5a45175fd962ada3e558210b104c34af8c6214bec8ad26230be40a40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/melodic/dataspeed_pds_rqt/1.0.6-1"; + sha256 = "sha256-9J0rmj2Ilzm9sDZE3BRuvft3ZFzdtmO303XBMLePAHs="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/dataspeed-pds-scripts/default.nix b/distros/melodic/dataspeed-pds-scripts/default.nix index 98d33d91f6..797aa7ddde 100644 --- a/distros/melodic/dataspeed-pds-scripts/default.nix +++ b/distros/melodic/dataspeed-pds-scripts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-pds-scripts"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/melodic/dataspeed_pds_scripts/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "78f2746975c73faea61d3614a764e97f8554eb00955f97014b64ba8cc5578e99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/melodic/dataspeed_pds_scripts/1.0.6-1"; + sha256 = "sha256-sDXfYOFnZaf7x/Re8ebwXEdzkfM0kX9+olQrlNwFqMY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dataspeed-pds/default.nix b/distros/melodic/dataspeed-pds/default.nix index 5d2d3c706a..8fb238392e 100644 --- a/distros/melodic/dataspeed-pds/default.nix +++ b/distros/melodic/dataspeed-pds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-pds"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/melodic/dataspeed_pds/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "235dc999c5c316d866364e8e26e40d313fdce4930bb8608452465416a0f11a11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/melodic/dataspeed_pds/1.0.6-1"; + sha256 = "sha256-XOk61kLYuHHf1FM9ziU/6qigUSLORr+O3OdcjMIADfw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dataspeed-ulc-can/default.nix b/distros/melodic/dataspeed-ulc-can/default.nix index 3f692013b0..5ee1a6bc9f 100644 --- a/distros/melodic/dataspeed-ulc-can/default.nix +++ b/distros/melodic/dataspeed-ulc-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-ulc-can"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_ulc_ros-release/archive/release/melodic/dataspeed_ulc_can/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "ecf0dbd15317c3d4a2fd3dea1ac5521fa0d0f642148f1fcb0556b6cabc81ac4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_ulc_ros-release"; + rev = "release/melodic/dataspeed_ulc_can/0.1.0-1"; + sha256 = "sha256-TXMu+fqYixQX9l5P7ZBzr1d7Gsr1XcPldWqHkDXGXwg="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/dataspeed-ulc-msgs/default.nix b/distros/melodic/dataspeed-ulc-msgs/default.nix index 773577d6ad..c340a120ea 100644 --- a/distros/melodic/dataspeed-ulc-msgs/default.nix +++ b/distros/melodic/dataspeed-ulc-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-ulc-msgs"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_ulc_ros-release/archive/release/melodic/dataspeed_ulc_msgs/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "c9dec9c3c11878e1e6e9aa732f2920a484f1ee6dbcc8ca28c5f73e10861223fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_ulc_ros-release"; + rev = "release/melodic/dataspeed_ulc_msgs/0.1.0-1"; + sha256 = "sha256-8+SpCh3N5uZOC687Ac50FnELyyOpzTa+2tnL8TyQf8A="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dataspeed-ulc/default.nix b/distros/melodic/dataspeed-ulc/default.nix index 9835bfa8d1..a20858e665 100644 --- a/distros/melodic/dataspeed-ulc/default.nix +++ b/distros/melodic/dataspeed-ulc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dataspeed-ulc"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_ulc_ros-release/archive/release/melodic/dataspeed_ulc/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "ab201e51b4e51c39b4e6db04e2a65ab377e091091086cb1cf121e6a757b3ee80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_ulc_ros-release"; + rev = "release/melodic/dataspeed_ulc/0.1.0-1"; + sha256 = "sha256-8ZYV6yz2+tK5L61CPzhTjbosO9Ga23y35Dw2dRiMY3Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/datmo/default.nix b/distros/melodic/datmo/default.nix index 02eadf1602..dfbf008aa5 100644 --- a/distros/melodic/datmo/default.nix +++ b/distros/melodic/datmo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-datmo"; version = "0.1.2-r2"; - src = fetchurl { - url = "https://github.com/kostaskonkk/datmo-release/archive/release/melodic/datmo/0.1.2-2.tar.gz"; - name = "0.1.2-2.tar.gz"; - sha256 = "7003a039dda59b01b5d934a090ea54ac289ef7653a975b1fda2063d429dee91b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "kostaskonkk"; + repo = "datmo-release"; + rev = "release/melodic/datmo/0.1.2-2"; + sha256 = "sha256-Mrfo0zFMz/LerjHW+Uh0/ievRlAaHjdThg5oYNX5iwc="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen message-generation nav-msgs sensor-msgs tf tf2-geometry-msgs visualization-msgs ]; diff --git a/distros/melodic/dbw-fca-can/default.nix b/distros/melodic/dbw-fca-can/default.nix index 1d6d8b1e86..7e488ae464 100644 --- a/distros/melodic/dbw-fca-can/default.nix +++ b/distros/melodic/dbw-fca-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-fca-can"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/melodic/dbw_fca_can/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "1926b5951ef4f0fa66cfb5085515bfcd0bb5cf39ef67f65cf269e99b139dcd80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/melodic/dbw_fca_can/1.3.0-1"; + sha256 = "sha256-3oae3i+Le894UArl9843cH/mIt5LJqFMbI4eG9a8z3I="; + }; buildType = "catkin"; buildInputs = [ catkin dataspeed-can-msg-filters ]; diff --git a/distros/melodic/dbw-fca-description/default.nix b/distros/melodic/dbw-fca-description/default.nix index b2254368a3..e21be040aa 100644 --- a/distros/melodic/dbw-fca-description/default.nix +++ b/distros/melodic/dbw-fca-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-fca-description"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/melodic/dbw_fca_description/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "a7550a0dbc7c754e2aa9502a0138e6ca4f196925910cf6f44b839a09579844d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/melodic/dbw_fca_description/1.3.0-1"; + sha256 = "sha256-35Wzci2X40KxcIeUwLvxv/QLalbDtLo/W6V2LQn/bpE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dbw-fca-joystick-demo/default.nix b/distros/melodic/dbw-fca-joystick-demo/default.nix index a52d571347..33637aa82a 100644 --- a/distros/melodic/dbw-fca-joystick-demo/default.nix +++ b/distros/melodic/dbw-fca-joystick-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-fca-joystick-demo"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/melodic/dbw_fca_joystick_demo/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "8978b799a0c317d5c98f696753ad3a60643917c7143e4f8bdce7ba3120bed68d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/melodic/dbw_fca_joystick_demo/1.3.0-1"; + sha256 = "sha256-Fn8+InBX58ewDJm9AyqUOEIDpxZ7KuOgK9en71GBakU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dbw-fca-msgs/default.nix b/distros/melodic/dbw-fca-msgs/default.nix index 701822110d..a2af4777e5 100644 --- a/distros/melodic/dbw-fca-msgs/default.nix +++ b/distros/melodic/dbw-fca-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-fca-msgs"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/melodic/dbw_fca_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "ad8a2865b54b855a48f7daea5d69e384b9c7e03e0b66316e610539d0fb139ccd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/melodic/dbw_fca_msgs/1.3.0-1"; + sha256 = "sha256-TwMR9JWmysOOf9jSWRcaWOnfbMIKXUa0TgkPvJqiGpg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dbw-fca/default.nix b/distros/melodic/dbw-fca/default.nix index e5513aff01..dc125a1f27 100644 --- a/distros/melodic/dbw-fca/default.nix +++ b/distros/melodic/dbw-fca/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-fca"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/melodic/dbw_fca/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "3ba45bbbfe8dd3c28f599558708bf395833370bbe18e45ee7db7835402284f8e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/melodic/dbw_fca/1.3.0-1"; + sha256 = "sha256-7IHpyvyfDFtHmloRt9iZAI52oBUNCYz3WiGgCmQiMzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dbw-mkz-can/default.nix b/distros/melodic/dbw-mkz-can/default.nix index 757c3a3a3a..0371c07978 100644 --- a/distros/melodic/dbw-mkz-can/default.nix +++ b/distros/melodic/dbw-mkz-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-mkz-can"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/melodic/dbw_mkz_can/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "3815d019d367a0105d74a1adf137f44f80a38c34b29c3df010d80861c1d10c72"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/melodic/dbw_mkz_can/1.6.0-1"; + sha256 = "sha256-P6BE6AEmLOFi4LDM7Zwm6Ghvk0/7tg1MmpeZ7Icjz+8="; + }; buildType = "catkin"; buildInputs = [ catkin dataspeed-can-msg-filters ]; diff --git a/distros/melodic/dbw-mkz-description/default.nix b/distros/melodic/dbw-mkz-description/default.nix index 87ae03b766..93a01686c8 100644 --- a/distros/melodic/dbw-mkz-description/default.nix +++ b/distros/melodic/dbw-mkz-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-mkz-description"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/melodic/dbw_mkz_description/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "b72cc4aebee0cc33b9c9461d0fecf3e12d2711411355e23b46c9a9b58e3de8ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/melodic/dbw_mkz_description/1.6.0-1"; + sha256 = "sha256-QNgneMb38+oRtzL7dC0l9uhzXGUnHg9gcml7JwnVkbw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dbw-mkz-joystick-demo/default.nix b/distros/melodic/dbw-mkz-joystick-demo/default.nix index edb55d6354..584cce4b7f 100644 --- a/distros/melodic/dbw-mkz-joystick-demo/default.nix +++ b/distros/melodic/dbw-mkz-joystick-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-mkz-joystick-demo"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/melodic/dbw_mkz_joystick_demo/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "d7a98bc384c30267c187079815526914effa649fd670bdb13e309e6793930f44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/melodic/dbw_mkz_joystick_demo/1.6.0-1"; + sha256 = "sha256-rwm6KNrm3whiLIq07anS6H5tS7pY8G/vEorJYmCFPVE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dbw-mkz-msgs/default.nix b/distros/melodic/dbw-mkz-msgs/default.nix index 17f8affeb6..37b3e745a1 100644 --- a/distros/melodic/dbw-mkz-msgs/default.nix +++ b/distros/melodic/dbw-mkz-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-mkz-msgs"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/melodic/dbw_mkz_msgs/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "ae6836add104248771d4cea931272882283c7c524f3a18e19fa890bb28d63f61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/melodic/dbw_mkz_msgs/1.6.0-1"; + sha256 = "sha256-yPKRzKr33qeNpT5S8q4jiaWwOSYJiUajsXZ99c/rEXA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dbw-mkz/default.nix b/distros/melodic/dbw-mkz/default.nix index db311ae7bc..3a47ec50de 100644 --- a/distros/melodic/dbw-mkz/default.nix +++ b/distros/melodic/dbw-mkz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-mkz"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/melodic/dbw_mkz/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "7e053bd84420035f03b3770dd0da0b1a1f75efafcc2b83322ab87fe392762342"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/melodic/dbw_mkz/1.6.0-1"; + sha256 = "sha256-w4IV2nf+dA0ifMWT+nnV/ryowWtzZiBdk6HJjMiSKAo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dbw-polaris-can/default.nix b/distros/melodic/dbw-polaris-can/default.nix index 482dd21f25..63ef69cd80 100644 --- a/distros/melodic/dbw-polaris-can/default.nix +++ b/distros/melodic/dbw-polaris-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-polaris-can"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/melodic/dbw_polaris_can/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "e01e578a29021f2da9b0754de9d4b2e76ba1e118100ac53aa387c7050e170193"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/melodic/dbw_polaris_can/1.1.0-1"; + sha256 = "sha256-/t28Mhp2LDRwMEN4RJuXKt/imjxSdLpPT4izLkdCEqc="; + }; buildType = "catkin"; buildInputs = [ catkin dataspeed-can-msg-filters ]; diff --git a/distros/melodic/dbw-polaris-description/default.nix b/distros/melodic/dbw-polaris-description/default.nix index 33eb8ec4c2..6eee0894b6 100644 --- a/distros/melodic/dbw-polaris-description/default.nix +++ b/distros/melodic/dbw-polaris-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-polaris-description"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/melodic/dbw_polaris_description/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "4cdd0b2065904fb41183a23b525029d6a8866dd1143a58755d6d18823d01955c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/melodic/dbw_polaris_description/1.1.0-1"; + sha256 = "sha256-EQ5HHDM+LU/iSupxm5xlJ16nZkoK8DlZ6bABxtikN64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dbw-polaris-joystick-demo/default.nix b/distros/melodic/dbw-polaris-joystick-demo/default.nix index 981ab2358d..b0b6b27c12 100644 --- a/distros/melodic/dbw-polaris-joystick-demo/default.nix +++ b/distros/melodic/dbw-polaris-joystick-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-polaris-joystick-demo"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/melodic/dbw_polaris_joystick_demo/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "5e6b31cb0ca08399c7f80acb0d147799f32e910831799c0d4a9390c72f435151"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/melodic/dbw_polaris_joystick_demo/1.1.0-1"; + sha256 = "sha256-IScNwPCoynOnNCzpFxHEM2mRUhyOE6p1ECD0THPCZQs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dbw-polaris-msgs/default.nix b/distros/melodic/dbw-polaris-msgs/default.nix index 7aa348f2ac..178a510901 100644 --- a/distros/melodic/dbw-polaris-msgs/default.nix +++ b/distros/melodic/dbw-polaris-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-polaris-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/melodic/dbw_polaris_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "a8ed7285a6f6fe7804235d9e14fdceedfe9ae4c8b75225f288fe7906b8a9a4b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/melodic/dbw_polaris_msgs/1.1.0-1"; + sha256 = "sha256-pu+jBW6Q7vx0i6N2NEix+YPJqTF1uA/er0lHTgI/8l4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dbw-polaris/default.nix b/distros/melodic/dbw-polaris/default.nix index 3a956f0685..d0c00e7d1a 100644 --- a/distros/melodic/dbw-polaris/default.nix +++ b/distros/melodic/dbw-polaris/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dbw-polaris"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/melodic/dbw_polaris/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "a031935a5ead635401d3ee0eb012cfe46b9cca2cc8776dccaac01e96a9d1117a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/melodic/dbw_polaris/1.1.0-1"; + sha256 = "sha256-n1NKuVMZa2Sk34YcHU30KTPQY/ikw2UyN10R12KJC9E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dccomms-ros-msgs/default.nix b/distros/melodic/dccomms-ros-msgs/default.nix index 8d81091838..e9a6d67e20 100644 --- a/distros/melodic/dccomms-ros-msgs/default.nix +++ b/distros/melodic/dccomms-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dccomms-ros-msgs"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/dcentelles/dccomms_ros_pkgs-release/archive/release/melodic/dccomms_ros_msgs/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "cc0b887b4b28a595f9cb549d74fc086b39221414e63d65c3976573a14ae7aef2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dcentelles"; + repo = "dccomms_ros_pkgs-release"; + rev = "release/melodic/dccomms_ros_msgs/0.0.3-1"; + sha256 = "sha256-k/LNckTNXlZA9TdgIGpvhwu/nc17i2NI7Lt696gO++E="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dccomms-ros/default.nix b/distros/melodic/dccomms-ros/default.nix index 2b343154fc..faebf0cbb5 100644 --- a/distros/melodic/dccomms-ros/default.nix +++ b/distros/melodic/dccomms-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dccomms-ros"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/dcentelles/dccomms_ros_pkgs-release/archive/release/melodic/dccomms_ros/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "9c82b3dcef96d0211f6267f3c6f9bdc87c0d127a2607240f102c17cd65f5a010"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dcentelles"; + repo = "dccomms_ros_pkgs-release"; + rev = "release/melodic/dccomms_ros/0.0.3-1"; + sha256 = "sha256-13ZyB5dpDO4l9llFApKe3yKxIv4yYef6XI7QNb2dZWc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ddwrt-access-point/default.nix b/distros/melodic/ddwrt-access-point/default.nix index 6a8dd55bfd..4c983bbd9a 100644 --- a/distros/melodic/ddwrt-access-point/default.nix +++ b/distros/melodic/ddwrt-access-point/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ddwrt-access-point"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/ddwrt_access_point/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "830e0935e4c51771f33e52de0645e5e4814bbde19b6fc7c30fab57f83e45264a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/ddwrt_access_point/1.0.16-1"; + sha256 = "sha256-eQN6M/WWJ107xV4BX07qKxBUMLoRFY/r5rYPmKT2T04="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ddynamic-reconfigure-python/default.nix b/distros/melodic/ddynamic-reconfigure-python/default.nix index d234302ba6..3399ae50a3 100644 --- a/distros/melodic/ddynamic-reconfigure-python/default.nix +++ b/distros/melodic/ddynamic-reconfigure-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ddynamic-reconfigure-python"; version = "0.0.1"; - src = fetchurl { - url = "https://github.com/pal-gbp/ddynamic_reconfigure_python-release/archive/release/melodic/ddynamic_reconfigure_python/0.0.1-0.tar.gz"; - name = "0.0.1-0.tar.gz"; - sha256 = "bc8dcf50274a8e4a0548a9044f4af8ef90d207eab61b8a3ff4e474582b88121c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "ddynamic_reconfigure_python-release"; + rev = "release/melodic/ddynamic_reconfigure_python/0.0.1-0"; + sha256 = "sha256-JLcpi+inwRitdo5Xol8fy27HaHg0wy9iD2NUtXfqdnc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ddynamic-reconfigure/default.nix b/distros/melodic/ddynamic-reconfigure/default.nix index 262e81b1e9..98211b811d 100644 --- a/distros/melodic/ddynamic-reconfigure/default.nix +++ b/distros/melodic/ddynamic-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ddynamic-reconfigure"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/ddynamic_reconfigure/archive/release/melodic/ddynamic_reconfigure/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "a8780576fba89c6bca7aa268f718041ab724d3f24ff44823b7dabee3f4b3315d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "ddynamic_reconfigure"; + rev = "release/melodic/ddynamic_reconfigure/0.3.2-1"; + sha256 = "sha256-7wU8+pg/natOlu90zvVV2vjRO1Gv7TBEiKiPXcpxOuM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/default-cfg-fkie/default.nix b/distros/melodic/default-cfg-fkie/default.nix index 66188bcdc6..683498f0d1 100644 --- a/distros/melodic/default-cfg-fkie/default.nix +++ b/distros/melodic/default-cfg-fkie/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-default-cfg-fkie"; version = "0.8.12"; - src = fetchurl { - url = "https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/default_cfg_fkie/0.8.12-0.tar.gz"; - name = "0.8.12-0.tar.gz"; - sha256 = "0b43fafcadef2aeff4fd5e7325daac4eeab711e5323c32fb37606bd318f5c7a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "multimaster_fkie-release"; + rev = "release/melodic/default_cfg_fkie/0.8.12-0"; + sha256 = "sha256-gRaIRm7RCXbyZStSwysITFoKMpz768bwtt4icmsvivE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/delphi-esr-msgs/default.nix b/distros/melodic/delphi-esr-msgs/default.nix index 0140e93f3b..7b5e3dbc15 100644 --- a/distros/melodic/delphi-esr-msgs/default.nix +++ b/distros/melodic/delphi-esr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-delphi-esr-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/delphi_esr_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "610a69fa08410ae871622aefa5896e7fe99c94c3776dca97e63291dcde2118b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/delphi_esr_msgs/3.0.2-1"; + sha256 = "sha256-mZ8CK8AgjPGfyRbI702sZAGvh46R0iEhCFqO+8jmo50="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/delphi-mrr-msgs/default.nix b/distros/melodic/delphi-mrr-msgs/default.nix index 174b1f3d35..52aa19e806 100644 --- a/distros/melodic/delphi-mrr-msgs/default.nix +++ b/distros/melodic/delphi-mrr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-delphi-mrr-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/delphi_mrr_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "ae772ab11e180eade5e1f1cde8f83d403b4bd2c3ae87fc0964ac20cf49d1cf39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/delphi_mrr_msgs/3.0.2-1"; + sha256 = "sha256-jULI18ihSgh6lBzyjnxVu7QB2c3AcjPWkRhzi17ZzDU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/delphi-srr-msgs/default.nix b/distros/melodic/delphi-srr-msgs/default.nix index d2a5490ae6..44a12a9e6f 100644 --- a/distros/melodic/delphi-srr-msgs/default.nix +++ b/distros/melodic/delphi-srr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-delphi-srr-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/delphi_srr_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "5e7b8a7119dcb32fcf621af3cdc777e08d09ee14778f1ea1c9c9cd9a983941df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/delphi_srr_msgs/3.0.2-1"; + sha256 = "sha256-4AK6O4bZSuySXhwed95aRAC/CFlDIKAEo+N87Q94BjM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/dense-laser-assembler/default.nix b/distros/melodic/dense-laser-assembler/default.nix index dd1c9eedd3..fc8995aeff 100644 --- a/distros/melodic/dense-laser-assembler/default.nix +++ b/distros/melodic/dense-laser-assembler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dense-laser-assembler"; version = "1.0.11-r3"; - src = fetchurl { - url = "https://github.com/UNR-RoboticsResearchLab/pr2_calibration-release/archive/release/melodic/dense_laser_assembler/1.0.11-3.tar.gz"; - name = "1.0.11-3.tar.gz"; - sha256 = "ae8c468360cf2e64738f25ca2722920008eff02f43806e5b4ac0009639ebe5ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UNR-RoboticsResearchLab"; + repo = "pr2_calibration-release"; + rev = "release/melodic/dense_laser_assembler/1.0.11-3"; + sha256 = "sha256-iOEfcBv0S4NAGJFf4UtLdT0uwbmUzShYkxYXRehQNFU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/denso-robot-bringup/default.nix b/distros/melodic/denso-robot-bringup/default.nix index 7a00116300..69c82dd31d 100644 --- a/distros/melodic/denso-robot-bringup/default.nix +++ b/distros/melodic/denso-robot-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-denso-robot-bringup"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/denso_robot_bringup/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "3ff3ec7024f60ea109a6bb0225bf60c7dd3805d648809e06f3df72eb380ac07b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/denso_robot_bringup/3.2.0-1"; + sha256 = "sha256-2AJfaTX2ERqPK+fQceqwlqknUg0opP74rxTPPr0zMZc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/denso-robot-control/default.nix b/distros/melodic/denso-robot-control/default.nix index b1bb275fd8..72a4f490e6 100644 --- a/distros/melodic/denso-robot-control/default.nix +++ b/distros/melodic/denso-robot-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-denso-robot-control"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/denso_robot_control/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "44632e28b7c8dc71fca2aacb9a2022f65fbfbc1cf41b86fa5db23572002c912f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/denso_robot_control/3.2.0-1"; + sha256 = "sha256-4qcPbPhGwXitzrND74gKJLcwtaeS++8yYfaCy1To404="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/denso-robot-core-test/default.nix b/distros/melodic/denso-robot-core-test/default.nix index 54049a0d84..2b542a19f5 100644 --- a/distros/melodic/denso-robot-core-test/default.nix +++ b/distros/melodic/denso-robot-core-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-denso-robot-core-test"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/denso_robot_core_test/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "b500a34855e62c572cb8b2590855e8398d10be29a7a729a168b86a3088cb36ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/denso_robot_core_test/3.2.0-1"; + sha256 = "sha256-fQkV9U2Nqstv7bR3HLYw06c9aAj1v1RvQ/WILp0NrRU="; + }; buildType = "catkin"; buildInputs = [ bcap-core catkin denso-robot-core ]; diff --git a/distros/melodic/denso-robot-core/default.nix b/distros/melodic/denso-robot-core/default.nix index 0d65eab65d..c22e07fada 100644 --- a/distros/melodic/denso-robot-core/default.nix +++ b/distros/melodic/denso-robot-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-denso-robot-core"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/denso_robot_core/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "c2823db29c7191e68ed73cd9e44f134dd0bed78fcbe2e5f0ad5a47ded3292b1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/denso_robot_core/3.2.0-1"; + sha256 = "sha256-DmKLgvuGgu+y3/nL2XJioUK9qmugv5JdMnek9TwYt2s="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/denso-robot-descriptions/default.nix b/distros/melodic/denso-robot-descriptions/default.nix index 3382c0c209..56a62f6a43 100644 --- a/distros/melodic/denso-robot-descriptions/default.nix +++ b/distros/melodic/denso-robot-descriptions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-denso-robot-descriptions"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/denso_robot_descriptions/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "d33cc562bd9f958255926e19a3854aeda0b20a7e54347e96481f73adf2b50e2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/denso_robot_descriptions/3.2.0-1"; + sha256 = "sha256-vX4ry2KiLwR4baEuSN0cpH53fZv98kDEciA7jryPH8I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/denso-robot-gazebo/default.nix b/distros/melodic/denso-robot-gazebo/default.nix index 731e1c1561..1f4d64fb38 100644 --- a/distros/melodic/denso-robot-gazebo/default.nix +++ b/distros/melodic/denso-robot-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-denso-robot-gazebo"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/denso_robot_gazebo/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "c7442f7cd0ba21a4ced665b742ba53c22d36ff9a03fa546d1415c969499aa65e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/denso_robot_gazebo/3.2.0-1"; + sha256 = "sha256-3Uc+hjqGn7XtwvGhgWWTb5m/33dJg7VCo2ZJ8NGkwsM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/denso-robot-moveit-config/default.nix b/distros/melodic/denso-robot-moveit-config/default.nix index 4a1d4667c0..91913a6fe7 100644 --- a/distros/melodic/denso-robot-moveit-config/default.nix +++ b/distros/melodic/denso-robot-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-denso-robot-moveit-config"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/denso_robot_moveit_config/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "399a482bbaf6ef0aa129e0607ebec00e9167e0b9230f0b94d271fdbae2fea7d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/denso_robot_moveit_config/3.2.0-1"; + sha256 = "sha256-mKoyHhKKMSM1/2nLjr6SWotdtdSUw2g51LemqqhIUKQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/denso-robot-ros/default.nix b/distros/melodic/denso-robot-ros/default.nix index 7aa919c8a4..52f5febba5 100644 --- a/distros/melodic/denso-robot-ros/default.nix +++ b/distros/melodic/denso-robot-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-denso-robot-ros"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/DENSORobot/denso_robot_ros-release/archive/release/melodic/denso_robot_ros/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "356d40c66bd94bd33f33913fd58789687500e1e653402b4f40b1c6799e33fd18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DENSORobot"; + repo = "denso_robot_ros-release"; + rev = "release/melodic/denso_robot_ros/3.2.0-1"; + sha256 = "sha256-RFVgNnVbkivy5EJkl2nafpkTNd5ZPdM4YNqQc6PZUT8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/depth-image-proc/default.nix b/distros/melodic/depth-image-proc/default.nix index 59df546204..562296efd9 100644 --- a/distros/melodic/depth-image-proc/default.nix +++ b/distros/melodic/depth-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-depth-image-proc"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/depth_image_proc/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "1a96a4b0043043f126f78236f49b335d69c163137c2a2b4af38db5e157e82289"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/melodic/depth_image_proc/1.15.2-1"; + sha256 = "sha256-kH6/mD8/ttC4mIR//pNObdt2OzpbKWaIIJOzQ7QWMGM="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-filters sensor-msgs stereo-msgs ]; diff --git a/distros/melodic/depthcloud-encoder/default.nix b/distros/melodic/depthcloud-encoder/default.nix index 0469914b57..7d5a173719 100644 --- a/distros/melodic/depthcloud-encoder/default.nix +++ b/distros/melodic/depthcloud-encoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-depthcloud-encoder"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/depthcloud_encoder-release/archive/release/melodic/depthcloud_encoder/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "cd0303245ac1fcc135761ad4d18dda3ed256e4165cf4fbbd6a4182037cecece6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "depthcloud_encoder-release"; + rev = "release/melodic/depthcloud_encoder/0.1.1-1"; + sha256 = "sha256-3DoHDLnNEC3hOiOEpTqH8T/rcSvbzKcoZ58na41a5X4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/depthimage-to-laserscan/default.nix b/distros/melodic/depthimage-to-laserscan/default.nix index 52884ee8a2..1561477452 100644 --- a/distros/melodic/depthimage-to-laserscan/default.nix +++ b/distros/melodic/depthimage-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-depthimage-to-laserscan"; version = "1.0.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/depthimage_to_laserscan-release/archive/release/melodic/depthimage_to_laserscan/1.0.8-0.tar.gz"; - name = "1.0.8-0.tar.gz"; - sha256 = "0620a9a74ab3a0601a55d1cbe593abe68bbc838ea3fb6a1dfa57ac7e6e3c10ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "depthimage_to_laserscan-release"; + rev = "release/melodic/depthimage_to_laserscan/1.0.8-0"; + sha256 = "sha256-zklPnFlu3CesAV/Nn4VBxDh6s1nsRgshyE9r46A2ZA0="; + }; buildType = "catkin"; buildInputs = [ catkin gtest ]; diff --git a/distros/melodic/derived-object-msgs/default.nix b/distros/melodic/derived-object-msgs/default.nix index 1353fc8dea..f144c0e127 100644 --- a/distros/melodic/derived-object-msgs/default.nix +++ b/distros/melodic/derived-object-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-derived-object-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/derived_object_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "643100d5f56828608ddd6648416bf3ddc08b5617ea211eba133fef3b0a3a7934"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/derived_object_msgs/3.0.2-1"; + sha256 = "sha256-wtD3ixCqLgLsnu/8wBZjoTkbnE+DcRKlA/jbKTMAz60="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/desistek-saga-control/default.nix b/distros/melodic/desistek-saga-control/default.nix index ddcd01fb16..1bd5ff5dd5 100644 --- a/distros/melodic/desistek-saga-control/default.nix +++ b/distros/melodic/desistek-saga-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-desistek-saga-control"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/uuvsimulator/desistek_saga-release/archive/release/melodic/desistek_saga_control/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "81fe5ef7f2ef085fcb784c8799971f63dd8f145ea59a04902b1adc9f04eda688"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "desistek_saga-release"; + rev = "release/melodic/desistek_saga_control/0.3.2-0"; + sha256 = "sha256-zztWgXl9XnBH7Xz+OKOiQJ43hmz4vvjFnseZts8+f8U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/desistek-saga-description/default.nix b/distros/melodic/desistek-saga-description/default.nix index e3c84ca9dd..e88e6f0335 100644 --- a/distros/melodic/desistek-saga-description/default.nix +++ b/distros/melodic/desistek-saga-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-desistek-saga-description"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/uuvsimulator/desistek_saga-release/archive/release/melodic/desistek_saga_description/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "1d23906087b0f5b4119ca5b63d3d621a40f93709a58a61fdab09330e3f712126"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "desistek_saga-release"; + rev = "release/melodic/desistek_saga_description/0.3.2-0"; + sha256 = "sha256-+tIUdWPSN40AxeFet2FdDqJ96MwExQo4UufUYDZMFj8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/desistek-saga-gazebo/default.nix b/distros/melodic/desistek-saga-gazebo/default.nix index fa37cc4ecb..07ab326740 100644 --- a/distros/melodic/desistek-saga-gazebo/default.nix +++ b/distros/melodic/desistek-saga-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-desistek-saga-gazebo"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/uuvsimulator/desistek_saga-release/archive/release/melodic/desistek_saga_gazebo/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "534d7e4e5fb0ab7d099d6e20561f3ac9275f98a06e13e59ca92b1b0114fb2911"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "desistek_saga-release"; + rev = "release/melodic/desistek_saga_gazebo/0.3.2-0"; + sha256 = "sha256-Y6v5S5aXbkXqDWYUlBvZzl6A7cuZorWLey5jDq/D8ZI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/desktop-full/default.nix b/distros/melodic/desktop-full/default.nix index 4115291c22..e576b89482 100644 --- a/distros/melodic/desktop-full/default.nix +++ b/distros/melodic/desktop-full/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-desktop-full"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/melodic/desktop_full/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "236064fd3c4cccc5327f1ac4c951c70762a1f6c88e9faa521251f78e26ea987b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/melodic/desktop_full/1.4.1-0"; + sha256 = "sha256-Um/GN6nZSPVdK56i9ovMDgBdSkBXNqBCcjygBiCGgeE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/desktop/default.nix b/distros/melodic/desktop/default.nix index aa08400f6c..b6eb1da6ba 100644 --- a/distros/melodic/desktop/default.nix +++ b/distros/melodic/desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-desktop"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/melodic/desktop/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "4d24671184136e854522257de40f9ce4b618b16ffeaa478f9a25c34d95cd8bc5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/melodic/desktop/1.4.1-0"; + sha256 = "sha256-kdth0D9c1qDEQxDTRk8f9UK43u5h3NDkmUBVK+5j6W0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/diagnostic-aggregator/default.nix b/distros/melodic/diagnostic-aggregator/default.nix index 6c772c233f..13215d02fc 100644 --- a/distros/melodic/diagnostic-aggregator/default.nix +++ b/distros/melodic/diagnostic-aggregator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-diagnostic-aggregator"; version = "1.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostic_aggregator/1.9.7-1.tar.gz"; - name = "1.9.7-1.tar.gz"; - sha256 = "1cba04421e31f4da80bddf6edd60c08b13c98cdb62ab3bfdf496517d752924b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/melodic/diagnostic_aggregator/1.9.7-1"; + sha256 = "sha256-GM24c/sOlOi1+V7WpQFYURvxUFZPGBM0iQlHtja93Us="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/diagnostic-analysis/default.nix b/distros/melodic/diagnostic-analysis/default.nix index 8de17c622c..1aa1d3364a 100644 --- a/distros/melodic/diagnostic-analysis/default.nix +++ b/distros/melodic/diagnostic-analysis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-diagnostic-analysis"; version = "1.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostic_analysis/1.9.7-1.tar.gz"; - name = "1.9.7-1.tar.gz"; - sha256 = "e38eb20f984ae213806289f7c7ee095f6af5acb8b4163aecfc20b9cf668e043f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/melodic/diagnostic_analysis/1.9.7-1"; + sha256 = "sha256-bhxF2+hXdwbAbIMtnZUnp7Le+w9Vk6ygjGQnJj+hR6s="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/diagnostic-common-diagnostics/default.nix b/distros/melodic/diagnostic-common-diagnostics/default.nix index d7db7a032b..4874f50409 100644 --- a/distros/melodic/diagnostic-common-diagnostics/default.nix +++ b/distros/melodic/diagnostic-common-diagnostics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-diagnostic-common-diagnostics"; version = "1.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostic_common_diagnostics/1.9.7-1.tar.gz"; - name = "1.9.7-1.tar.gz"; - sha256 = "40fa72958c582a7ac95fdcae430f79354d4308c847cdb4c59d1dfd837152c99d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/melodic/diagnostic_common_diagnostics/1.9.7-1"; + sha256 = "sha256-n7XzgIBBedz1nCC5tjiZd2W80jeUT0+9eTr/sEhIEB4="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/diagnostic-msgs/default.nix b/distros/melodic/diagnostic-msgs/default.nix index f3d48ef84c..b453d74667 100644 --- a/distros/melodic/diagnostic-msgs/default.nix +++ b/distros/melodic/diagnostic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-diagnostic-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/diagnostic_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "060557501838ace8ebd510d1e606420cd0fa1c82c2212553d671aed0193a2fc0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/diagnostic_msgs/1.12.8-1"; + sha256 = "sha256-rK8YITG7K6I0khbM8h5LRSp7WP99fMbaWzeUKPDNep4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/diagnostic-updater/default.nix b/distros/melodic/diagnostic-updater/default.nix index 925a3c12d6..2fcf9aeb4f 100644 --- a/distros/melodic/diagnostic-updater/default.nix +++ b/distros/melodic/diagnostic-updater/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-diagnostic-updater"; version = "1.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostic_updater/1.9.7-1.tar.gz"; - name = "1.9.7-1.tar.gz"; - sha256 = "5632f9e9b9d63ff2b6d0635d7e68ab4da1d9cf26494856002d36a3e63ecbf273"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/melodic/diagnostic_updater/1.9.7-1"; + sha256 = "sha256-4ITs6HjTgox/BCJgbb85QTHZ2YuHTDqybCyggqR1Kgo="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/diagnostics/default.nix b/distros/melodic/diagnostics/default.nix index 4926af584c..7b357cd74d 100644 --- a/distros/melodic/diagnostics/default.nix +++ b/distros/melodic/diagnostics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-diagnostics"; version = "1.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostics/1.9.7-1.tar.gz"; - name = "1.9.7-1.tar.gz"; - sha256 = "71d2509b1354fbeb88059ef74d45aeed281fd0e8b7d48fc66fc90f6b063a802b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/melodic/diagnostics/1.9.7-1"; + sha256 = "sha256-Biu99cahfaaJVaQtB8HgCvhVNVQd8Jdo76cosf5cvPM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/diff-drive-controller/default.nix b/distros/melodic/diff-drive-controller/default.nix index 6562d58e96..ed4056e163 100644 --- a/distros/melodic/diff-drive-controller/default.nix +++ b/distros/melodic/diff-drive-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-diff-drive-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/diff_drive_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "ffc17987a71bd6bee3e0224ff9f04d6fdffd5909cdf6e9cf4510902768929710"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/diff_drive_controller/0.17.2-1"; + sha256 = "sha256-n+Sc2ejqX0kkjVeQCYA0CShdbFPizuCnsjqOcRRyf7s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dijkstra-mesh-planner/default.nix b/distros/melodic/dijkstra-mesh-planner/default.nix index 82d7426c84..f56af00fc9 100644 --- a/distros/melodic/dijkstra-mesh-planner/default.nix +++ b/distros/melodic/dijkstra-mesh-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dijkstra-mesh-planner"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/melodic/dijkstra_mesh_planner/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "9b0df6ecfa43cd8dde6d68e8253170f015448b0d74338fe1214af831d4771d9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/melodic/dijkstra_mesh_planner/1.0.1-1"; + sha256 = "sha256-0jcTvJztBd30A7Qi+8EC432y/Kq2LavgyO4SVDU+nCY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dingo-control/default.nix b/distros/melodic/dingo-control/default.nix index dd4a803c59..b709fd53b7 100644 --- a/distros/melodic/dingo-control/default.nix +++ b/distros/melodic/dingo-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dingo-control"; version = "0.1.12-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo-release/archive/release/melodic/dingo_control/0.1.12-2.tar.gz"; - name = "0.1.12-2.tar.gz"; - sha256 = "5c1d0f0b180e99178dc7b9b588c6891dcda9c47821d5c4cae2f254867940d78e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo-release"; + rev = "release/melodic/dingo_control/0.1.12-2"; + sha256 = "sha256-39cBJ5XCP5VqtUZlrzAIMpvBzeu7tBkSU/39sNOiafk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dingo-description/default.nix b/distros/melodic/dingo-description/default.nix index 2c3d660180..88f5f75eb9 100644 --- a/distros/melodic/dingo-description/default.nix +++ b/distros/melodic/dingo-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dingo-description"; version = "0.1.12-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo-release/archive/release/melodic/dingo_description/0.1.12-2.tar.gz"; - name = "0.1.12-2.tar.gz"; - sha256 = "a48c399b727160f21224a5ae85179322ebfe515cd6001b9713467e028b769682"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo-release"; + rev = "release/melodic/dingo_description/0.1.12-2"; + sha256 = "sha256-9auaDBhNJyrG46HbPTPiV7lxLl6NKszN1AhO7ep4UQ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dingo-desktop/default.nix b/distros/melodic/dingo-desktop/default.nix index 573ea38f15..93f38f91af 100644 --- a/distros/melodic/dingo-desktop/default.nix +++ b/distros/melodic/dingo-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dingo-desktop"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo_desktop-release/archive/release/melodic/dingo_desktop/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "783a5da55c27e4175f547cbe6894001f3792040759fcbbc4e9d56f65b801d4ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo_desktop-release"; + rev = "release/melodic/dingo_desktop/0.1.1-1"; + sha256 = "sha256-mt70lJ4KDtvQWqnlsuB1OGuylAfInV6alQ+HoV77Li0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dingo-gazebo/default.nix b/distros/melodic/dingo-gazebo/default.nix index ccbc91a461..a21c37174a 100644 --- a/distros/melodic/dingo-gazebo/default.nix +++ b/distros/melodic/dingo-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dingo-gazebo"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo_simulator-release/archive/release/melodic/dingo_gazebo/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "fa86b9d84e6fdf5acd6654b58e57c061f661b15038eeeb79d5f4a2890064f39f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo_simulator-release"; + rev = "release/melodic/dingo_gazebo/0.1.1-1"; + sha256 = "sha256-4ghgMo3ectl8JNje839fy5GJGW0m/DSO1b9dmmWQExA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dingo-msgs/default.nix b/distros/melodic/dingo-msgs/default.nix index 7b1b48f98a..1784180f10 100644 --- a/distros/melodic/dingo-msgs/default.nix +++ b/distros/melodic/dingo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dingo-msgs"; version = "0.1.12-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo-release/archive/release/melodic/dingo_msgs/0.1.12-2.tar.gz"; - name = "0.1.12-2.tar.gz"; - sha256 = "f81569804a43200d0395f1d764ac4b8ff5db27aa221ef8dc646dd75229607561"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo-release"; + rev = "release/melodic/dingo_msgs/0.1.12-2"; + sha256 = "sha256-pc22/nrxVRuNPdVBMsHNJeFcHxUJkiinfFh5BsxOk98="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dingo-navigation/default.nix b/distros/melodic/dingo-navigation/default.nix index bae0ce2d4e..408a09a3f3 100644 --- a/distros/melodic/dingo-navigation/default.nix +++ b/distros/melodic/dingo-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dingo-navigation"; version = "0.1.12-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo-release/archive/release/melodic/dingo_navigation/0.1.12-2.tar.gz"; - name = "0.1.12-2.tar.gz"; - sha256 = "350629950a4bae0680de0d049ab76c51dea5f60f341e515250c7eec7ff6eef94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo-release"; + rev = "release/melodic/dingo_navigation/0.1.12-2"; + sha256 = "sha256-F7TE56jltwuLRT7b6gaAbQvEOCiedIEMk2hrQLlvwWI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dingo-simulator/default.nix b/distros/melodic/dingo-simulator/default.nix index b4a10bc93d..54bbbb09a4 100644 --- a/distros/melodic/dingo-simulator/default.nix +++ b/distros/melodic/dingo-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dingo-simulator"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo_simulator-release/archive/release/melodic/dingo_simulator/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "a00831f9eb08f30fdb5f6ab2d00952cd89454fce024dff8b9ab58888fcfe1ed5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo_simulator-release"; + rev = "release/melodic/dingo_simulator/0.1.1-1"; + sha256 = "sha256-9NyRnFXS1gBIkjm/KniByJ8VwPTiYOlSd6srsLkqtZk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dingo-viz/default.nix b/distros/melodic/dingo-viz/default.nix index 64a2016c1e..78f7e4f89f 100644 --- a/distros/melodic/dingo-viz/default.nix +++ b/distros/melodic/dingo-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dingo-viz"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo_desktop-release/archive/release/melodic/dingo_viz/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "e9b4282d6e944beda9b5be7a53f385c0b8a4ce0b0c8f1ae1c08ff6a5544eebcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo_desktop-release"; + rev = "release/melodic/dingo_viz/0.1.1-1"; + sha256 = "sha256-IGPvo5OSnIyMik+askiIoowplG4Soh5t1TwuaNrJfcc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/distance-map-core/default.nix b/distros/melodic/distance-map-core/default.nix index 5d1ddaddf5..c81ee1fff0 100644 --- a/distros/melodic/distance-map-core/default.nix +++ b/distros/melodic/distance-map-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-distance-map-core"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/artivis/distance_map-release/archive/release/melodic/distance_map_core/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "281115ed9ad36366fedc4b2b84245e907975f598c2ae1a6be6bed67cf5e31b50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artivis"; + repo = "distance_map-release"; + rev = "release/melodic/distance_map_core/0.1.0-1"; + sha256 = "sha256-ZX2F0CG5GzqPcHvfnkK5kpVOfy3MCnP4urynoHKMJQc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/distance-map-deadreck/default.nix b/distros/melodic/distance-map-deadreck/default.nix index ad80ee388d..de55b360c4 100644 --- a/distros/melodic/distance-map-deadreck/default.nix +++ b/distros/melodic/distance-map-deadreck/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-distance-map-deadreck"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/artivis/distance_map-release/archive/release/melodic/distance_map_deadreck/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "8a15566ebd8f5a596780668824ad86528c57a0649bc8d00de146f124ceae396e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artivis"; + repo = "distance_map-release"; + rev = "release/melodic/distance_map_deadreck/0.1.0-1"; + sha256 = "sha256-QzO3vOuIzCCiVGD6DBodTb+pIWd8M/xpst20UNvPpEI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/distance-map-msgs/default.nix b/distros/melodic/distance-map-msgs/default.nix index 69eb835447..cd2f3552d8 100644 --- a/distros/melodic/distance-map-msgs/default.nix +++ b/distros/melodic/distance-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-distance-map-msgs"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/artivis/distance_map-release/archive/release/melodic/distance_map_msgs/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "6e42332f75de13d580826ac98f1d6ccead3ea761d88f09c0ced6047494abbf39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artivis"; + repo = "distance_map-release"; + rev = "release/melodic/distance_map_msgs/0.1.0-1"; + sha256 = "sha256-8shkyXvuEQ06HU5otmpVOjvWBQWPlyq9Y/bEDhlsABM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/distance-map-node/default.nix b/distros/melodic/distance-map-node/default.nix index a6bd573d52..7a9401afb5 100644 --- a/distros/melodic/distance-map-node/default.nix +++ b/distros/melodic/distance-map-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-distance-map-node"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/artivis/distance_map-release/archive/release/melodic/distance_map_node/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "b46d36b7c07bf2ad49b711846486be9fe3f9fa625d05fa9c3b1445c05f03268c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artivis"; + repo = "distance_map-release"; + rev = "release/melodic/distance_map_node/0.1.0-1"; + sha256 = "sha256-dnGv+htkZZpgiaXGSkvPwVo+AFXq0g4nR2YjQopir8c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/distance-map-opencv/default.nix b/distros/melodic/distance-map-opencv/default.nix index 14d02140ae..641debfa01 100644 --- a/distros/melodic/distance-map-opencv/default.nix +++ b/distros/melodic/distance-map-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-distance-map-opencv"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/artivis/distance_map-release/archive/release/melodic/distance_map_opencv/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "391ef19d3ae55b03cdf3e80337d80a73134c2cd1d7fc93fdaf6474bd5c995ca8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artivis"; + repo = "distance_map-release"; + rev = "release/melodic/distance_map_opencv/0.1.0-1"; + sha256 = "sha256-WOwgXIRToKVPXALyxmoDHYRQLj8ZC2S/xCCWS66OcE8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/distance-map-rviz/default.nix b/distros/melodic/distance-map-rviz/default.nix index 91516c40a8..ae788e7d24 100644 --- a/distros/melodic/distance-map-rviz/default.nix +++ b/distros/melodic/distance-map-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-distance-map-rviz"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/artivis/distance_map-release/archive/release/melodic/distance_map_rviz/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "48414b67479cb1599a9db7e86b79373a418977221e0e95158776496dc5b2b2f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artivis"; + repo = "distance_map-release"; + rev = "release/melodic/distance_map_rviz/0.1.0-1"; + sha256 = "sha256-eJPG6pMVVsWCPE+WZX7WA7tOIStN7y/jJiPLEQrdz2A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/distance-map-tools/default.nix b/distros/melodic/distance-map-tools/default.nix index ceb592182e..528617d7b2 100644 --- a/distros/melodic/distance-map-tools/default.nix +++ b/distros/melodic/distance-map-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-distance-map-tools"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/artivis/distance_map-release/archive/release/melodic/distance_map_tools/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "92f4b8ac7e83d90aae1f555aa63ccd8de442b6a6737464c648ab6c0d363d451a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artivis"; + repo = "distance_map-release"; + rev = "release/melodic/distance_map_tools/0.1.0-1"; + sha256 = "sha256-TXf+kMoJXsrddThrtTLT3r27lJXS6Eqai0i7puZtVy8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/distance-map/default.nix b/distros/melodic/distance-map/default.nix index db5919f8fe..84e1b934ee 100644 --- a/distros/melodic/distance-map/default.nix +++ b/distros/melodic/distance-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-distance-map"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/artivis/distance_map-release/archive/release/melodic/distance_map/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "262190723b5fa17407d598707e424582868c71fa6848ecf408d7208ecb2b74d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "artivis"; + repo = "distance_map-release"; + rev = "release/melodic/distance_map/0.1.0-1"; + sha256 = "sha256-fGNcnzSulyEi380yHHbHgXhzsy2n/KXBMtOVhBmwF1c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dlux-global-planner/default.nix b/distros/melodic/dlux-global-planner/default.nix index 6ff621597e..d13bddc9a2 100644 --- a/distros/melodic/dlux-global-planner/default.nix +++ b/distros/melodic/dlux-global-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dlux-global-planner"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/dlux_global_planner/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "a5b6a4db7296280ca5a7bc11e95f0b04e35debd2dc299049d8332a8686f1811c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/dlux_global_planner/0.3.0-1"; + sha256 = "sha256-OSlXeQlZnJB759cHvzqTT/tV8nMf5orWfAQEtcTey2s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dlux-plugins/default.nix b/distros/melodic/dlux-plugins/default.nix index 6ae297b2f0..df3a048c12 100644 --- a/distros/melodic/dlux-plugins/default.nix +++ b/distros/melodic/dlux-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dlux-plugins"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/dlux_plugins/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "808a7a1c10ea340eb062a34d08d03d980eeb14084598245ef80282d007b9e616"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/dlux_plugins/0.3.0-1"; + sha256 = "sha256-cbK7cbBHwhSSO1pxlCKDM7DruFzBRGE+iyxxWgdGDt8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dockeros/default.nix b/distros/melodic/dockeros/default.nix index 80e5265cb5..1a66f62652 100644 --- a/distros/melodic/dockeros/default.nix +++ b/distros/melodic/dockeros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dockeros"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ct2034/dockeros-release/archive/release/melodic/dockeros/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "5c2e6a8bcf8bf6db553a1d597f143037da1ee614a3ef62d633ccf602de779c74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ct2034"; + repo = "dockeros-release"; + rev = "release/melodic/dockeros/1.1.0-1"; + sha256 = "sha256-IYlgDWUE3f+cVo9D61AQmcwLtD1gaUjwWf/YduCyi+A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/downward/default.nix b/distros/melodic/downward/default.nix index 8fe12c0270..73b9aef67d 100644 --- a/distros/melodic/downward/default.nix +++ b/distros/melodic/downward/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-downward"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/downward/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "9fe3d8f1499291060044573cdd470514331ebe1f4297b3c8de8eede9a49959ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/downward/2.1.24-2"; + sha256 = "sha256-0pd/HaQl8Pk+vrsjE/wGK85KeLx843ZhmIb3GeocJQg="; + }; buildType = "catkin"; buildInputs = [ bison cacert catkin flex python rostest ]; diff --git a/distros/melodic/driver-base/default.nix b/distros/melodic/driver-base/default.nix index 5c6eefe1fb..bd0e5fa066 100644 --- a/distros/melodic/driver-base/default.nix +++ b/distros/melodic/driver-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-driver-base"; version = "1.6.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/driver_common-release/archive/release/melodic/driver_base/1.6.8-0.tar.gz"; - name = "1.6.8-0.tar.gz"; - sha256 = "8f279b3f0297b7798e82dd8d88949507d9dfa4dc58641d6c8d7ec66f65a70c19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "driver_common-release"; + rev = "release/melodic/driver_base/1.6.8-0"; + sha256 = "sha256-u/F3YIOJwHmgKN/hg9m5VF2KqH4dutfdi2VAbGy8R6g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/driver-common/default.nix b/distros/melodic/driver-common/default.nix index f5d9d403ec..b2f00963d5 100644 --- a/distros/melodic/driver-common/default.nix +++ b/distros/melodic/driver-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-driver-common"; version = "1.6.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/driver_common-release/archive/release/melodic/driver_common/1.6.8-0.tar.gz"; - name = "1.6.8-0.tar.gz"; - sha256 = "ea3516b1e1c6ad29343302b5c174ea896dc280f60800fe0c6d0e34e08b31d465"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "driver_common-release"; + rev = "release/melodic/driver_common/1.6.8-0"; + sha256 = "sha256-njbzXRmDI9BpWWnrvU3mpbei4LmAZKauoG2YYFLdgF8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/drone-assets/default.nix b/distros/melodic/drone-assets/default.nix index e7dae35395..4d9f057427 100644 --- a/distros/melodic/drone-assets/default.nix +++ b/distros/melodic/drone-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-drone-assets"; version = "1.3.10-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/melodic/drone_assets/1.3.10-1.tar.gz"; - name = "1.3.10-1.tar.gz"; - sha256 = "30c14c93d4bed3552a6f521ca2ca0e00e86943614bc26864641e27520fcd5e88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/melodic/drone_assets/1.3.10-1"; + sha256 = "sha256-LXCreq+AP/k9V0u9lFSWRxVdiFA45lGM+Yb33fCoyDA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/drone-wrapper/default.nix b/distros/melodic/drone-wrapper/default.nix index 485a7058c2..63b6baee6d 100644 --- a/distros/melodic/drone-wrapper/default.nix +++ b/distros/melodic/drone-wrapper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-drone-wrapper"; version = "1.3.10-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/melodic/drone_wrapper/1.3.10-1.tar.gz"; - name = "1.3.10-1.tar.gz"; - sha256 = "b24352ca3298628b35cfb8b980a1a1954c380fab351f91d3fb0654650e4e1d6e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/melodic/drone_wrapper/1.3.10-1"; + sha256 = "sha256-l7OrpI+NQ5BSxTEaFFVqtsis5P3bsGu/8pcgDUxbR2k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dual-quaternions-ros/default.nix b/distros/melodic/dual-quaternions-ros/default.nix index 2d65a00490..7b8b6fa8e5 100644 --- a/distros/melodic/dual-quaternions-ros/default.nix +++ b/distros/melodic/dual-quaternions-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dual-quaternions-ros"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/Achllle/dual_quaternions_ros-release/archive/release/melodic/dual_quaternions_ros/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "66a4e3cebb3779e92bd153e90a2dc8b3bdc93e9276faebc39e46812390ffa21b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Achllle"; + repo = "dual_quaternions_ros-release"; + rev = "release/melodic/dual_quaternions_ros/0.1.4-1"; + sha256 = "sha256-9HlzJw1t6/8gkDmdGVExS7qxjWPEriEnJ2kSy5DZCqs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dual-quaternions/default.nix b/distros/melodic/dual-quaternions/default.nix index 5920ad4ee0..dbb8dc2868 100644 --- a/distros/melodic/dual-quaternions/default.nix +++ b/distros/melodic/dual-quaternions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dual-quaternions"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/Achllle/dual_quaternions-release/archive/release/melodic/dual_quaternions/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "7a453c19f652fa6d610a8ae72fc585e71458d7f382c0f7328a4c78b8e63eaadf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Achllle"; + repo = "dual_quaternions-release"; + rev = "release/melodic/dual_quaternions/0.3.2-1"; + sha256 = "sha256-MqSy4w6xMyoGTBTkUhni7eHaHhByXTQ1FXJPUd3du2c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dwa-local-planner/default.nix b/distros/melodic/dwa-local-planner/default.nix index 41998b6c1a..a3a5c10d23 100644 --- a/distros/melodic/dwa-local-planner/default.nix +++ b/distros/melodic/dwa-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dwa-local-planner"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/dwa_local_planner/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "7c1f6b22e578a0f305d7bd3665ee3aacedace301264626fd773f77e21dd761fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/dwa_local_planner/1.16.7-1"; + sha256 = "sha256-AMKoNm9w6YyZo9wY4/kqtgcXSYa3Otma3J++ZWc/QPA="; + }; buildType = "catkin"; buildInputs = [ angles catkin cmake-modules ]; diff --git a/distros/melodic/dwb-critics/default.nix b/distros/melodic/dwb-critics/default.nix index 79811d5086..88893112c9 100644 --- a/distros/melodic/dwb-critics/default.nix +++ b/distros/melodic/dwb-critics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dwb-critics"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/dwb_critics/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "a9c0885092dc161332ea1bca9947fb2412e4c24e22dd3b23f7cc6803b0e51e13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/dwb_critics/0.3.0-1"; + sha256 = "sha256-MyM84eSOh0gn4PzmD43SLU4vdAXBWmKf1kiPHNZo8hs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dwb-local-planner/default.nix b/distros/melodic/dwb-local-planner/default.nix index 133f9403fe..2ab463bdf7 100644 --- a/distros/melodic/dwb-local-planner/default.nix +++ b/distros/melodic/dwb-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dwb-local-planner"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/dwb_local_planner/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "5048db7129b2998db07653a76f3d354e3fb60a0fe3ede6eecadc079893aa1ae6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/dwb_local_planner/0.3.0-1"; + sha256 = "sha256-YCDNfEipWTd+F6LZgOzfAaYti0HSZN0iB9+ys2VMJeg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dwb-msgs/default.nix b/distros/melodic/dwb-msgs/default.nix index b1363d0ac7..787c169800 100644 --- a/distros/melodic/dwb-msgs/default.nix +++ b/distros/melodic/dwb-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dwb-msgs"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/dwb_msgs/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "5769cd1bf4f0ba369d9884e9d698f1170f993c68acd5bc97f37b20411ea9a2f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/dwb_msgs/0.3.0-1"; + sha256 = "sha256-AUVn4fevlMcQ10D5u/tEL7RZsP8uMp/jgl12H5/qAew="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dwb-plugins/default.nix b/distros/melodic/dwb-plugins/default.nix index ab3bd0ac73..df53cce47c 100644 --- a/distros/melodic/dwb-plugins/default.nix +++ b/distros/melodic/dwb-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dwb-plugins"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/dwb_plugins/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "e9326875f9630b6e0b1cdc3a465656c025bace6c19f912f48f5d9b014e378831"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/dwb_plugins/0.3.0-1"; + sha256 = "sha256-g+lpZ8y1bUhBsuLA62dzlb/nr+ejIQyTg3wGkMn7B9c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dynamic-edt-3d/default.nix b/distros/melodic/dynamic-edt-3d/default.nix index d1a830023e..b3f9880a91 100644 --- a/distros/melodic/dynamic-edt-3d/default.nix +++ b/distros/melodic/dynamic-edt-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamic-edt-3d"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/melodic/dynamic_edt_3d/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "03b45d87c83b117ff3202a82849b1f7cc07c2d0a4624c2b001abb92539330a55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/melodic/dynamic_edt_3d/1.9.8-1"; + sha256 = "sha256-522JD7zQBjHhrle/McBU6igMD2aGFVJvyheYkpGEJ3g="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/dynamic-graph-python/default.nix b/distros/melodic/dynamic-graph-python/default.nix index 0242c4e352..2065a8498c 100644 --- a/distros/melodic/dynamic-graph-python/default.nix +++ b/distros/melodic/dynamic-graph-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamic-graph-python"; version = "4.0.10-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/dynamic-graph-python-ros-release/archive/release/melodic/dynamic-graph-python/4.0.10-1.tar.gz"; - name = "4.0.10-1.tar.gz"; - sha256 = "327fc9150c392aa5663dc9a3bb1b5bed6351691f559260fd4cafce1d6c1efb51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "dynamic-graph-python-ros-release"; + rev = "release/melodic/dynamic-graph-python/4.0.10-1"; + sha256 = "sha256-eYwanDYP9SIMHeP5L6JLHIL8XUPkCf3k8IntZv0mWOM="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/melodic/dynamic-graph-tutorial/default.nix b/distros/melodic/dynamic-graph-tutorial/default.nix index cc01ecc1cb..24221388f1 100644 --- a/distros/melodic/dynamic-graph-tutorial/default.nix +++ b/distros/melodic/dynamic-graph-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamic-graph-tutorial"; version = "1.3.5-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/dynamic-graph-tutorial-ros-release/archive/release/melodic/dynamic-graph-tutorial/1.3.5-1.tar.gz"; - name = "1.3.5-1.tar.gz"; - sha256 = "d85ac43d800e7d74f365de3cf8d176bba7fbb47390ee7cffa0f540ccd2a8e327"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "dynamic-graph-tutorial-ros-release"; + rev = "release/melodic/dynamic-graph-tutorial/1.3.5-1"; + sha256 = "sha256-ELnfC/MTzDXBwxQsoY5Lmi/vhD8Kgs7SUqGPGJa0Efo="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen dynamic-graph dynamic-graph-python git ]; diff --git a/distros/melodic/dynamic-graph/default.nix b/distros/melodic/dynamic-graph/default.nix index e8b2b192a2..b88fc5f243 100644 --- a/distros/melodic/dynamic-graph/default.nix +++ b/distros/melodic/dynamic-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamic-graph"; version = "4.4.3-r2"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/dynamic-graph-ros-release/archive/release/melodic/dynamic-graph/4.4.3-2.tar.gz"; - name = "4.4.3-2.tar.gz"; - sha256 = "682d9e824e906f919778385d2244548da52656b31b1f34f9704c859c152fd001"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "dynamic-graph-ros-release"; + rev = "release/melodic/dynamic-graph/4.4.3-2"; + sha256 = "sha256-ZjYVYmbMDjUMw0P7+KODSEEm94FSWSkq9bG/x6JNFYY="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/melodic/dynamic-reconfigure/default.nix b/distros/melodic/dynamic-reconfigure/default.nix index f6827da1f0..3d5a51f03e 100644 --- a/distros/melodic/dynamic-reconfigure/default.nix +++ b/distros/melodic/dynamic-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamic-reconfigure"; version = "1.6.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/dynamic_reconfigure-release/archive/release/melodic/dynamic_reconfigure/1.6.5-1.tar.gz"; - name = "1.6.5-1.tar.gz"; - sha256 = "5e609322e2ed6ab0698b93ffa4fd89c7fee57f5e08ec4cc881e5f8246e9707b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "dynamic_reconfigure-release"; + rev = "release/melodic/dynamic_reconfigure/1.6.5-1"; + sha256 = "sha256-nBElSKQedu4IPWbZ3onF+KWPJs7+MmqCWN6Gi9tYlRY="; + }; buildType = "catkin"; buildInputs = [ catkin cpp-common message-generation roscpp-serialization rostest ]; diff --git a/distros/melodic/dynamic-robot-state-publisher/default.nix b/distros/melodic/dynamic-robot-state-publisher/default.nix index cdda20aee7..c21094a8e1 100644 --- a/distros/melodic/dynamic-robot-state-publisher/default.nix +++ b/distros/melodic/dynamic-robot-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamic-robot-state-publisher"; version = "1.1.1"; - src = fetchurl { - url = "https://github.com/peci1/dynamic_robot_state_publisher-release/archive/release/melodic/dynamic_robot_state_publisher/1.1.1-0.tar.gz"; - name = "1.1.1-0.tar.gz"; - sha256 = "d31428da9f939d33337bd61e9cefca16a4d820d208c3d75637999dc912d6629e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "dynamic_robot_state_publisher-release"; + rev = "release/melodic/dynamic_robot_state_publisher/1.1.1-0"; + sha256 = "sha256-EmDpoWBb6zz4LdPdP3HWXsKRRfIVf8mo+439mgi/Cxc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dynamic-tf-publisher/default.nix b/distros/melodic/dynamic-tf-publisher/default.nix index b091a0e525..a5bcd897d4 100644 --- a/distros/melodic/dynamic-tf-publisher/default.nix +++ b/distros/melodic/dynamic-tf-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamic-tf-publisher"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/dynamic_tf_publisher/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "6fe4cbaddcfc91c3e9e36ffc338bff1d07dc6d79f7126b789fcd292927e8e2db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/dynamic_tf_publisher/2.2.12-1"; + sha256 = "sha256-SvIdIgTT5O7cGJNR73ecMOhdNOygMflMdawhghm2A+Y="; + }; buildType = "catkin"; buildInputs = [ catkin dynamic-reconfigure message-generation ]; diff --git a/distros/melodic/dynamixel-sdk-examples/default.nix b/distros/melodic/dynamixel-sdk-examples/default.nix index 078002c2dc..af5b2f0b81 100644 --- a/distros/melodic/dynamixel-sdk-examples/default.nix +++ b/distros/melodic/dynamixel-sdk-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamixel-sdk-examples"; version = "3.7.51-r4"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/DynamixelSDK-release/archive/release/melodic/dynamixel_sdk_examples/3.7.51-4.tar.gz"; - name = "3.7.51-4.tar.gz"; - sha256 = "3a0fe8ed9053aaa5d2eae92dd76596a5d9d2917d8296733f5a3c4a842112ece2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "DynamixelSDK-release"; + rev = "release/melodic/dynamixel_sdk_examples/3.7.51-4"; + sha256 = "sha256-Qo9VFpdJf9QyrQ5wFCLCVNtszTR25Pnda+6EAe3Mo9Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dynamixel-sdk/default.nix b/distros/melodic/dynamixel-sdk/default.nix index 7085c7c79e..876de232ea 100644 --- a/distros/melodic/dynamixel-sdk/default.nix +++ b/distros/melodic/dynamixel-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamixel-sdk"; version = "3.7.51-r4"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/DynamixelSDK-release/archive/release/melodic/dynamixel_sdk/3.7.51-4.tar.gz"; - name = "3.7.51-4.tar.gz"; - sha256 = "9acbf98d3e733be9a321c31816c0beddd5bacff6dc266775c35fb455a31c6a3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "DynamixelSDK-release"; + rev = "release/melodic/dynamixel_sdk/3.7.51-4"; + sha256 = "sha256-wTXs6YQHEhPL8cckdQ0sDogjfCPmOEQpGhWi5ao5EkU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dynamixel-workbench-controllers/default.nix b/distros/melodic/dynamixel-workbench-controllers/default.nix index 97c5c79adc..ea24d9da74 100644 --- a/distros/melodic/dynamixel-workbench-controllers/default.nix +++ b/distros/melodic/dynamixel-workbench-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamixel-workbench-controllers"; version = "2.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-release/archive/release/melodic/dynamixel_workbench_controllers/2.2.0-0.tar.gz"; - name = "2.2.0-0.tar.gz"; - sha256 = "ee8de0278f4e337efe849f3bbf7347151e0f53d1b1e386d9bdb36811337ac062"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-release"; + rev = "release/melodic/dynamixel_workbench_controllers/2.2.0-0"; + sha256 = "sha256-OEukuw01/OJ4FhFbr1rgRFIbDwHwbEsoyKv1slSJbO4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dynamixel-workbench-msgs/default.nix b/distros/melodic/dynamixel-workbench-msgs/default.nix index 5a87c3d69b..3ba1ce41bd 100644 --- a/distros/melodic/dynamixel-workbench-msgs/default.nix +++ b/distros/melodic/dynamixel-workbench-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamixel-workbench-msgs"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-msgs-release/archive/release/melodic/dynamixel_workbench_msgs/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "28cc9426aa876bb8a64ed009d5683a61c547ff9b4926c68556e1a434065a8b18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-msgs-release"; + rev = "release/melodic/dynamixel_workbench_msgs/2.0.1-0"; + sha256 = "sha256-U6Mv9XdTnO0prCwU7Bg8uadBljqtqM2uZp7wHC7pSvU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/dynamixel-workbench-operators/default.nix b/distros/melodic/dynamixel-workbench-operators/default.nix index d7a0ab85ba..96e28605e2 100644 --- a/distros/melodic/dynamixel-workbench-operators/default.nix +++ b/distros/melodic/dynamixel-workbench-operators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamixel-workbench-operators"; version = "2.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-release/archive/release/melodic/dynamixel_workbench_operators/2.2.0-0.tar.gz"; - name = "2.2.0-0.tar.gz"; - sha256 = "7ee54432acff98b57a6111d496c3eb74fb34d0e324f2087c6c2d4cce29a3c47e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-release"; + rev = "release/melodic/dynamixel_workbench_operators/2.2.0-0"; + sha256 = "sha256-ZhdTeSc1rQZgLZSpzPGjGz6Q/EuqHhe5dWZY462X6MM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dynamixel-workbench-toolbox/default.nix b/distros/melodic/dynamixel-workbench-toolbox/default.nix index a7bbd47c0f..7f8edaef43 100644 --- a/distros/melodic/dynamixel-workbench-toolbox/default.nix +++ b/distros/melodic/dynamixel-workbench-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamixel-workbench-toolbox"; version = "2.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-release/archive/release/melodic/dynamixel_workbench_toolbox/2.2.0-0.tar.gz"; - name = "2.2.0-0.tar.gz"; - sha256 = "53f4f6fd40d99a4559a67bacfc26e637d546ad455128380596ef8464ba639c70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-release"; + rev = "release/melodic/dynamixel_workbench_toolbox/2.2.0-0"; + sha256 = "sha256-7vvHlRalfjzOdTs1/wh+wepth5OJywzh1kj3CRLe2Hw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/dynamixel-workbench/default.nix b/distros/melodic/dynamixel-workbench/default.nix index 6b19e56764..09266ef3c9 100644 --- a/distros/melodic/dynamixel-workbench/default.nix +++ b/distros/melodic/dynamixel-workbench/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-dynamixel-workbench"; version = "2.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-release/archive/release/melodic/dynamixel_workbench/2.2.0-0.tar.gz"; - name = "2.2.0-0.tar.gz"; - sha256 = "4b6b839b6a403bb7d8e8a8a3f7943d05c71c624b08d2089f53b91ca782fba7d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-release"; + rev = "release/melodic/dynamixel_workbench/2.2.0-0"; + sha256 = "sha256-bTX0JKVxB2UF/ugYkm00pOocZ1dLX0Vi8sOqZmeM8gQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/easy-markers/default.nix b/distros/melodic/easy-markers/default.nix index 7f67219643..3a3a7cad10 100644 --- a/distros/melodic/easy-markers/default.nix +++ b/distros/melodic/easy-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-easy-markers"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/melodic/easy_markers/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "813965652574355bf8c57995dfcd7c70da0f96b78fdf1c75df4e7c51f3454b42"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/melodic/easy_markers/0.2.6-1"; + sha256 = "sha256-zg9NVElCKsMvSn6ymWj4DY/8Id+B30ZFqOGDKT8uG7o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/eband-local-planner/default.nix b/distros/melodic/eband-local-planner/default.nix index 7c164295a5..079a39f989 100644 --- a/distros/melodic/eband-local-planner/default.nix +++ b/distros/melodic/eband-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eband-local-planner"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/utexas-bwi-gbp/eband_local_planner-release/archive/release/melodic/eband_local_planner/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "5c4fcdfb8e5d7fa63ba539b3cb4017a9d1f315a4133fad4277f7df4c53254a92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "utexas-bwi-gbp"; + repo = "eband_local_planner-release"; + rev = "release/melodic/eband_local_planner/0.4.0-1"; + sha256 = "sha256-SaGeuQz9z/FAVwfXeeOffKPf7mZn5dqe7wczd0tuIm8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/eca-a9-control/default.nix b/distros/melodic/eca-a9-control/default.nix index 1637f55b1f..a9727d4228 100644 --- a/distros/melodic/eca-a9-control/default.nix +++ b/distros/melodic/eca-a9-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eca-a9-control"; version = "0.1.6"; - src = fetchurl { - url = "https://github.com/uuvsimulator/eca_a9-release/archive/release/melodic/eca_a9_control/0.1.6-0.tar.gz"; - name = "0.1.6-0.tar.gz"; - sha256 = "2c5e9d6e0a17f5cf7b07029ac6e1df1dbcb1d47b77737b8c1d5a1eefd3254c1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "eca_a9-release"; + rev = "release/melodic/eca_a9_control/0.1.6-0"; + sha256 = "sha256-j9oxYwisAiXFf7B3iYZrX+YzBkct2dxYKfgq/NIaKGw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/eca-a9-description/default.nix b/distros/melodic/eca-a9-description/default.nix index 6fa672955a..1397fcb91d 100644 --- a/distros/melodic/eca-a9-description/default.nix +++ b/distros/melodic/eca-a9-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eca-a9-description"; version = "0.1.6"; - src = fetchurl { - url = "https://github.com/uuvsimulator/eca_a9-release/archive/release/melodic/eca_a9_description/0.1.6-0.tar.gz"; - name = "0.1.6-0.tar.gz"; - sha256 = "755c4708260a898bf6311271a70f9f48379327eb3c5721727afba6dc94fb035f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "eca_a9-release"; + rev = "release/melodic/eca_a9_description/0.1.6-0"; + sha256 = "sha256-Ea37u8SoRGH2LJAJhVOcdN5+bT65Kihka6Bq1MMG6To="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/eca-a9-gazebo/default.nix b/distros/melodic/eca-a9-gazebo/default.nix index de810e511d..4bdeaf4feb 100644 --- a/distros/melodic/eca-a9-gazebo/default.nix +++ b/distros/melodic/eca-a9-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eca-a9-gazebo"; version = "0.1.6"; - src = fetchurl { - url = "https://github.com/uuvsimulator/eca_a9-release/archive/release/melodic/eca_a9_gazebo/0.1.6-0.tar.gz"; - name = "0.1.6-0.tar.gz"; - sha256 = "e2dce04036c923f6df2b176be5b73ffc2f2f7002fb0c2db7f54d2ea686499d9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "eca_a9-release"; + rev = "release/melodic/eca_a9_gazebo/0.1.6-0"; + sha256 = "sha256-rP1bAPX+7GOkKLQnmv5xpUzoTieY4z3ST3LW7nb9DsY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-build/default.nix b/distros/melodic/ecl-build/default.nix index d921318eef..5e504ed13e 100644 --- a/distros/melodic/ecl-build/default.nix +++ b/distros/melodic/ecl-build/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-build"; version = "0.61.8-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/melodic/ecl_build/0.61.8-1.tar.gz"; - name = "0.61.8-1.tar.gz"; - sha256 = "52ff068d6f14f67a9f7a36a7a9974c346db0218c9822d8ac83b29f4ce810dff3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/melodic/ecl_build/0.61.8-1"; + sha256 = "sha256-Ozch2lkzQNM3ejTVuvlHg8qUQkhDlhDkamLnUG92XLo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-command-line/default.nix b/distros/melodic/ecl-command-line/default.nix index b7c9c97b2e..c85b4a61a4 100644 --- a/distros/melodic/ecl-command-line/default.nix +++ b/distros/melodic/ecl-command-line/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-command-line"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_command_line/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "db3031f9d20cc04364f267a0cc028ea9b86730a1679d5ff6fc7023409ebde7b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_command_line/0.62.2-0"; + sha256 = "sha256-xWZ0wrxqsJel0nAlyngEoNjWjvmZKEwHKQvToxRRlko="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-concepts/default.nix b/distros/melodic/ecl-concepts/default.nix index a6565a091d..2cde041670 100644 --- a/distros/melodic/ecl-concepts/default.nix +++ b/distros/melodic/ecl-concepts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-concepts"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_concepts/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "d34dac272c3aa77d62056445748c784c6a9acf8f4fc69945d6dd05be8dcc7815"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_concepts/0.62.2-0"; + sha256 = "sha256-1qOnLXG+UVFE5zbOOY0qvx4Bx12gN7Z3dMuhrbMkCUU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-config/default.nix b/distros/melodic/ecl-config/default.nix index e157095963..c47c890fe4 100644 --- a/distros/melodic/ecl-config/default.nix +++ b/distros/melodic/ecl-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-config"; version = "0.61.6"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/melodic/ecl_config/0.61.6-0.tar.gz"; - name = "0.61.6-0.tar.gz"; - sha256 = "a8fb8da4c0d398f4f209b8a0f35c738ee3aaca992c8bd3c5d541f60637b83063"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/melodic/ecl_config/0.61.6-0"; + sha256 = "sha256-0sot7I/1wIJE2Wd8WYEO3uM9LqX1znaq7dIaEKD91kk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-console/default.nix b/distros/melodic/ecl-console/default.nix index 25902079d7..b4e7887bd6 100644 --- a/distros/melodic/ecl-console/default.nix +++ b/distros/melodic/ecl-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-console"; version = "0.61.6"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/melodic/ecl_console/0.61.6-0.tar.gz"; - name = "0.61.6-0.tar.gz"; - sha256 = "5586ad3bb23b745e301fb78ddc22ae1125f5b0c559d93e39b9c832ca2307557b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/melodic/ecl_console/0.61.6-0"; + sha256 = "sha256-U80/WQjhe/jwjU3uIXnLoAiv6iYHRB6ZmIYmT25Lw6o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-containers/default.nix b/distros/melodic/ecl-containers/default.nix index f12b282998..fe913f5811 100644 --- a/distros/melodic/ecl-containers/default.nix +++ b/distros/melodic/ecl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-containers"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_containers/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "754395eafaca8f39801e1b53e4abc321787bbb47341aa82a767b507651114126"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_containers/0.62.2-0"; + sha256 = "sha256-ypCuyfVX8rgi88zoGMVKZVGSI6gJRm/4/C+APqnRnmQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-converters-lite/default.nix b/distros/melodic/ecl-converters-lite/default.nix index 15a2be24d8..c76d4f520a 100644 --- a/distros/melodic/ecl-converters-lite/default.nix +++ b/distros/melodic/ecl-converters-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-converters-lite"; version = "0.61.6"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/melodic/ecl_converters_lite/0.61.6-0.tar.gz"; - name = "0.61.6-0.tar.gz"; - sha256 = "ebd1d37b95bab3798917d592fa2fe83236f1b6a530ce43d1bf823b8730320368"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/melodic/ecl_converters_lite/0.61.6-0"; + sha256 = "sha256-IfnDZd3OkuxUKkpmyp9nEu/l7BHnkCWWtcQlk7sm5Ak="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-converters/default.nix b/distros/melodic/ecl-converters/default.nix index 49dbd0591b..f6f7995f82 100644 --- a/distros/melodic/ecl-converters/default.nix +++ b/distros/melodic/ecl-converters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-converters"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_converters/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "30286767e22011751173f3a7c3d063f26f675e6340cd56765e90853879058909"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_converters/0.62.2-0"; + sha256 = "sha256-LzIGSoDtAsE9Wnng7Ec0bHIibcCu+Fxfe5O4jGKl1NE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-core-apps/default.nix b/distros/melodic/ecl-core-apps/default.nix index 700c8afd80..82c3e8ead7 100644 --- a/distros/melodic/ecl-core-apps/default.nix +++ b/distros/melodic/ecl-core-apps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-core-apps"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_core_apps/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "30a847ca6b096e1baf1be88d85936ab7f5fdabc5ce5e705b90ddd9972f84ccde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_core_apps/0.62.2-0"; + sha256 = "sha256-B6jhFPwRfSwVQPtNSwYVwKpQzD/hSwfgVXXm6a/hAzg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-core/default.nix b/distros/melodic/ecl-core/default.nix index 5c423db31a..7797d23db1 100644 --- a/distros/melodic/ecl-core/default.nix +++ b/distros/melodic/ecl-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-core"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_core/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "faf777d4df832763a55bb0e32b19e5bc391f094d21aaec4acce62c11ed1695d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_core/0.62.2-0"; + sha256 = "sha256-wQwEXqZUnw0HHu3BrczQtZ4cGCFhTCwvyoPJWbZ3axA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-devices/default.nix b/distros/melodic/ecl-devices/default.nix index 19dd089a60..550da63e38 100644 --- a/distros/melodic/ecl-devices/default.nix +++ b/distros/melodic/ecl-devices/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-devices"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_devices/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "8fdd41c3aab78f532ddc8c228da3778ecdcb64e8a566952f1ec9dc4f026ba144"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_devices/0.62.2-0"; + sha256 = "sha256-oGJUeamrwedbWfNTEqY0Ruw1LWkc2o1y4xg6bkICWaA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-eigen/default.nix b/distros/melodic/ecl-eigen/default.nix index b35aa8c3d9..efc34404da 100644 --- a/distros/melodic/ecl-eigen/default.nix +++ b/distros/melodic/ecl-eigen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-eigen"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_eigen/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "e876bba5caea9487942c43d124404890361df1004126e7233a29d6b5c6e1c0c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_eigen/0.62.2-0"; + sha256 = "sha256-J86/KJbDamyP/0CanKQ518/KOB2N1R+IHUkvpG19HFE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/ecl-errors/default.nix b/distros/melodic/ecl-errors/default.nix index 04db6b4dcc..6a6a2b0193 100644 --- a/distros/melodic/ecl-errors/default.nix +++ b/distros/melodic/ecl-errors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-errors"; version = "0.61.6"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/melodic/ecl_errors/0.61.6-0.tar.gz"; - name = "0.61.6-0.tar.gz"; - sha256 = "e41cdee101ab35c2963fc8e080294f597646006e246cae31242898b1b69e4eb9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/melodic/ecl_errors/0.61.6-0"; + sha256 = "sha256-4DIby9C1Z0gGOjQxuV9Mk11JDhEd/0U5Ng2Qgkw0yQs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-exceptions/default.nix b/distros/melodic/ecl-exceptions/default.nix index 0494a6a42f..276a58a4ef 100644 --- a/distros/melodic/ecl-exceptions/default.nix +++ b/distros/melodic/ecl-exceptions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-exceptions"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_exceptions/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "41ebe177df444d6184cf296500c419bdac0173c0296d37dfd55110da85216017"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_exceptions/0.62.2-0"; + sha256 = "sha256-zYcC4Xvdw/6WlKrWe5ACxTxHt5398wWl5tLEPCUSZOw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-filesystem/default.nix b/distros/melodic/ecl-filesystem/default.nix index fee8393981..a451291f8e 100644 --- a/distros/melodic/ecl-filesystem/default.nix +++ b/distros/melodic/ecl-filesystem/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-filesystem"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_filesystem/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "7cc4e4aa69ad033c120e3642f512750348e6a15ca373c585e9d3e56a2b75973f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_filesystem/0.62.2-0"; + sha256 = "sha256-SPdVlXhnd3HVAqjUfgqEDYzWgTc/UX30aIo2dsFoi5E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-formatters/default.nix b/distros/melodic/ecl-formatters/default.nix index 5e1e6e3825..32d6754699 100644 --- a/distros/melodic/ecl-formatters/default.nix +++ b/distros/melodic/ecl-formatters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-formatters"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_formatters/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "a7f04f361b91c1ef60014240ddc7aacb2a54d37385d89b0163607bc0b536929f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_formatters/0.62.2-0"; + sha256 = "sha256-fGrtDAQWaideixrIu8877Z0fz40NtRlkUZaytXbYRdg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-geometry/default.nix b/distros/melodic/ecl-geometry/default.nix index 4a60407903..15581bba95 100644 --- a/distros/melodic/ecl-geometry/default.nix +++ b/distros/melodic/ecl-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-geometry"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_geometry/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "ba8a9aeaf31e8a0d1c6a0411fa1898c92894dfce06453d0882c7eeb000d88406"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_geometry/0.62.2-0"; + sha256 = "sha256-+chDBvvs3U5EPuPFpVHxsxJzCCMQ6FnVI8vUXuAi9jk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-io/default.nix b/distros/melodic/ecl-io/default.nix index f34728b829..9c4cd05bea 100644 --- a/distros/melodic/ecl-io/default.nix +++ b/distros/melodic/ecl-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-io"; version = "0.61.6"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/melodic/ecl_io/0.61.6-0.tar.gz"; - name = "0.61.6-0.tar.gz"; - sha256 = "8ed29cb5c059af11e82868c532fedfcefd85d2e4d8d16f97bee45fb5af9b6ee4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/melodic/ecl_io/0.61.6-0"; + sha256 = "sha256-BzfnkqKow3+4/LaN7sRKgwfZMKGLjTot/RWiYPhc7wA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-ipc/default.nix b/distros/melodic/ecl-ipc/default.nix index 8d45f40b70..a9fd22400c 100644 --- a/distros/melodic/ecl-ipc/default.nix +++ b/distros/melodic/ecl-ipc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-ipc"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_ipc/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "35873c953237fc4218b4a354119e76304a5a8aa4c4147e2ccfab5aac4f3bf4dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_ipc/0.62.2-0"; + sha256 = "sha256-/k0yGgJFNV1a9FgwTsNVCewMv1QVkPjOO7gXEF2LeL0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-license/default.nix b/distros/melodic/ecl-license/default.nix index fe481f31f1..8a9e7856e4 100644 --- a/distros/melodic/ecl-license/default.nix +++ b/distros/melodic/ecl-license/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-license"; version = "0.61.8-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/melodic/ecl_license/0.61.8-1.tar.gz"; - name = "0.61.8-1.tar.gz"; - sha256 = "812ed1887128fee8dc1d288ca24063ed4402e00bb128aa23a0f57fd7cdfaef9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/melodic/ecl_license/0.61.8-1"; + sha256 = "sha256-Ae8Cu9bRM9wxuMIwPLmO7H3J+cR+hnKFjAa4DB/tG7U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-linear-algebra/default.nix b/distros/melodic/ecl-linear-algebra/default.nix index f97c63d7f3..e3be31035c 100644 --- a/distros/melodic/ecl-linear-algebra/default.nix +++ b/distros/melodic/ecl-linear-algebra/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-linear-algebra"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_linear_algebra/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "5e9b99a6c02c0546ffdd155726bb735897f8591739850b9614143d6719e756e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_linear_algebra/0.62.2-0"; + sha256 = "sha256-iSMpwedT4ESpLVPPyZB/nMbByjKBZXPps0YKWfULGxE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-lite/default.nix b/distros/melodic/ecl-lite/default.nix index da60c99258..1f75c4e3df 100644 --- a/distros/melodic/ecl-lite/default.nix +++ b/distros/melodic/ecl-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-lite"; version = "0.61.6"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/melodic/ecl_lite/0.61.6-0.tar.gz"; - name = "0.61.6-0.tar.gz"; - sha256 = "fceacb01c4b94197a2e6f342c6a76f5a9af13273e9cda61c75c4b3702e3aea3f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/melodic/ecl_lite/0.61.6-0"; + sha256 = "sha256-+aO11JAcqDfLzHAoQ+7m7x5ponH/sAxnsV1LACmzH/E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-manipulation/default.nix b/distros/melodic/ecl-manipulation/default.nix index 10b5efd492..466fcd020d 100644 --- a/distros/melodic/ecl-manipulation/default.nix +++ b/distros/melodic/ecl-manipulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-manipulation"; version = "0.60.3"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_manipulation-release/archive/release/melodic/ecl_manipulation/0.60.3-0.tar.gz"; - name = "0.60.3-0.tar.gz"; - sha256 = "d8ab07c3933af9e3633c323a372ed18faa71d6c798769e2a9ce96175b5adb62b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_manipulation-release"; + rev = "release/melodic/ecl_manipulation/0.60.3-0"; + sha256 = "sha256-DvFDtsDIZr4PgYky1JwGW3fA0twW1Nq817/WHWify0w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-manipulators/default.nix b/distros/melodic/ecl-manipulators/default.nix index 7c5dfb23b2..701db5f143 100644 --- a/distros/melodic/ecl-manipulators/default.nix +++ b/distros/melodic/ecl-manipulators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-manipulators"; version = "0.60.3"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_manipulation-release/archive/release/melodic/ecl_manipulators/0.60.3-0.tar.gz"; - name = "0.60.3-0.tar.gz"; - sha256 = "29d59a85307ce361a71f362a25d9b1ff94aaafd5a2df8a51d0659f74d3d735d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_manipulation-release"; + rev = "release/melodic/ecl_manipulators/0.60.3-0"; + sha256 = "sha256-gdKgQDYuMxlrCWm9tJTtKUoopHjABxLiRl/DpTJfTec="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-math/default.nix b/distros/melodic/ecl-math/default.nix index c5cb82074a..b3eb2ab781 100644 --- a/distros/melodic/ecl-math/default.nix +++ b/distros/melodic/ecl-math/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-math"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_math/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "d488ba248dce19a054e54b2054930c7120d2c383c193efc659e8c42714f77dbd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_math/0.62.2-0"; + sha256 = "sha256-wn+nVQCWLq3gDbpDJ/8NoaWZvjlJrGalGT3OQikC8bA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-mobile-robot/default.nix b/distros/melodic/ecl-mobile-robot/default.nix index f7f46d4c27..d4571d06ea 100644 --- a/distros/melodic/ecl-mobile-robot/default.nix +++ b/distros/melodic/ecl-mobile-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-mobile-robot"; version = "0.60.3"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_navigation-release/archive/release/melodic/ecl_mobile_robot/0.60.3-0.tar.gz"; - name = "0.60.3-0.tar.gz"; - sha256 = "b90849f51b703d6d5c3b246161ad8679bf14b8a27865ae175e9c945fe9edf31e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_navigation-release"; + rev = "release/melodic/ecl_mobile_robot/0.60.3-0"; + sha256 = "sha256-51CJT+8WnuwK3b3txeAPa7U0mNSxeC7/ndBmD+yTTv0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-mpl/default.nix b/distros/melodic/ecl-mpl/default.nix index 7210597d37..744eff321d 100644 --- a/distros/melodic/ecl-mpl/default.nix +++ b/distros/melodic/ecl-mpl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-mpl"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_mpl/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "b0d2d0c068130287e3f8bc5d6e0fcf93cc5a5cefb02e2a8432504557dc411e46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_mpl/0.62.2-0"; + sha256 = "sha256-QnZvrJvd62aewDiwmTD3Yy/YkBDcqMuKfmk43tezLCM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-navigation/default.nix b/distros/melodic/ecl-navigation/default.nix index 6be2a1461a..8095fd37d3 100644 --- a/distros/melodic/ecl-navigation/default.nix +++ b/distros/melodic/ecl-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-navigation"; version = "0.60.3"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_navigation-release/archive/release/melodic/ecl_navigation/0.60.3-0.tar.gz"; - name = "0.60.3-0.tar.gz"; - sha256 = "1d3e834b6aa0b70617f25fc03c9c7f275e5280ed6a75570483b0db48ecd5b32d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_navigation-release"; + rev = "release/melodic/ecl_navigation/0.60.3-0"; + sha256 = "sha256-z63hJpfoyqhP8rI/Ri/3Kt+em5xuoOr0LSYOyW1LPVU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-sigslots-lite/default.nix b/distros/melodic/ecl-sigslots-lite/default.nix index a4d1e73736..92abfb84bb 100644 --- a/distros/melodic/ecl-sigslots-lite/default.nix +++ b/distros/melodic/ecl-sigslots-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-sigslots-lite"; version = "0.61.6"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/melodic/ecl_sigslots_lite/0.61.6-0.tar.gz"; - name = "0.61.6-0.tar.gz"; - sha256 = "6f41052abdb5ac99e0e5d7e0675b2798d1cc570cebd16b303e035b00d66afe96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/melodic/ecl_sigslots_lite/0.61.6-0"; + sha256 = "sha256-XRh+v69rNxpzDX3jNqCvJ14M9uF2Xe78WIKnnBt2rb8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-sigslots/default.nix b/distros/melodic/ecl-sigslots/default.nix index c25db9dd58..613cb14618 100644 --- a/distros/melodic/ecl-sigslots/default.nix +++ b/distros/melodic/ecl-sigslots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-sigslots"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_sigslots/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "092e00b6e973f3ea2fd160ff8c691a649c324192c2f06e8141cfa71ddb0e28b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_sigslots/0.62.2-0"; + sha256 = "sha256-3LkUlSOMUjBqmXx3/E+1TBtiD2+NcDfTeQz5k88N0mI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-statistics/default.nix b/distros/melodic/ecl-statistics/default.nix index e107145cd3..3f756d2382 100644 --- a/distros/melodic/ecl-statistics/default.nix +++ b/distros/melodic/ecl-statistics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-statistics"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_statistics/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "67ed25a3f69aa9d272c6c700e2b079115fddd28ed7b0f020f1fec28061a7579b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_statistics/0.62.2-0"; + sha256 = "sha256-35lKkFvRphVhUD0/HoUgSgaaEO15jQxPzvhnZ3K8bxg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-streams/default.nix b/distros/melodic/ecl-streams/default.nix index 72f40ee734..791739ff26 100644 --- a/distros/melodic/ecl-streams/default.nix +++ b/distros/melodic/ecl-streams/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-streams"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_streams/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "0fd7c5407bc67d28e90e8bb3cee3850ab90ee195b74703949c991cfc0a5836c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_streams/0.62.2-0"; + sha256 = "sha256-jhy6IVksVxDX4lpfvQpV59sm7sBxRS8CSaH90DJ2zFQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-threads/default.nix b/distros/melodic/ecl-threads/default.nix index 8c692828b6..e76fef47a9 100644 --- a/distros/melodic/ecl-threads/default.nix +++ b/distros/melodic/ecl-threads/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-threads"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_threads/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "ba9d0e01c8f88af99570d7a92b88a2184521c7c4e4622a440a7ab7eea56af380"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_threads/0.62.2-0"; + sha256 = "sha256-V7Neem7QeotUOYk6c1Z/F/D/N0k87xSvjG34FRAWlyU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-time-lite/default.nix b/distros/melodic/ecl-time-lite/default.nix index bfed2ed769..00084fc7d7 100644 --- a/distros/melodic/ecl-time-lite/default.nix +++ b/distros/melodic/ecl-time-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-time-lite"; version = "0.61.6"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/melodic/ecl_time_lite/0.61.6-0.tar.gz"; - name = "0.61.6-0.tar.gz"; - sha256 = "97485e9c7be495031bb6c5b207851c5e8458bb243cb2f4e5dcfa9c2dcc854050"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/melodic/ecl_time_lite/0.61.6-0"; + sha256 = "sha256-IwuMiDMWl6J6eL+qDd/gIs3NksOJuavR62+ED3Maqbk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-time/default.nix b/distros/melodic/ecl-time/default.nix index ab184268d3..1662942c46 100644 --- a/distros/melodic/ecl-time/default.nix +++ b/distros/melodic/ecl-time/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-time"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_time/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "3be2a120f7f4b5a020daac7cc5b8715c2af79c7d2d3c899ac49f2b6640065c04"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_time/0.62.2-0"; + sha256 = "sha256-j8s1Wcjz8wjeukyvIVMmwAAt3tteDLjf5tvpc1i2q0k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-tools/default.nix b/distros/melodic/ecl-tools/default.nix index 0df0a1f702..894002f541 100644 --- a/distros/melodic/ecl-tools/default.nix +++ b/distros/melodic/ecl-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-tools"; version = "0.61.8-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/melodic/ecl_tools/0.61.8-1.tar.gz"; - name = "0.61.8-1.tar.gz"; - sha256 = "5ea1eb5c7d3c86b08acadffe264deee68367494eebcfb9b95c0e091ed152e8b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/melodic/ecl_tools/0.61.8-1"; + sha256 = "sha256-IMbWk3ilrBgqjTCdHPUcDcDQNRqabzpGns+a64ac/ps="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-type-traits/default.nix b/distros/melodic/ecl-type-traits/default.nix index 01ef8cb626..11a4d8cb09 100644 --- a/distros/melodic/ecl-type-traits/default.nix +++ b/distros/melodic/ecl-type-traits/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-type-traits"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_type_traits/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "d7546064c5966aa158f8340aa0583fcdc804279613ca7facee9b0b0794a6be2d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_type_traits/0.62.2-0"; + sha256 = "sha256-sXUNcD1NRXQQN+C+mkcogFGFCmBK05oipcMEV2kAzVc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl-utilities/default.nix b/distros/melodic/ecl-utilities/default.nix index ab4889b2a0..84f335c93a 100644 --- a/distros/melodic/ecl-utilities/default.nix +++ b/distros/melodic/ecl-utilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl-utilities"; version = "0.62.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/melodic/ecl_utilities/0.62.2-0.tar.gz"; - name = "0.62.2-0.tar.gz"; - sha256 = "4e3ab2bd3246bbda3763e850f949bac0dcd3988bf5ec5269563bd4906ad23bdd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/melodic/ecl_utilities/0.62.2-0"; + sha256 = "sha256-WkU5ofGfZsBTdyASuyQS7gyy3lYw0/iBhpjAQJky/3I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ecl/default.nix b/distros/melodic/ecl/default.nix index 4bbea90678..217ee2b677 100644 --- a/distros/melodic/ecl/default.nix +++ b/distros/melodic/ecl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ecl"; version = "0.60.3"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_manipulation-release/archive/release/melodic/ecl/0.60.3-0.tar.gz"; - name = "0.60.3-0.tar.gz"; - sha256 = "bbcf9a596091fbf4158e2593c652fe8329338bcf39ab3258abc93f4ac42289ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_manipulation-release"; + rev = "release/melodic/ecl/0.60.3-0"; + sha256 = "sha256-wImPsGnMNl1+3vx8K9dnH9LNaGYKChHtOEMmVgL9FSY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/effort-controllers/default.nix b/distros/melodic/effort-controllers/default.nix index 09d978b222..622f221e29 100644 --- a/distros/melodic/effort-controllers/default.nix +++ b/distros/melodic/effort-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-effort-controllers"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/effort_controllers/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "87ac8f3079b57ca3c35361d3005d85c09170b21cf0b01fc2ac078fddf05c4ec1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/effort_controllers/0.17.2-1"; + sha256 = "sha256-rJHgWsvDLkuZA85ZuM84K9vA552i2hxUI7crKztYJ8A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/eigen-conversions/default.nix b/distros/melodic/eigen-conversions/default.nix index 3cc30fbbd0..b939d657d0 100644 --- a/distros/melodic/eigen-conversions/default.nix +++ b/distros/melodic/eigen-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eigen-conversions"; version = "1.12.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/melodic/eigen_conversions/1.12.1-1.tar.gz"; - name = "1.12.1-1.tar.gz"; - sha256 = "ba111914a7e79c176c8eafa732201d0aeca1dd0ffc481f4b83038384b2e44261"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/melodic/eigen_conversions/1.12.1-1"; + sha256 = "sha256-Zzij7U71es1kwAjvDZhHYOrNv2PAY3FrDJ09a1GXYBQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/eigen-stl-containers/default.nix b/distros/melodic/eigen-stl-containers/default.nix index 1b69977507..0fbf104408 100644 --- a/distros/melodic/eigen-stl-containers/default.nix +++ b/distros/melodic/eigen-stl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eigen-stl-containers"; version = "0.1.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/eigen_stl_containers-release/archive/release/melodic/eigen_stl_containers/0.1.8-0.tar.gz"; - name = "0.1.8-0.tar.gz"; - sha256 = "e10632b9c182ffc09170b5fc80bf0a0f3cb8ab1091c01b44953042ba71ad5843"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "eigen_stl_containers-release"; + rev = "release/melodic/eigen_stl_containers/0.1.8-0"; + sha256 = "sha256-2TsWKbxVYO7Di2JWs/jt9UEM6wHbIQJNuk0Vn8xAg2E="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/eigenpy/default.nix b/distros/melodic/eigenpy/default.nix index 6212afc0f8..6f38ce83cc 100644 --- a/distros/melodic/eigenpy/default.nix +++ b/distros/melodic/eigenpy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cmake, doxygen, eigen, git, python, pythonPackages }: buildRosPackage { pname = "ros-melodic-eigenpy"; - version = "2.8.1-r1"; + version = "2.9.0-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/eigenpy-ros-release/archive/release/melodic/eigenpy/2.8.1-1.tar.gz"; - name = "2.8.1-1.tar.gz"; - sha256 = "6e938acf9718a2950569b6a181f8305bd335988034094d6e57f1bb0d58bf32de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "eigenpy-ros-release"; + rev = "release/melodic/eigenpy/2.9.0-1"; + sha256 = "sha256-vMIvbWZE7iPm05rspCqXW0eUtWdcP7hOKPKz3F2mG+Q="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/melodic/eiquadprog/default.nix b/distros/melodic/eiquadprog/default.nix index 4f4fc13853..f9980b3c23 100644 --- a/distros/melodic/eiquadprog/default.nix +++ b/distros/melodic/eiquadprog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eiquadprog"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/eiquadprog-ros-release/archive/release/melodic/eiquadprog/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "5a08fefa36a061d8221bad3128fd630bcc371d8c89778a2cde7597291606a488"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "eiquadprog-ros-release"; + rev = "release/melodic/eiquadprog/1.2.5-1"; + sha256 = "sha256-70Gnb9UgIVTLKdrPg8jJuHY+tS1xJTCfhNmQGXsAtZw="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/melodic/eml/default.nix b/distros/melodic/eml/default.nix index 595c8c4cd6..ad9be53c4b 100644 --- a/distros/melodic/eml/default.nix +++ b/distros/melodic/eml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eml"; version = "1.8.15-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/eml-release/archive/release/melodic/eml/1.8.15-2.tar.gz"; - name = "1.8.15-2.tar.gz"; - sha256 = "be4a25b2632c6064f9d2567a5d1f9915aca203bebd8eda03e9cb3758d90e3c2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "eml-release"; + rev = "release/melodic/eml/1.8.15-2"; + sha256 = "sha256-3LM4rau+nhrhoeVcxUdszDkvoelRGEy1AikgMZud4fQ="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/end-effector/default.nix b/distros/melodic/end-effector/default.nix index 9da0ece226..9267574b8c 100644 --- a/distros/melodic/end-effector/default.nix +++ b/distros/melodic/end-effector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-end-effector"; version = "1.0.6-r2"; - src = fetchurl { - url = "https://github.com/ADVRHumanoids/ROSEndEffector-release/archive/release/melodic/end_effector/1.0.6-2.tar.gz"; - name = "1.0.6-2.tar.gz"; - sha256 = "57ec26ad6d42a58f7db0b640a0a0cf690ac56536b59fce65848b7f83f33b135e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ADVRHumanoids"; + repo = "ROSEndEffector-release"; + rev = "release/melodic/end_effector/1.0.6-2"; + sha256 = "sha256-qNG84bFQrv2nJhG77gjKzIBSk4te/eT9PabjE6tA06c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/er-public-msgs/default.nix b/distros/melodic/er-public-msgs/default.nix index 6a4c170d85..74c7fed1f5 100644 --- a/distros/melodic/er-public-msgs/default.nix +++ b/distros/melodic/er-public-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-er-public-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/enabled-robotics/er_public_msgs-release/archive/release/melodic/er_public_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "99d548a04ceb0efb2eb1c6ee68d91041b90e466ff69d71b53e65ffa91b16f860"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "enabled-robotics"; + repo = "er_public_msgs-release"; + rev = "release/melodic/er_public_msgs/1.4.0-1"; + sha256 = "sha256-i5RtfMdO7CyQSySWTit9z+oBmDbEHNTxst/L0qiVoDM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ess-imu-ros1-uart-driver/default.nix b/distros/melodic/ess-imu-ros1-uart-driver/default.nix index 8be3164d59..11c8a4e91f 100644 --- a/distros/melodic/ess-imu-ros1-uart-driver/default.nix +++ b/distros/melodic/ess-imu-ros1-uart-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ess-imu-ros1-uart-driver"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/cubicleguy/ess_imu_ros1_uart_driver-release/archive/release/melodic/ess_imu_ros1_uart_driver/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "fecf02b078b267bde1db3f1011d7504da248eeb5da7a8f4d174b09f8e2c62b96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cubicleguy"; + repo = "ess_imu_ros1_uart_driver-release"; + rev = "release/melodic/ess_imu_ros1_uart_driver/1.3.2-1"; + sha256 = "sha256-lKTY40ilPKvGfTF0wYF9q0Acp6eAdeqTOTsgNaPjRtA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ethercat-grant/default.nix b/distros/melodic/ethercat-grant/default.nix index d6da0ca4d7..617411a2a7 100644 --- a/distros/melodic/ethercat-grant/default.nix +++ b/distros/melodic/ethercat-grant/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ethercat-grant"; version = "0.2.5"; - src = fetchurl { - url = "https://github.com/shadow-robot/ethercat_grant-release/archive/release/melodic/ethercat_grant/0.2.5-0.tar.gz"; - name = "0.2.5-0.tar.gz"; - sha256 = "3b5baa1b6b84b2538af53dcc410d980579cbfc932f002dcf3cc25071bb452a52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "shadow-robot"; + repo = "ethercat_grant-release"; + rev = "release/melodic/ethercat_grant/0.2.5-0"; + sha256 = "sha256-OkTSYTlJNRz+xx20lY+Cn5gfnhsXFwEhWEexXmII1JM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ethercat-hardware/default.nix b/distros/melodic/ethercat-hardware/default.nix index f600625488..f2172b99be 100644 --- a/distros/melodic/ethercat-hardware/default.nix +++ b/distros/melodic/ethercat-hardware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ethercat-hardware"; version = "1.8.19-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_ethercat_drivers-release/archive/release/melodic/ethercat_hardware/1.8.19-1.tar.gz"; - name = "1.8.19-1.tar.gz"; - sha256 = "b2d0eea54e31386b19e79f7929b0885f1e5402b3c0efaafe70267bc5c51dbbfc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_ethercat_drivers-release"; + rev = "release/melodic/ethercat_hardware/1.8.19-1"; + sha256 = "sha256-8rvRR8AmqC5Yxtx+PGh4ghcRvTG7ehlHiLdFSjZ6NkQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ethercat-manager/default.nix b/distros/melodic/ethercat-manager/default.nix index f1e69e4c48..8f72fe286a 100644 --- a/distros/melodic/ethercat-manager/default.nix +++ b/distros/melodic/ethercat-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ethercat-manager"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/tork-a/minas-release/archive/release/melodic/ethercat_manager/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "de54e41f6f741c656d0b4124f7c9d9b2329e4364efef0463ee32ed2635b7b17f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "minas-release"; + rev = "release/melodic/ethercat_manager/1.0.10-1"; + sha256 = "sha256-qamTb4KFwTvj1RBvyB5F7baOZnpy/aNxjIkRej1TuGo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ethercat-trigger-controllers/default.nix b/distros/melodic/ethercat-trigger-controllers/default.nix index a5887258e1..c1d9d508a6 100644 --- a/distros/melodic/ethercat-trigger-controllers/default.nix +++ b/distros/melodic/ethercat-trigger-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ethercat-trigger-controllers"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/ethercat_trigger_controllers/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "d3630e54d263a3f14802f4b62710e4da4f21e78b6415d70fbd3b6a0b16b0ca5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/ethercat_trigger_controllers/1.10.17-1"; + sha256 = "sha256-WdHFWr2kAcJpbhhwx0ocFLpA6wdM7iekUqsSzOzCApQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/eus-assimp/default.nix b/distros/melodic/eus-assimp/default.nix index 9f371badb8..498c7a82d7 100644 --- a/distros/melodic/eus-assimp/default.nix +++ b/distros/melodic/eus-assimp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eus-assimp"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_model_tools-release/archive/release/melodic/eus_assimp/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "d94c8c3950538e07a3d17c344f0d25aa7ce89081991c80b3200fcd90b6077e06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_model_tools-release"; + rev = "release/melodic/eus_assimp/0.4.4-1"; + sha256 = "sha256-CMHByMDzOib51C2dAVuQsUGaq2BxiaO9DrscI6qlhgo="; + }; buildType = "catkin"; buildInputs = [ catkin euslisp pkg-config ]; diff --git a/distros/melodic/eus-nlopt/default.nix b/distros/melodic/eus-nlopt/default.nix index 7a8791aa84..927b7aed58 100644 --- a/distros/melodic/eus-nlopt/default.nix +++ b/distros/melodic/eus-nlopt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eus-nlopt"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/eus_nlopt/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "2879249973022d828e30dc71b3481387661578ba4927068829d56d9ea4628e79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/eus_nlopt/0.1.16-1"; + sha256 = "sha256-Jz08rmBtorxg68B90T8vak4XpnL2izQOYuf4/Pe+MWY="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/eus-qp/default.nix b/distros/melodic/eus-qp/default.nix index 007866a5f3..a1432f2ccd 100644 --- a/distros/melodic/eus-qp/default.nix +++ b/distros/melodic/eus-qp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eus-qp"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/eus_qp/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "7e066b267b55b2c98d6b8c9cdf8b988f7c2aab464027045627fc00ea41699309"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/eus_qp/0.1.16-1"; + sha256 = "sha256-rkmWhz1+yp5vrD7NOzfB5KmIRD1HIv7MG2ZmKR6N3y8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules rostest ]; diff --git a/distros/melodic/eus-qpoases/default.nix b/distros/melodic/eus-qpoases/default.nix index 1da8f624df..6a98c950a0 100644 --- a/distros/melodic/eus-qpoases/default.nix +++ b/distros/melodic/eus-qpoases/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eus-qpoases"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/eus_qpoases/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "b8ba9ea5267823ce81715398b76d84745b686a885f2af7f98efee48a7cdb845f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/eus_qpoases/0.1.16-1"; + sha256 = "sha256-/6xrnKQ41J06L5LrKUh+c9qrOjMzXihJ4jwKpSfRUis="; + }; buildType = "catkin"; buildInputs = [ catkin subversion ]; diff --git a/distros/melodic/euscollada/default.nix b/distros/melodic/euscollada/default.nix index 44f92ad771..dfde534d04 100644 --- a/distros/melodic/euscollada/default.nix +++ b/distros/melodic/euscollada/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-euscollada"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_model_tools-release/archive/release/melodic/euscollada/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "66836a2b67d75a93f8b328355c0bef40fd8894e4640f144bd3751c7b36a5f6b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_model_tools-release"; + rev = "release/melodic/euscollada/0.4.4-1"; + sha256 = "sha256-Z65Xvzg6tZ/MsnAwlyRNAVZFKaPQ1QUVOwJU02CmTnA="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules mk rosboost-cfg rosbuild ]; diff --git a/distros/melodic/euslime/default.nix b/distros/melodic/euslime/default.nix index ccf59b6b78..85547823fd 100644 --- a/distros/melodic/euslime/default.nix +++ b/distros/melodic/euslime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-euslime"; version = "1.1.4-r4"; - src = fetchurl { - url = "https://github.com/jsk-ros-pkg/euslime-release/archive/release/melodic/euslime/1.1.4-4.tar.gz"; - name = "1.1.4-4.tar.gz"; - sha256 = "63d93b261b839e4bc4f0ed3c1816f7c3208ba48af6a63c554d33ecf3ebef047e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "jsk-ros-pkg"; + repo = "euslime-release"; + rev = "release/melodic/euslime/1.1.4-4"; + sha256 = "sha256-THE3p1Yz+wOa5fYMaN+S4CZpjQFV/JtFrjXeX7A6jZk="; + }; buildType = "catkin"; buildInputs = [ catkin catkin-virtualenv ]; diff --git a/distros/melodic/euslisp/default.nix b/distros/melodic/euslisp/default.nix index df6fb2838a..7e9251516a 100644 --- a/distros/melodic/euslisp/default.nix +++ b/distros/melodic/euslisp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-euslisp"; version = "9.29.0-r6"; - src = fetchurl { - url = "https://github.com/tork-a/euslisp-release/archive/release/melodic/euslisp/9.29.0-6.tar.gz"; - name = "9.29.0-6.tar.gz"; - sha256 = "efe3908a6cc4183a28bcb0df8480fa00e08a3aa356d81e52c0d60ae84a744e33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "euslisp-release"; + rev = "release/melodic/euslisp/9.29.0-6"; + sha256 = "sha256-ZD3x+K0Ua8kZhz45zxMaqU0A9DtR0RPZHEw3AsoyOsg="; + }; buildType = "cmake"; buildInputs = [ catkin cmake-modules mk ]; diff --git a/distros/melodic/eusurdf/default.nix b/distros/melodic/eusurdf/default.nix index 5834e2d63f..125bf275fd 100644 --- a/distros/melodic/eusurdf/default.nix +++ b/distros/melodic/eusurdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-eusurdf"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_model_tools-release/archive/release/melodic/eusurdf/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "e65fe8bb4fa58516ec9b7833d07302ee91b8283808e5fe7f18c31db1f974722f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_model_tools-release"; + rev = "release/melodic/eusurdf/0.4.4-1"; + sha256 = "sha256-RPIEw9htKgsXZ4hb6vjPYQeRWgJz5EZKxdbop97NaBM="; + }; buildType = "catkin"; buildInputs = [ catkin roseus ]; diff --git a/distros/melodic/executive-smach-visualization/default.nix b/distros/melodic/executive-smach-visualization/default.nix index 8033ff4df4..cc905917ff 100644 --- a/distros/melodic/executive-smach-visualization/default.nix +++ b/distros/melodic/executive-smach-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-executive-smach-visualization"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/jbohren/executive_smach_visualization-release/archive/release/melodic/executive_smach_visualization/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "247e6d778d9108aa3ba0c47233c603d8c0e2cf17badbbebb519894ee3672135d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "jbohren"; + repo = "executive_smach_visualization-release"; + rev = "release/melodic/executive_smach_visualization/4.0.1-1"; + sha256 = "sha256-+AYysjmP/ZwZNvlVe2q+B8ObyGXp1JlyZbwGo3ccswY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/executive-smach/default.nix b/distros/melodic/executive-smach/default.nix index 398ab797c7..d1f8d86722 100644 --- a/distros/melodic/executive-smach/default.nix +++ b/distros/melodic/executive-smach/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-executive-smach"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/executive_smach-release/archive/release/melodic/executive_smach/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "5266563dc0f5888791fbf077127b3bb5539550c93496a103a4b0f3e1bafef697"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "executive_smach-release"; + rev = "release/melodic/executive_smach/2.0.1-0"; + sha256 = "sha256-ev06zxZAUA8VjWtqfmIxiIg5AsXWXd8H96EfLsx9LLQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-aico-solver/default.nix b/distros/melodic/exotica-aico-solver/default.nix index 4448a55eb0..dc919f23c9 100644 --- a/distros/melodic/exotica-aico-solver/default.nix +++ b/distros/melodic/exotica-aico-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-aico-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_aico_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "511627d7c2c811f3a189c91ffd4b33f37f368dd6be00d2522332ed1a7cd6455d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_aico_solver/6.2.0-1"; + sha256 = "sha256-XGMugHnBgoMkIp3U3Jn9dsn5l14AMAFBiigygbodZsQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-cartpole-dynamics-solver/default.nix b/distros/melodic/exotica-cartpole-dynamics-solver/default.nix index c0e10581d6..099f917b8c 100644 --- a/distros/melodic/exotica-cartpole-dynamics-solver/default.nix +++ b/distros/melodic/exotica-cartpole-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-cartpole-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_cartpole_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "70c082510ca9a1838c04f7de893251a0a510ba195d9078d2b1b9cfd9a8abae9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_cartpole_dynamics_solver/6.2.0-1"; + sha256 = "sha256-46GX8+6hpXfuZFwnn2TnQy+Dq+eN0iPxfFnJ+uBjSm0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-collision-scene-fcl-latest/default.nix b/distros/melodic/exotica-collision-scene-fcl-latest/default.nix index 75ccb496cb..934b13a20b 100644 --- a/distros/melodic/exotica-collision-scene-fcl-latest/default.nix +++ b/distros/melodic/exotica-collision-scene-fcl-latest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-collision-scene-fcl-latest"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_collision_scene_fcl_latest/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "a13d9ae11fd68e80daa62c8ac6aab85dca5111015468953b667be858c9d25606"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_collision_scene_fcl_latest/6.2.0-1"; + sha256 = "sha256-U8N+5YjAsxmFGGGCXCyo8NByX7mRvwGxfna494d3Bh4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-core-task-maps/default.nix b/distros/melodic/exotica-core-task-maps/default.nix index 7dab40aa35..75d8ba5492 100644 --- a/distros/melodic/exotica-core-task-maps/default.nix +++ b/distros/melodic/exotica-core-task-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-core-task-maps"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_core_task_maps/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "4610912d61cec611e4bd7f438d605168f5fa0ac976ff1f7aacbfb6ca92daf20b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_core_task_maps/6.2.0-1"; + sha256 = "sha256-m8KH231s/FWOrD0gsM166x4VlyOxRPlIn7jCpYROvzY="; + }; buildType = "catkin"; buildInputs = [ catkin eigen-conversions ]; diff --git a/distros/melodic/exotica-core/default.nix b/distros/melodic/exotica-core/default.nix index 6a2d7c6fab..70d69810ae 100644 --- a/distros/melodic/exotica-core/default.nix +++ b/distros/melodic/exotica-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-core"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_core/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "4223cfdf3dafcab1632b16847e289582f004d5adc9bdd9ad3d2cbf0eddda4240"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_core/6.2.0-1"; + sha256 = "sha256-bZkCdjLIfsm/yUwst5sQfNWLgUFscWWpth9oJpOMPDw="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/exotica-ddp-solver/default.nix b/distros/melodic/exotica-ddp-solver/default.nix index c6a64beb93..80855d89b4 100644 --- a/distros/melodic/exotica-ddp-solver/default.nix +++ b/distros/melodic/exotica-ddp-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-ddp-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_ddp_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "778875f473020668f70d8fd46ccd6b3438dce9ff3ab747a0929232b0ae07d963"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_ddp_solver/6.2.0-1"; + sha256 = "sha256-BkUusXl/YxioP2YDdwN4gPBjfpcpAcnQSn7CrsurawQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-double-integrator-dynamics-solver/default.nix b/distros/melodic/exotica-double-integrator-dynamics-solver/default.nix index bced10199b..ed0ddf2de8 100644 --- a/distros/melodic/exotica-double-integrator-dynamics-solver/default.nix +++ b/distros/melodic/exotica-double-integrator-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-double-integrator-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_double_integrator_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "fddc1c35f30e38eb033e4e5627e21fb699c1fb226cff4f676976fa8a25bb84d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_double_integrator_dynamics_solver/6.2.0-1"; + sha256 = "sha256-uBiD6XuDhv656o26eut036UXavYkAfxdUxneTK/KQ2Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-dynamics-solvers/default.nix b/distros/melodic/exotica-dynamics-solvers/default.nix index a1698c7fbb..e403e8d2d9 100644 --- a/distros/melodic/exotica-dynamics-solvers/default.nix +++ b/distros/melodic/exotica-dynamics-solvers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-dynamics-solvers"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_dynamics_solvers/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "bb7f1c96594f7789b8cac978571a23a8b28e629f2a14554e891a4cea90db7ab9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_dynamics_solvers/6.2.0-1"; + sha256 = "sha256-GokAu3SM9Iwel7j6NTm90HArXxpFUU2dPG7QhEy8t30="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-examples/default.nix b/distros/melodic/exotica-examples/default.nix index 06e2b817eb..e36ec9a40d 100644 --- a/distros/melodic/exotica-examples/default.nix +++ b/distros/melodic/exotica-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-examples"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_examples/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "e6b7a37a6c16fd636cfa279dbeb2540418e6404b2a35e64c4c6e9529ceb6ef3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_examples/6.2.0-1"; + sha256 = "sha256-H/l9Zf9VWnl8LWdeQvS8o5r2td/JbFPQMwYXGTAGwsc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-ik-solver/default.nix b/distros/melodic/exotica-ik-solver/default.nix index 69f105965e..0a6714d505 100644 --- a/distros/melodic/exotica-ik-solver/default.nix +++ b/distros/melodic/exotica-ik-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-ik-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_ik_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "7242987a28dd17b8d11486e1d1e15f65b8324c897de3e9be200213a60d875b36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_ik_solver/6.2.0-1"; + sha256 = "sha256-WVxw+U3AIKbxBWZqa6f6MxIArxvgHytg73F2QLsHPEA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-ilqg-solver/default.nix b/distros/melodic/exotica-ilqg-solver/default.nix index eafffd0eab..0b18c4c127 100644 --- a/distros/melodic/exotica-ilqg-solver/default.nix +++ b/distros/melodic/exotica-ilqg-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-ilqg-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_ilqg_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "628e317c178e94728ee4d18fcc75ec83b68c2f0c9429773d69ff0040be3a6868"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_ilqg_solver/6.2.0-1"; + sha256 = "sha256-UHz/UyAupE+yMN1vXsLt7eAgFfdP3KlxhNkA/dZ0728="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-ilqr-solver/default.nix b/distros/melodic/exotica-ilqr-solver/default.nix index a9aff3556e..fae613446c 100644 --- a/distros/melodic/exotica-ilqr-solver/default.nix +++ b/distros/melodic/exotica-ilqr-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-ilqr-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_ilqr_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "77e2f28159e77ccf37e4b88696682ab05232697588f64039c2dba3182b8c9692"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_ilqr_solver/6.2.0-1"; + sha256 = "sha256-aTqXEZ+k42nRlgVmvLS1QB7t2mF/C7ZHKq1SHU46QUY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-levenberg-marquardt-solver/default.nix b/distros/melodic/exotica-levenberg-marquardt-solver/default.nix index 51b2699feb..5880a306a1 100644 --- a/distros/melodic/exotica-levenberg-marquardt-solver/default.nix +++ b/distros/melodic/exotica-levenberg-marquardt-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-levenberg-marquardt-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_levenberg_marquardt_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "5c6f06ce4d3fd4a069477fd994f0b31c61adc48bc4b2709b955e1a784721879a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_levenberg_marquardt_solver/6.2.0-1"; + sha256 = "sha256-MoKLbKXkYLJYuzK0y2S5k6MXb/ePEMTLQBfmecPE7YY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-ompl-control-solver/default.nix b/distros/melodic/exotica-ompl-control-solver/default.nix index 19637a1e4a..39ed764ab3 100644 --- a/distros/melodic/exotica-ompl-control-solver/default.nix +++ b/distros/melodic/exotica-ompl-control-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-ompl-control-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_ompl_control_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "a62b78136c92e9db002785b9be5c3eeb1da0867063dc64233a009f36ccf45b91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_ompl_control_solver/6.2.0-1"; + sha256 = "sha256-aFwrdhW9pG+Y4ooimbuqiC1Khf1Jraz2JBNAqURgvRQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-ompl-solver/default.nix b/distros/melodic/exotica-ompl-solver/default.nix index aa3c99a928..dc00df6ccb 100644 --- a/distros/melodic/exotica-ompl-solver/default.nix +++ b/distros/melodic/exotica-ompl-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-ompl-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_ompl_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "38782932d1b6e6107f2bbafbd10c63357e23a9e771b1a208eb6372130c2aa67c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_ompl_solver/6.2.0-1"; + sha256 = "sha256-BrN3uQZeM3poSMIHnyO8y4jytCNS+IedYq6umGmSV2o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-pendulum-dynamics-solver/default.nix b/distros/melodic/exotica-pendulum-dynamics-solver/default.nix index ad712abab5..1c98355c36 100644 --- a/distros/melodic/exotica-pendulum-dynamics-solver/default.nix +++ b/distros/melodic/exotica-pendulum-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-pendulum-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_pendulum_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "8a80eee1ef29f578cc6ccf406b01044127ed46c988dab54484779b2b2b9963f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_pendulum_dynamics_solver/6.2.0-1"; + sha256 = "sha256-GgjRMUyY9F9oyhbigD8D+lWZXNHX0pZE1UHxaNqQDxA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-pinocchio-dynamics-solver/default.nix b/distros/melodic/exotica-pinocchio-dynamics-solver/default.nix index bd9c53d6a8..891c6ee1c5 100644 --- a/distros/melodic/exotica-pinocchio-dynamics-solver/default.nix +++ b/distros/melodic/exotica-pinocchio-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-pinocchio-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_pinocchio_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "e2fc909514d0a8eaf1272099e10ae0972da901271abd99cbc6bccf193720c5ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_pinocchio_dynamics_solver/6.2.0-1"; + sha256 = "sha256-jS0hrEhAiEYYKq6wJK2vg+HYbbC/iSoQJ+BpiPIdToI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-quadrotor-dynamics-solver/default.nix b/distros/melodic/exotica-quadrotor-dynamics-solver/default.nix index 47ba3e5695..7777e9ac5a 100644 --- a/distros/melodic/exotica-quadrotor-dynamics-solver/default.nix +++ b/distros/melodic/exotica-quadrotor-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-quadrotor-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_quadrotor_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "398c1c4340b857108543536ae16b2502b6d79ba70ed820b6ae9cdc863cd36fc9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_quadrotor_dynamics_solver/6.2.0-1"; + sha256 = "sha256-1MpruibjjwenRP6V9C1gx6x1lJiha07tm597tIiBTFw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-scipy-solver/default.nix b/distros/melodic/exotica-scipy-solver/default.nix index 243b74f494..9e67cb9810 100644 --- a/distros/melodic/exotica-scipy-solver/default.nix +++ b/distros/melodic/exotica-scipy-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-scipy-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_scipy_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "e8ab625926e85331b7926c49e3849f636b7d39a95e6a6662eec83c16ee5664b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_scipy_solver/6.2.0-1"; + sha256 = "sha256-CggoxRV9IGNIxfQ7XQw7mz91JtbthH40E0SfUQ0XDOs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-time-indexed-rrt-connect-solver/default.nix b/distros/melodic/exotica-time-indexed-rrt-connect-solver/default.nix index a3d2d7c64b..db507b57a8 100644 --- a/distros/melodic/exotica-time-indexed-rrt-connect-solver/default.nix +++ b/distros/melodic/exotica-time-indexed-rrt-connect-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-time-indexed-rrt-connect-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica_time_indexed_rrt_connect_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "bae5bdda0839de66c99c8b800877103ed50863f2b4e3899f8bf135c68de9c213"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica_time_indexed_rrt_connect_solver/6.2.0-1"; + sha256 = "sha256-Z88gG1hdAR/R6WNgnu/lsFZ+ZKEAa7Y1jfvtJzpt6Wc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica-val-description/default.nix b/distros/melodic/exotica-val-description/default.nix index 7b732074b9..0ae8c1dc72 100644 --- a/distros/melodic/exotica-val-description/default.nix +++ b/distros/melodic/exotica-val-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica-val-description"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/wxmerkt/exotica_val_description-release/archive/release/melodic/exotica_val_description/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "9ffa2502040e704ba54e21b691521ba3e3213011535eef52b7af2a4222dcc8cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wxmerkt"; + repo = "exotica_val_description-release"; + rev = "release/melodic/exotica_val_description/1.0.0-1"; + sha256 = "sha256-3tIPzhzHqVjh09fL/JcRv/CCVyzqgM5xiuOyAFYSYZg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/exotica/default.nix b/distros/melodic/exotica/default.nix index c22f953854..588226e5d8 100644 --- a/distros/melodic/exotica/default.nix +++ b/distros/melodic/exotica/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-exotica"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/melodic/exotica/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "20efa697c52405088af5188ee7e119d6492f1272efe15849ae20c059fbba2880"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/melodic/exotica/6.2.0-1"; + sha256 = "sha256-EMvZOSauwNKhUlur+T3Bn7rDI0oFyhOhDPQGhd0TkUo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/explore-lite/default.nix b/distros/melodic/explore-lite/default.nix index aecada61e7..9cee18d12e 100644 --- a/distros/melodic/explore-lite/default.nix +++ b/distros/melodic/explore-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-explore-lite"; version = "2.1.4-r1"; - src = fetchurl { - url = "https://github.com/hrnr/m-explore-release/archive/release/melodic/explore_lite/2.1.4-1.tar.gz"; - name = "2.1.4-1.tar.gz"; - sha256 = "54bba0170bf05baafe92894a693c3417ce791866035b2e6b7de408796f955ae1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "hrnr"; + repo = "m-explore-release"; + rev = "release/melodic/explore_lite/2.1.4-1"; + sha256 = "sha256-G6WSRw39XxIsShtpEh9Bvu52YIuixuqNW4MFvpc+xAY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/face-detector/default.nix b/distros/melodic/face-detector/default.nix index 8dbd11b199..4a8f33b56d 100644 --- a/distros/melodic/face-detector/default.nix +++ b/distros/melodic/face-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-face-detector"; version = "1.4.0-r4"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/melodic/face_detector/1.4.0-4.tar.gz"; - name = "1.4.0-4.tar.gz"; - sha256 = "3e1b62d50cd5401f37c4e8ad3e7af62c315905bc3aebe3681bc7333a07b2b57d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/melodic/face_detector/1.4.0-4"; + sha256 = "sha256-RwDtOXcKxm5W7yFoIJ5GEblRTkrY45OVK2TotCX7lNU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/fadecandy-driver/default.nix b/distros/melodic/fadecandy-driver/default.nix index 4a1bb4855c..9bfd5d799b 100644 --- a/distros/melodic/fadecandy-driver/default.nix +++ b/distros/melodic/fadecandy-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fadecandy-driver"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/iron-ox/fadecandy_ros-release/archive/release/melodic/fadecandy_driver/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "0deab9f6d9db619017f140288d2a31bcc6b462126440f2098340e2ec19882298"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "iron-ox"; + repo = "fadecandy_ros-release"; + rev = "release/melodic/fadecandy_driver/0.2.1-1"; + sha256 = "sha256-hnro2O+OnfaIdf+wghsY5pNHufwMxF3e4POTSljDKO0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fadecandy-msgs/default.nix b/distros/melodic/fadecandy-msgs/default.nix index f86d4bb5b6..dd6e71f17a 100644 --- a/distros/melodic/fadecandy-msgs/default.nix +++ b/distros/melodic/fadecandy-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fadecandy-msgs"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/iron-ox/fadecandy_ros-release/archive/release/melodic/fadecandy_msgs/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "54ef7969941c0a92984356491a4c929fb510a158f771a35d82b2a398547d0f71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "iron-ox"; + repo = "fadecandy_ros-release"; + rev = "release/melodic/fadecandy_msgs/0.2.1-1"; + sha256 = "sha256-6W6/Tk2kiNGpj9TN2ubWfacyvsBTcLU5WLaHpMCEgS0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/fake-joint-driver/default.nix b/distros/melodic/fake-joint-driver/default.nix index b3a2a57649..e992d13c3c 100644 --- a/distros/melodic/fake-joint-driver/default.nix +++ b/distros/melodic/fake-joint-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fake-joint-driver"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/fake_joint-release/archive/release/melodic/fake_joint_driver/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "fe4cc169633ac8e081d1ad84a6a594ce832751b07ad862516568fc9f834b7083"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "fake_joint-release"; + rev = "release/melodic/fake_joint_driver/0.0.4-1"; + sha256 = "sha256-hdFyMkt1M2s5xUqbMl/m4xZ8V50kSKIkCOvGsHK0ebc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fake-joint-launch/default.nix b/distros/melodic/fake-joint-launch/default.nix index b574a9f1b4..e7743b5b1d 100644 --- a/distros/melodic/fake-joint-launch/default.nix +++ b/distros/melodic/fake-joint-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fake-joint-launch"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/fake_joint-release/archive/release/melodic/fake_joint_launch/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "f15ae2e5630c3ef5ce5ca60149d8719fef5f75303d6dd03967461f3db3e3b4e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "fake_joint-release"; + rev = "release/melodic/fake_joint_launch/0.0.4-1"; + sha256 = "sha256-CqacIJEYJcEA/j6yylhUyGqq+iVIuOS3SugFi+ZBzvM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fake-joint/default.nix b/distros/melodic/fake-joint/default.nix index 5d2df8d537..b06d54b7f4 100644 --- a/distros/melodic/fake-joint/default.nix +++ b/distros/melodic/fake-joint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fake-joint"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/fake_joint-release/archive/release/melodic/fake_joint/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "918e8d3bdbc84b3e81e0ee5f9ed1bd1d0477bae1354f07aa15618a40bdfdf3be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "fake_joint-release"; + rev = "release/melodic/fake_joint/0.0.4-1"; + sha256 = "sha256-S28or/BtQhuco0S1rwyMIYWcqw81UcdkRb1EfmdYJAc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fake-localization/default.nix b/distros/melodic/fake-localization/default.nix index 648c544bf6..ec30cad55c 100644 --- a/distros/melodic/fake-localization/default.nix +++ b/distros/melodic/fake-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fake-localization"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/fake_localization/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "b2a07e814222a3612270dfc2139eb8b2c89ac68381f6c5eb25abece979e60957"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/fake_localization/1.16.7-1"; + sha256 = "sha256-C6hu8hqdni6xTQtLwSIgu+H/nJsWJCNRVyu9XQUZ65A="; + }; buildType = "catkin"; buildInputs = [ angles catkin tf2-geometry-msgs ]; diff --git a/distros/melodic/fath-pivot-mount-description/default.nix b/distros/melodic/fath-pivot-mount-description/default.nix index e3ebfd48bb..85e9ffcc1e 100644 --- a/distros/melodic/fath-pivot-mount-description/default.nix +++ b/distros/melodic/fath-pivot-mount-description/default.nix @@ -7,11 +7,15 @@ 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "fath_pivot_mount_description-release"; + rev = "release/melodic/fath_pivot_mount_description/0.1.1-1"; + sha256 = "sha256-T330klYUS78AFQDqpq/GZy2o49n2tf/5iq7fI5nq8OE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fcl-catkin/default.nix b/distros/melodic/fcl-catkin/default.nix index 58328e71ef..74f668f677 100644 --- a/distros/melodic/fcl-catkin/default.nix +++ b/distros/melodic/fcl-catkin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fcl-catkin"; version = "0.6.1-r2"; - src = fetchurl { - url = "https://github.com/wxmerkt/fcl_catkin-release/archive/release/melodic/fcl_catkin/0.6.1-2.tar.gz"; - name = "0.6.1-2.tar.gz"; - sha256 = "aa0d97c02a9b6ca22c02a263f2279ecefcc1570d1d79ef26fc5a1b15f6d5f5bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wxmerkt"; + repo = "fcl_catkin-release"; + rev = "release/melodic/fcl_catkin/0.6.1-2"; + sha256 = "sha256-WcsDCNzbxl+69WQ6m1ctq7rgXfwPDQ88VqXiRPC8rpU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-auto-dock-msgs/default.nix b/distros/melodic/fetch-auto-dock-msgs/default.nix index 59dfdc6e85..dd13d26b7d 100644 --- a/distros/melodic/fetch-auto-dock-msgs/default.nix +++ b/distros/melodic/fetch-auto-dock-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-auto-dock-msgs"; version = "1.1.1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_msgs-release/archive/release/melodic/fetch_auto_dock_msgs/1.1.1-0.tar.gz"; - name = "1.1.1-0.tar.gz"; - sha256 = "34f30fe803b0fad0edc3a7983308c34404592920ce11fbdd0d96fd8ea849eb77"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_msgs-release"; + rev = "release/melodic/fetch_auto_dock_msgs/1.1.1-0"; + sha256 = "sha256-44gElrgOCdl8HT4e/lDV1FNqnPynngNU+icXnJgXwdg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/fetch-bringup/default.nix b/distros/melodic/fetch-bringup/default.nix index 0453cc8943..8c0c97d2f6 100644 --- a/distros/melodic/fetch-bringup/default.nix +++ b/distros/melodic/fetch-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-bringup"; version = "0.8.9-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_robots-release/archive/release/melodic/fetch_bringup/0.8.9-1.tar.gz"; - name = "0.8.9-1.tar.gz"; - sha256 = "120c683bc11d44db7062a463603c0f9246e77c30ab72cb722ade4fb45cef81ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_robots-release"; + rev = "release/melodic/fetch_bringup/0.8.9-1"; + sha256 = "sha256-kByPzfhiGJ30/uABX/B5blzVaXIhnQKzLnYayNWEAcU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-calibration/default.nix b/distros/melodic/fetch-calibration/default.nix index bd54a144bd..3fc5feb7e4 100644 --- a/distros/melodic/fetch-calibration/default.nix +++ b/distros/melodic/fetch-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-calibration"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_calibration/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "3e2fafdcabe870e9a85de7e96582f8d42371e6cd23354f8f3da19f2331598178"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_calibration/0.8.3-1"; + sha256 = "sha256-wztLZvs91TQpcYRI4FIlB7v76XBQc3G6mzZuqlbusrc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-depth-layer/default.nix b/distros/melodic/fetch-depth-layer/default.nix index d2f8e50192..fc73d3a7a7 100644 --- a/distros/melodic/fetch-depth-layer/default.nix +++ b/distros/melodic/fetch-depth-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-depth-layer"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_depth_layer/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "490e0726b5855cdb1b1d6185c3d7960b6898854b580c19b44405af2f9c089439"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_depth_layer/0.8.3-1"; + sha256 = "sha256-d2fgKLdQ2MJ1/gjKpg2UxenbNnpQGFXXwZVicufndLs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-description/default.nix b/distros/melodic/fetch-description/default.nix index 4584a7872d..d072a3b0f9 100644 --- a/distros/melodic/fetch-description/default.nix +++ b/distros/melodic/fetch-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-description"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_description/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "687e90ba5a74c8f638c2141f710509056186288a9b58291c6cec54c017680347"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_description/0.8.3-1"; + sha256 = "sha256-+SBkIxVfgbQS2vYJkydxkl85odJK+CdhSZF1UZwWDyQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-driver-msgs/default.nix b/distros/melodic/fetch-driver-msgs/default.nix index 175ac665b2..455339c877 100644 --- a/distros/melodic/fetch-driver-msgs/default.nix +++ b/distros/melodic/fetch-driver-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-driver-msgs"; version = "1.1.1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_msgs-release/archive/release/melodic/fetch_driver_msgs/1.1.1-0.tar.gz"; - name = "1.1.1-0.tar.gz"; - sha256 = "aa88a178c8b721288077bbbb32c4bd4ca3b36e3b2cbda1535320326140d82ec5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_msgs-release"; + rev = "release/melodic/fetch_driver_msgs/1.1.1-0"; + sha256 = "sha256-3f226jvP42xD5gudw04daHpLqTMUlxppyjviOc2RFpM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/fetch-drivers/default.nix b/distros/melodic/fetch-drivers/default.nix index bd240ba2de..66f3b8314f 100644 --- a/distros/melodic/fetch-drivers/default.nix +++ b/distros/melodic/fetch-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-drivers"; version = "0.8.9-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_robots-release/archive/release/melodic/fetch_drivers/0.8.9-1.tar.gz"; - name = "0.8.9-1.tar.gz"; - sha256 = "21476cf4eb010a51179a0700644ac8a15f5aaa5ccb4d704e9d1d7ab102048f80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_robots-release"; + rev = "release/melodic/fetch_drivers/0.8.9-1"; + sha256 = "sha256-uUCcW6VzK70otO4WyCBAn29Szx+ytnoTclwZGVpM3Qg="; + }; buildType = "catkin"; buildInputs = [ catkin mk rospack ]; diff --git a/distros/melodic/fetch-gazebo-demo/default.nix b/distros/melodic/fetch-gazebo-demo/default.nix index 23ccd8aad3..a1dbefdb4f 100644 --- a/distros/melodic/fetch-gazebo-demo/default.nix +++ b/distros/melodic/fetch-gazebo-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-gazebo-demo"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_gazebo-release/archive/release/melodic/fetch_gazebo_demo/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "05bdd08b42eef924bb22fe4761ce314019a5192c9c4905c65cecb83aa42de1e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_gazebo-release"; + rev = "release/melodic/fetch_gazebo_demo/0.9.2-1"; + sha256 = "sha256-Dtr618grubtY9ceXwj14DkMroDjbC0wtg8BKoDYH06k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-gazebo/default.nix b/distros/melodic/fetch-gazebo/default.nix index 8d210577ea..cc621212c4 100644 --- a/distros/melodic/fetch-gazebo/default.nix +++ b/distros/melodic/fetch-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-gazebo"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_gazebo-release/archive/release/melodic/fetch_gazebo/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "e368f635946556a5334f6daeef1d2ab3c2be880fa3429b71e14ccf15ec5814f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_gazebo-release"; + rev = "release/melodic/fetch_gazebo/0.9.2-1"; + sha256 = "sha256-V+pVXnl5I6OR1PuSlxOJ7wKyYxyd0aZo3o/m9Z4RFwA="; + }; buildType = "catkin"; buildInputs = [ angles catkin gazebo-dev ]; diff --git a/distros/melodic/fetch-ikfast-plugin/default.nix b/distros/melodic/fetch-ikfast-plugin/default.nix index 0d91d37425..4916dec520 100644 --- a/distros/melodic/fetch-ikfast-plugin/default.nix +++ b/distros/melodic/fetch-ikfast-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-ikfast-plugin"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_ikfast_plugin/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "a0544a3c2d4320f714505bee02841026dddbdd25819836b0bafce8ef8e5d9e64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_ikfast_plugin/0.8.3-1"; + sha256 = "sha256-5jJyk5+9jTZWgYYViA+L6zSt6uDvtHaGxa1l4md33/4="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen tf2-kdl ]; diff --git a/distros/melodic/fetch-maps/default.nix b/distros/melodic/fetch-maps/default.nix index 0e5bda6ed0..7c06d67c16 100644 --- a/distros/melodic/fetch-maps/default.nix +++ b/distros/melodic/fetch-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-maps"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_maps/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "db4c4c0bf852af0c3cb9b87e7021a2576e30fafe715edc8a4c4cdc3c36edc02f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_maps/0.8.3-1"; + sha256 = "sha256-ChH6Hcj5PgsTXaIF10TLj1lVjw58iBqEc07WbBpYuko="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-moveit-config/default.nix b/distros/melodic/fetch-moveit-config/default.nix index f22b30b894..73ea3f48f0 100644 --- a/distros/melodic/fetch-moveit-config/default.nix +++ b/distros/melodic/fetch-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-moveit-config"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_moveit_config/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "310f13774d6806737101b5f8a11d6dd03df7f6f3858592b43e8b2d20900b7a62"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_moveit_config/0.8.3-1"; + sha256 = "sha256-EEcOEWRfwJRab1Rb4jHbPzaaaUymj4HpVgqRHCySmX4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-navigation/default.nix b/distros/melodic/fetch-navigation/default.nix index e6beb801bf..94661ced08 100644 --- a/distros/melodic/fetch-navigation/default.nix +++ b/distros/melodic/fetch-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-navigation"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_navigation/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "95caf008d946b5af25d11443d21a5cbb791185b54f91825b928894e27706ecdb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_navigation/0.8.3-1"; + sha256 = "sha256-TdiAD44HjspL3FssiV42/BoXF16GrNAdq1vBzZGgvcs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-open-auto-dock/default.nix b/distros/melodic/fetch-open-auto-dock/default.nix index bce385effd..cfeda28564 100644 --- a/distros/melodic/fetch-open-auto-dock/default.nix +++ b/distros/melodic/fetch-open-auto-dock/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-open-auto-dock"; version = "0.1.2"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_open_auto_dock-gbp/archive/release/melodic/fetch_open_auto_dock/0.1.2-0.tar.gz"; - name = "0.1.2-0.tar.gz"; - sha256 = "73cbede7be9f363559992d9bab141eea8b9c4ac72928fb567e0542cfb0ea7c2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_open_auto_dock-gbp"; + rev = "release/melodic/fetch_open_auto_dock/0.1.2-0"; + sha256 = "sha256-ou6pASSlpaPncSfLRYMmQw3QtrWS84MphEBNQjO3Shg="; + }; buildType = "catkin"; buildInputs = [ angles catkin ]; diff --git a/distros/melodic/fetch-ros/default.nix b/distros/melodic/fetch-ros/default.nix index 006d577ae8..c988ee303c 100644 --- a/distros/melodic/fetch-ros/default.nix +++ b/distros/melodic/fetch-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-ros"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_ros/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "0352c66a6b59ab197e607345b2fe5c6f68de8600eaa6dc0b241e7e47b9984888"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_ros/0.8.3-1"; + sha256 = "sha256-/HzzOfAbTeqItj/2xN/IPLO3TdWsyWvdLwia6rz1I8Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-simple-linear-controller/default.nix b/distros/melodic/fetch-simple-linear-controller/default.nix index 64f7f07eec..acf719dee3 100644 --- a/distros/melodic/fetch-simple-linear-controller/default.nix +++ b/distros/melodic/fetch-simple-linear-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-simple-linear-controller"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/gt-rail-release/fetch_simple_linear_controller-release/archive/release/melodic/fetch_simple_linear_controller/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "d9479296511f18cc03d51eb3879bd40eb8b3d93fe77c8eb7be34b96d88959ec6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gt-rail-release"; + repo = "fetch_simple_linear_controller-release"; + rev = "release/melodic/fetch_simple_linear_controller/0.0.1-1"; + sha256 = "sha256-pn4eYMlb61cSiMjJcIx36n2LIpVlFHi7ICxlvTobepE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/fetch-simulation/default.nix b/distros/melodic/fetch-simulation/default.nix index 1a6ceceaaf..06795bbea1 100644 --- a/distros/melodic/fetch-simulation/default.nix +++ b/distros/melodic/fetch-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-simulation"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_gazebo-release/archive/release/melodic/fetch_simulation/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "76b37846fcf07da29ab58753137ef1f324d53e8f6ca225fe46310e6673c7d801"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_gazebo-release"; + rev = "release/melodic/fetch_simulation/0.9.2-1"; + sha256 = "sha256-b04Y+CJhoE1a8xUtlmK+tVQg/GZQxHdX6TKKhpJGzz8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetch-teleop/default.nix b/distros/melodic/fetch-teleop/default.nix index f3d00e2a46..9caefefa83 100644 --- a/distros/melodic/fetch-teleop/default.nix +++ b/distros/melodic/fetch-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetch-teleop"; version = "0.8.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/melodic/fetch_teleop/0.8.3-1.tar.gz"; - name = "0.8.3-1.tar.gz"; - sha256 = "8546502b0596bab3a981a2f3d7aeb935e5dafac7a59a51a9c1204d0da771cadf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/melodic/fetch_teleop/0.8.3-1"; + sha256 = "sha256-YyoM1LcgG4mN7zUmwSfMRwqpw3E98cYqRRya1xPjqe0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fetchit-challenge/default.nix b/distros/melodic/fetchit-challenge/default.nix index 3b8df0c616..df9d82c062 100644 --- a/distros/melodic/fetchit-challenge/default.nix +++ b/distros/melodic/fetchit-challenge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fetchit-challenge"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_gazebo-release/archive/release/melodic/fetchit_challenge/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "603d36878e1a24437139fe6bc9542bbd19f197c3bea78c6c977b2231c7abb837"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_gazebo-release"; + rev = "release/melodic/fetchit_challenge/0.9.2-1"; + sha256 = "sha256-OMso/ie2HjtbevGkPQZSuOenvu1t1RIIkMk9yEGlWU0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ff/default.nix b/distros/melodic/ff/default.nix index 41b3eb36b0..bcd81dba94 100644 --- a/distros/melodic/ff/default.nix +++ b/distros/melodic/ff/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ff"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/ff/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "13dfc86b59d80bef612a14e95788d35e583bd0f6caec9a61ec443ca57ef03fc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/ff/2.1.24-2"; + sha256 = "sha256-s2zHWYRKqy8BetmOOkbRhMgL2CFUQT7+XEUtBzeqKb8="; + }; buildType = "catkin"; buildInputs = [ bison cacert catkin flex mk openssl rosbash rosbuild roslib rospack unzip ]; diff --git a/distros/melodic/ffha/default.nix b/distros/melodic/ffha/default.nix index 6e69cda14f..385d095e39 100644 --- a/distros/melodic/ffha/default.nix +++ b/distros/melodic/ffha/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ffha"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/ffha/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "cf98d5edbe4df60e5c37270f7a830cdf00fcee43004e8d5f743adc5e6c717ab4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/ffha/2.1.24-2"; + sha256 = "sha256-3wwXexE3RifMbXKIub7JO3c0XHmQWJ6pLCOfUthQi0M="; + }; buildType = "catkin"; buildInputs = [ bison catkin flex gawk mk rosbuild roslib rospack ]; diff --git a/distros/melodic/fiducial-msgs/default.nix b/distros/melodic/fiducial-msgs/default.nix index 7a4ffa8f61..de63777bb9 100644 --- a/distros/melodic/fiducial-msgs/default.nix +++ b/distros/melodic/fiducial-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fiducial-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/fiducials-release/archive/release/melodic/fiducial_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "f518a98e96490068c7b4d086801cca8b5948d274451c03e1e82221fde3101366"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "fiducials-release"; + rev = "release/melodic/fiducial_msgs/0.11.0-1"; + sha256 = "sha256-4bgYnfHapkrXRyXNo2SSpGuWbKPctbdVscBz7ZuxiIU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/fiducial-slam/default.nix b/distros/melodic/fiducial-slam/default.nix index e04d7b635f..46301f9c0e 100644 --- a/distros/melodic/fiducial-slam/default.nix +++ b/distros/melodic/fiducial-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fiducial-slam"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/fiducials-release/archive/release/melodic/fiducial_slam/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "d7bb17f5b59c70f84500b9e64d53c3d254832b3a1b802f24649394cd687720e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "fiducials-release"; + rev = "release/melodic/fiducial_slam/0.11.0-1"; + sha256 = "sha256-F4Ph4bXIXHKsDQnyQqv1u62Q1M5wp2v+OQv64aHfC00="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fiducials/default.nix b/distros/melodic/fiducials/default.nix index df7ae7650b..5a8f616267 100644 --- a/distros/melodic/fiducials/default.nix +++ b/distros/melodic/fiducials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fiducials"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/fiducials-release/archive/release/melodic/fiducials/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "cdfb60356b3852cae3028e4e0fb674fffb1f6a65d825fe26f12fab272b5dc3a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "fiducials-release"; + rev = "release/melodic/fiducials/0.11.0-1"; + sha256 = "sha256-V0QAwdnaGlMUgt3QY7nCy9uGrtOIyhyJAWOd6pEirsY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/file-management/default.nix b/distros/melodic/file-management/default.nix index 542504e5b5..f5fa93e5f6 100644 --- a/distros/melodic/file-management/default.nix +++ b/distros/melodic/file-management/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-file-management"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/cloudwatch_common-release/archive/release/melodic/file_management/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "ba98a28f68f31e1a51a1fb3de6afc22b8797f88ddeb0416a1d85fdbbc863e51d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "cloudwatch_common-release"; + rev = "release/melodic/file_management/1.1.5-1"; + sha256 = "sha256-hz4/LrFCmPDGkLfyFAYxvNYxiF7CVX5f9JgLGIm6jxs="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/file-uploader-msgs/default.nix b/distros/melodic/file-uploader-msgs/default.nix index 093b9a2fe0..572aff7065 100644 --- a/distros/melodic/file-uploader-msgs/default.nix +++ b/distros/melodic/file-uploader-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-file-uploader-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/rosbag_uploader-release/archive/release/melodic/file_uploader_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "09cb1bb3bd826bc012b149ae435bf76f4d1b9f9dc6efda04fbb57baf476ae2c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "rosbag_uploader-release"; + rev = "release/melodic/file_uploader_msgs/1.0.1-1"; + sha256 = "sha256-HjtUjfkwpWAwo3wI/6oGALUtmaoQQla8En9nK0xAiiE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/filters/default.nix b/distros/melodic/filters/default.nix index e4d66f9871..38aee65958 100644 --- a/distros/melodic/filters/default.nix +++ b/distros/melodic/filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-filters"; version = "1.8.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/filters-release/archive/release/melodic/filters/1.8.3-1.tar.gz"; - name = "1.8.3-1.tar.gz"; - sha256 = "8cd183df34d0c9458e0a3f90d5a1d2885aa9363978347e3e3cfc3d01ec709261"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "filters-release"; + rev = "release/melodic/filters/1.8.3-1"; + sha256 = "sha256-5lhvxW7rZfQvb+6q9Sme7WFpWYSrFnpXeroX20jU+Jo="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/find-object-2d/default.nix b/distros/melodic/find-object-2d/default.nix index 4c22ca84c4..8c74148cc5 100644 --- a/distros/melodic/find-object-2d/default.nix +++ b/distros/melodic/find-object-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-find-object-2d"; version = "0.7.0-r2"; - src = fetchurl { - url = "https://github.com/introlab/find_object_2d-release/archive/release/melodic/find_object_2d/0.7.0-2.tar.gz"; - name = "0.7.0-2.tar.gz"; - sha256 = "bd49b707c52b9c3bbc257f082562beb25139a89572bb87f531f795b6b8edacb9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "find_object_2d-release"; + rev = "release/melodic/find_object_2d/0.7.0-2"; + sha256 = "sha256-SaO74TFbaUB9XOb29ldwM0tRjIS2S+otZ3fsB2mO++s="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/fingertip-pressure/default.nix b/distros/melodic/fingertip-pressure/default.nix index 97162bfe0c..e67adeb7e3 100644 --- a/distros/melodic/fingertip-pressure/default.nix +++ b/distros/melodic/fingertip-pressure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fingertip-pressure"; version = "1.8.19-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_ethercat_drivers-release/archive/release/melodic/fingertip_pressure/1.8.19-1.tar.gz"; - name = "1.8.19-1.tar.gz"; - sha256 = "24a090d31a677615de660c07ec0bc95bb80e2896d95455b806f3116c1ceb5c23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_ethercat_drivers-release"; + rev = "release/melodic/fingertip_pressure/1.8.19-1"; + sha256 = "sha256-LFYy3JX5gmlINj5Ymj/D6zv92UADHOPgHgLrJhUk16s="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/melodic/fkie-message-filters/default.nix b/distros/melodic/fkie-message-filters/default.nix index 3b1faedce7..58fbf4b79d 100644 --- a/distros/melodic/fkie-message-filters/default.nix +++ b/distros/melodic/fkie-message-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fkie-message-filters"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/fkie-release/message_filters-release/archive/release/melodic/fkie_message_filters/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "eb46a7a5c55017a8d1b6ac46a790e57762819ccc0e26884a1ce1f9f9835bce39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "message_filters-release"; + rev = "release/melodic/fkie_message_filters/1.1.2-1"; + sha256 = "sha256-QFSEVgbep32zGMY9OffccZ80J7SEc6n0wrni+Hc6/SY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fkie-potree-rviz-plugin/default.nix b/distros/melodic/fkie-potree-rviz-plugin/default.nix index 2fbfa815d8..6f002557c2 100644 --- a/distros/melodic/fkie-potree-rviz-plugin/default.nix +++ b/distros/melodic/fkie-potree-rviz-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fkie-potree-rviz-plugin"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fkie-release/potree_rviz_plugin-release/archive/release/melodic/fkie_potree_rviz_plugin/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "c1b5661805e0eee8b57c70f305616a10753111376f3a846c4c0b0fc1486809d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "potree_rviz_plugin-release"; + rev = "release/melodic/fkie_potree_rviz_plugin/1.0.1-1"; + sha256 = "sha256-4G64ETXGSge+XUxK5Nd3gs36N0c3skLgmiuXLuPJMgM="; + }; buildType = "catkin"; buildInputs = [ catkin jsoncpp ]; diff --git a/distros/melodic/flatbuffers/default.nix b/distros/melodic/flatbuffers/default.nix index cfa20e0ccd..ff62371946 100644 --- a/distros/melodic/flatbuffers/default.nix +++ b/distros/melodic/flatbuffers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flatbuffers"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/flatbuffers-release/archive/release/melodic/flatbuffers/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "5795283a62da224d9cf76e21ea581f48ce9e1bc37be751aaf547cfbba77a1bf8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "flatbuffers-release"; + rev = "release/melodic/flatbuffers/1.1.0-0"; + sha256 = "sha256-2PV4s67rvz8Vq6OlGA/IhNZiUq3eJ+p+bD7I1GCevls="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/flexbe-behavior-engine/default.nix b/distros/melodic/flexbe-behavior-engine/default.nix index 16d50cc7e7..5e02666f68 100644 --- a/distros/melodic/flexbe-behavior-engine/default.nix +++ b/distros/melodic/flexbe-behavior-engine/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-behavior-engine"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_behavior_engine/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "1a487ca2743eb95a8af7463dbae7e01e6f0265e58029c3cbb726d8d5720fb1f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_behavior_engine/1.3.1-1"; + sha256 = "sha256-hibHtRJF+j5utUMiojrt0ceYMZnmDNfDVbKIavWwzCU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/flexbe-core/default.nix b/distros/melodic/flexbe-core/default.nix index 3896efa184..740b731ae7 100644 --- a/distros/melodic/flexbe-core/default.nix +++ b/distros/melodic/flexbe-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-core"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_core/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "76bc352f0f1eee154e958b4da7b7cc35ceba8f5ed1d0a38ded989ee301da1c30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_core/1.3.1-1"; + sha256 = "sha256-Cxkk2YQBvPPc8vhIT69WDR92xMlMbdz1OTW0nzMHisg="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/flexbe-input/default.nix b/distros/melodic/flexbe-input/default.nix index e62e594d59..73b0055419 100644 --- a/distros/melodic/flexbe-input/default.nix +++ b/distros/melodic/flexbe-input/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-input"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_input/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "ff53abeb3fdff9cf84447db21f67da532c57366b46801c34348500e63c3bfbba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_input/1.3.1-1"; + sha256 = "sha256-d7s3Rg5/scjED5UuXBN4+jbf08+qXoTcmYN0itVunFs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/flexbe-mirror/default.nix b/distros/melodic/flexbe-mirror/default.nix index 0f82aedc30..45c21af112 100644 --- a/distros/melodic/flexbe-mirror/default.nix +++ b/distros/melodic/flexbe-mirror/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-mirror"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_mirror/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "1a4db16ce0e35303a163e75a4cd99dae334892e83ce2a190b77044acc61c3569"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_mirror/1.3.1-1"; + sha256 = "sha256-cR7e7+J7x56JXLhtdTu6yk2mT4jI8FPxnCkifA1U41c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/flexbe-msgs/default.nix b/distros/melodic/flexbe-msgs/default.nix index 76997a451a..69f8c3702c 100644 --- a/distros/melodic/flexbe-msgs/default.nix +++ b/distros/melodic/flexbe-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "b50c2b33386a9314ed984fe8fd9899940b45cede26ece3d7046054b5bb86cc48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_msgs/1.3.1-1"; + sha256 = "sha256-5JTEXqvMK3xS1askj4ett71/LTxJn6XjnXYjHooNads="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/flexbe-onboard/default.nix b/distros/melodic/flexbe-onboard/default.nix index 1ed1c68da5..4de6cfd18c 100644 --- a/distros/melodic/flexbe-onboard/default.nix +++ b/distros/melodic/flexbe-onboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-onboard"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_onboard/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "c76dab2227ad0f060b157f3abfd498610edfe5174f77ff916e34ca02bf164e4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_onboard/1.3.1-1"; + sha256 = "sha256-F4Po6AOQNmweidPtk4tbz9y8fQ8XiiTZKBMtQiIacng="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/flexbe-states/default.nix b/distros/melodic/flexbe-states/default.nix index 2a879e9b21..1e4e433340 100644 --- a/distros/melodic/flexbe-states/default.nix +++ b/distros/melodic/flexbe-states/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-states"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_states/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "bc72bf6b6965a04c34a24a4defedbb9bc4bfbe04e69f31b1bef5e68ca9da875b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_states/1.3.1-1"; + sha256 = "sha256-kklN2k/gtdgbr1c690Xc+8s+wkam0I+Wuxvb5iibh8Y="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/flexbe-testing/default.nix b/distros/melodic/flexbe-testing/default.nix index 6991a5c9f7..fe990d448e 100644 --- a/distros/melodic/flexbe-testing/default.nix +++ b/distros/melodic/flexbe-testing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-testing"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_testing/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "3b56376d79de37442e202a668e2284a42719f3483b355e228b7b679f7656d6d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_testing/1.3.1-1"; + sha256 = "sha256-neird5Imdab1x1RdDbJrMD0iUfR/x2PNkQ29tfRG6Bs="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/flexbe-widget/default.nix b/distros/melodic/flexbe-widget/default.nix index f2d39c688c..2144e709ad 100644 --- a/distros/melodic/flexbe-widget/default.nix +++ b/distros/melodic/flexbe-widget/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flexbe-widget"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/FlexBE/flexbe_behavior_engine-release/archive/release/melodic/flexbe_widget/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "e576ca29ea89fdb8c34fc425ec1a1b014372057d4fcc6e65adbbc9fc83ecf898"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FlexBE"; + repo = "flexbe_behavior_engine-release"; + rev = "release/melodic/flexbe_widget/1.3.1-1"; + sha256 = "sha256-m3VWWnwelSdl/f4ro5paAdKYZ25vPDANMV7qlBfVydw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/flir-boson-usb/default.nix b/distros/melodic/flir-boson-usb/default.nix index 385523f152..b2de3365bf 100644 --- a/distros/melodic/flir-boson-usb/default.nix +++ b/distros/melodic/flir-boson-usb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flir-boson-usb"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/astuff/flir_boson_usb-release/archive/release/melodic/flir_boson_usb/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "8c1bec8b2961607d526d51d6ab068534865aee4f71a1a66c326f6bd552bbdedb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "flir_boson_usb-release"; + rev = "release/melodic/flir_boson_usb/1.2.1-1"; + sha256 = "sha256-2LR9jENM+HA7ryCFBuEAzj/K65UKDxGOiW9zHTzsL/E="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/flir-ptu-description/default.nix b/distros/melodic/flir-ptu-description/default.nix index d3765bf416..a02619e133 100644 --- a/distros/melodic/flir-ptu-description/default.nix +++ b/distros/melodic/flir-ptu-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flir-ptu-description"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/flir_ptu-release/archive/release/melodic/flir_ptu_description/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "8a409939df64d81d27f91a39022a960593311dd28ec247c24e888c143afe449a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "flir_ptu-release"; + rev = "release/melodic/flir_ptu_description/0.2.1-1"; + sha256 = "sha256-ky1vfozo7sK7HuZqM12xQzM2PPrGePCpbmNYp/6c/Vw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/flir-ptu-driver/default.nix b/distros/melodic/flir-ptu-driver/default.nix index 92d2424755..eae2e9c070 100644 --- a/distros/melodic/flir-ptu-driver/default.nix +++ b/distros/melodic/flir-ptu-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flir-ptu-driver"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/flir_ptu-release/archive/release/melodic/flir_ptu_driver/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "e6110cdc136d13ce0adce0f280478c984e9dd510974eac99f1345f6400e50afa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "flir_ptu-release"; + rev = "release/melodic/flir_ptu_driver/0.2.1-1"; + sha256 = "sha256-BTYZwED8SKskEn8kXFXOArZQ8f4oAVUZt/0x3WC11sY="; + }; buildType = "catkin"; buildInputs = [ boost catkin roslaunch roslint ]; diff --git a/distros/melodic/flir-ptu-viz/default.nix b/distros/melodic/flir-ptu-viz/default.nix index 1374b88850..f0c17c8509 100644 --- a/distros/melodic/flir-ptu-viz/default.nix +++ b/distros/melodic/flir-ptu-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-flir-ptu-viz"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/flir_ptu-release/archive/release/melodic/flir_ptu_viz/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "9664de1e3ea742650e24879c7efc5a54c89105249209645362c87b4b2c5952c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "flir_ptu-release"; + rev = "release/melodic/flir_ptu_viz/0.2.1-1"; + sha256 = "sha256-a/jScuyFZGhvDjglRQdwIZGvzODz5tMlVQ5sPO2QfGI="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/floam/default.nix b/distros/melodic/floam/default.nix index 647c7eb126..234747957b 100644 --- a/distros/melodic/floam/default.nix +++ b/distros/melodic/floam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-floam"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/flynneva/floam-release/archive/release/melodic/floam/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "beb288940b811899fc7dc80cc3d6b6c673c76fa6d68616179ca82660971bb097"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "floam-release"; + rev = "release/melodic/floam/0.1.0-1"; + sha256 = "sha256-SA+takXbqkSJibyAiw43/eYnsDSb2bN9Lid7Wn87OtU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fmi-adapter-examples/default.nix b/distros/melodic/fmi-adapter-examples/default.nix index cb2b549c0e..d51fcbd571 100644 --- a/distros/melodic/fmi-adapter-examples/default.nix +++ b/distros/melodic/fmi-adapter-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fmi-adapter-examples"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/boschresearch/fmi_adapter-release/archive/release/melodic/fmi_adapter_examples/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "043af4d2b06613c1454da61302fd10367a6ac30ae5bc506b833351dd171d966c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "boschresearch"; + repo = "fmi_adapter-release"; + rev = "release/melodic/fmi_adapter_examples/1.0.4-1"; + sha256 = "sha256-vMeNdWmjucn8ZM2ReMjUR9P3TI7KODdr0GgeJOYNQvg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fmi-adapter/default.nix b/distros/melodic/fmi-adapter/default.nix index 893c3d79dd..3da54fff5d 100644 --- a/distros/melodic/fmi-adapter/default.nix +++ b/distros/melodic/fmi-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fmi-adapter"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/boschresearch/fmi_adapter-release/archive/release/melodic/fmi_adapter/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "0894a446abbe7f62af13d424e545bb3da0bb15e307f2b26ce2b4e30f2f062fe7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "boschresearch"; + repo = "fmi_adapter-release"; + rev = "release/melodic/fmi_adapter/1.0.4-1"; + sha256 = "sha256-T/tOGSBZxproguefC+sHfBgs3Zl7GOieHXdo5n8jigM="; + }; buildType = "catkin"; buildInputs = [ catkin git ]; diff --git a/distros/melodic/force-torque-sensor-controller/default.nix b/distros/melodic/force-torque-sensor-controller/default.nix index 5d61c7787f..3d6997eb1e 100644 --- a/distros/melodic/force-torque-sensor-controller/default.nix +++ b/distros/melodic/force-torque-sensor-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-force-torque-sensor-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/force_torque_sensor_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "9c66710f29ce9b5f15b89d26d2945071f891e947157c9ee6bc62305a061301d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/force_torque_sensor_controller/0.17.2-1"; + sha256 = "sha256-/M4b9YqbjBvrv7Xi04rv3Mc4njXLEcGtA+bmV+KofFM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/force-torque-sensor/default.nix b/distros/melodic/force-torque-sensor/default.nix index a45263aa61..00874658e4 100644 --- a/distros/melodic/force-torque-sensor/default.nix +++ b/distros/melodic/force-torque-sensor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-force-torque-sensor"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/KITrobotics/force_torque_sensor-release/archive/release/melodic/force_torque_sensor/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "187d9649a0604ed6f13a57c41bd0893c659ac73908c925c4a8eba7ef50837770"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KITrobotics"; + repo = "force_torque_sensor-release"; + rev = "release/melodic/force_torque_sensor/1.0.0-1"; + sha256 = "sha256-FKNgFAQNtPEb/dMBLvfge0hFGHDOhhly31Cp7n3UAwo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/forward-command-controller/default.nix b/distros/melodic/forward-command-controller/default.nix index 4c786d9301..6fb35c54b1 100644 --- a/distros/melodic/forward-command-controller/default.nix +++ b/distros/melodic/forward-command-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-forward-command-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/forward_command_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "5f1e8cb2ea9ed8bb0d670f9780213bd09f87d12641ea59dae671d2787b3c79a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/forward_command_controller/0.17.2-1"; + sha256 = "sha256-czrWenJzMMEGHYX04pOjyJCYB3gcWA9vy7bprWdOJUM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/four-wheel-steering-controller/default.nix b/distros/melodic/four-wheel-steering-controller/default.nix index cf02772981..e50282449e 100644 --- a/distros/melodic/four-wheel-steering-controller/default.nix +++ b/distros/melodic/four-wheel-steering-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-four-wheel-steering-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/four_wheel_steering_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "fc0688411a344b201c2f046fcbfc3519022d0d6b31ed6b00ef2c6a2550ff2807"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/four_wheel_steering_controller/0.17.2-1"; + sha256 = "sha256-l15hhapGAMeNRXk1bmgaVsAW9orwZH3xol+jBlKtaSw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/four-wheel-steering-msgs/default.nix b/distros/melodic/four-wheel-steering-msgs/default.nix index d20740f6e4..c175b55668 100644 --- a/distros/melodic/four-wheel-steering-msgs/default.nix +++ b/distros/melodic/four-wheel-steering-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-four-wheel-steering-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/four_wheel_steering_msgs-release/archive/release/melodic/four_wheel_steering_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "e1021982b9dfb4c4f80c680fda3349e9295561f9d8b52e28b63c501e0779684c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "four_wheel_steering_msgs-release"; + rev = "release/melodic/four_wheel_steering_msgs/1.1.0-1"; + sha256 = "sha256-zBrUcIQiRkNkn3KKHW1G7dP8nbPzITuVuIuEwGZjjQg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/foxglove-bridge/default.nix b/distros/melodic/foxglove-bridge/default.nix index 6a66c178ed..17df86b4a7 100644 --- a/distros/melodic/foxglove-bridge/default.nix +++ b/distros/melodic/foxglove-bridge/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, asio, catkin, gtest, nlohmann_json, nodelet, openssl, ros-babel-fish, ros-environment, roscpp, rosgraph-msgs, roslib, rostest, rosunit, std-msgs, websocketpp }: buildRosPackage { pname = "ros-melodic-foxglove-bridge"; - version = "0.2.2-r1"; + version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/foxglove/ros_foxglove_bridge-release/archive/release/melodic/foxglove_bridge/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "bff9c1a2651cacd73e4020a5412bf4cb7dd6043d0c3b2de84862a6c635f15028"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "foxglove"; + repo = "ros_foxglove_bridge-release"; + rev = "release/melodic/foxglove_bridge/0.3.0-1"; + sha256 = "sha256-wRnMOoLOn6E7TrYny2wfwmQuOqnYt2T/ru+L/9ua1Tk="; + }; buildType = "catkin"; buildInputs = [ asio catkin nlohmann_json ros-environment websocketpp ]; diff --git a/distros/melodic/foxglove-msgs/default.nix b/distros/melodic/foxglove-msgs/default.nix index 8eb6f727bf..f36ffcad62 100644 --- a/distros/melodic/foxglove-msgs/default.nix +++ b/distros/melodic/foxglove-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-foxglove-msgs"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/foxglove/ros_foxglove_msgs-release/archive/release/melodic/foxglove_msgs/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "af943480902232e649fc6ffdc27c77c7e2e706a1eaf9ca3e134a14b0ef84dfce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "foxglove"; + repo = "ros_foxglove_msgs-release"; + rev = "release/melodic/foxglove_msgs/2.1.1-1"; + sha256 = "sha256-WVd87BSDwF+o7s/HMSXhpwvIBHYpp6J263sCn635ILE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/frame-editor/default.nix b/distros/melodic/frame-editor/default.nix index 48733fa397..1a1be44099 100644 --- a/distros/melodic/frame-editor/default.nix +++ b/distros/melodic/frame-editor/default.nix @@ -7,11 +7,15 @@ 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "rqt_frame_editor_plugin-release"; + rev = "release/melodic/frame_editor/1.1.0-1"; + sha256 = "sha256-qDs5a96KG7MXcFyrmHPm3TNXCp2bGmMxuwCiJgXfsjM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/franka-control/default.nix b/distros/melodic/franka-control/default.nix index 0289e3a329..4b1151bb3d 100644 --- a/distros/melodic/franka-control/default.nix +++ b/distros/melodic/franka-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-control"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_control/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "07589244289085574a12bcc748da238b1b11551a72066ec8047f377637d49508"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_control/0.10.1-1"; + sha256 = "sha256-AyswjHrlwGomK37rSJ96UTA+WqlzjA2X52i+/UPSl4A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/franka-description/default.nix b/distros/melodic/franka-description/default.nix index f8e7b67d3c..cbfcb409b9 100644 --- a/distros/melodic/franka-description/default.nix +++ b/distros/melodic/franka-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-description"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_description/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "df3d79ff347588aa0f0b57f8fd72da4cddeffa378eb7dffd79b6d8b856dc1851"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_description/0.10.1-1"; + sha256 = "sha256-p8nbJN7KGlNFLGcvUeZo/ldjsPGAfgOiOEdIQ/qjH64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/franka-example-controllers/default.nix b/distros/melodic/franka-example-controllers/default.nix index d6932d507e..4ba0ad94f0 100644 --- a/distros/melodic/franka-example-controllers/default.nix +++ b/distros/melodic/franka-example-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-example-controllers"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_example_controllers/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "4c7b7d9b253dad24bd1b7709892ea28aae91f821f3679bb2e8f46dcdd776b10e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_example_controllers/0.10.1-1"; + sha256 = "sha256-8p7Gw20DddL8YvDbOFecVs3VYEhU+2mALEOjNJY3pdA="; + }; buildType = "catkin"; buildInputs = [ catkin eigen message-generation ]; diff --git a/distros/melodic/franka-gazebo/default.nix b/distros/melodic/franka-gazebo/default.nix index 5b84d74729..bbae1facb3 100644 --- a/distros/melodic/franka-gazebo/default.nix +++ b/distros/melodic/franka-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-gazebo"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_gazebo/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "f5ef11afca656489bb5b4dc9934757bf17e3f546c3d84b8fc2ee233af58b3499"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_gazebo/0.10.1-1"; + sha256 = "sha256-k+tSmXZZuPT/sdvNLNfR3TPRUgf7LXFvjHsZpz8Ktm4="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-dev ]; diff --git a/distros/melodic/franka-gripper/default.nix b/distros/melodic/franka-gripper/default.nix index 99a8b8a966..26e5edd52d 100644 --- a/distros/melodic/franka-gripper/default.nix +++ b/distros/melodic/franka-gripper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-gripper"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_gripper/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "4b2b55e24afe8ed4bf32f48b18027ea5fab1920c2685495deb0ea2041ecf1d6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_gripper/0.10.1-1"; + sha256 = "sha256-0+LWjt71ty6lIcgby7jtYDAGWWyxV5w68nV4+9xxaIg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/franka-hw/default.nix b/distros/melodic/franka-hw/default.nix index ce10829d0f..a340c4bcf7 100644 --- a/distros/melodic/franka-hw/default.nix +++ b/distros/melodic/franka-hw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-hw"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_hw/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "422d86e4c1af8d23ac212bb3b4c38a83d13b2d5731b8f9a60993a268775c4958"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_hw/0.10.1-1"; + sha256 = "sha256-qON6CwF05nRmOdaG62Spaz/+473wsMyLDhz8SaHDCJs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/franka-msgs/default.nix b/distros/melodic/franka-msgs/default.nix index bccdc4b037..94228f51a3 100644 --- a/distros/melodic/franka-msgs/default.nix +++ b/distros/melodic/franka-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-msgs"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_msgs/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "96bef59a748cc62328fc4dbd73d32020cf3e6196b7a316aa321dddbf4c35a60c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_msgs/0.10.1-1"; + sha256 = "sha256-rYMpm72ymxQ8x9fJCmMULdHdVB9C1G10ZyqN4C3PAHI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/franka-ros/default.nix b/distros/melodic/franka-ros/default.nix index 21671ed8b9..c1b5c35022 100644 --- a/distros/melodic/franka-ros/default.nix +++ b/distros/melodic/franka-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-ros"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_ros/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "2c2bca9bd599d357d5c1658000a4f08d1359da3bfa0e1d9672cebb2c3337255a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_ros/0.10.1-1"; + sha256 = "sha256-s0tJdQWTFKOVc0iTFu4iNLBkczyooC+JgTM0YFm8Weo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/franka-visualization/default.nix b/distros/melodic/franka-visualization/default.nix index 155803f7ca..20736811b8 100644 --- a/distros/melodic/franka-visualization/default.nix +++ b/distros/melodic/franka-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-franka-visualization"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/melodic/franka_visualization/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "dc1eff2c1031962f07c4f39d595d238c9e0e233ea2e93b9925d72ddd87b43cdd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/melodic/franka_visualization/0.10.1-1"; + sha256 = "sha256-sr9NeGx2mzy79LTkzszTHIdYAOPl/9mMKEMAo1laTIM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/freenect-camera/default.nix b/distros/melodic/freenect-camera/default.nix index e1320e8c60..beb14b65b9 100644 --- a/distros/melodic/freenect-camera/default.nix +++ b/distros/melodic/freenect-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-freenect-camera"; version = "0.4.3-r2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/freenect_stack-release/archive/release/melodic/freenect_camera/0.4.3-2.tar.gz"; - name = "0.4.3-2.tar.gz"; - sha256 = "86588c3b8cb5a41bc7ffabe05ccd0347248d6714997a888d662996b2a1db152f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "freenect_stack-release"; + rev = "release/melodic/freenect_camera/0.4.3-2"; + sha256 = "sha256-DM1/kZnkx+ilstVN+ZH9ssAuUxvo10/Y9GYnSUo+8Hg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/freenect-launch/default.nix b/distros/melodic/freenect-launch/default.nix index 32c82060c0..6c386bb329 100644 --- a/distros/melodic/freenect-launch/default.nix +++ b/distros/melodic/freenect-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-freenect-launch"; version = "0.4.3-r2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/freenect_stack-release/archive/release/melodic/freenect_launch/0.4.3-2.tar.gz"; - name = "0.4.3-2.tar.gz"; - sha256 = "d4041676b145d7a7ec352e261fc9565580f8b70db614675b7ce5246b03a563bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "freenect_stack-release"; + rev = "release/melodic/freenect_launch/0.4.3-2"; + sha256 = "sha256-LQ9HkSoWAC1T+Fc6vKXuFpstl5KJnIIXBCcklm6ee4A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/freenect-stack/default.nix b/distros/melodic/freenect-stack/default.nix index d8805f422d..556644d995 100644 --- a/distros/melodic/freenect-stack/default.nix +++ b/distros/melodic/freenect-stack/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-freenect-stack"; version = "0.4.3-r2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/freenect_stack-release/archive/release/melodic/freenect_stack/0.4.3-2.tar.gz"; - name = "0.4.3-2.tar.gz"; - sha256 = "0533f42d1d73c9bed14f900d28b4bf078c14c9e6c93f2245d13bbfb244532e67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "freenect_stack-release"; + rev = "release/melodic/freenect_stack/0.4.3-2"; + sha256 = "sha256-Xs5xWfbTUAzTEQRQc/hyBEepV1Pj4Ae8iHX82EG+eFI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/freight-bringup/default.nix b/distros/melodic/freight-bringup/default.nix index 9c6bc5f53f..9c395a7807 100644 --- a/distros/melodic/freight-bringup/default.nix +++ b/distros/melodic/freight-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-freight-bringup"; version = "0.8.9-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_robots-release/archive/release/melodic/freight_bringup/0.8.9-1.tar.gz"; - name = "0.8.9-1.tar.gz"; - sha256 = "7b06775c7543e57a19625778ee7165df819dcf336947f32b751772a841c6cc78"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_robots-release"; + rev = "release/melodic/freight_bringup/0.8.9-1"; + sha256 = "sha256-P/Khu8Gaxe+8qG1r2Mdt0SfXWEYoBjwBYkfK6D3v+5s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fsrobo-r-bringup/default.nix b/distros/melodic/fsrobo-r-bringup/default.nix index 4070016105..afec6f5e8e 100644 --- a/distros/melodic/fsrobo-r-bringup/default.nix +++ b/distros/melodic/fsrobo-r-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fsrobo-r-bringup"; version = "0.7.1-r1"; - src = fetchurl { - url = "https://github.com/FUJISOFT-Robotics/fsrobo_r-release/archive/release/melodic/fsrobo_r_bringup/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "6488f5bedd8e129d9de9bd6e2e39c49e79f314b5f429caed4cea410fc838e1b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FUJISOFT-Robotics"; + repo = "fsrobo_r-release"; + rev = "release/melodic/fsrobo_r_bringup/0.7.1-1"; + sha256 = "sha256-89wyo74dZUNTnvI2ovox4JGJ1bZJ/sCxRy4vQzaarQc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fsrobo-r-description/default.nix b/distros/melodic/fsrobo-r-description/default.nix index 7225799d01..d7cb08ddca 100644 --- a/distros/melodic/fsrobo-r-description/default.nix +++ b/distros/melodic/fsrobo-r-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fsrobo-r-description"; version = "0.7.1-r1"; - src = fetchurl { - url = "https://github.com/FUJISOFT-Robotics/fsrobo_r-release/archive/release/melodic/fsrobo_r_description/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "65ba35c5d734c65a9e8dffa971e527a2293755fb3e957052d2b3a9e2277b613f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FUJISOFT-Robotics"; + repo = "fsrobo_r-release"; + rev = "release/melodic/fsrobo_r_description/0.7.1-1"; + sha256 = "sha256-9RyfWYHQT8w64g6stMVXsNzZdOjKkpbbByMyiwg+0s0="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/fsrobo-r-driver/default.nix b/distros/melodic/fsrobo-r-driver/default.nix index bf583bceaf..1cf2561db9 100644 --- a/distros/melodic/fsrobo-r-driver/default.nix +++ b/distros/melodic/fsrobo-r-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fsrobo-r-driver"; version = "0.7.1-r1"; - src = fetchurl { - url = "https://github.com/FUJISOFT-Robotics/fsrobo_r-release/archive/release/melodic/fsrobo_r_driver/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "73f8370bc1e3f312b1addf1cb87ecef8ce8f98ffd9d98aebd7d7cb57ec7115da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FUJISOFT-Robotics"; + repo = "fsrobo_r-release"; + rev = "release/melodic/fsrobo_r_driver/0.7.1-1"; + sha256 = "sha256-Z6HBsu50Xl5EpR6qE3coyqK8hDqAfrD7pUyliRlJH2A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fsrobo-r-moveit-config/default.nix b/distros/melodic/fsrobo-r-moveit-config/default.nix index 7461593453..ffee014cc2 100644 --- a/distros/melodic/fsrobo-r-moveit-config/default.nix +++ b/distros/melodic/fsrobo-r-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fsrobo-r-moveit-config"; version = "0.7.1-r1"; - src = fetchurl { - url = "https://github.com/FUJISOFT-Robotics/fsrobo_r-release/archive/release/melodic/fsrobo_r_moveit_config/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "da7d237127402bc919fd00bc29f585a6d294143d95206c000326ebb3ef4e0a65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FUJISOFT-Robotics"; + repo = "fsrobo_r-release"; + rev = "release/melodic/fsrobo_r_moveit_config/0.7.1-1"; + sha256 = "sha256-5sXl3iAzxptunerL/m9tlVVQdEuilFYO7YsClkAvatc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fsrobo-r-msgs/default.nix b/distros/melodic/fsrobo-r-msgs/default.nix index 4e7ef781bb..abb6f6bdc8 100644 --- a/distros/melodic/fsrobo-r-msgs/default.nix +++ b/distros/melodic/fsrobo-r-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fsrobo-r-msgs"; version = "0.7.1-r1"; - src = fetchurl { - url = "https://github.com/FUJISOFT-Robotics/fsrobo_r-release/archive/release/melodic/fsrobo_r_msgs/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "b642305829687c22386d859d37febbe8645291be255ac7350ab8dc22f1ec220c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FUJISOFT-Robotics"; + repo = "fsrobo_r-release"; + rev = "release/melodic/fsrobo_r_msgs/0.7.1-1"; + sha256 = "sha256-bHM9+6gUFeJuoZsCVhOGxRhfuwZz7Hn0PG7sfdLCkY8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fsrobo-r-trajectory-filters/default.nix b/distros/melodic/fsrobo-r-trajectory-filters/default.nix index 00b9b36eb5..78c7d237fd 100644 --- a/distros/melodic/fsrobo-r-trajectory-filters/default.nix +++ b/distros/melodic/fsrobo-r-trajectory-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fsrobo-r-trajectory-filters"; version = "0.7.1-r1"; - src = fetchurl { - url = "https://github.com/FUJISOFT-Robotics/fsrobo_r-release/archive/release/melodic/fsrobo_r_trajectory_filters/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "14571dee2b64290f8c11e654994b76408a7485a0c9889a1b8506e4d6402c6aae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FUJISOFT-Robotics"; + repo = "fsrobo_r-release"; + rev = "release/melodic/fsrobo_r_trajectory_filters/0.7.1-1"; + sha256 = "sha256-WlQQIzbzL3X6iEeGsY09Ll7X4AZvmpdU7bY4tl4xlwc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fsrobo-r/default.nix b/distros/melodic/fsrobo-r/default.nix index 33ddb3a041..8231847c3d 100644 --- a/distros/melodic/fsrobo-r/default.nix +++ b/distros/melodic/fsrobo-r/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fsrobo-r"; version = "0.7.1-r1"; - src = fetchurl { - url = "https://github.com/FUJISOFT-Robotics/fsrobo_r-release/archive/release/melodic/fsrobo_r/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "6606f6f7371e0d138bba3841c5ef2b917969d1798208ba906bbe8bbb72ca8913"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FUJISOFT-Robotics"; + repo = "fsrobo_r-release"; + rev = "release/melodic/fsrobo_r/0.7.1-1"; + sha256 = "sha256-v342iXkrRROt6MMSy8a5Lw0hjz+2xn9fF3pQj9eF8DA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fuse-constraints/default.nix b/distros/melodic/fuse-constraints/default.nix index 9d08097cc6..712a49589c 100644 --- a/distros/melodic/fuse-constraints/default.nix +++ b/distros/melodic/fuse-constraints/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-constraints"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_constraints/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "4b6e6cbc547f90366836d7421c18799d4ee57fb1c481968fc5d5be93f5778f0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_constraints/0.4.2-1"; + sha256 = "sha256-HSYCPaQbLzg/fB/PQJ0qnN03lQIP0NKF9kdM78d+blU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fuse-core/default.nix b/distros/melodic/fuse-core/default.nix index 640a62e53e..a7604b7f2a 100644 --- a/distros/melodic/fuse-core/default.nix +++ b/distros/melodic/fuse-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-core"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_core/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "c77b8eaf22b5a011e67d962b57a7b59833a909f0fd4388b0438974879bb3f8c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_core/0.4.2-1"; + sha256 = "sha256-drX6XfrXcl+tOUKRIRxs2H6r2H2bEOVoSG5hT58KIPo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fuse-doc/default.nix b/distros/melodic/fuse-doc/default.nix index 25db2d72a9..31193141f5 100644 --- a/distros/melodic/fuse-doc/default.nix +++ b/distros/melodic/fuse-doc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-doc"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_doc/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "57e9290fc5658904228e2729d9ffbb7da66253d78b4c09c615c3bdb17fea7987"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_doc/0.4.2-1"; + sha256 = "sha256-26c5pwUd0+LEqoA5ZszgfKebfM7piQ4PZ2VHmP9lhG8="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/fuse-graphs/default.nix b/distros/melodic/fuse-graphs/default.nix index 01cacb6e6e..7731a9b912 100644 --- a/distros/melodic/fuse-graphs/default.nix +++ b/distros/melodic/fuse-graphs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-graphs"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_graphs/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "b630f3416c052e14d727a00ffdce6c4cd853400048c39cccb7ae1bdf02d7f30f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_graphs/0.4.2-1"; + sha256 = "sha256-cvugc+QoTfpkErB/+qD3bGi0xT24rzvDPzbZT432F3k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fuse-loss/default.nix b/distros/melodic/fuse-loss/default.nix index 2fb9360660..72a46a8077 100644 --- a/distros/melodic/fuse-loss/default.nix +++ b/distros/melodic/fuse-loss/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-loss"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_loss/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "6978e2c311fb7736a5afe5f373c7d2b178df364f4f9745eb15dd7b25956002f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_loss/0.4.2-1"; + sha256 = "sha256-tE+1qXZugUfiPNEUYhwJ9beyqP0ZcSc2fCHB8C3+xU0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fuse-models/default.nix b/distros/melodic/fuse-models/default.nix index 0bf88b03a4..1e1a2260d8 100644 --- a/distros/melodic/fuse-models/default.nix +++ b/distros/melodic/fuse-models/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-models"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_models/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "2998b03703ba53c58f02faef9eb706ab91c7f8e51b53c23da8922539026dafa7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_models/0.4.2-1"; + sha256 = "sha256-XxiZYv0muI50mZkHc0ruzrfsdiAUXM4fh0GQxngf224="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/melodic/fuse-msgs/default.nix b/distros/melodic/fuse-msgs/default.nix index 59a8cf1e04..44c89699a9 100644 --- a/distros/melodic/fuse-msgs/default.nix +++ b/distros/melodic/fuse-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-msgs"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_msgs/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "c9cd309c4090cf1d964e26b231c118cd290263d5d44ac2b19c1e3b850db780c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_msgs/0.4.2-1"; + sha256 = "sha256-kpAxD9WBkmHZ5rWPvPtgjcvs0J12pfqF9onpMebQYNc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/fuse-optimizers/default.nix b/distros/melodic/fuse-optimizers/default.nix index 3bad488c93..315959087d 100644 --- a/distros/melodic/fuse-optimizers/default.nix +++ b/distros/melodic/fuse-optimizers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-optimizers"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_optimizers/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "19db2d9a282a84189f9ad5ce940c4079f5d6bda5a93864fb128a4f5a41caa459"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_optimizers/0.4.2-1"; + sha256 = "sha256-sfdo5rzV2QTNUShw+q/DusxeUu0W+1AEHGZtEhPuFuU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fuse-publishers/default.nix b/distros/melodic/fuse-publishers/default.nix index d6c329464e..c105492485 100644 --- a/distros/melodic/fuse-publishers/default.nix +++ b/distros/melodic/fuse-publishers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-publishers"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_publishers/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "b9be70663b6edafeb4f05cb24ad1ed84cf5298b36a6c3fc1a627ebea77437579"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_publishers/0.4.2-1"; + sha256 = "sha256-VXMzYTYgXUqhkAVxkw5tmV8Zvfp38oZxyLfEAmmFj+Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fuse-variables/default.nix b/distros/melodic/fuse-variables/default.nix index 1eb672dab3..13e9f32723 100644 --- a/distros/melodic/fuse-variables/default.nix +++ b/distros/melodic/fuse-variables/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-variables"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_variables/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "98776b63e33317a449abc8ac1060982454f76d81722f3d8b52c79fbe2f346d4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_variables/0.4.2-1"; + sha256 = "sha256-kjU7t41ZU92TGpGUx9YQeRed1YH90trjYgWlnydKLww="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/fuse-viz/default.nix b/distros/melodic/fuse-viz/default.nix index 0f109fe468..e2d3e9ec9e 100644 --- a/distros/melodic/fuse-viz/default.nix +++ b/distros/melodic/fuse-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse-viz"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse_viz/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "344e5b335b0d41ae4b1eef9e3a7e0d26efefdbd1e9db412d9a41106673fa1d23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse_viz/0.4.2-1"; + sha256 = "sha256-xEwnt5HUd7AakfWEBitDW41HU5Dr6pxp2juUzfoyPiw="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/melodic/fuse/default.nix b/distros/melodic/fuse/default.nix index 2f0d3f3f9d..0ea2af30f3 100644 --- a/distros/melodic/fuse/default.nix +++ b/distros/melodic/fuse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-fuse"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/melodic/fuse/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "1b4c234605c45fb56e982e84cf9bf59947af23db2659eb7c038a94b5c3062d4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/melodic/fuse/0.4.2-1"; + sha256 = "sha256-fNIeOlL9jLL3OzEUoCbxsQw5E7Cda+T8uGkNJFWBnAc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gateway-msgs/default.nix b/distros/melodic/gateway-msgs/default.nix index 68d736a903..4254bdbe3d 100644 --- a/distros/melodic/gateway-msgs/default.nix +++ b/distros/melodic/gateway-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gateway-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/gateway_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "a9b6276a77498772c62e18a0f864bb657ab32a661cc4d7c150910462a4d97bc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/gateway_msgs/0.9.0-0"; + sha256 = "sha256-GZdJHAM8Vl5rsGGMKB/vAlcSEqCwD8cvrZcupDSMhoM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/gazebo-dev/default.nix b/distros/melodic/gazebo-dev/default.nix index 01a82ddd30..963ce5ef2d 100644 --- a/distros/melodic/gazebo-dev/default.nix +++ b/distros/melodic/gazebo-dev/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-dev"; version = "2.8.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_dev/2.8.7-1.tar.gz"; - name = "2.8.7-1.tar.gz"; - sha256 = "6f4a77811479925460c669ec6b9bd8c883c0e932a848affadaa81c9aac8f6b41"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/melodic/gazebo_dev/2.8.7-1"; + sha256 = "sha256-rqVkAi/7ZizqYI9gAPsFyeOeBQtOdlL5Uc1OlByEaPo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gazebo-msgs/default.nix b/distros/melodic/gazebo-msgs/default.nix index d9e29c0a1d..0f3d95877e 100644 --- a/distros/melodic/gazebo-msgs/default.nix +++ b/distros/melodic/gazebo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-msgs"; version = "2.8.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_msgs/2.8.7-1.tar.gz"; - name = "2.8.7-1.tar.gz"; - sha256 = "65a804640e4e2f3ed6c1f3cc4ba8a3133b61ba1cbd8d1f87b4dae9560009572e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/melodic/gazebo_msgs/2.8.7-1"; + sha256 = "sha256-rPPjwU2zVhGYyqiRodoRrNfo4j1e6y3gZUdQU3aNOvc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/gazebo-plugins/default.nix b/distros/melodic/gazebo-plugins/default.nix index edac692180..753de5c164 100644 --- a/distros/melodic/gazebo-plugins/default.nix +++ b/distros/melodic/gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-plugins"; version = "2.8.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_plugins/2.8.7-1.tar.gz"; - name = "2.8.7-1.tar.gz"; - sha256 = "625b943a9b31c39631b7af384aff458903170b38a252424ea1f259228d0114f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/melodic/gazebo_plugins/2.8.7-1"; + sha256 = "sha256-5TTme8cZcaczl+zlQeVLslrD118UuLwBMMSJV9ED6sU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/gazebo-ros-control/default.nix b/distros/melodic/gazebo-ros-control/default.nix index 602b705918..f48c26228e 100644 --- a/distros/melodic/gazebo-ros-control/default.nix +++ b/distros/melodic/gazebo-ros-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-ros-control"; version = "2.8.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros_control/2.8.7-1.tar.gz"; - name = "2.8.7-1.tar.gz"; - sha256 = "ecdf8af43115ba2e33784fc929f2a3db6c686ab9b5536e6276939ba846fd6b3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/melodic/gazebo_ros_control/2.8.7-1"; + sha256 = "sha256-3n4P6ZZThOL78HZONjHa7X/pOU/R2t0FDEALC1/XsQI="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-dev ]; diff --git a/distros/melodic/gazebo-ros-pkgs/default.nix b/distros/melodic/gazebo-ros-pkgs/default.nix index 111a42b17a..5df8f3a363 100644 --- a/distros/melodic/gazebo-ros-pkgs/default.nix +++ b/distros/melodic/gazebo-ros-pkgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-ros-pkgs"; version = "2.8.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros_pkgs/2.8.7-1.tar.gz"; - name = "2.8.7-1.tar.gz"; - sha256 = "32f8f2bec39336a5ee3896b263f8d2b02dcd74b077e08ae74c0f836bb02a0c7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/melodic/gazebo_ros_pkgs/2.8.7-1"; + sha256 = "sha256-500UbsiPsb17U9wyni8hYLOn4XslTjpAF2KtLWtnZK4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gazebo-ros/default.nix b/distros/melodic/gazebo-ros/default.nix index 7a0d7ed79d..3e01357472 100644 --- a/distros/melodic/gazebo-ros/default.nix +++ b/distros/melodic/gazebo-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-ros"; version = "2.8.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros/2.8.7-1.tar.gz"; - name = "2.8.7-1.tar.gz"; - sha256 = "15d999f6d119f015cf13d6bd41fcbed70138fc57ca3244e23170755949ae7067"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/melodic/gazebo_ros/2.8.7-1"; + sha256 = "sha256-3f8ewQO/MVhD+qgaV1gnZag/ok7miaKJ7qMQ0RsKfqE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/gazebo-video-monitor-msgs/default.nix b/distros/melodic/gazebo-video-monitor-msgs/default.nix index c583a5e1fb..dd4a01c570 100644 --- a/distros/melodic/gazebo-video-monitor-msgs/default.nix +++ b/distros/melodic/gazebo-video-monitor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-video-monitor-msgs"; version = "0.6.0-r2"; - src = fetchurl { - url = "https://github.com/nlamprian/gazebo_video_monitors-release/archive/release/melodic/gazebo_video_monitor_msgs/0.6.0-2.tar.gz"; - name = "0.6.0-2.tar.gz"; - sha256 = "9c04d80c315c88867ea5d67a5c7bda2cead7a3d6dd04a6a070394e6a3e6f162d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nlamprian"; + repo = "gazebo_video_monitors-release"; + rev = "release/melodic/gazebo_video_monitor_msgs/0.6.0-2"; + sha256 = "sha256-q01uh7O45SEiebkthCb4or60biXaAyjr6vphnX8zUig="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/gazebo-video-monitor-plugins/default.nix b/distros/melodic/gazebo-video-monitor-plugins/default.nix index a2423df749..66a100a70a 100644 --- a/distros/melodic/gazebo-video-monitor-plugins/default.nix +++ b/distros/melodic/gazebo-video-monitor-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-video-monitor-plugins"; version = "0.6.0-r2"; - src = fetchurl { - url = "https://github.com/nlamprian/gazebo_video_monitors-release/archive/release/melodic/gazebo_video_monitor_plugins/0.6.0-2.tar.gz"; - name = "0.6.0-2.tar.gz"; - sha256 = "b33909506f81e443d5246da568e8465b808bb82192a9b21d9e141c41a06e2d73"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nlamprian"; + repo = "gazebo_video_monitors-release"; + rev = "release/melodic/gazebo_video_monitor_plugins/0.6.0-2"; + sha256 = "sha256-35jkVTv6rle0U5HB9s9FZdDKkDgS3p1qMN4Hi/19bps="; + }; buildType = "catkin"; buildInputs = [ catkin libyamlcpp ]; diff --git a/distros/melodic/gazebo-video-monitors/default.nix b/distros/melodic/gazebo-video-monitors/default.nix index 4e5c61beab..93425c8b5a 100644 --- a/distros/melodic/gazebo-video-monitors/default.nix +++ b/distros/melodic/gazebo-video-monitors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gazebo-video-monitors"; version = "0.6.0-r2"; - src = fetchurl { - url = "https://github.com/nlamprian/gazebo_video_monitors-release/archive/release/melodic/gazebo_video_monitors/0.6.0-2.tar.gz"; - name = "0.6.0-2.tar.gz"; - sha256 = "36ec756dae6dbd2dcb27b7e7fda5627144c9f998d04064c68c90f7b04eafcdc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nlamprian"; + repo = "gazebo_video_monitors-release"; + rev = "release/melodic/gazebo_video_monitors/0.6.0-2"; + sha256 = "sha256-ndjyL1W0JDkeER/fnRptbBxE9PEVVQvt2D4tM9aZYuE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gencpp/default.nix b/distros/melodic/gencpp/default.nix index 005b1e42d9..32de1ee1b1 100644 --- a/distros/melodic/gencpp/default.nix +++ b/distros/melodic/gencpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gencpp"; version = "0.6.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gencpp-release/archive/release/melodic/gencpp/0.6.6-1.tar.gz"; - name = "0.6.6-1.tar.gz"; - sha256 = "f90054067bf428d2d09add230148de8696facdd704b3a0b2832690e8db760f75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gencpp-release"; + rev = "release/melodic/gencpp/0.6.6-1"; + sha256 = "sha256-rcC8ovZE7/49tC9pmDQx4k43dMdwGo8OmgE1Kwfvgx0="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/generated.nix b/distros/melodic/generated.nix index 2d820ebd54..35cb647f59 100644 --- a/distros/melodic/generated.nix +++ b/distros/melodic/generated.nix @@ -216,16 +216,6 @@ self: super: { boost-sml = self.callPackage ./boost-sml {}; - bota-driver = self.callPackage ./bota-driver {}; - - bota-driver-testing = self.callPackage ./bota-driver-testing {}; - - bota-node = self.callPackage ./bota-node {}; - - bota-signal-handler = self.callPackage ./bota-signal-handler {}; - - bota-worker = self.callPackage ./bota-worker {}; - brics-actuator = self.callPackage ./brics-actuator {}; calibration = self.callPackage ./calibration {}; @@ -2034,28 +2024,6 @@ self: super: { marti-can-msgs = self.callPackage ./marti-can-msgs {}; - marti-common-msgs = self.callPackage ./marti-common-msgs {}; - - marti-data-structures = self.callPackage ./marti-data-structures {}; - - marti-dbw-msgs = self.callPackage ./marti-dbw-msgs {}; - - marti-introspection-msgs = self.callPackage ./marti-introspection-msgs {}; - - marti-nav-msgs = self.callPackage ./marti-nav-msgs {}; - - marti-perception-msgs = self.callPackage ./marti-perception-msgs {}; - - marti-sensor-msgs = self.callPackage ./marti-sensor-msgs {}; - - marti-status-msgs = self.callPackage ./marti-status-msgs {}; - - marti-visualization-msgs = self.callPackage ./marti-visualization-msgs {}; - - marvelmind-nav = self.callPackage ./marvelmind-nav {}; - - master-discovery-fkie = self.callPackage ./master-discovery-fkie {}; - master-sync-fkie = self.callPackage ./master-sync-fkie {}; mav-comm = self.callPackage ./mav-comm {}; @@ -2064,32 +2032,6 @@ self: super: { mav-planning-msgs = self.callPackage ./mav-planning-msgs {}; - mavlink = self.callPackage ./mavlink {}; - - mavros = self.callPackage ./mavros {}; - - mavros-extras = self.callPackage ./mavros-extras {}; - - mavros-msgs = self.callPackage ./mavros-msgs {}; - - mbf-abstract-core = self.callPackage ./mbf-abstract-core {}; - - mbf-abstract-nav = self.callPackage ./mbf-abstract-nav {}; - - mbf-costmap-core = self.callPackage ./mbf-costmap-core {}; - - mbf-costmap-nav = self.callPackage ./mbf-costmap-nav {}; - - mbf-mesh-core = self.callPackage ./mbf-mesh-core {}; - - mbf-mesh-nav = self.callPackage ./mbf-mesh-nav {}; - - mbf-msgs = self.callPackage ./mbf-msgs {}; - - mbf-recovery-behaviors = self.callPackage ./mbf-recovery-behaviors {}; - - mbf-simple-nav = self.callPackage ./mbf-simple-nav {}; - mbf-utility = self.callPackage ./mbf-utility {}; mcl-3dl = self.callPackage ./mcl-3dl {}; @@ -2221,7 +2163,7 @@ self: super: { moveback-recovery = self.callPackage ./moveback-recovery {}; moveit = self.callPackage ./moveit {}; - + moveit-chomp-optimizer-adapter = self.callPackage ./moveit-chomp-optimizer-adapter {}; moveit-controller-manager-example = self.callPackage ./moveit-controller-manager-example {}; @@ -3068,6 +3010,8 @@ self: super: { qb-device-driver = self.callPackage ./qb-device-driver {}; + qb-device-gazebo = self.callPackage ./qb-device-gazebo {}; + qb-device-hardware-interface = self.callPackage ./qb-device-hardware-interface {}; qb-device-msgs = self.callPackage ./qb-device-msgs {}; @@ -3082,6 +3026,8 @@ self: super: { qb-hand-description = self.callPackage ./qb-hand-description {}; + qb-hand-gazebo = self.callPackage ./qb-hand-gazebo {}; + qb-hand-hardware-interface = self.callPackage ./qb-hand-hardware-interface {}; qb-move = self.callPackage ./qb-move {}; @@ -3090,6 +3036,8 @@ self: super: { qb-move-description = self.callPackage ./qb-move-description {}; + qb-move-gazebo = self.callPackage ./qb-move-gazebo {}; + qb-move-hardware-interface = self.callPackage ./qb-move-hardware-interface {}; qpmad = self.callPackage ./qpmad {}; @@ -3190,20 +3138,6 @@ self: super: { rcdiscover = self.callPackage ./rcdiscover {}; - rdl = self.callPackage ./rdl {}; - - rdl-benchmark = self.callPackage ./rdl-benchmark {}; - - rdl-cmake = self.callPackage ./rdl-cmake {}; - - rdl-dynamics = self.callPackage ./rdl-dynamics {}; - - rdl-msgs = self.callPackage ./rdl-msgs {}; - - rdl-ros-tools = self.callPackage ./rdl-ros-tools {}; - - rdl-urdfreader = self.callPackage ./rdl-urdfreader {}; - realsense2-camera = self.callPackage ./realsense2-camera {}; realsense2-description = self.callPackage ./realsense2-description {}; @@ -3354,18 +3288,6 @@ self: super: { rocon-uri = self.callPackage ./rocon-uri {}; - rokubimini = self.callPackage ./rokubimini {}; - - rokubimini-bus-manager = self.callPackage ./rokubimini-bus-manager {}; - - rokubimini-description = self.callPackage ./rokubimini-description {}; - - rokubimini-ethercat = self.callPackage ./rokubimini-ethercat {}; - - rokubimini-msgs = self.callPackage ./rokubimini-msgs {}; - - rokubimini-serial = self.callPackage ./rokubimini-serial {}; - roomba-stage = self.callPackage ./roomba-stage {}; ros = self.callPackage ./ros {}; @@ -4162,26 +4084,6 @@ self: super: { topic-tools = self.callPackage ./topic-tools {}; - toposens = self.callPackage ./toposens {}; - - toposens-sensor-library = self.callPackage ./toposens-sensor-library {}; - - 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 {}; @@ -4374,14 +4276,20 @@ self: super: { ur5e-moveit-config = self.callPackage ./ur5e-moveit-config {}; + ur-calibration = self.callPackage ./ur-calibration {}; + ur-client-library = self.callPackage ./ur-client-library {}; + ur-dashboard-msgs = self.callPackage ./ur-dashboard-msgs {}; + ur-description = self.callPackage ./ur-description {}; ur-gazebo = self.callPackage ./ur-gazebo {}; ur-msgs = self.callPackage ./ur-msgs {}; + ur-robot-driver = self.callPackage ./ur-robot-driver {}; + urdf = self.callPackage ./urdf {}; urdf-geometry-parser = self.callPackage ./urdf-geometry-parser {}; diff --git a/distros/melodic/generic-throttle/default.nix b/distros/melodic/generic-throttle/default.nix index 5ad8ad3034..4f91ce70af 100644 --- a/distros/melodic/generic-throttle/default.nix +++ b/distros/melodic/generic-throttle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-generic-throttle"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/generic_throttle/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "12fe78d29a029cfb0412a24e6fcd2108096c6b137493c309736f9675ad132c49"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/generic_throttle/0.6.19-1"; + sha256 = "sha256-Su9ShqBrHYerj3xM7CswqHM2UxFSEPmlLBoyPvkv09M="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/geneus/default.nix b/distros/melodic/geneus/default.nix index 1f7a1c8030..c2e760c860 100644 --- a/distros/melodic/geneus/default.nix +++ b/distros/melodic/geneus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geneus"; version = "2.2.6"; - src = fetchurl { - url = "https://github.com/tork-a/geneus-release/archive/release/melodic/geneus/2.2.6-0.tar.gz"; - name = "2.2.6-0.tar.gz"; - sha256 = "aadb96f7266f5584813ea6033317b1decf6a7358d01cf257239ae4c04ffb67c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "geneus-release"; + rev = "release/melodic/geneus/2.2.6-0"; + sha256 = "sha256-jU3g3HbBbxZicXeqmApz8s7kGqbozsDAmzn2COAlvD0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/genlisp/default.nix b/distros/melodic/genlisp/default.nix index cfd396bd55..96aa10d0fc 100644 --- a/distros/melodic/genlisp/default.nix +++ b/distros/melodic/genlisp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-genlisp"; version = "0.4.16"; - src = fetchurl { - url = "https://github.com/ros-gbp/genlisp-release/archive/release/melodic/genlisp/0.4.16-0.tar.gz"; - name = "0.4.16-0.tar.gz"; - sha256 = "0da61ebbb633656062ce030fc94b5931bf3cdf3b5cf896116895608a739a520a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "genlisp-release"; + rev = "release/melodic/genlisp/0.4.16-0"; + sha256 = "sha256-rgb3lhBFBIDQIg6NuajQYdKy7o3KNa+rMv5AFAL1zWI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/genmsg/default.nix b/distros/melodic/genmsg/default.nix index f705343b21..ff28888f85 100644 --- a/distros/melodic/genmsg/default.nix +++ b/distros/melodic/genmsg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-genmsg"; version = "0.5.17-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/genmsg-release/archive/release/melodic/genmsg/0.5.17-1.tar.gz"; - name = "0.5.17-1.tar.gz"; - sha256 = "cd554bd374a82c88486fed47a82330e40b6046097bde80e9ff02e15d796a3b45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "genmsg-release"; + rev = "release/melodic/genmsg/0.5.17-1"; + sha256 = "sha256-4659So/0dJGGdMB2Ee/qre/KHOS3t6fQZ5s8Gr0pU/o="; + }; buildType = "catkin"; buildInputs = [ pythonPackages.setuptools ]; diff --git a/distros/melodic/genmypy/default.nix b/distros/melodic/genmypy/default.nix index cd38b0bdeb..c086eeb4d6 100644 --- a/distros/melodic/genmypy/default.nix +++ b/distros/melodic/genmypy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-genmypy"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/rospypi/genmypy-release/archive/release/melodic/genmypy/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "6a55a01f75fa0cb6ec6fb8eb55d3a89067016bb38f9c0a10c31427c97360573e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rospypi"; + repo = "genmypy-release"; + rev = "release/melodic/genmypy/0.3.1-1"; + sha256 = "sha256-hf/egLXmmmwG/ST3AlI7ljjfjFcVTtTcGeRP2FiLBQA="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/gennodejs/default.nix b/distros/melodic/gennodejs/default.nix index 57f0871e85..f8d6a46926 100644 --- a/distros/melodic/gennodejs/default.nix +++ b/distros/melodic/gennodejs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gennodejs"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/RethinkRobotics-release/gennodejs-release/archive/release/melodic/gennodejs/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "09d5f9ee001d83dd19c111dc8c2d995b9e9a90e21df2a379b882ac555b9bc9b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RethinkRobotics-release"; + repo = "gennodejs-release"; + rev = "release/melodic/gennodejs/2.0.1-0"; + sha256 = "sha256-UJ76t3rPxaMOnKzT+qyyoBbUT+yQvF+saiJgtzIT9Bw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/genpy/default.nix b/distros/melodic/genpy/default.nix index 2111259386..05f36de31d 100644 --- a/distros/melodic/genpy/default.nix +++ b/distros/melodic/genpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-genpy"; version = "0.6.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/genpy-release/archive/release/melodic/genpy/0.6.16-1.tar.gz"; - name = "0.6.16-1.tar.gz"; - sha256 = "1b1e9c10f9bc7976395bc7d966d6ec895f1a5d5d4c161a11c3f38c8a2e614f7d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "genpy-release"; + rev = "release/melodic/genpy/0.6.16-1"; + sha256 = "sha256-qukQ2jqAlARNBiF7EYehvMXTW2tZkuMAeGpt4wvGEoA="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/geodesy/default.nix b/distros/melodic/geodesy/default.nix index 8665f99a8a..77138af6b7 100644 --- a/distros/melodic/geodesy/default.nix +++ b/distros/melodic/geodesy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geodesy"; version = "0.5.3"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/melodic/geodesy/0.5.3-0.tar.gz"; - name = "0.5.3-0.tar.gz"; - sha256 = "58e20388e22a583385b39acf097e80a508617623d484f29a30f31ee96558f58b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/melodic/geodesy/0.5.3-0"; + sha256 = "sha256-hhVKkLuDjbfnjwNkoO9Yzm76mB5ZdJsCNy5cwJmSBpU="; + }; buildType = "catkin"; buildInputs = [ angles catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/geographic-info/default.nix b/distros/melodic/geographic-info/default.nix index e50153b370..81deb0b088 100644 --- a/distros/melodic/geographic-info/default.nix +++ b/distros/melodic/geographic-info/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geographic-info"; version = "0.5.3"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/melodic/geographic_info/0.5.3-0.tar.gz"; - name = "0.5.3-0.tar.gz"; - sha256 = "fa023c42d3d879c61e6052534eb94de0ab79635946e10f0039f7daeb80f92bf1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/melodic/geographic_info/0.5.3-0"; + sha256 = "sha256-9PlyZydnmuj1cEcW0q24rTt5auRwJ2mBJmoTr0u5yD0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/geographic-msgs/default.nix b/distros/melodic/geographic-msgs/default.nix index a290b8e245..ce9ff2d80c 100644 --- a/distros/melodic/geographic-msgs/default.nix +++ b/distros/melodic/geographic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geographic-msgs"; version = "0.5.3"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/melodic/geographic_msgs/0.5.3-0.tar.gz"; - name = "0.5.3-0.tar.gz"; - sha256 = "68d46a359b8eec02f2ee60c6997f9bf3399925e9f93c453839a07125ce8f959f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/melodic/geographic_msgs/0.5.3-0"; + sha256 = "sha256-8kr6S613mnsjH29obusj5kgf7XqW7ZvxtBXAXbfY2uk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/geometric-shapes/default.nix b/distros/melodic/geometric-shapes/default.nix index d84b9e56a7..4ab737a3dd 100644 --- a/distros/melodic/geometric-shapes/default.nix +++ b/distros/melodic/geometric-shapes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geometric-shapes"; version = "0.6.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometric_shapes-release/archive/release/melodic/geometric_shapes/0.6.4-1.tar.gz"; - name = "0.6.4-1.tar.gz"; - sha256 = "0f6df13673315030432f153008c0d0eb9a8188911e84ade79d627358ea562e4d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometric_shapes-release"; + rev = "release/melodic/geometric_shapes/0.6.4-1"; + sha256 = "sha256-ETVtsZZvyqZNDNYbrhtJYBqhl7RJLvO8ZhdnICRGnCc="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/melodic/geometry-msgs/default.nix b/distros/melodic/geometry-msgs/default.nix index ee9e0b84ad..465165dcba 100644 --- a/distros/melodic/geometry-msgs/default.nix +++ b/distros/melodic/geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geometry-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/geometry_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "cbac8c272635cd628ac4ea51b1bbfcba1070c018d84c27da08af484512870d1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/geometry_msgs/1.12.8-1"; + sha256 = "sha256-hxAv9bj235l/nR6Ik9eeZ4iWsa6r9f1dhXI0L5sny3o="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/geometry-tutorials/default.nix b/distros/melodic/geometry-tutorials/default.nix index d112404350..12763f64c9 100644 --- a/distros/melodic/geometry-tutorials/default.nix +++ b/distros/melodic/geometry-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geometry-tutorials"; version = "0.2.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry_tutorials-release/archive/release/melodic/geometry_tutorials/0.2.2-0.tar.gz"; - name = "0.2.2-0.tar.gz"; - sha256 = "681b5bd03623bc5832921eeb3d314a4f8d9dfbf05f7f48fb48adf327bfc4e2ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/melodic/geometry_tutorials/0.2.2-0"; + sha256 = "sha256-8TFVqx9XsM4p3sUBQ+KfvPXNtVHeccdETErbdvmt/UQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/geometry/default.nix b/distros/melodic/geometry/default.nix index 5c2a06f8b6..8589715f25 100644 --- a/distros/melodic/geometry/default.nix +++ b/distros/melodic/geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geometry"; version = "1.12.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/melodic/geometry/1.12.1-1.tar.gz"; - name = "1.12.1-1.tar.gz"; - sha256 = "6c8b032a8095842fb79e21e2c07aa440e71193130702a637dd46ea02e34166a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/melodic/geometry/1.12.1-1"; + sha256 = "sha256-rPe1b8eic+/XG6//88KNV+G4uLzlfidDYdu4Mr6WAqs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/geometry2/default.nix b/distros/melodic/geometry2/default.nix index f16631123a..d2c3d05ca6 100644 --- a/distros/melodic/geometry2/default.nix +++ b/distros/melodic/geometry2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geometry2"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/geometry2/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "077b18d3f1afdc72a99c3fb4e14168da26d82e4ae2e5b18ef90960e187209140"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/geometry2/0.6.5-0"; + sha256 = "sha256-ETEJrKohcPW7N+WhGYWRFRjULShAfXd+BqJwUxiFfI0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/geos-cmake-module/default.nix b/distros/melodic/geos-cmake-module/default.nix index 89e1063678..60356fee9e 100644 --- a/distros/melodic/geos-cmake-module/default.nix +++ b/distros/melodic/geos-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-geos-cmake-module"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/geos_cmake_module-release/archive/release/melodic/geos_cmake_module/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "42f6d0459dd82805452093922bdf8e7afec3119f4aa1eb205442949b5dae5b9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "geos_cmake_module-release"; + rev = "release/melodic/geos_cmake_module/0.0.2-1"; + sha256 = "sha256-FDRKdYdEgfAGl4bDOmWs08kLCyq6aLruF/ASxeJvagM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gl-dependency/default.nix b/distros/melodic/gl-dependency/default.nix index 9391ef74d0..9cce97d240 100644 --- a/distros/melodic/gl-dependency/default.nix +++ b/distros/melodic/gl-dependency/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gl-dependency"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/gl_dependency-release/archive/release/melodic/gl_dependency/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "268881107d9d7d88c38530235fe1c38bd6343ffa7d326c451136895e06f3422e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gl_dependency-release"; + rev = "release/melodic/gl_dependency/1.1.0-0"; + sha256 = "sha256-NlAXVT/NACslJBN58DCVmqjnkgOdRcBbrFm3T2aQwMs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/global-planner-tests/default.nix b/distros/melodic/global-planner-tests/default.nix index f20ade3e12..ef53a96636 100644 --- a/distros/melodic/global-planner-tests/default.nix +++ b/distros/melodic/global-planner-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-global-planner-tests"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/global_planner_tests/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "1efd62a2479f2356edb5ade328ea03f1ce3e1b14b7d20d00b90063dec919bc24"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/global_planner_tests/0.3.0-1"; + sha256 = "sha256-KYuVFQT7UB5CQhx8UHiKd0TXJxPicUr4MoKaNVW0/i4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/global-planner/default.nix b/distros/melodic/global-planner/default.nix index 8c90d5166e..3a58a234b0 100644 --- a/distros/melodic/global-planner/default.nix +++ b/distros/melodic/global-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-global-planner"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/global_planner/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "2905ff218546ce410b06ffb9884013561952e391f206326b1ac78917480a5379"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/global_planner/1.16.7-1"; + sha256 = "sha256-doYXLRgI8a8Qw8J4f9j1ePwcEY/dUNVLoaL5XkBq90M="; + }; buildType = "catkin"; buildInputs = [ angles catkin tf2-geometry-msgs ]; diff --git a/distros/melodic/gmapping/default.nix b/distros/melodic/gmapping/default.nix index 0299949f42..79959c0258 100644 --- a/distros/melodic/gmapping/default.nix +++ b/distros/melodic/gmapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gmapping"; version = "1.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/slam_gmapping-release/archive/release/melodic/gmapping/1.4.1-1.tar.gz"; - name = "1.4.1-1.tar.gz"; - sha256 = "2296a00ee0763992b9b67cff969f3e7c8021e14df878d351406104a4c321e4af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "slam_gmapping-release"; + rev = "release/melodic/gmapping/1.4.1-1"; + sha256 = "sha256-F6RgxeEU3GejHxb/nPx1nzO3xjmvq6J13Bqs5N5vRrI="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/goal-passer/default.nix b/distros/melodic/goal-passer/default.nix index df3e6ab45d..3238148ebd 100644 --- a/distros/melodic/goal-passer/default.nix +++ b/distros/melodic/goal-passer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-goal-passer"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/melodic/goal_passer/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "d68d61e5b36ed2c75022cb13f54ce924c91d187cc4d052eab864cdcf64844fb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/melodic/goal_passer/0.3.6-1"; + sha256 = "sha256-yFz90bEkJP+uXtnIeOOL8WHzbhDtkb//GqD7y1SIFA0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gpio-control/default.nix b/distros/melodic/gpio-control/default.nix index b207990c37..2c10683241 100644 --- a/distros/melodic/gpio-control/default.nix +++ b/distros/melodic/gpio-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gpio-control"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/cst0/gpio_control-release/archive/release/melodic/gpio_control/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "36bb27fdd2f6a914db67bdd646795874b37a3f3a2b8def950ac1719b5bd0dbca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cst0"; + repo = "gpio_control-release"; + rev = "release/melodic/gpio_control/1.0.0-1"; + sha256 = "sha256-vpJhG+yiOgyzrMSdffcQy6cAv24qQo0VciIuItxkdI0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/gps-common/default.nix b/distros/melodic/gps-common/default.nix index beda994914..f969540330 100644 --- a/distros/melodic/gps-common/default.nix +++ b/distros/melodic/gps-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gps-common"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/melodic/gps_common/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "06528187c6d9c788cdae1cd1b7c92953d09e49337a1820f9898f7bb9e51e8935"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/melodic/gps_common/0.3.3-1"; + sha256 = "sha256-QVIxTt/bEqxclSU4eZ+rqX2jKWcf/jZd1CMUKHxfTZQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/gps-umd/default.nix b/distros/melodic/gps-umd/default.nix index 53d7959f91..9b2d8a3f64 100644 --- a/distros/melodic/gps-umd/default.nix +++ b/distros/melodic/gps-umd/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gps-umd"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/melodic/gps_umd/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "35dec4ec952f063ec3265e29eea27c8814c28a11899371c3816d4912c76741b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/melodic/gps_umd/0.3.3-1"; + sha256 = "sha256-RfpgXAfHt3iFHFy6QLBMHkXpkysWJnkJ3v1Xj/GB9bM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gpsd-client/default.nix b/distros/melodic/gpsd-client/default.nix index e4e9242081..4ec1878928 100644 --- a/distros/melodic/gpsd-client/default.nix +++ b/distros/melodic/gpsd-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gpsd-client"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/melodic/gpsd_client/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "adf1eb7857e1de99693e8b0826b037bc3562caf6f21e015d0023146e21d47ecd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/melodic/gpsd_client/0.3.3-1"; + sha256 = "sha256-MiUnHvwdIX+rvfcj2Uaok4Jud6lyIakUHJBnMsr9Z1g="; + }; buildType = "catkin"; buildInputs = [ catkin gps-common gpsd pkg-config roscpp sensor-msgs ]; diff --git a/distros/melodic/graceful-controller-ros/default.nix b/distros/melodic/graceful-controller-ros/default.nix index 7191ecfdc8..8c276d1a4a 100644 --- a/distros/melodic/graceful-controller-ros/default.nix +++ b/distros/melodic/graceful-controller-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-graceful-controller-ros"; version = "0.4.5-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/melodic/graceful_controller_ros/0.4.5-1.tar.gz"; - name = "0.4.5-1.tar.gz"; - sha256 = "0fa7f1fb32f33c95ea89aaf25e00ddfb0d27a73533b62bd80ff05af34667c0a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "graceful_controller-gbp"; + rev = "release/melodic/graceful_controller_ros/0.4.5-1"; + sha256 = "sha256-l1iTel1PccKaj2fzdWW4ZiQf/PWcU1TmB+G2VmJRTPc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/graceful-controller/default.nix b/distros/melodic/graceful-controller/default.nix index a00a0acba1..d27eafaebe 100644 --- a/distros/melodic/graceful-controller/default.nix +++ b/distros/melodic/graceful-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-graceful-controller"; version = "0.4.5-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/melodic/graceful_controller/0.4.5-1.tar.gz"; - name = "0.4.5-1.tar.gz"; - sha256 = "cbe4f3daeb5be8bc16d6a1b5910070b0067fa654ec9341717e64309f8ad6662c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "graceful_controller-gbp"; + rev = "release/melodic/graceful_controller/0.4.5-1"; + sha256 = "sha256-exxlqw+4aBd75Tp9vtNvqCs8P+97KEAMex94M8R1gzQ="; + }; buildType = "catkin"; buildInputs = [ angles catkin ]; diff --git a/distros/melodic/graft/default.nix b/distros/melodic/graft/default.nix index 8cafeb997f..f490eb3685 100644 --- a/distros/melodic/graft/default.nix +++ b/distros/melodic/graft/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-graft"; version = "0.2.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/graft-release/archive/release/melodic/graft/0.2.3-2.tar.gz"; - name = "0.2.3-2.tar.gz"; - sha256 = "9a8974a928fe75527071337fedbe94266631129c0a1b9cb9d9163b06302bedce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "graft-release"; + rev = "release/melodic/graft/0.2.3-2"; + sha256 = "sha256-iptW0ogmMJY4rrW2fbaDEO+ZC/+ZS4Nx1KvnUlQADaE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen message-generation ]; diff --git a/distros/melodic/graph-msgs/default.nix b/distros/melodic/graph-msgs/default.nix index f9c5255230..adb696bb38 100644 --- a/distros/melodic/graph-msgs/default.nix +++ b/distros/melodic/graph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-graph-msgs"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/graph_msgs-release/archive/release/melodic/graph_msgs/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "39e497e03412353c16417a98db50aba5508d4bba0f36e50385a2c1b7954a6997"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "graph_msgs-release"; + rev = "release/melodic/graph_msgs/0.1.0-1"; + sha256 = "sha256-t7ggPFTWsw+cJsxTPHhEsAqpkSTa1ruf06UeSuI2Yhg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/grasping-msgs/default.nix b/distros/melodic/grasping-msgs/default.nix index 7283a982d7..f723feef97 100644 --- a/distros/melodic/grasping-msgs/default.nix +++ b/distros/melodic/grasping-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grasping-msgs"; version = "0.3.1"; - src = fetchurl { - url = "https://github.com/mikeferguson/grasping_msgs-gbp/archive/release/melodic/grasping_msgs/0.3.1-0.tar.gz"; - name = "0.3.1-0.tar.gz"; - sha256 = "1deeb71cb90294e0027a324105670add8ffd4dabbcd454cc4d2b9508f4fe89af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "grasping_msgs-gbp"; + rev = "release/melodic/grasping_msgs/0.3.1-0"; + sha256 = "sha256-6k890ogz0VZKvtTMcT8QQCf3sTND96p4bV7L9WA6AaM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/grid-map-core/default.nix b/distros/melodic/grid-map-core/default.nix index 62cc4ef248..e8f890ae00 100644 --- a/distros/melodic/grid-map-core/default.nix +++ b/distros/melodic/grid-map-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-core"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_core/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "ea5d9d47bb6f5935ce95e8f2d241c1e482c5aa4d5f75c1e9819f8a5554b70a3f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_core/1.6.4-2"; + sha256 = "sha256-B3WTIP2KVYfvVTAlIUnr6WCzF0AMUudurpbdegjmlXA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-costmap-2d/default.nix b/distros/melodic/grid-map-costmap-2d/default.nix index bbc4707148..c11ff2c095 100644 --- a/distros/melodic/grid-map-costmap-2d/default.nix +++ b/distros/melodic/grid-map-costmap-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-costmap-2d"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_costmap_2d/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "508952e1bd8e3dfc9a1109ad3295f08f7e53452992eef748bc56144e43691e57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_costmap_2d/1.6.4-2"; + sha256 = "sha256-lZ7JC33LIskMQOq9xIZqHjuhpakmHF15cCi0eN+uyIg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-cv/default.nix b/distros/melodic/grid-map-cv/default.nix index 2683c82ad8..8fa14edc72 100644 --- a/distros/melodic/grid-map-cv/default.nix +++ b/distros/melodic/grid-map-cv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-cv"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_cv/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "68a238c0e5e2854c8c4b0ff6af540290d45f63cf6e8938f2767e8e8fb9ccd053"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_cv/1.6.4-2"; + sha256 = "sha256-NgGfnWGegzwTwUZXew8KsV7uZzFcDdyJw7dqQkxhTrg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-demos/default.nix b/distros/melodic/grid-map-demos/default.nix index 11cf70fb3f..2eaadfdfca 100644 --- a/distros/melodic/grid-map-demos/default.nix +++ b/distros/melodic/grid-map-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-demos"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_demos/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "af010970395ae6e3b4ac8fedae39a35edba1a7f3fff7a5989bad9df899002722"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_demos/1.6.4-2"; + sha256 = "sha256-pXxMq6Xq9B06OjQ2OuwhOm65udzVrutP4DEhgaX4pU4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-filters/default.nix b/distros/melodic/grid-map-filters/default.nix index c87b531489..3351357e62 100644 --- a/distros/melodic/grid-map-filters/default.nix +++ b/distros/melodic/grid-map-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-filters"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_filters/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "7fac82b2939d4a4e047e106e4d8986300bf1d5aa708e8bfc2cc487ca4b740710"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_filters/1.6.4-2"; + sha256 = "sha256-t00WIN/CLS+qjHIEn22SFDBvc/fi6itSHZyGkf+7Xh0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-loader/default.nix b/distros/melodic/grid-map-loader/default.nix index 5f56c0b095..46c2e1a8bf 100644 --- a/distros/melodic/grid-map-loader/default.nix +++ b/distros/melodic/grid-map-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-loader"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_loader/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "3b32397c6eda6714eb4f31b6f64bcb55f63e934015a0e519e90e3dc2bdcf41f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_loader/1.6.4-2"; + sha256 = "sha256-XtluSHAsXqk0NwvtosRl66LXHwGemJzwdUx9l/MrNpo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-msgs/default.nix b/distros/melodic/grid-map-msgs/default.nix index 2caeb93c4d..7875fa460a 100644 --- a/distros/melodic/grid-map-msgs/default.nix +++ b/distros/melodic/grid-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-msgs"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_msgs/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "e2d6e7a3c2d9a849d0f112f100209e618a8a4dd8040cc8049c875f0441bc52e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_msgs/1.6.4-2"; + sha256 = "sha256-o893zF0pnmxAh2KENP8czB8zoFeOVERo30Yo1iJMEw4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-octomap/default.nix b/distros/melodic/grid-map-octomap/default.nix index 6fd288432e..ef0425e620 100644 --- a/distros/melodic/grid-map-octomap/default.nix +++ b/distros/melodic/grid-map-octomap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-octomap"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_octomap/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "6572bfb578b59433cf8a62c2f43c5dc9d2c378c23fd8ed93d2a3f94c30042676"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_octomap/1.6.4-2"; + sha256 = "sha256-1s3r1WyxwF5UmxWm2rbNzhehG9TDGnpQtP4k86j9xDE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-pcl/default.nix b/distros/melodic/grid-map-pcl/default.nix index 478041d48f..0d55fa8611 100644 --- a/distros/melodic/grid-map-pcl/default.nix +++ b/distros/melodic/grid-map-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-pcl"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_pcl/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "face4f96f1471f2f3abc855af51faacbfaeece155011a92170c1b3591f907eea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_pcl/1.6.4-2"; + sha256 = "sha256-eayKnOGauHu5czEyFKNz0kUj8FrU0MlMEnMTYgNT8h4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-ros/default.nix b/distros/melodic/grid-map-ros/default.nix index b2c1c14816..15303c309c 100644 --- a/distros/melodic/grid-map-ros/default.nix +++ b/distros/melodic/grid-map-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-ros"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_ros/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "721766d9f080d0901ced0f174bef73beee1a0aa5b9a6b7085d2f615633a76afc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_ros/1.6.4-2"; + sha256 = "sha256-aSYRr866BBxYhDK+2NSG7GeqCRLOZtAdOg9aWY9mm4s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-rviz-plugin/default.nix b/distros/melodic/grid-map-rviz-plugin/default.nix index 9bf1cf4ba5..22c18a7760 100644 --- a/distros/melodic/grid-map-rviz-plugin/default.nix +++ b/distros/melodic/grid-map-rviz-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-rviz-plugin"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_rviz_plugin/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "3f7fc2d4d92f2b696fb751d0b62d995fcdcb23d6ba640805ac5fdb52e0b85c90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_rviz_plugin/1.6.4-2"; + sha256 = "sha256-qkqH5aUWlSvVepOidlz6yY+8sUudmC/bNxbUjoJGTPE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-sdf/default.nix b/distros/melodic/grid-map-sdf/default.nix index f9148401bd..7a35c96ef5 100644 --- a/distros/melodic/grid-map-sdf/default.nix +++ b/distros/melodic/grid-map-sdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-sdf"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_sdf/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "52a6c54cbfc51b951f761c5e79711bdd9fe1229545c3d0eb0270a719700a011a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_sdf/1.6.4-2"; + sha256 = "sha256-bYaVjHvW0jqJ1BocdFcw+h15heGsQKMLbRg65eHHQew="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map-visualization/default.nix b/distros/melodic/grid-map-visualization/default.nix index 60ab2805d3..f28cc15c4f 100644 --- a/distros/melodic/grid-map-visualization/default.nix +++ b/distros/melodic/grid-map-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map-visualization"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map_visualization/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "4e1b9aa84d034d0f2cdd31220fa39bd4ceb7fd052a6f77f544c82ca4a2524ff6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map_visualization/1.6.4-2"; + sha256 = "sha256-t8Fme0mbDCSk+cvB9kgQDk2yl8p0Zh8AeGSegyIxq/A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grid-map/default.nix b/distros/melodic/grid-map/default.nix index 166b68edf9..ed18076a47 100644 --- a/distros/melodic/grid-map/default.nix +++ b/distros/melodic/grid-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grid-map"; version = "1.6.4-r2"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/melodic/grid_map/1.6.4-2.tar.gz"; - name = "1.6.4-2.tar.gz"; - sha256 = "5bc44d6241fa2000ba7ded5f92e296b2813905dd9ff43f1bdeeef2a7bee8bdd8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/melodic/grid_map/1.6.4-2"; + sha256 = "sha256-rrfUsMhqdhUx8AqDkPK9fW4PtjKfcBmCYMIDUp+cChw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gripper-action-controller/default.nix b/distros/melodic/gripper-action-controller/default.nix index 43f785fa08..f9326125b8 100644 --- a/distros/melodic/gripper-action-controller/default.nix +++ b/distros/melodic/gripper-action-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gripper-action-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/gripper_action_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "d2809f80fe662d21b1e654c7f3cdc1b4b99e60336b37ae7d7fc138e5e56a606c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/gripper_action_controller/0.17.2-1"; + sha256 = "sha256-Zs5vrTBWr9fp2ORo305SPjGvKa+tSFVKOu8h4BKtyTg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/grpc/default.nix b/distros/melodic/grpc/default.nix index f260c1ad93..dd168131da 100644 --- a/distros/melodic/grpc/default.nix +++ b/distros/melodic/grpc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-grpc"; version = "0.0.10"; - src = fetchurl { - url = "https://github.com/CogRobRelease/catkin_grpc-release/archive/release/melodic/grpc/0.0.10-0.tar.gz"; - name = "0.0.10-0.tar.gz"; - sha256 = "c68b25e98a58f726e6d9a86a1a16c943c468e8f1d426781f9086cd31c525e7b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CogRobRelease"; + repo = "catkin_grpc-release"; + rev = "release/melodic/grpc/0.0.10-0"; + sha256 = "sha256-YlKwFJEngerjXnkZ3bVB7OZWGUIRFYNHiQ0em9GBb0Y="; + }; buildType = "catkin"; buildInputs = [ autoconf catkin git libtool rsync zlib ]; diff --git a/distros/melodic/gscam/default.nix b/distros/melodic/gscam/default.nix index 8d755aab08..111030a4e9 100644 --- a/distros/melodic/gscam/default.nix +++ b/distros/melodic/gscam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gscam"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/gscam-release/archive/release/melodic/gscam/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "bbd838538ef852691f2de43b5b0a5541e0b8f4a8bd1c5ef7d0bb5c5387491996"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "gscam-release"; + rev = "release/melodic/gscam/1.0.1-0"; + sha256 = "sha256-xL+ss3/a5h2gqoOj5oMM8jNFIjHpuNHEEtjEhPtecSU="; + }; buildType = "catkin"; buildInputs = [ catkin gst_all_1.gst-plugins-base gst_all_1.gstreamer ]; diff --git a/distros/melodic/gundam-robot/default.nix b/distros/melodic/gundam-robot/default.nix index c77f26a2f9..3908bc6f42 100644 --- a/distros/melodic/gundam-robot/default.nix +++ b/distros/melodic/gundam-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gundam-robot"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/gundam-global-challenge/gundam_robot-release/archive/release/melodic/gundam_robot/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "104242639f58d31d81f2635f9a84db3e777dd60c82912fb774aff076719d8db9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gundam-global-challenge"; + repo = "gundam_robot-release"; + rev = "release/melodic/gundam_robot/0.0.3-1"; + sha256 = "sha256-agYnxYX+BnWxZ4PdMDncV0JV/p+EOBkq+oJZkXbnTLY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/gundam-rx78-control/default.nix b/distros/melodic/gundam-rx78-control/default.nix index e242cdea94..062348a262 100644 --- a/distros/melodic/gundam-rx78-control/default.nix +++ b/distros/melodic/gundam-rx78-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gundam-rx78-control"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/gundam-global-challenge/gundam_robot-release/archive/release/melodic/gundam_rx78_control/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "aea11f0c98aced57ce60008763b2265d61130564f9a7be68085ea41662770f65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gundam-global-challenge"; + repo = "gundam_robot-release"; + rev = "release/melodic/gundam_rx78_control/0.0.3-1"; + sha256 = "sha256-ZIOMMDiYB7Hwzryof/VWFvkvFe6hjAGDB4r6wuvewTA="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/gundam-rx78-description/default.nix b/distros/melodic/gundam-rx78-description/default.nix index a57a0074dc..46e4e6b465 100644 --- a/distros/melodic/gundam-rx78-description/default.nix +++ b/distros/melodic/gundam-rx78-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gundam-rx78-description"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/gundam-global-challenge/gundam_robot-release/archive/release/melodic/gundam_rx78_description/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "4004070bbf315f396604e927dfe815feada9964aad421c3eb739706bb0705d18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gundam-global-challenge"; + repo = "gundam_robot-release"; + rev = "release/melodic/gundam_rx78_description/0.0.3-1"; + sha256 = "sha256-mMnsJ+01aA7ZzEwOlQnHnz85IKWlsK7NysN9Qg1vkUE="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/gundam-rx78-gazebo/default.nix b/distros/melodic/gundam-rx78-gazebo/default.nix index 44bf0f19a4..387fc0d908 100644 --- a/distros/melodic/gundam-rx78-gazebo/default.nix +++ b/distros/melodic/gundam-rx78-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-gundam-rx78-gazebo"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/gundam-global-challenge/gundam_robot-release/archive/release/melodic/gundam_rx78_gazebo/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "0115b438aa2868aa547464ed22dfbedfd01b0c62a37d4d0b4fa3b7f3310e50c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gundam-global-challenge"; + repo = "gundam_robot-release"; + rev = "release/melodic/gundam_rx78_gazebo/0.0.3-1"; + sha256 = "sha256-t9iuhkMsXnOATgGXkeFueS5VLn43thVpJLdjO2d+u3g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/h264-encoder-core/default.nix b/distros/melodic/h264-encoder-core/default.nix index ebd7109b34..dc615a2e3c 100644 --- a/distros/melodic/h264-encoder-core/default.nix +++ b/distros/melodic/h264-encoder-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-h264-encoder-core"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/h264_encoder_core-release/archive/release/melodic/h264_encoder_core/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "19f31cb9992ac20374ee457efcac78772598992ad832d31da4c9c23f02029dad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "h264_encoder_core-release"; + rev = "release/melodic/h264_encoder_core/2.0.3-1"; + sha256 = "sha256-d8OkRKseYZCpBBsQ0qidBjB/AypP0fLdkLdC2dLWODA="; + }; buildType = "cmake"; buildInputs = [ catkin cmake ]; diff --git a/distros/melodic/h264-video-encoder/default.nix b/distros/melodic/h264-video-encoder/default.nix index 332896e43f..0e0b37a2c3 100644 --- a/distros/melodic/h264-video-encoder/default.nix +++ b/distros/melodic/h264-video-encoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-h264-video-encoder"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/h264_video_encoder-release/archive/release/melodic/h264_video_encoder/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "38a0e3a060c7431cd832095221ba6eaa681fe9c982286e8a008032448e9bf861"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "h264_video_encoder-release"; + rev = "release/melodic/h264_video_encoder/1.1.4-1"; + sha256 = "sha256-ejeDv1zgyDpC2ZhTKc2TsU/DKf0FiqOPbBSJ8QYImU0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/handeye/default.nix b/distros/melodic/handeye/default.nix index bc462c938d..d34444f410 100644 --- a/distros/melodic/handeye/default.nix +++ b/distros/melodic/handeye/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-handeye"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/crigroup/handeye-release/archive/release/melodic/handeye/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "63c728c534746bdf434c25d972de02ad713dda6dcb45463c1688c2ec3cd704e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "crigroup"; + repo = "handeye-release"; + rev = "release/melodic/handeye/0.1.1-2"; + sha256 = "sha256-FUjDbHO991JhcwudP7DtSPSB+wXOgBNOmJk//ICXQsQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/hardware-interface/default.nix b/distros/melodic/hardware-interface/default.nix index eac3015cf8..0315a54b08 100644 --- a/distros/melodic/hardware-interface/default.nix +++ b/distros/melodic/hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hardware-interface"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/hardware_interface/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "b80c58cf8ee11ea90f4efbe8498f686bc6b0e64c023b933e4abc1994f05b6bcc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/hardware_interface/0.18.4-1"; + sha256 = "sha256-4H2pPdoomobbAGAPzEqQkZMyslto82qtVTxZECDMhCQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/haros-catkin/default.nix b/distros/melodic/haros-catkin/default.nix index 31324f7ddc..faafcc51fc 100644 --- a/distros/melodic/haros-catkin/default.nix +++ b/distros/melodic/haros-catkin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-haros-catkin"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/rosin-project/haros_catkin-release/archive/release/melodic/haros_catkin/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "b8b53adbf7f2de24566dc6990f033e9d7c397e37dbcc0c54f19b7e03a601371d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosin-project"; + repo = "haros_catkin-release"; + rev = "release/melodic/haros_catkin/0.1.1-1"; + sha256 = "sha256-ocjmh768L+OhM9Gj87YiLFCLBCswOwLBdTwLk9Ff4gg="; + }; buildType = "catkin"; buildInputs = [ catkin catkin-virtualenv ]; diff --git a/distros/melodic/hdf5-map-io/default.nix b/distros/melodic/hdf5-map-io/default.nix index 04730b3cbd..cfdb93df64 100644 --- a/distros/melodic/hdf5-map-io/default.nix +++ b/distros/melodic/hdf5-map-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hdf5-map-io"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/melodic/hdf5_map_io/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "13f5cf1290c667d40005dfb864ec17d5a2329410dfa8714a4574ab4764754c72"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/melodic/hdf5_map_io/1.1.0-1"; + sha256 = "sha256-uGfz9W97JDomrPLt7PKwlP4UGNdee8XJwzovBpzyra8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/health-metric-collector/default.nix b/distros/melodic/health-metric-collector/default.nix index a9c48c4c5a..0095e5c0c7 100644 --- a/distros/melodic/health-metric-collector/default.nix +++ b/distros/melodic/health-metric-collector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-health-metric-collector"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/health_metric_collector-release/archive/release/melodic/health_metric_collector/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "de3cceb8580f9dea5b9dc921ff1364c6486c89e217ae42ebf5349d67f8668c0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "health_metric_collector-release"; + rev = "release/melodic/health_metric_collector/2.0.2-1"; + sha256 = "sha256-KDzA3rJq7tkzu4iVbr3mwJuUfo0pNeh/5CP+hJh/XpA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hebi-cpp-api/default.nix b/distros/melodic/hebi-cpp-api/default.nix index ef47fbc489..4fb541d8c1 100644 --- a/distros/melodic/hebi-cpp-api/default.nix +++ b/distros/melodic/hebi-cpp-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hebi-cpp-api"; version = "3.2.0-r2"; - src = fetchurl { - url = "https://github.com/HebiRobotics/hebi_cpp_api_ros-release/archive/release/melodic/hebi_cpp_api/3.2.0-2.tar.gz"; - name = "3.2.0-2.tar.gz"; - sha256 = "8bf76ffbba3dc13648069d8d9b293c791dd0c03ccc6ba6ebb51604691e6a2276"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "HebiRobotics"; + repo = "hebi_cpp_api_ros-release"; + rev = "release/melodic/hebi_cpp_api/3.2.0-2"; + sha256 = "sha256-QSAEabtAQlkrQTpDECGciMGUtGZzgFgFzK5D+IHf/O8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen ]; diff --git a/distros/melodic/hebi-description/default.nix b/distros/melodic/hebi-description/default.nix index b4cd33dbfc..1fd713b763 100644 --- a/distros/melodic/hebi-description/default.nix +++ b/distros/melodic/hebi-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hebi-description"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/HebiRobotics/hebi_description-release/archive/release/melodic/hebi_description/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "a98ed8c034550c518fac9fe8eca1f14ae662278efcd5089abe07f90a4e6a4df0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "HebiRobotics"; + repo = "hebi_description-release"; + rev = "release/melodic/hebi_description/0.1.0-1"; + sha256 = "sha256-5Y/NYNb90T10xDCH4eMDKBFDspYQZfHW0mWzWsCBNlA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-components-description/default.nix b/distros/melodic/hector-components-description/default.nix index 8c07ae193e..30850af37f 100644 --- a/distros/melodic/hector-components-description/default.nix +++ b/distros/melodic/hector-components-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-components-description"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_models-release/archive/release/melodic/hector_components_description/0.5.0-0.tar.gz"; - name = "0.5.0-0.tar.gz"; - sha256 = "b3626eafa575c9d792d9a92beefb7b588076ebdafaec15c168268b60a1890053"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_models-release"; + rev = "release/melodic/hector_components_description/0.5.0-0"; + sha256 = "sha256-kAe3BZv7C2I183iMQQ8LKxdbiPRNZ0gm433YhWDWZD4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-compressed-map-transport/default.nix b/distros/melodic/hector-compressed-map-transport/default.nix index 479938f53a..59f3f35795 100644 --- a/distros/melodic/hector-compressed-map-transport/default.nix +++ b/distros/melodic/hector-compressed-map-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-compressed-map-transport"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_compressed_map_transport/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "72b380538c9d4c4368b5631afa0a92e97a02d0cd20da07ee50723b65dd1b3a37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_compressed_map_transport/0.4.1-1"; + sha256 = "sha256-IT3MKOme42THX+4W6QSoCUnYMfnbDiaAsbRROExCo7U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-gazebo-plugins/default.nix b/distros/melodic/hector-gazebo-plugins/default.nix index 3815cfcdb5..4660ace78b 100644 --- a/distros/melodic/hector-gazebo-plugins/default.nix +++ b/distros/melodic/hector-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-gazebo-plugins"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/melodic/hector_gazebo_plugins/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "a215cd06c58b2ab21a634c69f5debcfff0f189c92faf6e6371fe1392610a511a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/melodic/hector_gazebo_plugins/0.5.4-1"; + sha256 = "sha256-4c+jJP00hi1Xmns+loZX4THAkQ48w1x2ZanWxd22pIE="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-dev message-generation ]; diff --git a/distros/melodic/hector-gazebo-thermal-camera/default.nix b/distros/melodic/hector-gazebo-thermal-camera/default.nix index 50b6b44140..dee7e48ab7 100644 --- a/distros/melodic/hector-gazebo-thermal-camera/default.nix +++ b/distros/melodic/hector-gazebo-thermal-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-gazebo-thermal-camera"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/melodic/hector_gazebo_thermal_camera/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "dcd0abbdd0b1bf98a7b10e37e08f6822214a4c088f3068ff6f4fed38d928ea39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/melodic/hector_gazebo_thermal_camera/0.5.4-1"; + sha256 = "sha256-6h4wPMO/Rda03LKTTNKb35YD/xj0BKpHeKTj+F/tG74="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-gazebo-worlds/default.nix b/distros/melodic/hector-gazebo-worlds/default.nix index 96bcb86b38..88ea49e648 100644 --- a/distros/melodic/hector-gazebo-worlds/default.nix +++ b/distros/melodic/hector-gazebo-worlds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-gazebo-worlds"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/melodic/hector_gazebo_worlds/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "f155a9a3e1bf7eb33b575241e2a049056ced64687bf207ae23c90efeb60a55ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/melodic/hector_gazebo_worlds/0.5.4-1"; + sha256 = "sha256-DMc4PnfYFalcJ8tf4UDRrf68rGq90JQeC6ASpbRNmdc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-gazebo/default.nix b/distros/melodic/hector-gazebo/default.nix index 87fb3248a2..d551c37f63 100644 --- a/distros/melodic/hector-gazebo/default.nix +++ b/distros/melodic/hector-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-gazebo"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/melodic/hector_gazebo/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "5a0f19ce263c79bed61d68679fa7cacb0e14549ce62945b253c5ea30a7510062"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/melodic/hector_gazebo/0.5.4-1"; + sha256 = "sha256-OdXPnPHs+zVN/Rc/2V7meTUXXJJHR/xkM4UPT9QOShM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-geotiff-plugins/default.nix b/distros/melodic/hector-geotiff-plugins/default.nix index 23a5be0e28..79bc729512 100644 --- a/distros/melodic/hector-geotiff-plugins/default.nix +++ b/distros/melodic/hector-geotiff-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-geotiff-plugins"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_geotiff_plugins/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "bad8710701ff02823d3cb1f85bf510bb986c55a91ecb498576dbdbbd931444f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_geotiff_plugins/0.4.1-1"; + sha256 = "sha256-FDed7b21RS9hgQ+vVy6TRH/k+Yx0rWP/V++KdBcvYCA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-geotiff/default.nix b/distros/melodic/hector-geotiff/default.nix index bf062e608a..5cdf2df7ba 100644 --- a/distros/melodic/hector-geotiff/default.nix +++ b/distros/melodic/hector-geotiff/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-geotiff"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_geotiff/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "fc5fb0b6bbd507578ff03f1e117532994fc9fe1a10e5a15410edaf0e9cbf4be9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_geotiff/0.4.1-1"; + sha256 = "sha256-FgcopOkapFpBCIEMmIoYSltUEaLqG3FuLzkgTMz6nYw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-imu-attitude-to-tf/default.nix b/distros/melodic/hector-imu-attitude-to-tf/default.nix index 93e0501684..ed0a8d375c 100644 --- a/distros/melodic/hector-imu-attitude-to-tf/default.nix +++ b/distros/melodic/hector-imu-attitude-to-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-imu-attitude-to-tf"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_imu_attitude_to_tf/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "2e186eb4656f497c7dc1438e672cc0990b11120a0bf41aab78c08ceed40bc35e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_imu_attitude_to_tf/0.4.1-1"; + sha256 = "sha256-yJp/jswi/78/Nyx4QXUZp2QkxhBkyA34BwMi+QwHv0s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-imu-tools/default.nix b/distros/melodic/hector-imu-tools/default.nix index bef5047b88..9850f96592 100644 --- a/distros/melodic/hector-imu-tools/default.nix +++ b/distros/melodic/hector-imu-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-imu-tools"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_imu_tools/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "e2a39e77a85688b2bb89ef2d07975ea71558c94037a77c1a9bd7b478ee84b99d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_imu_tools/0.4.1-1"; + sha256 = "sha256-NYOh5WtrIMZo13YuuzJHZ/mWZgaY4K6g07j2YraqIrA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-localization/default.nix b/distros/melodic/hector-localization/default.nix index bc8ed10a99..12d0cca762 100644 --- a/distros/melodic/hector-localization/default.nix +++ b/distros/melodic/hector-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-localization"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_localization-release/archive/release/melodic/hector_localization/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "0c27cd303cddb5ab6317dc465a2b8edeb3d08e394fdcd8be8d23cf840260b8e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_localization-release"; + rev = "release/melodic/hector_localization/0.3.0-1"; + sha256 = "sha256-qQ0wLzK5X4eSPjEOoCZ7Fp10MMrhu4yVUlujroVquns="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-map-server/default.nix b/distros/melodic/hector-map-server/default.nix index 7eb07c9efa..0fd4550c69 100644 --- a/distros/melodic/hector-map-server/default.nix +++ b/distros/melodic/hector-map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-map-server"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_map_server/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "5d34745850c2814852fb3adbb67c7d9c219807449c3e24445573752b7ac53e6d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_map_server/0.4.1-1"; + sha256 = "sha256-vcKUH0FVgW4TJeBR8FbBPsfaPh3fxBpqjlyAO40eHYo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-map-tools/default.nix b/distros/melodic/hector-map-tools/default.nix index 183118f81d..5aa71f4306 100644 --- a/distros/melodic/hector-map-tools/default.nix +++ b/distros/melodic/hector-map-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-map-tools"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_map_tools/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "85afa10dff34e1bc05af980434c524b99185acb91403a94bc3fba68fda31755d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_map_tools/0.4.1-1"; + sha256 = "sha256-IEVPZUR7A73fYQG08NaTSSnEVOEy7xCvx6OqDWlFFOk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-mapping/default.nix b/distros/melodic/hector-mapping/default.nix index 2049f03e9e..0bbb16c988 100644 --- a/distros/melodic/hector-mapping/default.nix +++ b/distros/melodic/hector-mapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-mapping"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_mapping/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "fc1af9c95dcce587f5d5f72025ccf8b487dba26ad2d6b1158a53b5de79d5b1d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_mapping/0.4.1-1"; + sha256 = "sha256-X7UuT4TuItVzZ7wpZ+qBic3dcteesIHE7fN8C0kurP4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/hector-marker-drawing/default.nix b/distros/melodic/hector-marker-drawing/default.nix index 9f68f85286..e734cce947 100644 --- a/distros/melodic/hector-marker-drawing/default.nix +++ b/distros/melodic/hector-marker-drawing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-marker-drawing"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_marker_drawing/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "c17a86ba1a6c603dedfc4c757c6f19c5537e808d0eb01241bf18431e9ef0bbca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_marker_drawing/0.4.1-1"; + sha256 = "sha256-YBvyJeQGt7k7KOUQFTl7NhyXs30q8GA2cs34R6SZqtU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-models/default.nix b/distros/melodic/hector-models/default.nix index 2678f20311..81caa4f642 100644 --- a/distros/melodic/hector-models/default.nix +++ b/distros/melodic/hector-models/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-models"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_models-release/archive/release/melodic/hector_models/0.5.0-0.tar.gz"; - name = "0.5.0-0.tar.gz"; - sha256 = "aea206089e02162e6f34440dd82a3c9f0c66f4030e8dc4738838c77a9afc6701"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_models-release"; + rev = "release/melodic/hector_models/0.5.0-0"; + sha256 = "sha256-BasPZjbK9TJNu7bTiYOY9L/VegUcajnfQaHmF/MZ6C4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-nav-msgs/default.nix b/distros/melodic/hector-nav-msgs/default.nix index fe2dc29cca..f4166e484b 100644 --- a/distros/melodic/hector-nav-msgs/default.nix +++ b/distros/melodic/hector-nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-nav-msgs"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_nav_msgs/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "d13b74403ab5af03a0c127c92549a0aacc23d69fa968f69557dab5e4d99bc875"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_nav_msgs/0.4.1-1"; + sha256 = "sha256-hxPP5WMPdWLato971Pq12uU9FZdF2LHWQrvqYcQXe+U="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/hector-pose-estimation-core/default.nix b/distros/melodic/hector-pose-estimation-core/default.nix index f0dac53cb7..3e1e3dbddf 100644 --- a/distros/melodic/hector-pose-estimation-core/default.nix +++ b/distros/melodic/hector-pose-estimation-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-pose-estimation-core"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_localization-release/archive/release/melodic/hector_pose_estimation_core/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "1114f90fbc18355cb0737a76598ff3f6b95bafc98ea780b79010446d37c7ae5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_localization-release"; + rev = "release/melodic/hector_pose_estimation_core/0.3.0-1"; + sha256 = "sha256-RuZ+pHvJKdUyFrAeQfNSJ3cZHbKjAt+L/1euKXCVbac="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/hector-pose-estimation/default.nix b/distros/melodic/hector-pose-estimation/default.nix index 9e3b390560..82f040f079 100644 --- a/distros/melodic/hector-pose-estimation/default.nix +++ b/distros/melodic/hector-pose-estimation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-pose-estimation"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_localization-release/archive/release/melodic/hector_pose_estimation/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "769e253c6396b165b40b40e75a06f48d5401ff474795308d249dfbf60ce21f67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_localization-release"; + rev = "release/melodic/hector_pose_estimation/0.3.0-1"; + sha256 = "sha256-5pO7UF4/dj36Bjx+9qiclY7Q5tYWtHjvuDNimsGaxUo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-sensors-description/default.nix b/distros/melodic/hector-sensors-description/default.nix index 056491dfad..0ec1f5fbfe 100644 --- a/distros/melodic/hector-sensors-description/default.nix +++ b/distros/melodic/hector-sensors-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-sensors-description"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_models-release/archive/release/melodic/hector_sensors_description/0.5.0-0.tar.gz"; - name = "0.5.0-0.tar.gz"; - sha256 = "622a110133e72bcaaffeb45ed9eed1fd4f7f24eaabebd9e52442dc7c81d194f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_models-release"; + rev = "release/melodic/hector_sensors_description/0.5.0-0"; + sha256 = "sha256-veWsSSWMp0nhJbSbft1gAyI2qDwtpj1XVjUtgUlm82Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-sensors-gazebo/default.nix b/distros/melodic/hector-sensors-gazebo/default.nix index 0c5476e0c7..7c74f4ea73 100644 --- a/distros/melodic/hector-sensors-gazebo/default.nix +++ b/distros/melodic/hector-sensors-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-sensors-gazebo"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/melodic/hector_sensors_gazebo/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "1233ccf3a39ff184ec0376f06473d50ed22d8562f5a06ad6d251efb58b26e446"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/melodic/hector_sensors_gazebo/0.5.4-1"; + sha256 = "sha256-kaMZztq+MoNUHRHp0FdIDD1V7jfDUa7dDBRrknkyNX0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-slam-launch/default.nix b/distros/melodic/hector-slam-launch/default.nix index e852f8454a..99c7944bb0 100644 --- a/distros/melodic/hector-slam-launch/default.nix +++ b/distros/melodic/hector-slam-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-slam-launch"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_slam_launch/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "5f39ba101db27d43a79e682330cbbd248f46fff16ad6a8acbccd3a88e7cec850"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_slam_launch/0.4.1-1"; + sha256 = "sha256-+X199JyehFfT2YHmYA5p6AnTIbNVudD+RJloiEeKwaE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-slam/default.nix b/distros/melodic/hector-slam/default.nix index 9c7656562d..5b92dbc392 100644 --- a/distros/melodic/hector-slam/default.nix +++ b/distros/melodic/hector-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-slam"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_slam/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "5de924ad2cd6d85d5b5ff4ea8762e2b9ea5e68139133e42a0dd7cb537503ee49"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_slam/0.4.1-1"; + sha256 = "sha256-wu0kJbTPKURt+uIetNr9MDq21/Z8tTBBkMC3JZdbxCI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-trajectory-server/default.nix b/distros/melodic/hector-trajectory-server/default.nix index d61cd18d84..60c0299359 100644 --- a/distros/melodic/hector-trajectory-server/default.nix +++ b/distros/melodic/hector-trajectory-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-trajectory-server"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/melodic/hector_trajectory_server/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "f7babbe07541363e5593fd7e7145b8c7be41e224f25242e11e462d7222901f44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/melodic/hector_trajectory_server/0.4.1-1"; + sha256 = "sha256-jg08pbatncB4LiZONPowiBZB/ikhiUGuU0vr4wMQeyo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hector-xacro-tools/default.nix b/distros/melodic/hector-xacro-tools/default.nix index 4340c45350..191ccde310 100644 --- a/distros/melodic/hector-xacro-tools/default.nix +++ b/distros/melodic/hector-xacro-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hector-xacro-tools"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_models-release/archive/release/melodic/hector_xacro_tools/0.5.0-0.tar.gz"; - name = "0.5.0-0.tar.gz"; - sha256 = "c3fb08b2e43e363415754750c0208062b87686415088d2eaf191d1f9879c95f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_models-release"; + rev = "release/melodic/hector_xacro_tools/0.5.0-0"; + sha256 = "sha256-Ur2naJbLA3e6hRudEMFWift7PcEXTw0bhoCsnR7Zjc4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heifu-bringup/default.nix b/distros/melodic/heifu-bringup/default.nix index dcf60dd404..6ffc704f8a 100644 --- a/distros/melodic/heifu-bringup/default.nix +++ b/distros/melodic/heifu-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu-bringup"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu_bringup/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "6798c1d532a30c3c156470eaeb00c13c680f33de1ebe5af1dc7a0b8daeff3c2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu_bringup/0.7.7-2"; + sha256 = "sha256-QXJo3jsNR0/843SKs+Qg4yIxFHHLj/oW+nUwfT6Kymw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heifu-description/default.nix b/distros/melodic/heifu-description/default.nix index 91a86a5107..c8eb3d71dd 100644 --- a/distros/melodic/heifu-description/default.nix +++ b/distros/melodic/heifu-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu-description"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu_description/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "3c72dc5fc4988fc7322aa406441a6890dc550b3cd4315f7775cd25a681346c0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu_description/0.7.7-2"; + sha256 = "sha256-z95jA0XplKk2/jykWjyI9VJaVg2pA4EQbdVv//rXTCE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heifu-diagnostic/default.nix b/distros/melodic/heifu-diagnostic/default.nix index 3c759512ec..e800063a17 100644 --- a/distros/melodic/heifu-diagnostic/default.nix +++ b/distros/melodic/heifu-diagnostic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu-diagnostic"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu_diagnostic/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "cf52fdd4185ce056dfce243bb15ba3a2335a32d155c484d4c6704a1f2e2b3ddf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu_diagnostic/0.7.7-2"; + sha256 = "sha256-FCwN+f7pdc30y1Fwo4uC1rGOHY9EWhvcq8juJNlJVSQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heifu-mavros/default.nix b/distros/melodic/heifu-mavros/default.nix index 7874371ffe..86d0f135b6 100644 --- a/distros/melodic/heifu-mavros/default.nix +++ b/distros/melodic/heifu-mavros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu-mavros"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu_mavros/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "7fef13c5fe3fd3fb9e7068d82f9a0268b1d6a250900c46982f0b1d732840b0e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu_mavros/0.7.7-2"; + sha256 = "sha256-0rU4VuOcGfe8dLcGbUn6QSikyaDavZ3wTML9YDhyb5Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heifu-msgs/default.nix b/distros/melodic/heifu-msgs/default.nix index f725c5c162..2f0ad72e0d 100644 --- a/distros/melodic/heifu-msgs/default.nix +++ b/distros/melodic/heifu-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu-msgs"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu_msgs/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "59ead4d32ce7668d215daac5aa4616f7a03c5e56e4940c671435da114d3df871"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu_msgs/0.7.7-2"; + sha256 = "sha256-0JBoJnJSVZBTy1F/ZORsdoBO5sgePm/v5iQP4Rw75VI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/heifu-safety/default.nix b/distros/melodic/heifu-safety/default.nix index e03b8a8e87..25316a395d 100644 --- a/distros/melodic/heifu-safety/default.nix +++ b/distros/melodic/heifu-safety/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu-safety"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu_safety/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "237643936466dc423019b216b87cfb67708a74490a7aeb44f070c2fbacfb4bef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu_safety/0.7.7-2"; + sha256 = "sha256-RKwKQmkUyEKQsFptkuMfBRoJvFskFfBzp32OLSxCJxA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heifu-simple-waypoint/default.nix b/distros/melodic/heifu-simple-waypoint/default.nix index 77f317de4d..c7cc0c625e 100644 --- a/distros/melodic/heifu-simple-waypoint/default.nix +++ b/distros/melodic/heifu-simple-waypoint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu-simple-waypoint"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu_simple_waypoint/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "66e237afdc740d1ba4b427441fd178cd501c3374094631a81e66362445759127"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu_simple_waypoint/0.7.7-2"; + sha256 = "sha256-IpZKslOkJ4NvAc7PAkfB00G1YnfrtHySzZH93KQ/cPM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heifu-tools/default.nix b/distros/melodic/heifu-tools/default.nix index 408503d834..adfa347138 100644 --- a/distros/melodic/heifu-tools/default.nix +++ b/distros/melodic/heifu-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu-tools"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu_tools/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "20f3cbb6ee95a822f7f7ffadac6f9f8dadc2d22ab2e8350fa87658ff7f9bcab9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu_tools/0.7.7-2"; + sha256 = "sha256-NT+bWJWSXY+joLmKLhTQCOGsOCCyO77p219b7/N3oQ8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heifu/default.nix b/distros/melodic/heifu/default.nix index 9b479e18e6..02ae6c314e 100644 --- a/distros/melodic/heifu/default.nix +++ b/distros/melodic/heifu/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heifu"; version = "0.7.7-r2"; - src = fetchurl { - url = "https://github.com/BV-OpenSource/heifu-release/archive/release/melodic/heifu/0.7.7-2.tar.gz"; - name = "0.7.7-2.tar.gz"; - sha256 = "8436cf31ff37312589400f124aeaeed1aacb9093847ea92546287d8e1147c909"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BV-OpenSource"; + repo = "heifu-release"; + rev = "release/melodic/heifu/0.7.7-2"; + sha256 = "sha256-wF+xqTykwL206VnJL1OLn42CQHwlyZPFOb14PlM3w7I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heron-control/default.nix b/distros/melodic/heron-control/default.nix index 68b65ee99b..9c6f49f347 100644 --- a/distros/melodic/heron-control/default.nix +++ b/distros/melodic/heron-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heron-control"; version = "0.3.4-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/heron-release/archive/release/melodic/heron_control/0.3.4-1.tar.gz"; - name = "0.3.4-1.tar.gz"; - sha256 = "fd775e78508739fa2e7860a3c9b23c24e37f1b9015a75de364c91693aed01738"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "heron-release"; + rev = "release/melodic/heron_control/0.3.4-1"; + sha256 = "sha256-iUddH8vBWHyrp3GIk4z4+IhAWysPl9DsKXj9k/RTCLE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heron-controller/default.nix b/distros/melodic/heron-controller/default.nix index 35f79c169e..3adfaaf5d8 100644 --- a/distros/melodic/heron-controller/default.nix +++ b/distros/melodic/heron-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heron-controller"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/heron_controller-release/archive/release/melodic/heron_controller/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "fb128ac4dec46641368bc6fe28a399f18af9eb26da359d1e7c4edaf47e62bd61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "heron_controller-release"; + rev = "release/melodic/heron_controller/0.2.0-1"; + sha256 = "sha256-F4Y1c854HODlkb39Lfw9mmg5mFxgrb6yZSHogKqesjQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heron-description/default.nix b/distros/melodic/heron-description/default.nix index 1328a59bf8..94e28d6c98 100644 --- a/distros/melodic/heron-description/default.nix +++ b/distros/melodic/heron-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heron-description"; version = "0.3.4-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/heron-release/archive/release/melodic/heron_description/0.3.4-1.tar.gz"; - name = "0.3.4-1.tar.gz"; - sha256 = "8f667197332029beffb8c146923e072566af0eea4a53b913f07843853dfdfa4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "heron-release"; + rev = "release/melodic/heron_description/0.3.4-1"; + sha256 = "sha256-Qsso03/8ULy9f6eqIwXJjP3bQ78VGpKyOOHdftZN7GY="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/heron-desktop/default.nix b/distros/melodic/heron-desktop/default.nix index 6b0ee1878d..08825fa343 100644 --- a/distros/melodic/heron-desktop/default.nix +++ b/distros/melodic/heron-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heron-desktop"; version = "0.0.3-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/heron_desktop-release/archive/release/melodic/heron_desktop/0.0.3-2.tar.gz"; - name = "0.0.3-2.tar.gz"; - sha256 = "9f85ce7a3ac1b2946097bf03585b55b9577ace9bed0bf395ab331ac2749c6f46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "heron_desktop-release"; + rev = "release/melodic/heron_desktop/0.0.3-2"; + sha256 = "sha256-BquXX2eUA1aOGFW2cIf7N5SBD1q6YoUGomEgBtecR3M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heron-gazebo/default.nix b/distros/melodic/heron-gazebo/default.nix index c22924164c..4f7f3beac3 100644 --- a/distros/melodic/heron-gazebo/default.nix +++ b/distros/melodic/heron-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heron-gazebo"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/heron_simulator-release/archive/release/melodic/heron_gazebo/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "f4d7452f43a628c49f32212655878cc2a69d42a5e502ef85eb629e002f027d8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "heron_simulator-release"; + rev = "release/melodic/heron_gazebo/0.3.3-1"; + sha256 = "sha256-KFZPVgjfAH0h0zF+UT/GHKw/5eptUiu+l+so5KrObqM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/heron-msgs/default.nix b/distros/melodic/heron-msgs/default.nix index 6f7c161c35..0dc8f4df57 100644 --- a/distros/melodic/heron-msgs/default.nix +++ b/distros/melodic/heron-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heron-msgs"; version = "0.3.4-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/heron-release/archive/release/melodic/heron_msgs/0.3.4-1.tar.gz"; - name = "0.3.4-1.tar.gz"; - sha256 = "899a24ec3766be77d115b0d13f93a17e06975b9d1efc66af3f760df81e0555ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "heron-release"; + rev = "release/melodic/heron_msgs/0.3.4-1"; + sha256 = "sha256-11D4oe4bDBo6uXwbYBTAS2cxvg6oZQVQZe6iqsrrmXg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/heron-simulator/default.nix b/distros/melodic/heron-simulator/default.nix index eeb5d2a156..122c48ae44 100644 --- a/distros/melodic/heron-simulator/default.nix +++ b/distros/melodic/heron-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heron-simulator"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/heron_simulator-release/archive/release/melodic/heron_simulator/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "01e62741f3b4ac972fe81036559221d1c85baa78e0b6c9a6e4e42ad2013b3e77"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "heron_simulator-release"; + rev = "release/melodic/heron_simulator/0.3.3-1"; + sha256 = "sha256-s2OLWWT5eERt64/5M7FtjwMZu2xjd4J0yNXP4HLt6+s="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/heron-viz/default.nix b/distros/melodic/heron-viz/default.nix index f12fe451b4..3ef89e3286 100644 --- a/distros/melodic/heron-viz/default.nix +++ b/distros/melodic/heron-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-heron-viz"; version = "0.0.3-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/heron_desktop-release/archive/release/melodic/heron_viz/0.0.3-2.tar.gz"; - name = "0.0.3-2.tar.gz"; - sha256 = "d884b05c99242ce6154dd63a8bbe69bafa8d85dc5efdd640cf7ab524f96600f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "heron_desktop-release"; + rev = "release/melodic/heron_viz/0.0.3-2"; + sha256 = "sha256-p036aZOiJdrUk13Jv0gRZC54XWUGwbw3K7TLY/8iN48="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/hfl-driver/default.nix b/distros/melodic/hfl-driver/default.nix index d78bdb744d..d086b868fc 100644 --- a/distros/melodic/hfl-driver/default.nix +++ b/distros/melodic/hfl-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hfl-driver"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/flynneva/hfl_driver-release/archive/release/melodic/hfl_driver/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "0583fd59b8cff10160d9a76fa358e86972430114a59b8422a5bdc063f69e8772"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "hfl_driver-release"; + rev = "release/melodic/hfl_driver/0.1.0-1"; + sha256 = "sha256-8dygZmk/hyGSEKHvlXVMM511HxluBHQZz14zSoFNhkE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hironx-calibration/default.nix b/distros/melodic/hironx-calibration/default.nix index 6975f25ad1..0af799fee2 100644 --- a/distros/melodic/hironx-calibration/default.nix +++ b/distros/melodic/hironx-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hironx-calibration"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_hironx-release/archive/release/melodic/hironx_calibration/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "13d0ab19563ad8f91a7091b091002e6eef15af25fcbb017575ed95e3bf19f749"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_hironx-release"; + rev = "release/melodic/hironx_calibration/2.2.0-1"; + sha256 = "sha256-mQHYkzCJQm+3VyhdmWYXPC5fPNmc7J0Y3IYjCOwXfOo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hironx-moveit-config/default.nix b/distros/melodic/hironx-moveit-config/default.nix index 34cffbd8c9..c28efb71ce 100644 --- a/distros/melodic/hironx-moveit-config/default.nix +++ b/distros/melodic/hironx-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hironx-moveit-config"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_hironx-release/archive/release/melodic/hironx_moveit_config/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "25a9b7c9dabea8e03d2f0e08544d7285c8920c7542d52eba6064f912b503962b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_hironx-release"; + rev = "release/melodic/hironx_moveit_config/2.2.0-1"; + sha256 = "sha256-KuqqmllptppX8YewbjR+b6nX9JYjorKTi10mioalWD8="; + }; buildType = "catkin"; buildInputs = [ catkin collada-urdf moveit-ros-move-group ]; diff --git a/distros/melodic/hironx-ros-bridge/default.nix b/distros/melodic/hironx-ros-bridge/default.nix index f7d1bf3681..af1974f3db 100644 --- a/distros/melodic/hironx-ros-bridge/default.nix +++ b/distros/melodic/hironx-ros-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hironx-ros-bridge"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_hironx-release/archive/release/melodic/hironx_ros_bridge/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "0a91dd930c34df29ce651af41d878bdd9c463be2a5a7d1ef4f2cbeeb6c403524"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_hironx-release"; + rev = "release/melodic/hironx_ros_bridge/2.2.0-1"; + sha256 = "sha256-gNcs10j43wAMbPPslIZGbaVJoVsDmBBENh+m49sWsKI="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosbuild roslint unzip ]; diff --git a/distros/melodic/hls-lfcd-lds-driver/default.nix b/distros/melodic/hls-lfcd-lds-driver/default.nix index d8735e3d66..4b238f81ea 100644 --- a/distros/melodic/hls-lfcd-lds-driver/default.nix +++ b/distros/melodic/hls-lfcd-lds-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hls-lfcd-lds-driver"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/hls-lfcd-lds-driver-release/archive/release/melodic/hls_lfcd_lds_driver/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "818186f69f514fea41023eefdeef1721c8817b0a57a7f113c4f8ae887f1147a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "hls-lfcd-lds-driver-release"; + rev = "release/melodic/hls_lfcd_lds_driver/1.1.2-1"; + sha256 = "sha256-qFZn3c0vWo+U036jfgy8NlQFsGt1Vbf2dD8o5ke22uE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hokuyo3d/default.nix b/distros/melodic/hokuyo3d/default.nix index ddb87ccf25..e316a487da 100644 --- a/distros/melodic/hokuyo3d/default.nix +++ b/distros/melodic/hokuyo3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hokuyo3d"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/at-wat/hokuyo3d-release/archive/release/melodic/hokuyo3d/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "bc85a3df064e76fb26e2d04d8f355ad9dee7a8bc3fdc3de67d10302bcdabb88e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "hokuyo3d-release"; + rev = "release/melodic/hokuyo3d/0.2.1-1"; + sha256 = "sha256-t+5kRJKbUQzoRqYHAh4k+jbBqOcuy0m+se8tSXCtpNM="; + }; buildType = "catkin"; buildInputs = [ catkin roslint rostest ]; diff --git a/distros/melodic/hostapd-access-point/default.nix b/distros/melodic/hostapd-access-point/default.nix index 453fdd5956..8919f67813 100644 --- a/distros/melodic/hostapd-access-point/default.nix +++ b/distros/melodic/hostapd-access-point/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hostapd-access-point"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/hostapd_access_point/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "ab8712b49eb1b1b3cd7b99e4966225807714ea52a589777089d9fb99ea5ed293"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/hostapd_access_point/1.0.16-1"; + sha256 = "sha256-6GHJCeVsqVYp/9ow6DFkE4bhypXzqgHbomvBFrsJC3Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/hpp-fcl/default.nix b/distros/melodic/hpp-fcl/default.nix index 805586dc2c..5f21cabbbb 100644 --- a/distros/melodic/hpp-fcl/default.nix +++ b/distros/melodic/hpp-fcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hpp-fcl"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/humanoid-path-planner/hpp-fcl-ros-release/archive/release/melodic/hpp-fcl/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "6bcc4bea9886c332a57db218d8767e49524a8984bb8623d13bee3184e5ae672b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "humanoid-path-planner"; + repo = "hpp-fcl-ros-release"; + rev = "release/melodic/hpp-fcl/2.2.0-1"; + sha256 = "sha256-Jg/himo9KLlbAM9hVexTrYyJ/m9rxp3+R5fhfXgRbJM="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git pythonPackages.lxml ]; diff --git a/distros/melodic/hri-msgs/default.nix b/distros/melodic/hri-msgs/default.nix index 6a36d956dd..eb77260273 100644 --- a/distros/melodic/hri-msgs/default.nix +++ b/distros/melodic/hri-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, sensor-msgs }: buildRosPackage { pname = "ros-melodic-hri-msgs"; - version = "0.7.1-r1"; + version = "0.8.0-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/hri_msgs-release/archive/release/melodic/hri_msgs/0.7.1-1.tar.gz"; - name = "0.7.1-1.tar.gz"; - sha256 = "38e6797d23d882d009dba699e06459a65efe381cebba9f18d619a92f1a8f26ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "hri_msgs-release"; + rev = "release/melodic/hri_msgs/0.8.0-1"; + sha256 = "sha256-M3qb+B/8NzY3NHEaMj8YBAdBO4tkog1j4m1brr5eMc4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/hri/default.nix b/distros/melodic/hri/default.nix index 0255bc9379..70136175de 100644 --- a/distros/melodic/hri/default.nix +++ b/distros/melodic/hri/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cv-bridge, geometry-msgs, hri-msgs, rosconsole, roscpp, sensor-msgs, std-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-melodic-hri"; - version = "0.5.0-r1"; + version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/libhri-release/archive/release/melodic/hri/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "f1855981d95343c53912ee8fcbfabc4526465636ed127fce75f14ef89698ad89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "libhri-release"; + rev = "release/melodic/hri/0.6.0-1"; + sha256 = "sha256-807gfglQNhis5UM7Aaj7O9sR9An8jaTUNb3ghAgv/Wk="; + }; buildType = "catkin"; buildInputs = [ boost catkin ]; diff --git a/distros/melodic/hrpsys-ros-bridge/default.nix b/distros/melodic/hrpsys-ros-bridge/default.nix index 44ccac6c55..ff0ab2ec95 100644 --- a/distros/melodic/hrpsys-ros-bridge/default.nix +++ b/distros/melodic/hrpsys-ros-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hrpsys-ros-bridge"; version = "1.4.3-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_common-release/archive/release/melodic/hrpsys_ros_bridge/1.4.3-1.tar.gz"; - name = "1.4.3-1.tar.gz"; - sha256 = "6952e7f4b1edeb8a7a51d03a8c1e082775257a5ed9e6a79ab3a7e8da680fb7bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_common-release"; + rev = "release/melodic/hrpsys_ros_bridge/1.4.3-1"; + sha256 = "sha256-biH7RPenq/Ew2ip/Oy2fm+lCl14PtG/rbruVsNz7LeI="; + }; buildType = "catkin"; buildInputs = [ angles catkin euscollada git hostname message-generation mk nettools pkg-config procps pythonPackages.rosdep rosbuild roslang subversion ]; diff --git a/distros/melodic/hrpsys-tools/default.nix b/distros/melodic/hrpsys-tools/default.nix index 62e56862db..7cd5251971 100644 --- a/distros/melodic/hrpsys-tools/default.nix +++ b/distros/melodic/hrpsys-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hrpsys-tools"; version = "1.4.3-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_common-release/archive/release/melodic/hrpsys_tools/1.4.3-1.tar.gz"; - name = "1.4.3-1.tar.gz"; - sha256 = "022b471d0ff125eb3e55e527a04b71984645c5fcf74185e834f640356461a8fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_common-release"; + rev = "release/melodic/hrpsys_tools/1.4.3-1"; + sha256 = "sha256-xgcxzSSUTFCdqhpWoriEwEyhiKTMUOTfJsz3QC+poew="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/hrpsys/default.nix b/distros/melodic/hrpsys/default.nix index 90d362c50e..208d234e60 100644 --- a/distros/melodic/hrpsys/default.nix +++ b/distros/melodic/hrpsys/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-hrpsys"; version = "315.15.0-r8"; - src = fetchurl { - url = "https://github.com/tork-a/hrpsys-release/archive/release/melodic/hrpsys/315.15.0-8.tar.gz"; - name = "315.15.0-8.tar.gz"; - sha256 = "c7041e257756bd66cf745714ba92fc1b9e34342a68687d812a0495e716180f9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "hrpsys-release"; + rev = "release/melodic/hrpsys/315.15.0-8"; + sha256 = "sha256-E266Bh+jOlroIyrHPLSAKlGMXOY1X0L4EVZ9fcSESQU="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git glew graphviz mk pkg-config ]; diff --git a/distros/melodic/human-description/default.nix b/distros/melodic/human-description/default.nix index 478956d0c1..da94fb6792 100644 --- a/distros/melodic/human-description/default.nix +++ b/distros/melodic/human-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-human-description"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/human_description-release/archive/release/melodic/human_description/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "d689202e31482503b615ddd0ec2f7bbf764386d3d648b20b780a6583046e9da1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "human_description-release"; + rev = "release/melodic/human_description/1.0.0-1"; + sha256 = "sha256-IOiqvPIAOordrjzw3G+CeOGXowXXGRNwkrC3RNIKHvI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/husky-base/default.nix b/distros/melodic/husky-base/default.nix index 53d6e2cf01..a344eee509 100644 --- a/distros/melodic/husky-base/default.nix +++ b/distros/melodic/husky-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-base"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_base/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "e1eb0bf695fc8998633a74e0a4d8294dbb927fee1e40aff42eb4b859d6bbe0ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_base/0.4.13-1"; + sha256 = "sha256-u4pkpyRtogAn+T9DRG3q8vW1FjKpYkwo/k++A8nw+mw="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch roslint ]; diff --git a/distros/melodic/husky-bringup/default.nix b/distros/melodic/husky-bringup/default.nix index 91d0eca83c..77ec8eeaa4 100644 --- a/distros/melodic/husky-bringup/default.nix +++ b/distros/melodic/husky-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-bringup"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_bringup/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "74b50e9cd2abc193a8087249b1d501a2fd6a0d5ef471579b2029ecbac899e81f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_bringup/0.4.13-1"; + sha256 = "sha256-hOFhOyRAJnA8GINo9w6msfLZwXshXEvZ5I5uAR9iYw0="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/husky-cartographer-navigation/default.nix b/distros/melodic/husky-cartographer-navigation/default.nix index 39baff2c86..22c102940d 100644 --- a/distros/melodic/husky-cartographer-navigation/default.nix +++ b/distros/melodic/husky-cartographer-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-cartographer-navigation"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky_cartographer_navigation-release/archive/release/melodic/husky_cartographer_navigation/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "1912f181984d2181fd512a7612854756ecc53be736d111c8cc9d59cca2304c24"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky_cartographer_navigation-release"; + rev = "release/melodic/husky_cartographer_navigation/0.0.2-1"; + sha256 = "sha256-uiS2PHEQVmE/RF6ANQDdE/xoN3mBBvqAme+Dp6gdJAE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/husky-control/default.nix b/distros/melodic/husky-control/default.nix index 9eb7459b7d..b5c0f5861e 100644 --- a/distros/melodic/husky-control/default.nix +++ b/distros/melodic/husky-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-control"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_control/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "5fae84b138ee8e4aa7020396803657b3a0e533c6f1209c72e39c93c64d38d6a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_control/0.4.13-1"; + sha256 = "sha256-G24xib7xORB7XO7hMropAxkxvioxmN0ec3R+zN73OLI="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/husky-description/default.nix b/distros/melodic/husky-description/default.nix index a7490f753d..1f05f9fdbb 100644 --- a/distros/melodic/husky-description/default.nix +++ b/distros/melodic/husky-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-description"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_description/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "7617e67398d4cd36901d205f027c4756d53c6f3e2e4c55fb474e02b456eefd12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_description/0.4.13-1"; + sha256 = "sha256-Kd2O7njsE2qZMPAD825h7IQQZi9RQsrhNLJJ6Etc8Rk="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/husky-desktop/default.nix b/distros/melodic/husky-desktop/default.nix index 1265f1a4c9..ac3cb35fde 100644 --- a/distros/melodic/husky-desktop/default.nix +++ b/distros/melodic/husky-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-desktop"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_desktop/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "22d9796b879a3f4abcfd7c4755be838744a9f53f949268bdd58221c12a363ff3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_desktop/0.4.13-1"; + sha256 = "sha256-eiC8X2oy9WeLh1pHDRGCaC55QbuJAPK32GZSmdtTRy0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/husky-gazebo/default.nix b/distros/melodic/husky-gazebo/default.nix index bd77c6de4e..a1f88217b6 100644 --- a/distros/melodic/husky-gazebo/default.nix +++ b/distros/melodic/husky-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-gazebo"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_gazebo/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "0b0812181f501c21c01fe533021fa792f08711790b45ac7c18de2572446dc39e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_gazebo/0.4.13-1"; + sha256 = "sha256-azLQI+B8bqKyQ9zUSNLD91PnMzsgIkhMeCtdf4A4ocE="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/husky-msgs/default.nix b/distros/melodic/husky-msgs/default.nix index 3348614c22..1df01e5dbf 100644 --- a/distros/melodic/husky-msgs/default.nix +++ b/distros/melodic/husky-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-msgs"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_msgs/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "92c90d180c3feb55f8631e019e58b38929ae867e0024d3938f4b8a806784069b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_msgs/0.4.13-1"; + sha256 = "sha256-LO6pW52tiTq8n0VJr5smMXhQJeEkcZN9JYwWwn6+nrk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/husky-navigation/default.nix b/distros/melodic/husky-navigation/default.nix index 0939a1e183..988c478b09 100644 --- a/distros/melodic/husky-navigation/default.nix +++ b/distros/melodic/husky-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-navigation"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_navigation/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "d1a435498e9fbd96c6881ee861ef4994a923bed7bbd450f082bd288ecab8f895"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_navigation/0.4.13-1"; + sha256 = "sha256-IQGXn8y9GPEd5oppYJH4X/zHqTaOzhaN6wBtSGAQRvI="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/husky-robot/default.nix b/distros/melodic/husky-robot/default.nix index f7ad269a3b..4f62086ae3 100644 --- a/distros/melodic/husky-robot/default.nix +++ b/distros/melodic/husky-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-robot"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_robot/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "61d45341d98e1d62810c87140606eb2e35cce5e69797c3618bc33621ca542567"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_robot/0.4.13-1"; + sha256 = "sha256-xIUT3j/qxWo6QQel0MW+XTpX78LzKlLdSdCaEyko0Dc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/husky-simulator/default.nix b/distros/melodic/husky-simulator/default.nix index e4b56d58f4..e2801b5ffb 100644 --- a/distros/melodic/husky-simulator/default.nix +++ b/distros/melodic/husky-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-simulator"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_simulator/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "a8beaee8a72de3d55cfcedf30580a25735d53870a41e64cf10d70c2acc475b5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_simulator/0.4.13-1"; + sha256 = "sha256-sROGibokVuhA4nqn3Z1n4PxOvo0UqPvCIQfzuTUZliQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/husky-viz/default.nix b/distros/melodic/husky-viz/default.nix index eaf586416d..5ef070c24c 100644 --- a/distros/melodic/husky-viz/default.nix +++ b/distros/melodic/husky-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-husky-viz"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/melodic/husky_viz/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "1428ff190714d183165eb4f47e76b9e93ab241716dea92d2a6520e00fd4f73b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/melodic/husky_viz/0.4.13-1"; + sha256 = "sha256-nb2BOzWg9mIV1knLFrgUZT6AfNy3xdmT+sosrYB8WNk="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/ibeo-core/default.nix b/distros/melodic/ibeo-core/default.nix index 7189a87049..ff30e68c82 100644 --- a/distros/melodic/ibeo-core/default.nix +++ b/distros/melodic/ibeo-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ibeo-core"; version = "2.0.2"; - src = fetchurl { - url = "https://github.com/astuff/ibeo_core-release/archive/release/melodic/ibeo_core/2.0.2-0.tar.gz"; - name = "2.0.2-0.tar.gz"; - sha256 = "c2ee7a2ea9424ee0c40e44d9cf22ab00bface29f418167a42451c6fae071071b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "ibeo_core-release"; + rev = "release/melodic/ibeo_core/2.0.2-0"; + sha256 = "sha256-EeoNy61hClwo2+0CkVkiR8sttoWOmXHQpo1WXfIURRg="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/ibeo-lux/default.nix b/distros/melodic/ibeo-lux/default.nix index c52ba4f307..7faf1e94fb 100644 --- a/distros/melodic/ibeo-lux/default.nix +++ b/distros/melodic/ibeo-lux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ibeo-lux"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/astuff/ibeo_lux-release/archive/release/melodic/ibeo_lux/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "0aa9797cbee3936a930074405e44de2f604c0eaf99b7b4e6b60d3773243a0fb3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "ibeo_lux-release"; + rev = "release/melodic/ibeo_lux/2.0.1-0"; + sha256 = "sha256-dUIQxcUON4deem4TwBKoYmCRgpk2xkF73iln3qkN1MM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ibeo-msgs/default.nix b/distros/melodic/ibeo-msgs/default.nix index d1ca4bf55e..6f894219df 100644 --- a/distros/melodic/ibeo-msgs/default.nix +++ b/distros/melodic/ibeo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ibeo-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/ibeo_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "0e7dc35d20626bbd58866e4dbbcc1bd00b8bdd1b09d5487629311d0fa91c04e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/ibeo_msgs/3.0.2-1"; + sha256 = "sha256-Zh5gYrXDgrnHZX6dZoe1VJcu+l6u0vzlJm8JAuAL4tU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/ieee80211-channels/default.nix b/distros/melodic/ieee80211-channels/default.nix index 6680589024..8f40c1dfd8 100644 --- a/distros/melodic/ieee80211-channels/default.nix +++ b/distros/melodic/ieee80211-channels/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ieee80211-channels"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/ieee80211_channels/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "0fdd1c65ca9d698ae50345ae73904b34161753ada49f53ddceec13066f9bd355"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/ieee80211_channels/1.0.16-1"; + sha256 = "sha256-bHk/M/QsOKp44WbPGrSUQ1xh5aoYyg6dvtc/JKmb7N4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ifm3d-core/default.nix b/distros/melodic/ifm3d-core/default.nix index e607649880..6199b22f07 100644 --- a/distros/melodic/ifm3d-core/default.nix +++ b/distros/melodic/ifm3d-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ifm3d-core"; version = "0.18.0-r1"; - src = fetchurl { - url = "https://github.com/ifm/ifm3d-release/archive/release/melodic/ifm3d_core/0.18.0-1.tar.gz"; - name = "0.18.0-1.tar.gz"; - sha256 = "c34250d57fa25729bccdf466a3b94c02a22e900d7b17a9b88fc5ec34b60b98b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ifm"; + repo = "ifm3d-release"; + rev = "release/melodic/ifm3d_core/0.18.0-1"; + sha256 = "sha256-AhAJqGARcpU087nBGQRL80/Xk0BF3+5wmxDeZfxofog="; + }; buildType = "cmake"; buildInputs = [ boost cmake ]; diff --git a/distros/melodic/ifm3d/default.nix b/distros/melodic/ifm3d/default.nix index 026cf89cbb..11970cf135 100644 --- a/distros/melodic/ifm3d/default.nix +++ b/distros/melodic/ifm3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ifm3d"; version = "0.6.2-r2"; - src = fetchurl { - url = "https://github.com/ifm/ifm3d-ros-release/archive/release/melodic/ifm3d/0.6.2-2.tar.gz"; - name = "0.6.2-2.tar.gz"; - sha256 = "71bf4886c74200afc466308abfadec6ff8c44a22c77f7d82603642e613d74b23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ifm"; + repo = "ifm3d-ros-release"; + rev = "release/melodic/ifm3d/0.6.2-2"; + sha256 = "sha256-hCfT4PKk3DEEntLQeolnlvCKzWLY68gfE/TaSz64R7M="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/igvc-self-drive-description/default.nix b/distros/melodic/igvc-self-drive-description/default.nix index 7cf780561b..c7ba916062 100644 --- a/distros/melodic/igvc-self-drive-description/default.nix +++ b/distros/melodic/igvc-self-drive-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-igvc-self-drive-description"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/robustify/igvc_self_drive_sim-release/archive/release/melodic/igvc_self_drive_description/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "fa2ffa41025c6113ccd2b1ae750a29c23e8b50b5f2a52f3dad64a764afbd90f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "igvc_self_drive_sim-release"; + rev = "release/melodic/igvc_self_drive_description/0.1.4-1"; + sha256 = "sha256-P6HRITD64atCpcRVYkERYZOF3BdEOVbbF2kYh6ULJW0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix b/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix index 6f245c30d7..d721749862 100644 --- a/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix +++ b/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-igvc-self-drive-gazebo-plugins"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/robustify/igvc_self_drive_sim-release/archive/release/melodic/igvc_self_drive_gazebo_plugins/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "b05458848d4831c3a1dda0396285a2380bca48743fd980319fcacd645e1c26bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "igvc_self_drive_sim-release"; + rev = "release/melodic/igvc_self_drive_gazebo_plugins/0.1.4-1"; + sha256 = "sha256-tvVCnjRpVQBE7T0goiRvb6yaTFaMFiIF7EAdsTA7GPQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/igvc-self-drive-gazebo/default.nix b/distros/melodic/igvc-self-drive-gazebo/default.nix index 4cbefb6811..10f4bbd043 100644 --- a/distros/melodic/igvc-self-drive-gazebo/default.nix +++ b/distros/melodic/igvc-self-drive-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-igvc-self-drive-gazebo"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/robustify/igvc_self_drive_sim-release/archive/release/melodic/igvc_self_drive_gazebo/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "8b83406423a8bcc6de599c32df446a7165145353418a9c5e279c43a0b9f08e4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "igvc_self_drive_sim-release"; + rev = "release/melodic/igvc_self_drive_gazebo/0.1.4-1"; + sha256 = "sha256-0jsaVkta0fwi9nrz8N34MUQ+7wjrC1cphKrkZJ6o+wA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/igvc-self-drive-sim/default.nix b/distros/melodic/igvc-self-drive-sim/default.nix index 31875fbd9a..5a0aaa629e 100644 --- a/distros/melodic/igvc-self-drive-sim/default.nix +++ b/distros/melodic/igvc-self-drive-sim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-igvc-self-drive-sim"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/robustify/igvc_self_drive_sim-release/archive/release/melodic/igvc_self_drive_sim/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "8a843a920d6ffe9cb3c37a6c3e9b07e993aa0373599583f68304e5827883e214"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "igvc_self_drive_sim-release"; + rev = "release/melodic/igvc_self_drive_sim/0.1.4-1"; + sha256 = "sha256-kOPI73PHUXpGvyDNzMoP4oKS3l7oUqUgW4JwxNBUJR4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/iirob-filters/default.nix b/distros/melodic/iirob-filters/default.nix index 50b63982b8..3090114027 100644 --- a/distros/melodic/iirob-filters/default.nix +++ b/distros/melodic/iirob-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-iirob-filters"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/KITrobotics/iirob_filters-release/archive/release/melodic/iirob_filters/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "9ba0c2617ca283652577baa67f0a379974488d85fa5bf89ae1331ac9d917ebe0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KITrobotics"; + repo = "iirob_filters-release"; + rev = "release/melodic/iirob_filters/0.9.2-1"; + sha256 = "sha256-hYWW0UZrfxhC2cnV0a+xCngOscqiqtRnUx5yc9cPyxM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/image-cb-detector/default.nix b/distros/melodic/image-cb-detector/default.nix index 3d6872eab3..5932df0e3a 100644 --- a/distros/melodic/image-cb-detector/default.nix +++ b/distros/melodic/image-cb-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-cb-detector"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/image_cb_detector/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "b979f5db4bef45b9072a8392e5abb0f8608a5ebd06ba6dbbb5c51cb48e2ed335"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/image_cb_detector/0.10.14-0"; + sha256 = "sha256-+JELnlCH9MHLdFJhvmHQa5njYTXOPECVcAPGXkvlIzw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/image-common/default.nix b/distros/melodic/image-common/default.nix index ed55ea8788..9b89fdafe6 100644 --- a/distros/melodic/image-common/default.nix +++ b/distros/melodic/image-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-common"; version = "1.11.13"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/melodic/image_common/1.11.13-0.tar.gz"; - name = "1.11.13-0.tar.gz"; - sha256 = "987bdb08a0bf935d3c657331b79564a3e272f6c4538e5be5d893ab6a13865ede"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/melodic/image_common/1.11.13-0"; + sha256 = "sha256-QGpvmDBlHMOXfznlkGsVUFaV62wHa1+BFxs/+UDotSE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/image-exposure-msgs/default.nix b/distros/melodic/image-exposure-msgs/default.nix index 086b4c95e5..09e6940b1e 100644 --- a/distros/melodic/image-exposure-msgs/default.nix +++ b/distros/melodic/image-exposure-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-exposure-msgs"; version = "0.14.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/melodic/image_exposure_msgs/0.14.2-1.tar.gz"; - name = "0.14.2-1.tar.gz"; - sha256 = "c6ba39025b456f77a855837ff900d4fa5a327054fcda320f2d2e94c219ef8ac5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/melodic/image_exposure_msgs/0.14.2-1"; + sha256 = "sha256-reyeVa18EedWwKIk7ef6Cq/6YQif+lkcBcueS7m11bM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/image-geometry/default.nix b/distros/melodic/image-geometry/default.nix index d95fc728c7..591a6353d6 100644 --- a/distros/melodic/image-geometry/default.nix +++ b/distros/melodic/image-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-geometry"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vision_opencv-release/archive/release/melodic/image_geometry/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "e18a65c66349b9788c70e620cc8f08f3e9c80f2ba2efc2912b164216e91d0ed8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vision_opencv-release"; + rev = "release/melodic/image_geometry/1.13.1-1"; + sha256 = "sha256-G2hloVRaDZSVMqW27ndR3SOfz3kI4oK9jN4kQE8tc3I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/image-pipeline/default.nix b/distros/melodic/image-pipeline/default.nix index 47c2d87b5b..0b97e70d87 100644 --- a/distros/melodic/image-pipeline/default.nix +++ b/distros/melodic/image-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-pipeline"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_pipeline/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "4a7d7906fa86fb64308ab843b43e48fabe79bfaaa085e662a95dfbd4517c1991"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/melodic/image_pipeline/1.15.2-1"; + sha256 = "sha256-BLH4XfHsW1NN/Nkwc177PC8mX+ibtZp/tLXgN3/a4WQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/image-proc/default.nix b/distros/melodic/image-proc/default.nix index c128af9f45..8f97deaf31 100644 --- a/distros/melodic/image-proc/default.nix +++ b/distros/melodic/image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-proc"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_proc/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "e93866f644228cb471e156021c77dd987a92015937ca917048616898b1d6f778"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/melodic/image_proc/1.15.2-1"; + sha256 = "sha256-B6j9UdOZ3DTeGuJn8RQR4liR7FH/k46Y9hM6DdPeGNQ="; + }; buildType = "catkin"; buildInputs = [ boost catkin ]; diff --git a/distros/melodic/image-publisher/default.nix b/distros/melodic/image-publisher/default.nix index c4419cbac6..c46c8c54db 100644 --- a/distros/melodic/image-publisher/default.nix +++ b/distros/melodic/image-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-publisher"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_publisher/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "843271015b7a665270a06c1eaa430e1364462bbcc180be8e1fd04c9332532b69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/melodic/image_publisher/1.15.2-1"; + sha256 = "sha256-INm247Dr8J32Ib5rqixttvXNnkHP6fdaIcIs7bx3CwE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/image-rotate/default.nix b/distros/melodic/image-rotate/default.nix index 69c8034f06..f9f5e28020 100644 --- a/distros/melodic/image-rotate/default.nix +++ b/distros/melodic/image-rotate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-rotate"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_rotate/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "a8e9c585ede1f4c11f7bb189064ec13f2b01321b1bf1725a335b1f7d051d0994"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/melodic/image_rotate/1.15.2-1"; + sha256 = "sha256-2szAXUnSbT/gYj03xjrAyFSrBlhE6O4DorAvJLv+y4k="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules geometry-msgs ]; diff --git a/distros/melodic/image-transport-plugins/default.nix b/distros/melodic/image-transport-plugins/default.nix index e840d584a3..370fefd35d 100644 --- a/distros/melodic/image-transport-plugins/default.nix +++ b/distros/melodic/image-transport-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-transport-plugins"; version = "1.9.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_transport_plugins-release/archive/release/melodic/image_transport_plugins/1.9.5-0.tar.gz"; - name = "1.9.5-0.tar.gz"; - sha256 = "1838bdad50e903b572a00fcb66935326e81c5e706af3356a64c0322927361ecd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/melodic/image_transport_plugins/1.9.5-0"; + sha256 = "sha256-e5P8DxGxfS1yYw9cwbFGATYEdrYPpzOW23bHd8IPTcQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/image-transport/default.nix b/distros/melodic/image-transport/default.nix index 557b70d3de..de8ae1c93e 100644 --- a/distros/melodic/image-transport/default.nix +++ b/distros/melodic/image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-transport"; version = "1.11.13"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/melodic/image_transport/1.11.13-0.tar.gz"; - name = "1.11.13-0.tar.gz"; - sha256 = "070c49d03d5320c322237672d62c34b3fd3f8c4b311a76f3572894f368421d55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/melodic/image_transport/1.11.13-0"; + sha256 = "sha256-FbqaPg89mI4nws9/v/igDm+galB2BztRSX9ophhKySU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/image-view/default.nix b/distros/melodic/image-view/default.nix index 3a766487e9..b46635cd32 100644 --- a/distros/melodic/image-view/default.nix +++ b/distros/melodic/image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-view"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/image_view/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "29776f65d7776982f87630615460afec9ae3666212b1ce2384b91c954cce154c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/melodic/image_view/1.15.2-1"; + sha256 = "sha256-JutAY2sz/XQnZu1VERzYRBuGKvGx1OrScDgnQt10cqE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation sensor-msgs stereo-msgs ]; diff --git a/distros/melodic/image-view2/default.nix b/distros/melodic/image-view2/default.nix index aca483c921..b630c1849a 100644 --- a/distros/melodic/image-view2/default.nix +++ b/distros/melodic/image-view2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-image-view2"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/image_view2/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "6ca6f03b21bd7feee26a9935b7f2eea8fa7c3c4e9dccf12013b415d4b7c61a50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/image_view2/2.2.12-1"; + sha256 = "sha256-coBA7xwyBUpFLf9FYkCRDdSMtbsT3Mwf2h/x6cjrFK8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/melodic/imagesift/default.nix b/distros/melodic/imagesift/default.nix index f692f1a593..496320c022 100644 --- a/distros/melodic/imagesift/default.nix +++ b/distros/melodic/imagesift/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imagesift"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/imagesift/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "0ebd264be9395ab7d14ca8daec8e98aa961cfa44134c02dad6e775c277486e53"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/imagesift/1.2.15-1"; + sha256 = "sha256-r9uhAIkmQer5PvqENwrrsezi1M+tIToO+CW4RBFPA8g="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules pythonPackages.setuptools ]; diff --git a/distros/melodic/imagezero-image-transport/default.nix b/distros/melodic/imagezero-image-transport/default.nix index fa404f0fcd..1f62321dfc 100644 --- a/distros/melodic/imagezero-image-transport/default.nix +++ b/distros/melodic/imagezero-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imagezero-image-transport"; version = "0.2.4"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/imagezero_transport-release/archive/release/melodic/imagezero_image_transport/0.2.4-0.tar.gz"; - name = "0.2.4-0.tar.gz"; - sha256 = "4c9fbc7c319b30bb24174343cc8e901e9908725890f11cdca4866fbd4f4550ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "imagezero_transport-release"; + rev = "release/melodic/imagezero_image_transport/0.2.4-0"; + sha256 = "sha256-BENMAIdW1ulOJr0Sh9YeVc7N2+HzuyMjWvzDZI4GN8Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/imagezero-ros/default.nix b/distros/melodic/imagezero-ros/default.nix index 716600b94e..c3dab84468 100644 --- a/distros/melodic/imagezero-ros/default.nix +++ b/distros/melodic/imagezero-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imagezero-ros"; version = "0.2.4"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/imagezero_transport-release/archive/release/melodic/imagezero_ros/0.2.4-0.tar.gz"; - name = "0.2.4-0.tar.gz"; - sha256 = "3bebcdd5695eedb7733be8f49515ff4c8d341fe5f75f09442ddb2e5ca44a1766"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "imagezero_transport-release"; + rev = "release/melodic/imagezero_ros/0.2.4-0"; + sha256 = "sha256-TKcNCttvaRV3hIzu54xUkZV9a/9GQuYIgbosg+YUOwA="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp ]; diff --git a/distros/melodic/imagezero/default.nix b/distros/melodic/imagezero/default.nix index 38fb0af850..28e5be23c7 100644 --- a/distros/melodic/imagezero/default.nix +++ b/distros/melodic/imagezero/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imagezero"; version = "0.2.4"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/imagezero_transport-release/archive/release/melodic/imagezero/0.2.4-0.tar.gz"; - name = "0.2.4-0.tar.gz"; - sha256 = "9cd7f77aca000dcb09f08f4f618755e8ee7f6099563aee77102f336e7622ec80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "imagezero_transport-release"; + rev = "release/melodic/imagezero/0.2.4-0"; + sha256 = "sha256-ZQHq/lLE4TCflrCD4Sf63q6vzWTuFd0T17KO3iiDIpI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/imu-complementary-filter/default.nix b/distros/melodic/imu-complementary-filter/default.nix index f0d1d678a7..c18c249d02 100644 --- a/distros/melodic/imu-complementary-filter/default.nix +++ b/distros/melodic/imu-complementary-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imu-complementary-filter"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/imu_tools-release/archive/release/melodic/imu_complementary_filter/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "e8d4d45abd00848d2ded1185cd622ecb9171ae8d3a9666bdd16597d6ba1c2215"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "imu_tools-release"; + rev = "release/melodic/imu_complementary_filter/1.2.5-1"; + sha256 = "sha256-ZPGg9wHoe+X6Yn0HUz7py7u+iuTQ4DZvSFbnLddrgr4="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/imu-filter-madgwick/default.nix b/distros/melodic/imu-filter-madgwick/default.nix index f326b37cd0..2ea48b58f0 100644 --- a/distros/melodic/imu-filter-madgwick/default.nix +++ b/distros/melodic/imu-filter-madgwick/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imu-filter-madgwick"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/imu_tools-release/archive/release/melodic/imu_filter_madgwick/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "25547d4ccabc7c57147e48813727e7e34e87aef8076ed6880cfeb379a87de684"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "imu_tools-release"; + rev = "release/melodic/imu_filter_madgwick/1.2.5-1"; + sha256 = "sha256-KY7fVs0auCxZHMRGsxz151p8GUzlF6SoYRuArEN9UiQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/imu-monitor/default.nix b/distros/melodic/imu-monitor/default.nix index efb52778ca..53efbf597f 100644 --- a/distros/melodic/imu-monitor/default.nix +++ b/distros/melodic/imu-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imu-monitor"; version = "1.6.31-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/melodic/imu_monitor/1.6.31-1.tar.gz"; - name = "1.6.31-1.tar.gz"; - sha256 = "7bbe15ef4ee3287381effb583fb31b131fc5989015bb88cd03dbc5435b2bf73e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/melodic/imu_monitor/1.6.31-1"; + sha256 = "sha256-uvL6I4H7KBxQzE9OvK9oTnzUL6ggjGl0gxzzYyzzgC8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/imu-pipeline/default.nix b/distros/melodic/imu-pipeline/default.nix index 1a34937dfe..6485f8d385 100644 --- a/distros/melodic/imu-pipeline/default.nix +++ b/distros/melodic/imu-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imu-pipeline"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/imu_pipeline-release/archive/release/melodic/imu_pipeline/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "3a0c3f1b2c077f581a50e83d9d44575e2f927bbb780feedc7f0a309454e9517b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "imu_pipeline-release"; + rev = "release/melodic/imu_pipeline/0.2.4-1"; + sha256 = "sha256-awKeMQEfTzkS6edp4EaTzjmCHNbNWUcbanXOe5x13GY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/imu-processors/default.nix b/distros/melodic/imu-processors/default.nix index 9833e5324a..9141ee3c2f 100644 --- a/distros/melodic/imu-processors/default.nix +++ b/distros/melodic/imu-processors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imu-processors"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/imu_pipeline-release/archive/release/melodic/imu_processors/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "5cb336af69513d32e17e25cb9cc8bd7e51176eb14e67e38b37ee9ab527c85da1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "imu_pipeline-release"; + rev = "release/melodic/imu_processors/0.2.4-1"; + sha256 = "sha256-lzlCw2iChw47/A3l1CDG97/oq79obCOhBwUUBYL1uC0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/imu-sensor-controller/default.nix b/distros/melodic/imu-sensor-controller/default.nix index acffccca8d..4d90471b0c 100644 --- a/distros/melodic/imu-sensor-controller/default.nix +++ b/distros/melodic/imu-sensor-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imu-sensor-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/imu_sensor_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "e08eb7d66b078379ee01e910381311ae5d956f1479890874f1e8a9ae096f5f91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/imu_sensor_controller/0.17.2-1"; + sha256 = "sha256-MmXR4ftcMSPMFy4IbYYYLLFs3d8nZtIMfCBUn1U1KYY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/imu-tools/default.nix b/distros/melodic/imu-tools/default.nix index a3cdedeb20..5143e3ecb6 100644 --- a/distros/melodic/imu-tools/default.nix +++ b/distros/melodic/imu-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imu-tools"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/imu_tools-release/archive/release/melodic/imu_tools/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "baf641b93e413076f3d7400da14630442a225ebb16c5f20c9a117f7b415f4784"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "imu_tools-release"; + rev = "release/melodic/imu_tools/1.2.5-1"; + sha256 = "sha256-TwnbHGZAeAzQkvQQPsiJom3etXNheKfJs6JmzqUn+6c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/imu-transformer/default.nix b/distros/melodic/imu-transformer/default.nix index eeadc4e091..18386a17b3 100644 --- a/distros/melodic/imu-transformer/default.nix +++ b/distros/melodic/imu-transformer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-imu-transformer"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/imu_pipeline-release/archive/release/melodic/imu_transformer/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "ea366e28b07fd5ebef132e1c41f2c6f56c89cfc22c966145c0823d7efa63967a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "imu_pipeline-release"; + rev = "release/melodic/imu_transformer/0.2.4-1"; + sha256 = "sha256-26grohttwVTU27kakuVEWI8lMToXXoDgpdsGkKWkpB4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/industrial-core/default.nix b/distros/melodic/industrial-core/default.nix index 7f65c98bb0..c5d03f4e0d 100644 --- a/distros/melodic/industrial-core/default.nix +++ b/distros/melodic/industrial-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-core"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/melodic/industrial_core/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "b37cab9d1669956c8a3d7314314cb3b54e0e4b1a4ac9a231416e89f5b1bfa266"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/melodic/industrial_core/0.7.3-1"; + sha256 = "sha256-ZaZnIom8Fvoem61kUwEJL/xy/b8U8ZAxJoZV6J+zOkE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/industrial-deprecated/default.nix b/distros/melodic/industrial-deprecated/default.nix index 8c51772a5f..9c39c0e076 100644 --- a/distros/melodic/industrial-deprecated/default.nix +++ b/distros/melodic/industrial-deprecated/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-deprecated"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/melodic/industrial_deprecated/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "32ee44d4411020c706eb55523f8dffb857ec94615f83d78c44fc90d8310a9d87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/melodic/industrial_deprecated/0.7.3-1"; + sha256 = "sha256-d1F0ETLuUe19WcayhUlqx7BOyHaQ9K8rhT2itWO6pYk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/industrial-msgs/default.nix b/distros/melodic/industrial-msgs/default.nix index 177a562e2d..a6047a8b81 100644 --- a/distros/melodic/industrial-msgs/default.nix +++ b/distros/melodic/industrial-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-msgs"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/melodic/industrial_msgs/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "ea2f9d7bed6e3bfd7c2a3fe74718d450c5b886f20904bc5b222f14848fb02110"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/melodic/industrial_msgs/0.7.3-1"; + sha256 = "sha256-tYfr1AQOZgUBX7+un6HBIe2YqG+SkpI4U0/lkeXZloM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/industrial-robot-client/default.nix b/distros/melodic/industrial-robot-client/default.nix index 613b871606..8497bc69c9 100644 --- a/distros/melodic/industrial-robot-client/default.nix +++ b/distros/melodic/industrial-robot-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-robot-client"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/melodic/industrial_robot_client/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "752478205c90b5ca1bfb45a88e14ad235f773377af99444ef9a42ad23bb015e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/melodic/industrial_robot_client/0.7.3-1"; + sha256 = "sha256-LgvtZfdDxAZjIa9OvxJbl+lOHxfAiz5mJiMScB1qf2k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/industrial-robot-simulator/default.nix b/distros/melodic/industrial-robot-simulator/default.nix index 85c2af8b52..aca802d48f 100644 --- a/distros/melodic/industrial-robot-simulator/default.nix +++ b/distros/melodic/industrial-robot-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-robot-simulator"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/melodic/industrial_robot_simulator/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "56f07602a4716e5c0a328cb37a4f7f9c976a9e1e1f331f8569422999e3122f33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/melodic/industrial_robot_simulator/0.7.3-1"; + sha256 = "sha256-oYT+ady9spoNwZ6DmC3djlPcdjo8n/W6uxh/mn0VMeE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/industrial-robot-status-controller/default.nix b/distros/melodic/industrial-robot-status-controller/default.nix index 88ade4b3c8..58d1f2ffcf 100644 --- a/distros/melodic/industrial-robot-status-controller/default.nix +++ b/distros/melodic/industrial-robot-status-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-robot-status-controller"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/gavanderhoorn/industrial_robot_status_controller-release/archive/release/melodic/industrial_robot_status_controller/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "89e803b0db1051773ed0cd7c0e8287ed8f1ab406caa7d637479742686311e3a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gavanderhoorn"; + repo = "industrial_robot_status_controller-release"; + rev = "release/melodic/industrial_robot_status_controller/0.1.2-1"; + sha256 = "sha256-p022V+EEm9prUjYhRXN1E0niuxHHS6W0+aHw3/5q+Dg="; + }; buildType = "catkin"; buildInputs = [ catkin industrial-robot-status-interface ]; diff --git a/distros/melodic/industrial-robot-status-interface/default.nix b/distros/melodic/industrial-robot-status-interface/default.nix index 480dfd64eb..5912667921 100644 --- a/distros/melodic/industrial-robot-status-interface/default.nix +++ b/distros/melodic/industrial-robot-status-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-robot-status-interface"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/gavanderhoorn/industrial_robot_status_controller-release/archive/release/melodic/industrial_robot_status_interface/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "27b082bec56d4f649c198ac39b78b9d2932b448f4ab7281ff055f023d4085be8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gavanderhoorn"; + repo = "industrial_robot_status_controller-release"; + rev = "release/melodic/industrial_robot_status_interface/0.1.2-1"; + sha256 = "sha256-J1PiBH1lTC2sKh1Dc3IxXux9JyByOJNeXzxjdVkbU5c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/industrial-trajectory-filters/default.nix b/distros/melodic/industrial-trajectory-filters/default.nix index 05747ac7ab..2bde73f6bc 100644 --- a/distros/melodic/industrial-trajectory-filters/default.nix +++ b/distros/melodic/industrial-trajectory-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-trajectory-filters"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/melodic/industrial_trajectory_filters/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "a9e5f67a1156a469a399a90351db828360728b186e0d1bb287991cc4b74ffbae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/melodic/industrial_trajectory_filters/0.7.3-1"; + sha256 = "sha256-mYFmwuST9s4knzmD3KiLBzZ+Y6yRtozbXtsDY0NqcSU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/industrial-utils/default.nix b/distros/melodic/industrial-utils/default.nix index e4656d7a9a..7755e44f15 100644 --- a/distros/melodic/industrial-utils/default.nix +++ b/distros/melodic/industrial-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-industrial-utils"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/melodic/industrial_utils/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "82705cad368cb6995c9d75f3045802d2a86aae8de325ee517d8f066e3ad19c58"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/melodic/industrial_utils/0.7.3-1"; + sha256 = "sha256-xFWcAajLIgu+PEjw414AY+4VJXsiSKqr6KieVZLBQSk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/inorbit-republisher/default.nix b/distros/melodic/inorbit-republisher/default.nix index 1965a5599a..e05336ac70 100644 --- a/distros/melodic/inorbit-republisher/default.nix +++ b/distros/melodic/inorbit-republisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-inorbit-republisher"; version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/inorbit-ai/ros_inorbit_samples-release/archive/release/melodic/inorbit_republisher/0.2.5-1.tar.gz"; - name = "0.2.5-1.tar.gz"; - sha256 = "11a7868e1e1b7cfd8c209179e0bce11a9339230d9afbf994ac72f0d4c7fe496c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "inorbit-ai"; + repo = "ros_inorbit_samples-release"; + rev = "release/melodic/inorbit_republisher/0.2.5-1"; + sha256 = "sha256-Bv0QQ3O6DuPCm+5E4cCDRiU+Wc4GuVMtS/BCP879aYk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/interactive-marker-proxy/default.nix b/distros/melodic/interactive-marker-proxy/default.nix index 4dcbcec0dc..c8eb890d86 100644 --- a/distros/melodic/interactive-marker-proxy/default.nix +++ b/distros/melodic/interactive-marker-proxy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-interactive-marker-proxy"; version = "0.1.2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/interactive_marker_proxy-release/archive/release/melodic/interactive_marker_proxy/0.1.2-0.tar.gz"; - name = "0.1.2-0.tar.gz"; - sha256 = "39123a492c42042c9566254a5342fa930f30cf26c0bc2279b83135477ef56bce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "interactive_marker_proxy-release"; + rev = "release/melodic/interactive_marker_proxy/0.1.2-0"; + sha256 = "sha256-UqzW/6+nZOG28/fGHffdRtYKzqY9udxpcuJtOpzJbfA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/interactive-marker-tutorials/default.nix b/distros/melodic/interactive-marker-tutorials/default.nix index 3f30060fbf..d6dbe1de88 100644 --- a/distros/melodic/interactive-marker-tutorials/default.nix +++ b/distros/melodic/interactive-marker-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-interactive-marker-tutorials"; version = "0.10.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/melodic/interactive_marker_tutorials/0.10.5-1.tar.gz"; - name = "0.10.5-1.tar.gz"; - sha256 = "fdc4a18af48d2edfa19927dd14db6a268edbe35652d1625d3e708f1bb7b0874b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/melodic/interactive_marker_tutorials/0.10.5-1"; + sha256 = "sha256-cSANn9R73MUTSmy+BFcyg4GItyQJeo+oNLgYR/p1S48="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/interactive-marker-twist-server/default.nix b/distros/melodic/interactive-marker-twist-server/default.nix index 411185c536..7303f27686 100644 --- a/distros/melodic/interactive-marker-twist-server/default.nix +++ b/distros/melodic/interactive-marker-twist-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-interactive-marker-twist-server"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/interactive_marker_twist_server-release/archive/release/melodic/interactive_marker_twist_server/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "6ccbf6ca0203b06b71bec241bdb61dbb76d05fab9e7977d61c758d5189c3df9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "interactive_marker_twist_server-release"; + rev = "release/melodic/interactive_marker_twist_server/1.2.2-1"; + sha256 = "sha256-JncKemRQ5Bt6lURZB0oSoC57We2g9/ciwhx/PeIXq/U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/interactive-markers/default.nix b/distros/melodic/interactive-markers/default.nix index 2b3bcdc634..83c0fac83c 100644 --- a/distros/melodic/interactive-markers/default.nix +++ b/distros/melodic/interactive-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-interactive-markers"; version = "1.11.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/interactive_markers-release/archive/release/melodic/interactive_markers/1.11.5-1.tar.gz"; - name = "1.11.5-1.tar.gz"; - sha256 = "65b162af44f44a38bd0015ea4aa50a9d14441599a91f9b23781084be1a0d5d3f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "interactive_markers-release"; + rev = "release/melodic/interactive_markers/1.11.5-1"; + sha256 = "sha256-nTLEn1/cFu/86pDtbO5Yb86RHC7/1/0h6GQGeuf5Ido="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/interval-intersection/default.nix b/distros/melodic/interval-intersection/default.nix index e26f40c6da..68813ad043 100644 --- a/distros/melodic/interval-intersection/default.nix +++ b/distros/melodic/interval-intersection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-interval-intersection"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/interval_intersection/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "4466aa2fd48b25d0fa963f756b1ed3c5bb4bcba29d9dc1fc6d392d2dfe4685a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/interval_intersection/0.10.14-0"; + sha256 = "sha256-3gOrGGv/EgmleTUsgX7A6tJbe15Poi59NpWyHgNuF/E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ipa-3d-fov-visualization/default.nix b/distros/melodic/ipa-3d-fov-visualization/default.nix index e5a2d8e611..b86341d249 100644 --- a/distros/melodic/ipa-3d-fov-visualization/default.nix +++ b/distros/melodic/ipa-3d-fov-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ipa-3d-fov-visualization"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/melodic/ipa_3d_fov_visualization/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "4a41d4d5b8188500255a594b9f8ed89274c1619d55af61c5bc1a03e67c7f504d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/melodic/ipa_3d_fov_visualization/0.6.17-1"; + sha256 = "sha256-eXU/7LzhP83Fn21YbfaxwPhwCjIFL5QTwOkETlxiSds="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ipr-extern/default.nix b/distros/melodic/ipr-extern/default.nix index 39526dea1d..4df0bf557c 100644 --- a/distros/melodic/ipr-extern/default.nix +++ b/distros/melodic/ipr-extern/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ipr-extern"; version = "0.8.8-r1"; - src = fetchurl { - url = "https://github.com/KITrobotics/ipr_extern-release/archive/release/melodic/ipr_extern/0.8.8-1.tar.gz"; - name = "0.8.8-1.tar.gz"; - sha256 = "a117475704fac421bb5f283eb775ab4339944f6ea148c2c996c0fb7642bb0fe8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KITrobotics"; + repo = "ipr_extern-release"; + rev = "release/melodic/ipr_extern/0.8.8-1"; + sha256 = "sha256-GU8Xmk1SXG5m7msNUb1wJHvZsgrH8jLXTk3yxR/u3FU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ira-laser-tools/default.nix b/distros/melodic/ira-laser-tools/default.nix index 81dc19e6d6..63d9dcdfd2 100644 --- a/distros/melodic/ira-laser-tools/default.nix +++ b/distros/melodic/ira-laser-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ira-laser-tools"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/iralabdisco/ira_laser_tools-release/archive/release/melodic/ira_laser_tools/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "6986f1a7ae2ad688a40edb8e0dc5687eca413a21631eaae2c608c6f84fa06541"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "iralabdisco"; + repo = "ira_laser_tools-release"; + rev = "release/melodic/ira_laser_tools/1.0.7-1"; + sha256 = "sha256-gCrYhlVL1oo/v9DpUW25s+TllnpFFbWZoNCMpLE58lQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/iris-lama-ros/default.nix b/distros/melodic/iris-lama-ros/default.nix index d2d321a424..aea03917c7 100644 --- a/distros/melodic/iris-lama-ros/default.nix +++ b/distros/melodic/iris-lama-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-iris-lama-ros"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/eupedrosa/iris_lama_ros-release/archive/release/melodic/iris_lama_ros/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "2107bf075df0ee097ce884a08d919b5bf659d293ac4b5409025f8d3931655b2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "eupedrosa"; + repo = "iris_lama_ros-release"; + rev = "release/melodic/iris_lama_ros/1.2.0-1"; + sha256 = "sha256-pJoxqHpdaq8ApZU7oGHs0KwmJ53yve0LfsmJAP1ftuU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/iris-lama/default.nix b/distros/melodic/iris-lama/default.nix index 924fc39219..446a04be1d 100644 --- a/distros/melodic/iris-lama/default.nix +++ b/distros/melodic/iris-lama/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-iris-lama"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/eupedrosa/iris_lama-release/archive/release/melodic/iris_lama/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "50395fa0959650024b0ff00692fb86b9d37b7aea8d330cd82a63a9ee917c121a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "eupedrosa"; + repo = "iris_lama-release"; + rev = "release/melodic/iris_lama/1.2.0-1"; + sha256 = "sha256-b+fE4tDyfzUmCjRX0W+QG6Q2oGBhjGxm7BD5lnXuUCU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ivcon/default.nix b/distros/melodic/ivcon/default.nix index 15a4c0b5fb..1eeb1d95e1 100644 --- a/distros/melodic/ivcon/default.nix +++ b/distros/melodic/ivcon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ivcon"; version = "0.1.7"; - src = fetchurl { - url = "https://github.com/ros-gbp/ivcon-release/archive/release/melodic/ivcon/0.1.7-0.tar.gz"; - name = "0.1.7-0.tar.gz"; - sha256 = "cbf6855c3a967f5e124a3ea7c6c954bbb57345030d77b22e2f76a77a17bcd3f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ivcon-release"; + rev = "release/melodic/ivcon/0.1.7-0"; + sha256 = "sha256-/AREyVRZcOgZ6unXhnDRXXjgs270+ZhbsaVnzE7IBtQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ixblue-ins-driver/default.nix b/distros/melodic/ixblue-ins-driver/default.nix index 743c3cc734..f976a81aca 100644 --- a/distros/melodic/ixblue-ins-driver/default.nix +++ b/distros/melodic/ixblue-ins-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ixblue-ins-driver"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/ixblue/ixblue_ins_stdbin_driver-release/archive/release/melodic/ixblue_ins_driver/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "e8c2cf9338a916824a0ac0eb1cf6a32dba409954dd4c76cf0196c27e9fb4813e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ixblue"; + repo = "ixblue_ins_stdbin_driver-release"; + rev = "release/melodic/ixblue_ins_driver/0.1.5-1"; + sha256 = "sha256-NtYgVa3xwzyAPkZyJUJApX8wlF6tynzpQ7HprRa2JrA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ixblue-ins-msgs/default.nix b/distros/melodic/ixblue-ins-msgs/default.nix index 53c32c2618..693fab736b 100644 --- a/distros/melodic/ixblue-ins-msgs/default.nix +++ b/distros/melodic/ixblue-ins-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ixblue-ins-msgs"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/ixblue/ixblue_ins_stdbin_driver-release/archive/release/melodic/ixblue_ins_msgs/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "08c1cb7de51604655cffee31329002fe4064cda296ca35f165da2bc21bdca8a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ixblue"; + repo = "ixblue_ins_stdbin_driver-release"; + rev = "release/melodic/ixblue_ins_msgs/0.1.5-1"; + sha256 = "sha256-mGmykbgOqH5j2XSi0VVw6+MdufbCFUtLo5vYaMvbzJk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ixblue-ins/default.nix b/distros/melodic/ixblue-ins/default.nix index 3b07ea58ec..f6a38db172 100644 --- a/distros/melodic/ixblue-ins/default.nix +++ b/distros/melodic/ixblue-ins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ixblue-ins"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/ixblue/ixblue_ins_stdbin_driver-release/archive/release/melodic/ixblue_ins/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "69760d7da2a07f7d39257f057ce47e0ced915cc333912737f046931d708a98ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ixblue"; + repo = "ixblue_ins_stdbin_driver-release"; + rev = "release/melodic/ixblue_ins/0.1.5-1"; + sha256 = "sha256-KRogPGGUVYeQP7RODBj5CTtl4IzJAPFwot2MxP9q0ck="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ixblue-stdbin-decoder/default.nix b/distros/melodic/ixblue-stdbin-decoder/default.nix index 1700ba9ab2..f9466b47c9 100644 --- a/distros/melodic/ixblue-stdbin-decoder/default.nix +++ b/distros/melodic/ixblue-stdbin-decoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ixblue-stdbin-decoder"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ixblue/ixblue_stdbin_decoder-release/archive/release/melodic/ixblue_stdbin_decoder/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "7e0f3d91ae4c3d9349e4cf450439284061c27f00c84ee94069daaf12e26c8988"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ixblue"; + repo = "ixblue_stdbin_decoder-release"; + rev = "release/melodic/ixblue_stdbin_decoder/0.2.0-1"; + sha256 = "sha256-fjucNh530wldQfBOf7SINGGp0e2XJKOhjMCw3aiWI2w="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/jackal-cartographer-navigation/default.nix b/distros/melodic/jackal-cartographer-navigation/default.nix index 4092f25905..629e3dccee 100644 --- a/distros/melodic/jackal-cartographer-navigation/default.nix +++ b/distros/melodic/jackal-cartographer-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-cartographer-navigation"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_cartographer_navigation-release/archive/release/melodic/jackal_cartographer_navigation/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "42f4aeabb0b51ed36a729a239531196c52a9e1ab1a0c6ae5d75d71fe0a7158b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_cartographer_navigation-release"; + rev = "release/melodic/jackal_cartographer_navigation/0.0.1-1"; + sha256 = "sha256-fZlsnhhet4q1iln+1CyhUETIsTyVaTkcmCiwpmmvgcA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/jackal-control/default.nix b/distros/melodic/jackal-control/default.nix index d36e4f4145..e84a092dc7 100644 --- a/distros/melodic/jackal-control/default.nix +++ b/distros/melodic/jackal-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-control"; version = "0.7.9-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/melodic/jackal_control/0.7.9-1"; + sha256 = "sha256-zQ9zFqyzbPIrBrkrnqO10Qepd6zvvV8kf3W2qF3oOMA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/jackal-description/default.nix b/distros/melodic/jackal-description/default.nix index 3419aeba83..e461be0e74 100644 --- a/distros/melodic/jackal-description/default.nix +++ b/distros/melodic/jackal-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-description"; version = "0.7.9-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/melodic/jackal_description/0.7.9-1"; + sha256 = "sha256-EwBksm6gF9r8VjDwU02P3Qrai6SYbyxzu7VNcd3sEMI="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/jackal-desktop/default.nix b/distros/melodic/jackal-desktop/default.nix index 7518b70416..d2baded64e 100644 --- a/distros/melodic/jackal-desktop/default.nix +++ b/distros/melodic/jackal-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-desktop"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_desktop-release/archive/release/melodic/jackal_desktop/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "72c94376d4b6d0af285c61998eee8da28ca5e08e172f3a9826a7e8f2b4ed7dee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_desktop-release"; + rev = "release/melodic/jackal_desktop/0.4.1-1"; + sha256 = "sha256-UTbnSaowc6pL+Sbu5kMVVi1z4H1V//xVarSrKogm5zo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jackal-gazebo/default.nix b/distros/melodic/jackal-gazebo/default.nix index c74a580508..30b8b0dcea 100644 --- a/distros/melodic/jackal-gazebo/default.nix +++ b/distros/melodic/jackal-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-gazebo"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_simulator-release/archive/release/melodic/jackal_gazebo/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "202c29adfd750e5043f10171294ca27c0a310aa44a99ea46afebbc269ec9bbef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_simulator-release"; + rev = "release/melodic/jackal_gazebo/0.4.0-1"; + sha256 = "sha256-Q2AGmvi2h5fUsGMYzhQVAgW62umb6gPdpixVBMDOvyk="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/jackal-msgs/default.nix b/distros/melodic/jackal-msgs/default.nix index 3b8c68b5a3..5fe2df648b 100644 --- a/distros/melodic/jackal-msgs/default.nix +++ b/distros/melodic/jackal-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-msgs"; version = "0.7.9-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/melodic/jackal_msgs/0.7.9-1"; + sha256 = "sha256-OJPWuhcwKNV5IRcjqpD5TD8bcRz3tvwriclvk0QK9xo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/jackal-navigation/default.nix b/distros/melodic/jackal-navigation/default.nix index 0e5975b815..9895e5aa4b 100644 --- a/distros/melodic/jackal-navigation/default.nix +++ b/distros/melodic/jackal-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-navigation"; version = "0.7.9-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/melodic/jackal_navigation/0.7.9-1"; + sha256 = "sha256-04iedYhhD+4jffEtOR1vpU9ccpDEjrRNE3YhdA6i55o="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/jackal-simulator/default.nix b/distros/melodic/jackal-simulator/default.nix index 7a95200db9..299d2643ca 100644 --- a/distros/melodic/jackal-simulator/default.nix +++ b/distros/melodic/jackal-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-simulator"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_simulator-release/archive/release/melodic/jackal_simulator/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "adf0d04519d339a355293cb30113435a4a4575adc65b4690681977ed1e4b900f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_simulator-release"; + rev = "release/melodic/jackal_simulator/0.4.0-1"; + sha256 = "sha256-XS3UbgAnUqZXLJkaAlp+N6AMNlPetcCqCdHusgrNEB0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jackal-tutorials/default.nix b/distros/melodic/jackal-tutorials/default.nix index 314016ca86..1012f2aa7d 100644 --- a/distros/melodic/jackal-tutorials/default.nix +++ b/distros/melodic/jackal-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-tutorials"; version = "0.7.9-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/melodic/jackal_tutorials/0.7.9-1"; + sha256 = "sha256-4NVnGN7NbiacYEVXxEK65xjGdKFku4okuHGkiHx42Jg="; + }; buildType = "catkin"; buildInputs = [ catkin rosdoc-lite ]; diff --git a/distros/melodic/jackal-viz/default.nix b/distros/melodic/jackal-viz/default.nix index 03f04a0172..52c6fc7184 100644 --- a/distros/melodic/jackal-viz/default.nix +++ b/distros/melodic/jackal-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jackal-viz"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_desktop-release/archive/release/melodic/jackal_viz/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "aa7216c1a1982b0289692e673b80eb160a0daed28f15c5ac5fdf2362ca28ba97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_desktop-release"; + rev = "release/melodic/jackal_viz/0.4.1-1"; + sha256 = "sha256-XliSyOvMI4eL27lfjmVjKDN8HDLl21DbG/kw+1Zfor0="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/jderobot-assets/default.nix b/distros/melodic/jderobot-assets/default.nix index 45e9c773c5..ca7916e9f3 100644 --- a/distros/melodic/jderobot-assets/default.nix +++ b/distros/melodic/jderobot-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jderobot-assets"; version = "1.0.4-r3"; - src = fetchurl { - url = "https://github.com/JdeRobot/assets-release/archive/release/melodic/jderobot_assets/1.0.4-3.tar.gz"; - name = "1.0.4-3.tar.gz"; - sha256 = "5a9b5d2b0f99b289689b9c3974f01ae01f653e0c662865c902f2722cd2f1311c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "assets-release"; + rev = "release/melodic/jderobot_assets/1.0.4-3"; + sha256 = "sha256-eWhRxjn5YapadUxzYpqpZg+egltRYbGrPutzPeiyPLk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jderobot-color-tuner/default.nix b/distros/melodic/jderobot-color-tuner/default.nix index 10edc11f68..b9e0673ac1 100644 --- a/distros/melodic/jderobot-color-tuner/default.nix +++ b/distros/melodic/jderobot-color-tuner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jderobot-color-tuner"; version = "0.0.5-r2"; - src = fetchurl { - url = "https://github.com/JdeRobot/ColorTuner-release/archive/release/melodic/jderobot_color_tuner/0.0.5-2.tar.gz"; - name = "0.0.5-2.tar.gz"; - sha256 = "fbd11a0183302b10796d47e4489c4da0709aeb176dc0d00af3770f06629ddb70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "ColorTuner-release"; + rev = "release/melodic/jderobot_color_tuner/0.0.5-2"; + sha256 = "sha256-tdsWZFwUTsgpNiKbpIuUWCPHf6djVvl3dCXd/2PmGyA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jderobot-drones/default.nix b/distros/melodic/jderobot-drones/default.nix index 73eee730b5..ed0ff2f42d 100644 --- a/distros/melodic/jderobot-drones/default.nix +++ b/distros/melodic/jderobot-drones/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jderobot-drones"; version = "1.3.10-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/melodic/jderobot_drones/1.3.10-1.tar.gz"; - name = "1.3.10-1.tar.gz"; - sha256 = "cdc5ddad637cbac4972c70e3bfbc209705abf6568259ee94688c82414264aaf8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/melodic/jderobot_drones/1.3.10-1"; + sha256 = "sha256-iUwBwy36sprBXZo2GA+RhRJwySqGVxqm34bZEZ2AniE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joint-limits-interface/default.nix b/distros/melodic/joint-limits-interface/default.nix index 424b120405..ffd14b7339 100644 --- a/distros/melodic/joint-limits-interface/default.nix +++ b/distros/melodic/joint-limits-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-limits-interface"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/joint_limits_interface/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "823ce3b28e894f53139b27f00606a291b891e791dc193069d478c91055cb14d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/joint_limits_interface/0.18.4-1"; + sha256 = "sha256-jX5xI6jO75emWADZCUZ+qP8sFQI+K1B2qgpreRq4Sc0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joint-qualification-controllers/default.nix b/distros/melodic/joint-qualification-controllers/default.nix index 7d91d37a75..55647ed573 100644 --- a/distros/melodic/joint-qualification-controllers/default.nix +++ b/distros/melodic/joint-qualification-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-qualification-controllers"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/melodic/joint_qualification_controllers/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "479200ec0c009cee31a2eaf0bb794dd9b97ad57d3b8929ac8a2cc851e9b3a6bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/melodic/joint_qualification_controllers/1.0.15-1"; + sha256 = "sha256-uvnfL4x18yI+1gH0HhMnbgPmwqrkBPF9Pl+eB8WCKOE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/joint-state-controller/default.nix b/distros/melodic/joint-state-controller/default.nix index 0db8c41292..5b72d34a5d 100644 --- a/distros/melodic/joint-state-controller/default.nix +++ b/distros/melodic/joint-state-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-state-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/joint_state_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "eff367735f79b32aa52aba89499345d6b4389bb3cd2883d58f57c04b7ec89dd4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/joint_state_controller/0.17.2-1"; + sha256 = "sha256-aMNUkiRb1FdK+Eiq/9v88fJQMoLm9vo6Z8waPHHh6iI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joint-state-publisher-gui/default.nix b/distros/melodic/joint-state-publisher-gui/default.nix index 84a370a983..cab6f5bdbf 100644 --- a/distros/melodic/joint-state-publisher-gui/default.nix +++ b/distros/melodic/joint-state-publisher-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-state-publisher-gui"; version = "1.12.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joint_state_publisher-release/archive/release/melodic/joint_state_publisher_gui/1.12.15-1.tar.gz"; - name = "1.12.15-1.tar.gz"; - sha256 = "f728911eb7f886ce99289fc18cd27528c91cb630c84a29d76d406f970ed775b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/melodic/joint_state_publisher_gui/1.12.15-1"; + sha256 = "sha256-+O9tHLwqz64Sbqbk9Ctmp7nQ0Ygb7tlo6ZueED2hNDA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joint-state-publisher/default.nix b/distros/melodic/joint-state-publisher/default.nix index 1b51c2bb54..0877460ec3 100644 --- a/distros/melodic/joint-state-publisher/default.nix +++ b/distros/melodic/joint-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-state-publisher"; version = "1.12.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joint_state_publisher-release/archive/release/melodic/joint_state_publisher/1.12.15-1.tar.gz"; - name = "1.12.15-1.tar.gz"; - sha256 = "623eb3bb3613bfd2a6b61ab1a631e6927450b41ef2a4871b044925b7c60aeaf3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/melodic/joint_state_publisher/1.12.15-1"; + sha256 = "sha256-0vtMS9ZBr+CWHGEzVMPYcj/IZrsmQ849bjpD5LqYINU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joint-states-settler/default.nix b/distros/melodic/joint-states-settler/default.nix index ad7d83c658..50d8ff2234 100644 --- a/distros/melodic/joint-states-settler/default.nix +++ b/distros/melodic/joint-states-settler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-states-settler"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/joint_states_settler/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "7625fdf3c7c87b21dd67a05f53faa5d09926c6065251b5d761b1ec3a23f79654"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/joint_states_settler/0.10.14-0"; + sha256 = "sha256-PRJrYNt+O8zjHvrn810ivTi2AR8PruRxgOtdXNqUqao="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joint-trajectory-action-tools/default.nix b/distros/melodic/joint-trajectory-action-tools/default.nix index 7ada2c0937..f4796aafeb 100644 --- a/distros/melodic/joint-trajectory-action-tools/default.nix +++ b/distros/melodic/joint-trajectory-action-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-trajectory-action-tools"; version = "0.0.11"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/melodic/joint_trajectory_action_tools/0.0.11-0.tar.gz"; - name = "0.0.11-0.tar.gz"; - sha256 = "cff217c086340f75d87f968fe96ab08c5485fb39779aa8d1af8699bcb993f356"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/melodic/joint_trajectory_action_tools/0.0.11-0"; + sha256 = "sha256-MN1herm7yuB6b39Sm6OLqS5ELj8zsPFK6Z58OBVC9VM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joint-trajectory-action/default.nix b/distros/melodic/joint-trajectory-action/default.nix index a2f51426d9..3fe15943fb 100644 --- a/distros/melodic/joint-trajectory-action/default.nix +++ b/distros/melodic/joint-trajectory-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-trajectory-action"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/joint_trajectory_action/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "eaf127a1c131ce422b9bba23fad9a20d278360d80d23ae389a021c15e962f053"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/joint_trajectory_action/1.10.17-1"; + sha256 = "sha256-TaQU68mxE5G8LDX0nHdWP1eVqjWXt37C8LR8+LQ0w3E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joint-trajectory-controller/default.nix b/distros/melodic/joint-trajectory-controller/default.nix index cb2a3a0390..a8c5fa6121 100644 --- a/distros/melodic/joint-trajectory-controller/default.nix +++ b/distros/melodic/joint-trajectory-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-trajectory-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/joint_trajectory_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "4c8b612ce523760bd97ef16961d516adbe64ee44f9c035da71277466c05586d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/joint_trajectory_controller/0.17.2-1"; + sha256 = "sha256-5eX1sjnm+BRAKvtgAgexRMi1T1bPn7kgXJYksJKbgsI="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/joint-trajectory-generator/default.nix b/distros/melodic/joint-trajectory-generator/default.nix index e5259e717f..0bcdbfc53b 100644 --- a/distros/melodic/joint-trajectory-generator/default.nix +++ b/distros/melodic/joint-trajectory-generator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joint-trajectory-generator"; version = "0.0.11"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/melodic/joint_trajectory_generator/0.0.11-0.tar.gz"; - name = "0.0.11-0.tar.gz"; - sha256 = "273943f65776908254c198a36be8792716e78e5487d52e849be32aa66094695d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/melodic/joint_trajectory_generator/0.0.11-0"; + sha256 = "sha256-1OCg23ATBuIsrXc+/kSD+VkXzDYmBo1tJTu8bQi12ss="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jointstick/default.nix b/distros/melodic/jointstick/default.nix index 54fba78f9b..ae3e34c0a4 100644 --- a/distros/melodic/jointstick/default.nix +++ b/distros/melodic/jointstick/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jointstick"; version = "0.9.1-r2"; - src = fetchurl { - url = "https://github.com/gstavrinos/jointstick-release/archive/release/melodic/jointstick/0.9.1-2.tar.gz"; - name = "0.9.1-2.tar.gz"; - sha256 = "40810fdb769af4467b634649a2cfabf49337ae5e00fe08f034fe0555036ba39f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gstavrinos"; + repo = "jointstick-release"; + rev = "release/melodic/jointstick/0.9.1-2"; + sha256 = "sha256-GLWoprPLuRIvTq9KSnbDS/PgnOwIOUnHXJY/IpJGaO0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joy-listener/default.nix b/distros/melodic/joy-listener/default.nix index 4bbb6f828d..872ef99f76 100644 --- a/distros/melodic/joy-listener/default.nix +++ b/distros/melodic/joy-listener/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joy-listener"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/melodic/joy_listener/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "c3a314410863c09fdf904cae518744a981c5290d9db85848d99f16df301d4351"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/melodic/joy_listener/0.2.6-1"; + sha256 = "sha256-c93REbjUAhrp1YfHOpbVOmhCu0HBqh/5lm8waHpTw7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joy-mouse/default.nix b/distros/melodic/joy-mouse/default.nix index d6413cffb4..cad092556a 100644 --- a/distros/melodic/joy-mouse/default.nix +++ b/distros/melodic/joy-mouse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joy-mouse"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/joy_mouse/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "84854fafbddce5196ff24be375d857dabea63062d3a973f6f2ce7b3c4636b6fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/joy_mouse/0.1.16-1"; + sha256 = "sha256-MvD0OmrRF3bH9VZNfQGwdi0KjliMpZdKbmn+lBJkByc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joy-teleop/default.nix b/distros/melodic/joy-teleop/default.nix index 9d19330e6c..81d1fd9f0a 100644 --- a/distros/melodic/joy-teleop/default.nix +++ b/distros/melodic/joy-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joy-teleop"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/melodic/joy_teleop/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "9b40cbf56d2384f70de1281d1e6269131dab98a92f7c84036212e5f216c08ea0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/melodic/joy_teleop/0.3.1-1"; + sha256 = "sha256-LK0hIHlQ1kN1zT+CvATCf0rCDdDhs0GW2ZveiuF9KGA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joy/default.nix b/distros/melodic/joy/default.nix index 7c9ea9c16f..360551c0a0 100644 --- a/distros/melodic/joy/default.nix +++ b/distros/melodic/joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joy"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joystick_drivers-release/archive/release/melodic/joy/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "05eef45382fb49c008a833290b4b842da049b2f3bcfeae505751edb40ac50e21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joystick_drivers-release"; + rev = "release/melodic/joy/1.14.0-1"; + sha256 = "sha256-5fJHxCRLKVrguJSqrNC28J56GMtrsZxblZVk7NysL7o="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/joystick-drivers/default.nix b/distros/melodic/joystick-drivers/default.nix index 4acbc28f8d..ee3811d415 100644 --- a/distros/melodic/joystick-drivers/default.nix +++ b/distros/melodic/joystick-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-joystick-drivers"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joystick_drivers-release/archive/release/melodic/joystick_drivers/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "f0454955c9262422916a88ff9e2751d21c26c631ccd08b6224a57c83c6909550"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joystick_drivers-release"; + rev = "release/melodic/joystick_drivers/1.14.0-1"; + sha256 = "sha256-FYOvseNSUJ1GZi5EahtTT6k3UDanI3kcPx52ldLqJnU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/joystick-interrupt/default.nix b/distros/melodic/joystick-interrupt/default.nix index 65cc8c0393..f98120be67 100644 --- a/distros/melodic/joystick-interrupt/default.nix +++ b/distros/melodic/joystick-interrupt/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, neonavigation-common, roscpp, roslint, rostest, sensor-msgs, topic-tools }: buildRosPackage { pname = "ros-melodic-joystick-interrupt"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/joystick_interrupt/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "7d4a26f4ce4c19bd29e782e160b81c8da6ae7aaee19eded8b9933185e7e4e7c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/joystick_interrupt/0.12.0-1"; + sha256 = "sha256-Wb2GnCI7TbxxsppPPpubxTYQEmUb+29ebC84qgiLtQM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jpeg-streamer/default.nix b/distros/melodic/jpeg-streamer/default.nix index 6a240ef27a..5b499baab2 100644 --- a/distros/melodic/jpeg-streamer/default.nix +++ b/distros/melodic/jpeg-streamer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jpeg-streamer"; version = "0.2.7"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/camera_umd-release/archive/release/melodic/jpeg_streamer/0.2.7-0.tar.gz"; - name = "0.2.7-0.tar.gz"; - sha256 = "2f2d7e91f8743383d48353d1fc7fbbcd47ad1438a9029949cdd499ce3885e221"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "camera_umd-release"; + rev = "release/melodic/jpeg_streamer/0.2.7-0"; + sha256 = "sha256-3nfLie2HFYdIPZOtKR7aSKRvm528kp3HaZZcA0U2b+4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-3rdparty/default.nix b/distros/melodic/jsk-3rdparty/default.nix index b9617cd162..15a77aa674 100644 --- a/distros/melodic/jsk-3rdparty/default.nix +++ b/distros/melodic/jsk-3rdparty/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-3rdparty"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/jsk_3rdparty/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "d689658c87a23f49a5956e6a7832213d3f80c0572a5e5946b2fe762ac90578b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/jsk_3rdparty/2.1.24-2"; + sha256 = "sha256-w8cHbI0hHqDEi1VDkYbOceU1f5e2o2/Y7seG6dUspwA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-calibration/default.nix b/distros/melodic/jsk-calibration/default.nix index e9b99721a9..479ae31fbc 100644 --- a/distros/melodic/jsk-calibration/default.nix +++ b/distros/melodic/jsk-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-calibration"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/jsk_calibration/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "8a6b4ebf86b29e86feec2f50c7c901c8e4f796171ff5f24741f6e6deb3b3f5c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/jsk_calibration/0.1.16-1"; + sha256 = "sha256-C0ViUnTsZ1bs8/mhCdlS34UmBr88sgfEPIHtxDmwOEY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-common-msgs/default.nix b/distros/melodic/jsk-common-msgs/default.nix index 218fffc132..b6a81396bd 100644 --- a/distros/melodic/jsk-common-msgs/default.nix +++ b/distros/melodic/jsk-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-common-msgs"; version = "4.3.1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/melodic/jsk_common_msgs/4.3.1-0.tar.gz"; - name = "4.3.1-0.tar.gz"; - sha256 = "3b58085e4249a1b809d2e657158c595336460295578ba0cfe369f8006f0cfc85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/melodic/jsk_common_msgs/4.3.1-0"; + sha256 = "sha256-HnBmI6iRtVfh8BdBSfGG8+8eHvaN6Z22uD00E2Zbb0w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-common/default.nix b/distros/melodic/jsk-common/default.nix index 8526566c7d..21b71aacee 100644 --- a/distros/melodic/jsk-common/default.nix +++ b/distros/melodic/jsk-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-common"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/jsk_common/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "8f062c2a196d3cc4e5176b3483147f308002a3a957e0e6bf59796af9d9ab323c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/jsk_common/2.2.12-1"; + sha256 = "sha256-XazgDRNWipT1K+kgE9sQWDoQc/DxjLCpq/C0dgjICtQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-control/default.nix b/distros/melodic/jsk-control/default.nix index ce6d6d0f1f..35c9577031 100644 --- a/distros/melodic/jsk-control/default.nix +++ b/distros/melodic/jsk-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-control"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/jsk_control/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "8ab1ebd0fef82e7268dec4d22ad02b0491e1a94cc4787b5fb8866c4746e2fda4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/jsk_control/0.1.16-1"; + sha256 = "sha256-0TFki9mag61pN0NN5ibF6UgSLdBR/Oy126KoeuxQmj8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-footstep-controller/default.nix b/distros/melodic/jsk-footstep-controller/default.nix index 5b4f11df1c..929df39214 100644 --- a/distros/melodic/jsk-footstep-controller/default.nix +++ b/distros/melodic/jsk-footstep-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-footstep-controller"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/jsk_footstep_controller/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "b3bf67a033ebccb9768bc4dde8624f00af21df0be6b1d86eb0254c58796cbfe8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/jsk_footstep_controller/0.1.16-1"; + sha256 = "sha256-gTfi5vl9Dpj0P0BeGeeWUaLPHFhnlZrNgxwwQ671Y9I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-footstep-msgs/default.nix b/distros/melodic/jsk-footstep-msgs/default.nix index ac633d750c..691bcc86f6 100644 --- a/distros/melodic/jsk-footstep-msgs/default.nix +++ b/distros/melodic/jsk-footstep-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-footstep-msgs"; version = "4.3.1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/melodic/jsk_footstep_msgs/4.3.1-0.tar.gz"; - name = "4.3.1-0.tar.gz"; - sha256 = "c461c1a447cca272bbd283203796ec6126bb42b6ae13b953f22193d574e49251"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/melodic/jsk_footstep_msgs/4.3.1-0"; + sha256 = "sha256-ggzBQ8USYDm5j2MzyPs8SXtsMHiVNKYqIfZDT8kmsbs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/jsk-footstep-planner/default.nix b/distros/melodic/jsk-footstep-planner/default.nix index 474d60e14c..b0bc6d56fc 100644 --- a/distros/melodic/jsk-footstep-planner/default.nix +++ b/distros/melodic/jsk-footstep-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-footstep-planner"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/jsk_footstep_planner/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "25adf6434c5afc97e8a5a743999333eda0f42e9347200f0a80112b023a710a9d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/jsk_footstep_planner/0.1.16-1"; + sha256 = "sha256-d22ielC/PDHwo6NqeoocfX8Ak27TsRPnqs2tZcKlY7w="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/jsk-gui-msgs/default.nix b/distros/melodic/jsk-gui-msgs/default.nix index 0631cb452f..12345eb64b 100644 --- a/distros/melodic/jsk-gui-msgs/default.nix +++ b/distros/melodic/jsk-gui-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-gui-msgs"; version = "4.3.1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/melodic/jsk_gui_msgs/4.3.1-0.tar.gz"; - name = "4.3.1-0.tar.gz"; - sha256 = "6af87adf6d809a7311c1b561093859751c7c2575791e5dc89e089a8dd98a118d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/melodic/jsk_gui_msgs/4.3.1-0"; + sha256 = "sha256-e/IjFUsBngyH9cN62SfpSXWyoxJ3vF0Kv3qgKq4LCBg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/jsk-hark-msgs/default.nix b/distros/melodic/jsk-hark-msgs/default.nix index 630f49df21..1be0ecc1b4 100644 --- a/distros/melodic/jsk-hark-msgs/default.nix +++ b/distros/melodic/jsk-hark-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-hark-msgs"; version = "4.3.1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/melodic/jsk_hark_msgs/4.3.1-0.tar.gz"; - name = "4.3.1-0.tar.gz"; - sha256 = "f9bcc221412c9950f156dc4c57c6dd8ca9aa4eff1201c12a412a05211fcd07ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/melodic/jsk_hark_msgs/4.3.1-0"; + sha256 = "sha256-GzodngcsOe8P2cftsnGyytj33IdfsHbQLsjeYJAFUEw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/jsk-ik-server/default.nix b/distros/melodic/jsk-ik-server/default.nix index 9f567e054d..8daba94ee7 100644 --- a/distros/melodic/jsk-ik-server/default.nix +++ b/distros/melodic/jsk-ik-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-ik-server"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/jsk_ik_server/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "9db6bcdbf9dac42d1442ddae80b22d02832be8f96570f8170b171c5e984c4c92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/jsk_ik_server/0.1.16-1"; + sha256 = "sha256-J0+SCpwcTHtm/MTGzy9k9Ch4qKmAtkoOXeKJabCwSKg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-interactive-marker/default.nix b/distros/melodic/jsk-interactive-marker/default.nix index e2db902aef..7efbabb934 100644 --- a/distros/melodic/jsk-interactive-marker/default.nix +++ b/distros/melodic/jsk-interactive-marker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-interactive-marker"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/melodic/jsk_interactive_marker/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "56744adac4f633df0b6c7b8f1073e5f7b3f07d8109335c370f7add394ee03b57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/melodic/jsk_interactive_marker/2.1.8-1"; + sha256 = "sha256-DYSTITS/0q/dW6hwxKNBlgiM5HUlhCaTcJ6OAIwek6s="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation mk rosbuild ]; diff --git a/distros/melodic/jsk-interactive-test/default.nix b/distros/melodic/jsk-interactive-test/default.nix index a999d4f78d..8f1f7b12b7 100644 --- a/distros/melodic/jsk-interactive-test/default.nix +++ b/distros/melodic/jsk-interactive-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-interactive-test"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/melodic/jsk_interactive_test/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "5c4234901ba9b98bf6b8644c7829f4ab966aa7c797987e3eb7deb2b77f7ae782"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/melodic/jsk_interactive_test/2.1.8-1"; + sha256 = "sha256-TTsMi9XDN5YpqmHVT260wRbgrXgWd2QdxXhwI3qoanU="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosbuild ]; diff --git a/distros/melodic/jsk-interactive/default.nix b/distros/melodic/jsk-interactive/default.nix index 2f5e504377..153f1f5020 100644 --- a/distros/melodic/jsk-interactive/default.nix +++ b/distros/melodic/jsk-interactive/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-interactive"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/melodic/jsk_interactive/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "5ba59c717424d8864d93e9a1bd2f8347a7532f016de3981841adf7c46cd54029"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/melodic/jsk_interactive/2.1.8-1"; + sha256 = "sha256-C+M96eJuZZF6C9yX4tInILOfgUeuYbiQrDkG4U0nZBg="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosbuild ]; diff --git a/distros/melodic/jsk-model-tools/default.nix b/distros/melodic/jsk-model-tools/default.nix index 6de52b3550..16c1524e6a 100644 --- a/distros/melodic/jsk-model-tools/default.nix +++ b/distros/melodic/jsk-model-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-model-tools"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_model_tools-release/archive/release/melodic/jsk_model_tools/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "7d67e14898a9a2dc4d8c0db7b9cb584f5f541de477f336ed63bbf74c7c76a1bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_model_tools-release"; + rev = "release/melodic/jsk_model_tools/0.4.4-1"; + sha256 = "sha256-zvzP7mUCPf61EnF41GEPxJ3kB6VrI1gLE+HEhG1Q0jM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-network-tools/default.nix b/distros/melodic/jsk-network-tools/default.nix index a3dcbf4b5e..cffbb8baf2 100644 --- a/distros/melodic/jsk-network-tools/default.nix +++ b/distros/melodic/jsk-network-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-network-tools"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/jsk_network_tools/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "e0e2baa74874bc7f6fe1b7524374a33cb6904296cc24f2c518dffb58efa6b0e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/jsk_network_tools/2.2.12-1"; + sha256 = "sha256-5syw3GvBtwT+SoBMPN63X2RLJcMOIXKHwfVXfJxP3FM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/melodic/jsk-pcl-ros-utils/default.nix b/distros/melodic/jsk-pcl-ros-utils/default.nix index 8d6b85b24c..fd9096390b 100644 --- a/distros/melodic/jsk-pcl-ros-utils/default.nix +++ b/distros/melodic/jsk-pcl-ros-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-pcl-ros-utils"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/jsk_pcl_ros_utils/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "a64d6abbe000e2c333ce92f318abf94be30dedfe06d21ef4f2361c2b9b695f07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/jsk_pcl_ros_utils/1.2.15-1"; + sha256 = "sha256-wLSyOZzssle1nKkzBLbPPBWLzbIgh/gQb5/+OuIa3r8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.pyyaml ]; diff --git a/distros/melodic/jsk-pcl-ros/default.nix b/distros/melodic/jsk-pcl-ros/default.nix index d88db6a3b7..74f10b8c83 100644 --- a/distros/melodic/jsk-pcl-ros/default.nix +++ b/distros/melodic/jsk-pcl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-pcl-ros"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/jsk_pcl_ros/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "0383a96eb13ac27a5589583457aedf6ccc491f969f45150e468fa1a715c82f86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/jsk_pcl_ros/1.2.15-1"; + sha256 = "sha256-U+xL60WNCPkL8d4nC4GKUKKJTEp9lNNkojwi0r2mpGE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-planning/default.nix b/distros/melodic/jsk-planning/default.nix index 34102f1fdb..4ec97469f6 100644 --- a/distros/melodic/jsk-planning/default.nix +++ b/distros/melodic/jsk-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-planning"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_planning-release/archive/release/melodic/jsk_planning/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "8182d06f0742a80fa8b31184bfd8f1fd385b69d660e0716a0091e5d4b248137d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_planning-release"; + rev = "release/melodic/jsk_planning/0.1.12-1"; + sha256 = "sha256-1Zq7qaiJuRy2s1mQsHTp8rz2Fzja4edJlb6M7lHcyhc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-pr2eus/default.nix b/distros/melodic/jsk-pr2eus/default.nix index 746937f7e0..0e7acb9c49 100644 --- a/distros/melodic/jsk-pr2eus/default.nix +++ b/distros/melodic/jsk-pr2eus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-pr2eus"; version = "0.3.14-r3"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_pr2eus-release/archive/release/melodic/jsk_pr2eus/0.3.14-3.tar.gz"; - name = "0.3.14-3.tar.gz"; - sha256 = "bfe20ebd5febc154b2a7e052f41900e4eaf4f11890d79dc0428facf06fb855b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_pr2eus-release"; + rev = "release/melodic/jsk_pr2eus/0.3.14-3"; + sha256 = "sha256-ydRGk+aDdsyUJrZZgLOPvM98k9W/z0uXExBfp501Ap0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-python-orocos-kdl-python3/default.nix b/distros/melodic/jsk-python-orocos-kdl-python3/default.nix index 0f5aaba584..f4cf240b70 100644 --- a/distros/melodic/jsk-python-orocos-kdl-python3/default.nix +++ b/distros/melodic/jsk-python-orocos-kdl-python3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-python-orocos-kdl-python3"; version = "1.4.2-r2"; - src = fetchurl { - url = "https://github.com/tork-a/orocos-kdl_python3-release/archive/release/melodic/jsk_python_orocos_kdl_python3/1.4.2-2.tar.gz"; - name = "1.4.2-2.tar.gz"; - sha256 = "519c3d3a7ce2739bfedf3b94d39b9b1351c38cfaa3aaddb1a865a23ca5f0b1fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "orocos-kdl_python3-release"; + rev = "release/melodic/jsk_python_orocos_kdl_python3/1.4.2-2"; + sha256 = "sha256-TKMgRH2Sq9p7Epq1yzvmCCF3+ABYhwMy9BJsVCbE7xs="; + }; buildType = "cmake"; buildInputs = [ python3Packages.catkin-pkg python3Packages.sip_4 ]; diff --git a/distros/melodic/jsk-recognition-msgs/default.nix b/distros/melodic/jsk-recognition-msgs/default.nix index 1aed538b6b..3f5fd67ec1 100644 --- a/distros/melodic/jsk-recognition-msgs/default.nix +++ b/distros/melodic/jsk-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-recognition-msgs"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/jsk_recognition_msgs/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "3214810dd81fd86a3023aa920f5a57cacab4d57e635900f4ec034897954b22f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/jsk_recognition_msgs/1.2.15-1"; + sha256 = "sha256-pTlRnRxhSm8VEDkgg6BRIZSnxvK2m86qOokTuzrUPJ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-recognition-utils/default.nix b/distros/melodic/jsk-recognition-utils/default.nix index a8204c423b..0cf506f229 100644 --- a/distros/melodic/jsk-recognition-utils/default.nix +++ b/distros/melodic/jsk-recognition-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-recognition-utils"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/jsk_recognition_utils/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "2075af1e8da7c8d4f0f559246274dd597cda4b7d4413700a285ca76ba54b4d2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/jsk_recognition_utils/1.2.15-1"; + sha256 = "sha256-k3WWrIY2lKmJ0VvcGmxEsm91VbbLBxpDkjh/8aHCxs4="; + }; buildType = "catkin"; buildInputs = [ catkin dynamic-reconfigure message-generation pythonPackages.cython pythonPackages.setuptools qt5.qtbase ]; diff --git a/distros/melodic/jsk-recognition/default.nix b/distros/melodic/jsk-recognition/default.nix index f91c6a2aea..ab479e4408 100644 --- a/distros/melodic/jsk-recognition/default.nix +++ b/distros/melodic/jsk-recognition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-recognition"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/jsk_recognition/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "518fcc5c7479143dafb6eca60cc31833e3e27ee43115e8a9ab7eb894640fb6c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/jsk_recognition/1.2.15-1"; + sha256 = "sha256-/zGusMJaBzIsW3bOlA/A+3xI/ZB7QBCyZ+nYdRpUEiQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-roseus/default.nix b/distros/melodic/jsk-roseus/default.nix index 0229877e33..2ab2940fcb 100644 --- a/distros/melodic/jsk-roseus/default.nix +++ b/distros/melodic/jsk-roseus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-roseus"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/melodic/jsk_roseus/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "38497ef160c3e76b0602f2ddf41bb50ce54e8063de8a6ed3bce0984af02c1b09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/melodic/jsk_roseus/1.7.4-1"; + sha256 = "sha256-X6V5+qyVJ7MBm0vlvbxVkM1zigy+8+yV1tmJ71QavmA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-rqt-plugins/default.nix b/distros/melodic/jsk-rqt-plugins/default.nix index 496197a38f..e05c95ca6b 100644 --- a/distros/melodic/jsk-rqt-plugins/default.nix +++ b/distros/melodic/jsk-rqt-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-rqt-plugins"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/melodic/jsk_rqt_plugins/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "516b5b98d4e1aa2fdb5c7c6f1dee109b9025e544923f9a25d2f425db8b47d9c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/melodic/jsk_rqt_plugins/2.1.8-1"; + sha256 = "sha256-CyitFiHgdQvs/1AuJOGmqMgdT/xslOtKZGGnqmbTK/s="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation mk rosbuild ]; diff --git a/distros/melodic/jsk-teleop-joy/default.nix b/distros/melodic/jsk-teleop-joy/default.nix index 2d2e868079..a3d7e3c6f4 100644 --- a/distros/melodic/jsk-teleop-joy/default.nix +++ b/distros/melodic/jsk-teleop-joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-teleop-joy"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/melodic/jsk_teleop_joy/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "f5a9855281a3dce5f037a0e91f711dd9a90ef261abeffe0ef0dad8c9816a0941"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/melodic/jsk_teleop_joy/0.1.16-1"; + sha256 = "sha256-sAd5SxDGajZnov0ogNZs8kLunRLe20194aYbIgf7ykQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jsk-tf2-py-python3/default.nix b/distros/melodic/jsk-tf2-py-python3/default.nix index e806e59473..86157190a1 100644 --- a/distros/melodic/jsk-tf2-py-python3/default.nix +++ b/distros/melodic/jsk-tf2-py-python3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-tf2-py-python3"; version = "0.6.9-r2"; - src = fetchurl { - url = "https://github.com/tork-a/geometry2_python3-release/archive/release/melodic/jsk_tf2_py_python3/0.6.9-2.tar.gz"; - name = "0.6.9-2.tar.gz"; - sha256 = "b9dcbe07c5e9e519cbb81170f910d4ccc865bee3d180db3862ab4a6fe6398cf6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "geometry2_python3-release"; + rev = "release/melodic/jsk_tf2_py_python3/0.6.9-2"; + sha256 = "sha256-nrFC8Czn5n5iZLRvPaDbFTVDY3payeFM7CH4CiiBvlk="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.catkin-pkg ]; diff --git a/distros/melodic/jsk-tilt-laser/default.nix b/distros/melodic/jsk-tilt-laser/default.nix index 463202e734..51c2115b79 100644 --- a/distros/melodic/jsk-tilt-laser/default.nix +++ b/distros/melodic/jsk-tilt-laser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-tilt-laser"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/jsk_tilt_laser/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "64f7242e53af8b5e6aee3da001f1fe6d60056dbe9d2ee8b582ad185839f66eeb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/jsk_tilt_laser/2.2.12-1"; + sha256 = "sha256-0g9YIl+KFy/5BRAu3Z83tXgP//WdTN6Ivy9XwTw1i84="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/jsk-topic-tools/default.nix b/distros/melodic/jsk-topic-tools/default.nix index 92dfeba18a..015c43e650 100644 --- a/distros/melodic/jsk-topic-tools/default.nix +++ b/distros/melodic/jsk-topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-topic-tools"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/jsk_topic_tools/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "2f7cb216f61223ced93c39253049e49baa9fd4878decdd5d94c80a6ca5f09280"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/jsk_topic_tools/2.2.12-1"; + sha256 = "sha256-dSPXQ06+0SIVrSfTQvpFc1zYYuZ09sjqpQdlGRUO5Fo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/melodic/jsk-visualization/default.nix b/distros/melodic/jsk-visualization/default.nix index 0d4ae6fe54..88d44af513 100644 --- a/distros/melodic/jsk-visualization/default.nix +++ b/distros/melodic/jsk-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jsk-visualization"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/melodic/jsk_visualization/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "7493abb6f57c227f4b59d2d26e592a0424c0a66a587fdaa85cbb441588344260"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/melodic/jsk_visualization/2.1.8-1"; + sha256 = "sha256-sR2bHaoN3KTK1cAi9+Maizm3PFbNpLjALHa3FNCXjAc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/jskeus/default.nix b/distros/melodic/jskeus/default.nix index 3c3117594b..0fa65bc102 100644 --- a/distros/melodic/jskeus/default.nix +++ b/distros/melodic/jskeus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-jskeus"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jskeus-release/archive/release/melodic/jskeus/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "09ad2aa44249d07cecf8ebb717ca99194f310e93a836dc4ec4107d2a057e313f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jskeus-release"; + rev = "release/melodic/jskeus/1.2.5-1"; + sha256 = "sha256-7ACJxMQgaYXe2vXheCjCqfITRQhGBZUTve9QqgtTj4M="; + }; buildType = "cmake"; buildInputs = [ catkin ]; diff --git a/distros/melodic/json-msgs/default.nix b/distros/melodic/json-msgs/default.nix index 7170f7c74b..ccd38e9f69 100644 --- a/distros/melodic/json-msgs/default.nix +++ b/distros/melodic/json-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-json-msgs"; version = "0.0.3"; - src = fetchurl { - url = "https://github.com/locusrobotics/json_transport-release/archive/release/melodic/json_msgs/0.0.3-0.tar.gz"; - name = "0.0.3-0.tar.gz"; - sha256 = "bf40e01a92a86cd7c5f7c56e26b160dd8425c7bdcaee3d407ceac8f6dfc115f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "json_transport-release"; + rev = "release/melodic/json_msgs/0.0.3-0"; + sha256 = "sha256-zOGVlXbUqmInpvvXZOttxLfAvzL3zRdjWD+Rqh5rmjI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/json-transport/default.nix b/distros/melodic/json-transport/default.nix index 8fbf0d7b0c..2a50d5266a 100644 --- a/distros/melodic/json-transport/default.nix +++ b/distros/melodic/json-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-json-transport"; version = "0.0.3"; - src = fetchurl { - url = "https://github.com/locusrobotics/json_transport-release/archive/release/melodic/json_transport/0.0.3-0.tar.gz"; - name = "0.0.3-0.tar.gz"; - sha256 = "c7077ff6fff4119b0383218c2426ac4629ee02485af8e569920149031f791b2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "json_transport-release"; + rev = "release/melodic/json_transport/0.0.3-0"; + sha256 = "sha256-dcwwgJv0vTieJ/+pRe0gqqu/fsE6YL9KgeYWmoqvcHs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/julius/default.nix b/distros/melodic/julius/default.nix index 055a60282a..dcdc75de37 100644 --- a/distros/melodic/julius/default.nix +++ b/distros/melodic/julius/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-julius"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/julius/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "c729762c703fad77210f45279b17b1e807fe9e48bff481fa5a321f1099ad1da0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/julius/2.1.24-2"; + sha256 = "sha256-q9VJDS6Sf+hkSDGAsbmcElj/XwZLd7w0rNogKiDWBgQ="; + }; buildType = "catkin"; buildInputs = [ catkin mk roslib rospack ]; diff --git a/distros/melodic/kalman-filter/default.nix b/distros/melodic/kalman-filter/default.nix index f72e68ec96..6e92ef9c02 100644 --- a/distros/melodic/kalman-filter/default.nix +++ b/distros/melodic/kalman-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kalman-filter"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/melodic/kalman_filter/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "475f257f7956a310bf68174451cc299d57b40d0933c72a6d2ec878c9deef76fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/melodic/kalman_filter/0.2.6-1"; + sha256 = "sha256-/a/1udT+YzGVg8uWGfsGWTOmSG17q+uRCYvws7QJv6Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/kartech-linear-actuator-msgs/default.nix b/distros/melodic/kartech-linear-actuator-msgs/default.nix index bc535dc6b1..b90ca9398a 100644 --- a/distros/melodic/kartech-linear-actuator-msgs/default.nix +++ b/distros/melodic/kartech-linear-actuator-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kartech-linear-actuator-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/kartech_linear_actuator_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "3fa3af9c845b1d7844947dd1e7147d5cc00935a20733c740fca379d2b1069a1a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/kartech_linear_actuator_msgs/3.0.2-1"; + sha256 = "sha256-ZRQ9L/1RnQF276VFXXzt6+ru82cZBo4XSVP9aDBNGs4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/kdl-conversions/default.nix b/distros/melodic/kdl-conversions/default.nix index 0575644969..f47e06d7fa 100644 --- a/distros/melodic/kdl-conversions/default.nix +++ b/distros/melodic/kdl-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kdl-conversions"; version = "1.12.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/melodic/kdl_conversions/1.12.1-1.tar.gz"; - name = "1.12.1-1.tar.gz"; - sha256 = "617dd8beae97409400b106c6a3f5a2e76afab2d6c2ea1fca6b740aca3a4e6ee6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/melodic/kdl_conversions/1.12.1-1"; + sha256 = "sha256-9hH/qu1Yrx74QF6KtoKdf19X6vXSfOtfOhygmP7OVq0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/kdl-parser-py/default.nix b/distros/melodic/kdl-parser-py/default.nix index 57b3ebf92a..06e98fb649 100644 --- a/distros/melodic/kdl-parser-py/default.nix +++ b/distros/melodic/kdl-parser-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kdl-parser-py"; version = "1.13.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/kdl_parser-release/archive/release/melodic/kdl_parser_py/1.13.3-1.tar.gz"; - name = "1.13.3-1.tar.gz"; - sha256 = "5463332e38a5d3483f6dd76859eac55d39560a019eddb02709a04adbd98490b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "kdl_parser-release"; + rev = "release/melodic/kdl_parser_py/1.13.3-1"; + sha256 = "sha256-KDV2+mx7xlP45jEWJctpCLN9dBS4F/Reo9lq8iMKtGA="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg pythonPackages.setuptools ]; diff --git a/distros/melodic/kdl-parser/default.nix b/distros/melodic/kdl-parser/default.nix index 9c2b5003f6..41e4c78c23 100644 --- a/distros/melodic/kdl-parser/default.nix +++ b/distros/melodic/kdl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kdl-parser"; version = "1.13.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/kdl_parser-release/archive/release/melodic/kdl_parser/1.13.3-1.tar.gz"; - name = "1.13.3-1.tar.gz"; - sha256 = "3330b28612c51a321bfa0ab45e542b774ad69f8d73acb2f1377c20b65c90f50a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "kdl_parser-release"; + rev = "release/melodic/kdl_parser/1.13.3-1"; + sha256 = "sha256-1T9TC1HeOGAK+pNgNwOLjNmaAASsBCIquIt3DMdsl6w="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/key-teleop/default.nix b/distros/melodic/key-teleop/default.nix index 63cc985b9d..155ed7c79e 100644 --- a/distros/melodic/key-teleop/default.nix +++ b/distros/melodic/key-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-key-teleop"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/melodic/key_teleop/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "798313243d19edcf979363cd0a1d3e28d4a4a93393ece7c5148924021adb067e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/melodic/key_teleop/0.3.1-1"; + sha256 = "sha256-Z9kVAHBq7uPY/EesKRBy+XbaYfSRtf5GIJP2D14Z5KM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-duaro-description/default.nix b/distros/melodic/khi-duaro-description/default.nix index 8caea2bb29..7465f86d99 100644 --- a/distros/melodic/khi-duaro-description/default.nix +++ b/distros/melodic/khi-duaro-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-duaro-description"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_duaro_description/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "a4666e742360013543b7fd11c8b01367f8abe03a01430fd247126b1222d8ff52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_duaro_description/1.2.0-1"; + sha256 = "sha256-5KcfuEsce1jCtytLxV5DvsKEQLWAdjlc5vJkNB6KU78="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/khi-duaro-gazebo/default.nix b/distros/melodic/khi-duaro-gazebo/default.nix index e628d06c69..379880732b 100644 --- a/distros/melodic/khi-duaro-gazebo/default.nix +++ b/distros/melodic/khi-duaro-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-duaro-gazebo"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_duaro_gazebo/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "c72abe21a0c26ae8f45f33e712adc52cf35d9ebf41bcf7a1b2605d586b48773a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_duaro_gazebo/1.2.0-1"; + sha256 = "sha256-imNhui4ZOFlRsfuHLJhd/3HcIBgENbFMA/hVBSup5TI="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-ros-control ]; diff --git a/distros/melodic/khi-duaro-ikfast-plugin/default.nix b/distros/melodic/khi-duaro-ikfast-plugin/default.nix index ca40315b47..f660f539e0 100644 --- a/distros/melodic/khi-duaro-ikfast-plugin/default.nix +++ b/distros/melodic/khi-duaro-ikfast-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-duaro-ikfast-plugin"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_duaro_ikfast_plugin/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "3eda3984c7adabaa70f7d83c4d63a58e147049ef64d09d61569e99d143e13d2e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_duaro_ikfast_plugin/1.2.0-1"; + sha256 = "sha256-R5jeevyIsFuxUmmnNTDS2FwkiCw4tMQkqCxdFZpWPFY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-duaro-moveit-config/default.nix b/distros/melodic/khi-duaro-moveit-config/default.nix index 3070630c83..9081fecee5 100644 --- a/distros/melodic/khi-duaro-moveit-config/default.nix +++ b/distros/melodic/khi-duaro-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-duaro-moveit-config"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_duaro_moveit_config/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "bbb02ab96961608832b53b3e37256e58849d8e66262b7adece3d6feb9f4cb9ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_duaro_moveit_config/1.2.0-1"; + sha256 = "sha256-u+ggNCUEA/eftyYa7L9fsCqoeDzalbESfo+WdQ5eJ8w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-robot-bringup/default.nix b/distros/melodic/khi-robot-bringup/default.nix index e7575d83a0..99e665d09f 100644 --- a/distros/melodic/khi-robot-bringup/default.nix +++ b/distros/melodic/khi-robot-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-robot-bringup"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_robot_bringup/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "6133099b2e9517127d48a9235e08db0ca88c5a89070257b2d08656a27a168089"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_robot_bringup/1.2.0-1"; + sha256 = "sha256-IiMzL8VOt8SxNp3rDou9JBa8XyqSgIqaTJlvwH5FT5c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-robot-control/default.nix b/distros/melodic/khi-robot-control/default.nix index eefd8c4d2e..b9c9c30675 100644 --- a/distros/melodic/khi-robot-control/default.nix +++ b/distros/melodic/khi-robot-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-robot-control"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_robot_control/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "5b41dc0be0d2c297e2df384f877f5db6388398fef8e557eddcd2433e2216c68b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_robot_control/1.2.0-1"; + sha256 = "sha256-RR7MZ1af3mOA4v7JUq3XymO6ncD+HHA+G8RcWXHHqSE="; + }; buildType = "catkin"; buildInputs = [ catkin realtime-tools ]; diff --git a/distros/melodic/khi-robot-msgs/default.nix b/distros/melodic/khi-robot-msgs/default.nix index 568e1c5dbd..b67f98ec82 100644 --- a/distros/melodic/khi-robot-msgs/default.nix +++ b/distros/melodic/khi-robot-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-robot-msgs"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_robot_msgs/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "63a2b5f4a4a75efd865b78c631ea2fb778ebe0fdf6a3a31d3c64849e64b583db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_robot_msgs/1.2.0-1"; + sha256 = "sha256-762AUGeu0zDP0OmV1eKk0S43hFYa6PosHRZ8bRUgNyc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/khi-robot-test/default.nix b/distros/melodic/khi-robot-test/default.nix index efe8adddf6..a3ab993d44 100644 --- a/distros/melodic/khi-robot-test/default.nix +++ b/distros/melodic/khi-robot-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-robot-test"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_robot_test/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "e04b6b83430e5d53a7700c7c4a2ca88c8f52129691fdf804606c2bf5b69f7dab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_robot_test/1.2.0-1"; + sha256 = "sha256-x21R3Nc4ipRuKmds5SGHYMvqHvdk5nax0rkpsm/E6V0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-robot/default.nix b/distros/melodic/khi-robot/default.nix index b879e0568b..62d548fc65 100644 --- a/distros/melodic/khi-robot/default.nix +++ b/distros/melodic/khi-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-robot"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_robot/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "b655c268651024301efbbf3b19403eec907af1d075347063715aa1e1a21d5d65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_robot/1.2.0-1"; + sha256 = "sha256-t2S/Bn3nfhNw5mA9lFRHC7pStGdDBbBdV+LjkZCUTk0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-rs-description/default.nix b/distros/melodic/khi-rs-description/default.nix index bcd6b75623..c711d5f5ac 100644 --- a/distros/melodic/khi-rs-description/default.nix +++ b/distros/melodic/khi-rs-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-rs-description"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_rs_description/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "4a43ed20e06a9b3a7a8cd7a0a536b08906e8b92bb1eb072cbf6c16515d98b40f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_rs_description/1.2.0-1"; + sha256 = "sha256-yN0wvlnMnpF0X2+JPIc91rUj7PknLvu8zQo15fS/GbM="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/khi-rs-gazebo/default.nix b/distros/melodic/khi-rs-gazebo/default.nix index 0a8ad12201..b4fc154b84 100644 --- a/distros/melodic/khi-rs-gazebo/default.nix +++ b/distros/melodic/khi-rs-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-rs-gazebo"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_rs_gazebo/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "5f8d1aca50da477a7b8f95fbc542d51f37acf6c9bd6df5e090e1f994554cd00a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_rs_gazebo/1.2.0-1"; + sha256 = "sha256-XmEl580cE9mxZsgPl2vPR55jwBufMBog16iWqnZROag="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-rs-ikfast-plugin/default.nix b/distros/melodic/khi-rs-ikfast-plugin/default.nix index 53eee0f0ba..c6d2184d16 100644 --- a/distros/melodic/khi-rs-ikfast-plugin/default.nix +++ b/distros/melodic/khi-rs-ikfast-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-rs-ikfast-plugin"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_rs_ikfast_plugin/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "d9f697807d99df9fb28ee0e5dacf746d59998eb9e36895e167c80fb571194b2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_rs_ikfast_plugin/1.2.0-1"; + sha256 = "sha256-ZcMgaCsYLH27UT/AtJ5mkNYEu9JHcFue8UEpBixP0K4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-rs007l-moveit-config/default.nix b/distros/melodic/khi-rs007l-moveit-config/default.nix index cde4568523..2312c478c2 100644 --- a/distros/melodic/khi-rs007l-moveit-config/default.nix +++ b/distros/melodic/khi-rs007l-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-rs007l-moveit-config"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_rs007l_moveit_config/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "564e6223536c64aa0963d043a6a5ff3f8d819053acbdc2dec330a97da22e7a68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_rs007l_moveit_config/1.2.0-1"; + sha256 = "sha256-A3tbopwelUi/ACg+cgicjsZ3bES/BYevEtFe76txhhE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-rs007n-moveit-config/default.nix b/distros/melodic/khi-rs007n-moveit-config/default.nix index 49393531d0..b509f6c70d 100644 --- a/distros/melodic/khi-rs007n-moveit-config/default.nix +++ b/distros/melodic/khi-rs007n-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-rs007n-moveit-config"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_rs007n_moveit_config/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "8dcf45cb635bcb6fdb87094daf598e94ecc5a9748067c6550b9c139b5d72400f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_rs007n_moveit_config/1.2.0-1"; + sha256 = "sha256-e9ZylzuUIfVnFl8UsuTCqAs2sMw63A/ty7R5fBVuFEs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/khi-rs080n-moveit-config/default.nix b/distros/melodic/khi-rs080n-moveit-config/default.nix index 6a194354a4..d65a53b71e 100644 --- a/distros/melodic/khi-rs080n-moveit-config/default.nix +++ b/distros/melodic/khi-rs080n-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-khi-rs080n-moveit-config"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/melodic/khi_rs080n_moveit_config/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "6719e7ec11326619aeba4b3289f06be44a33e87baec9fb28c7a6fe271d17a37e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/melodic/khi_rs080n_moveit_config/1.2.0-1"; + sha256 = "sha256-ZHZXe4L4VAURfKVcJYxySd/pLPN4EK+VBM+gX+hM7+w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/kinesis-manager/default.nix b/distros/melodic/kinesis-manager/default.nix index 48d44addfa..d3f7753b1e 100644 --- a/distros/melodic/kinesis-manager/default.nix +++ b/distros/melodic/kinesis-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kinesis-manager"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/kinesis_manager-release/archive/release/melodic/kinesis_manager/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "6db7c90ac6fb345ff10ec737c2f37f5cc6a0f6a6aebf038c852375afd2fb40e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "kinesis_manager-release"; + rev = "release/melodic/kinesis_manager/2.0.3-1"; + sha256 = "sha256-8Hfppg6oU0MVKr6VeDNS1HF5rhoX87kDs8SAtmFlGiU="; + }; buildType = "cmake"; buildInputs = [ catkin cmake pkg-config ]; diff --git a/distros/melodic/kinesis-video-msgs/default.nix b/distros/melodic/kinesis-video-msgs/default.nix index 6effe26def..9df0129400 100644 --- a/distros/melodic/kinesis-video-msgs/default.nix +++ b/distros/melodic/kinesis-video-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kinesis-video-msgs"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/kinesis_video_streamer-release/archive/release/melodic/kinesis_video_msgs/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "d3116f1e9c9aea3eeda1de9c5a49056834699356ebdf058f713112425306ca09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "kinesis_video_streamer-release"; + rev = "release/melodic/kinesis_video_msgs/2.0.3-1"; + sha256 = "sha256-yGzplYDgHHMcN4kDPvIj+hdZ6HUwOwT1aZ45kkb4Qj8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/kinesis-video-streamer/default.nix b/distros/melodic/kinesis-video-streamer/default.nix index 8008c2aa5b..572c63009b 100644 --- a/distros/melodic/kinesis-video-streamer/default.nix +++ b/distros/melodic/kinesis-video-streamer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kinesis-video-streamer"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/kinesis_video_streamer-release/archive/release/melodic/kinesis_video_streamer/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "c9d21edf29f27e1896e428ecabe75be86a821ecb7caa07ff4fd3ffd45c4c1385"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "kinesis_video_streamer-release"; + rev = "release/melodic/kinesis_video_streamer/2.0.3-1"; + sha256 = "sha256-vkA4+UztYasIaN/twFWYskiAmkTJQQ9qt9BXVVcX/0w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/knowledge-representation/default.nix b/distros/melodic/knowledge-representation/default.nix index f769cd9451..efe0cd9fe8 100644 --- a/distros/melodic/knowledge-representation/default.nix +++ b/distros/melodic/knowledge-representation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-knowledge-representation"; version = "0.9.4-r1"; - src = fetchurl { - url = "https://github.com/utexas-bwi-gbp/knowledge_representation-release/archive/release/melodic/knowledge_representation/0.9.4-1.tar.gz"; - name = "0.9.4-1.tar.gz"; - sha256 = "9d78c86fd031e08f16d5c2592b9f6d24a4d91f97a8c894752727c37ea292820d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "utexas-bwi-gbp"; + repo = "knowledge_representation-release"; + rev = "release/melodic/knowledge_representation/0.9.4-1"; + sha256 = "sha256-gnLg1NF27HVgu0h2vR88yG01B1RxwFzYu9GLoz6HHDM="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools roslint ]; diff --git a/distros/melodic/kobuki-core/default.nix b/distros/melodic/kobuki-core/default.nix index ec05fc790a..c496fdf397 100644 --- a/distros/melodic/kobuki-core/default.nix +++ b/distros/melodic/kobuki-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kobuki-core"; version = "0.7.12-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_core-release/archive/release/melodic/kobuki_core/0.7.12-1.tar.gz"; - name = "0.7.12-1.tar.gz"; - sha256 = "d5b2023576b24ec3fcf8ea0a624084a8b6a7aad7f677c9c8b16d65bc2136c6ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_core-release"; + rev = "release/melodic/kobuki_core/0.7.12-1"; + sha256 = "sha256-FJ6sT/26Sul/nwI17KnFDkFKz7eoZIwu1pA/RbbhmbE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/kobuki-dock-drive/default.nix b/distros/melodic/kobuki-dock-drive/default.nix index 002b9afb7c..ec43a2ef01 100644 --- a/distros/melodic/kobuki-dock-drive/default.nix +++ b/distros/melodic/kobuki-dock-drive/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kobuki-dock-drive"; version = "0.7.12-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_core-release/archive/release/melodic/kobuki_dock_drive/0.7.12-1.tar.gz"; - name = "0.7.12-1.tar.gz"; - sha256 = "29aad541dfcc801a6f5a9b615416d382e7804d1f59a803cb48012ca39384a2b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_core-release"; + rev = "release/melodic/kobuki_dock_drive/0.7.12-1"; + sha256 = "sha256-hv4seL1TnWeg/AzXHsXU6avtUCMupu0l9zvKZHZzlgM="; + }; buildType = "catkin"; buildInputs = [ catkin ecl-build ]; diff --git a/distros/melodic/kobuki-driver/default.nix b/distros/melodic/kobuki-driver/default.nix index 4ee4698a78..f70ca6adf8 100644 --- a/distros/melodic/kobuki-driver/default.nix +++ b/distros/melodic/kobuki-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kobuki-driver"; version = "0.7.12-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_core-release/archive/release/melodic/kobuki_driver/0.7.12-1.tar.gz"; - name = "0.7.12-1.tar.gz"; - sha256 = "38e54041401f657447538999ea3adb4ba2c8c34f8677a80df31d7685eafa896f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_core-release"; + rev = "release/melodic/kobuki_driver/0.7.12-1"; + sha256 = "sha256-d09KDqqPXd6jw3/dU6Y7aHSyv7xBhOJhwAY72amQGIM="; + }; buildType = "catkin"; buildInputs = [ catkin ecl-build ]; diff --git a/distros/melodic/kobuki-ftdi/default.nix b/distros/melodic/kobuki-ftdi/default.nix index 0d40286b89..6833c54c89 100644 --- a/distros/melodic/kobuki-ftdi/default.nix +++ b/distros/melodic/kobuki-ftdi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kobuki-ftdi"; version = "0.7.12-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_core-release/archive/release/melodic/kobuki_ftdi/0.7.12-1.tar.gz"; - name = "0.7.12-1.tar.gz"; - sha256 = "5e9dd769834fdfab45353add1cb5375000bff8fb98a65f9a39b3751967630baa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_core-release"; + rev = "release/melodic/kobuki_ftdi/0.7.12-1"; + sha256 = "sha256-i2LlVZgPhygnQ1VayUu65PWLgt4CPqOSiL1X4jqq4IA="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/melodic/kobuki-msgs/default.nix b/distros/melodic/kobuki-msgs/default.nix index a4c9b106c2..2b50a7453d 100644 --- a/distros/melodic/kobuki-msgs/default.nix +++ b/distros/melodic/kobuki-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kobuki-msgs"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_msgs-release/archive/release/melodic/kobuki_msgs/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "11990d638a2cea62be1b3f6a33e17a6ac080ec52eda926bb69c173d7c14166ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_msgs-release"; + rev = "release/melodic/kobuki_msgs/0.7.0-1"; + sha256 = "sha256-pPNOb/rCCyHVD5v9TWCWjYenDPJcoAmRDEn2BUsyG4o="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ksql-airport/default.nix b/distros/melodic/ksql-airport/default.nix index 137e17d943..2957c6e2e6 100644 --- a/distros/melodic/ksql-airport/default.nix +++ b/distros/melodic/ksql-airport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ksql-airport"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/uav_testing-release/archive/release/melodic/ksql_airport/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "b889d36b4514ad7eb0585a6a63a596a04cc2b909d1ba90ef3ca858be9a99de47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "uav_testing-release"; + rev = "release/melodic/ksql_airport/0.0.1-1"; + sha256 = "sha256-1IZY2Byz5iklWuAp1gMYJ4HQS7ZHyHg06JSuGE2fE68="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/kvh-geo-fog-3d-driver/default.nix b/distros/melodic/kvh-geo-fog-3d-driver/default.nix index 74455f16ec..82050f6647 100644 --- a/distros/melodic/kvh-geo-fog-3d-driver/default.nix +++ b/distros/melodic/kvh-geo-fog-3d-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kvh-geo-fog-3d-driver"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/MITRE/kvh_geo_fog_3d-release/archive/release/melodic/kvh_geo_fog_3d_driver/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "c2556efa67c6dfa7ad60406fc08a3d8a618f1838a25259dd9f32794ee6792ebd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MITRE"; + repo = "kvh_geo_fog_3d-release"; + rev = "release/melodic/kvh_geo_fog_3d_driver/1.5.1-1"; + sha256 = "sha256-NzHPOtfKvXWFJK+MMYhpqaJb6qCx+61cdVpz66j12mw="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/kvh-geo-fog-3d-msgs/default.nix b/distros/melodic/kvh-geo-fog-3d-msgs/default.nix index ae39a06a54..2040991afb 100644 --- a/distros/melodic/kvh-geo-fog-3d-msgs/default.nix +++ b/distros/melodic/kvh-geo-fog-3d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kvh-geo-fog-3d-msgs"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/MITRE/kvh_geo_fog_3d-release/archive/release/melodic/kvh_geo_fog_3d_msgs/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "80c23203e375105bd7e99139b21ddce46d251c4ce43709ef3c1f80f91ef65107"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MITRE"; + repo = "kvh_geo_fog_3d-release"; + rev = "release/melodic/kvh_geo_fog_3d_msgs/1.5.1-1"; + sha256 = "sha256-3Iif23aBXpZVarMlripUtWjO6saS/vSwInZruF6HDps="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/kvh-geo-fog-3d-rviz/default.nix b/distros/melodic/kvh-geo-fog-3d-rviz/default.nix index 63607ba809..abd556f40d 100644 --- a/distros/melodic/kvh-geo-fog-3d-rviz/default.nix +++ b/distros/melodic/kvh-geo-fog-3d-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kvh-geo-fog-3d-rviz"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/MITRE/kvh_geo_fog_3d-release/archive/release/melodic/kvh_geo_fog_3d_rviz/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "8921cdefb404c9c8b7d73830499c7a912d256da57d643a44e7e77dabe8027227"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MITRE"; + repo = "kvh_geo_fog_3d-release"; + rev = "release/melodic/kvh_geo_fog_3d_rviz/1.5.1-1"; + sha256 = "sha256-QwWD95ht7fYpC8FMr1LfwRlt6vipVp+7lMtQFNe66TU="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase qt5.qtdeclarative qt5.qtmultimedia qt5.qtsvg roslint ]; diff --git a/distros/melodic/kvh-geo-fog-3d/default.nix b/distros/melodic/kvh-geo-fog-3d/default.nix index d8f7e8cc17..12e8979b4e 100644 --- a/distros/melodic/kvh-geo-fog-3d/default.nix +++ b/distros/melodic/kvh-geo-fog-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-kvh-geo-fog-3d"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/MITRE/kvh_geo_fog_3d-release/archive/release/melodic/kvh_geo_fog_3d/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "dd37181032cc101a812e169099344c177d61c29e3942d071063bd83c90a6f0cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MITRE"; + repo = "kvh_geo_fog_3d-release"; + rev = "release/melodic/kvh_geo_fog_3d/1.5.1-1"; + sha256 = "sha256-3jNCCKMdZNlkLZS8gWJzd1KBfOEqCUC3VLZ3P29fVMI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/label-manager/default.nix b/distros/melodic/label-manager/default.nix index 69d4059da1..bb481aa5c6 100644 --- a/distros/melodic/label-manager/default.nix +++ b/distros/melodic/label-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-label-manager"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/melodic/label_manager/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "4dfe909eaef99fc3c632498a58de78e48bff3a2fb7cede0c3a8bfe2043b68ed4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/melodic/label_manager/1.1.0-1"; + sha256 = "sha256-z4qdRuckd+O/q4Y3ibC6/Fyao0yGI+IZIWVGj2PK/Mk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-core/default.nix b/distros/melodic/lanelet2-core/default.nix index dfb4041980..dc2d419c67 100644 --- a/distros/melodic/lanelet2-core/default.nix +++ b/distros/melodic/lanelet2-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-core"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_core/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "67b6ac6167690fb3b583ebd7ef0957d47875965dcb32955f41696a3e6f4e9b4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_core/1.0.1-1"; + sha256 = "sha256-6YgQVWBJyszHaG+VPD3hBCMofdzSC+L/lSTsJf7vftk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-examples/default.nix b/distros/melodic/lanelet2-examples/default.nix index 86a00639c1..91a4acfe59 100644 --- a/distros/melodic/lanelet2-examples/default.nix +++ b/distros/melodic/lanelet2-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-examples"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_examples/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "9f93b536ff1bc3af4626a20119bbcf166d0468f0b3ddd108ac6a484ca7e67ffc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_examples/1.0.1-1"; + sha256 = "sha256-rq0B8gzC9cG7IVN3QBPKpTmL/HxYog5JtFFOx2C41X4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-io/default.nix b/distros/melodic/lanelet2-io/default.nix index 75384bca9d..4184dc361c 100644 --- a/distros/melodic/lanelet2-io/default.nix +++ b/distros/melodic/lanelet2-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-io"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_io/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "1b2f1ca013896894b8119cd6926789840420a14a736807691265f0520b22fa91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_io/1.0.1-1"; + sha256 = "sha256-D7LFRLUuPMHR/qyGIAKJc3LYk2Vk4WGBPFk9cxfXhl8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-maps/default.nix b/distros/melodic/lanelet2-maps/default.nix index eeae624bad..da0a511226 100644 --- a/distros/melodic/lanelet2-maps/default.nix +++ b/distros/melodic/lanelet2-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-maps"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_maps/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "d3a607df84c727c2c9190f5b4a50d6733637b4962819f9897a0f0063ddeb3a3f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_maps/1.0.1-1"; + sha256 = "sha256-QkxHdhUv3Kh0oekCFA4q++fHMHoGnWShGQsDkceNwIY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-projection/default.nix b/distros/melodic/lanelet2-projection/default.nix index 646e4a213c..4e42d23db7 100644 --- a/distros/melodic/lanelet2-projection/default.nix +++ b/distros/melodic/lanelet2-projection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-projection"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_projection/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "28d6325d9e366f3384f1fccaec28119566a851976db10513313b04997aab80b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_projection/1.0.1-1"; + sha256 = "sha256-EQOJTF2aSpPN086tdDVMsAP0azso+TAD6n/fg7i5bxA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-python/default.nix b/distros/melodic/lanelet2-python/default.nix index 296ae0784d..c8406a9cf1 100644 --- a/distros/melodic/lanelet2-python/default.nix +++ b/distros/melodic/lanelet2-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-python"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_python/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "f40a48bceae8f129db010733f9062ff3a738087a532aa373fdc8a63f506dacab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_python/1.0.1-1"; + sha256 = "sha256-EuqmHYdvowhS8XVDfMq5N+R2+FLJEYvo9FzvIx8Ws0M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-routing/default.nix b/distros/melodic/lanelet2-routing/default.nix index 933de676a2..c0a659ed37 100644 --- a/distros/melodic/lanelet2-routing/default.nix +++ b/distros/melodic/lanelet2-routing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-routing"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_routing/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "1ff4e46e74b7f5317c986065bfe035031bec07318e49164256e7f2e7af308b16"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_routing/1.0.1-1"; + sha256 = "sha256-yZ2NseoQfyA7NlcDKOEM7ceKJ4xw/2IUfMynQuWTePQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-traffic-rules/default.nix b/distros/melodic/lanelet2-traffic-rules/default.nix index 003c2a6006..0d5a0ede0a 100644 --- a/distros/melodic/lanelet2-traffic-rules/default.nix +++ b/distros/melodic/lanelet2-traffic-rules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-traffic-rules"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_traffic_rules/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "f4c595f49fde53881eb785a245e2b4d60a6cf43209d1d5dcdc6d96d6f928f6a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_traffic_rules/1.0.1-1"; + sha256 = "sha256-cfxRXsWVlCKt1977kV7+42/X3HwRej1Zm2RvJDK59GM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2-validation/default.nix b/distros/melodic/lanelet2-validation/default.nix index 870295534b..8d319494d4 100644 --- a/distros/melodic/lanelet2-validation/default.nix +++ b/distros/melodic/lanelet2-validation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2-validation"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2_validation/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "b590cfac79b81805137ebfb427a325a7f20442038b704ddc49e73db92b4b75f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2_validation/1.0.1-1"; + sha256 = "sha256-AXJOe+HvlrLK6hqpNMlME85xr4N/j5nYcAwWashVn3s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lanelet2/default.nix b/distros/melodic/lanelet2/default.nix index fd0e738d00..03acb92e47 100644 --- a/distros/melodic/lanelet2/default.nix +++ b/distros/melodic/lanelet2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lanelet2"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/melodic/lanelet2/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "cc72ae7156a463738d24df6ca4b0a57f594d69fffdf8817400280c268b3b14b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/melodic/lanelet2/1.0.1-1"; + sha256 = "sha256-AFz8yU+aKr0hwx9p20eD4jdgCrDswhbY56N5kaYHci4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laptop-battery-monitor/default.nix b/distros/melodic/laptop-battery-monitor/default.nix index 2509a099c7..60e1de6d58 100644 --- a/distros/melodic/laptop-battery-monitor/default.nix +++ b/distros/melodic/laptop-battery-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laptop-battery-monitor"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/linux_peripheral_interfaces-release/archive/release/melodic/laptop_battery_monitor/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "d486cc68028e01679ecbc328c3164ad952e32cd81b49f8224a155f67390d7442"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "linux_peripheral_interfaces-release"; + rev = "release/melodic/laptop_battery_monitor/0.2.1-1"; + sha256 = "sha256-etYep+6DnJOZqUBonwyJxtIB/iNX16jLjHz7ArywVOs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-assembler/default.nix b/distros/melodic/laser-assembler/default.nix index 4b87a7d9f8..1caabb3dde 100644 --- a/distros/melodic/laser-assembler/default.nix +++ b/distros/melodic/laser-assembler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-assembler"; version = "1.7.7-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_assembler-release/archive/release/melodic/laser_assembler/1.7.7-2.tar.gz"; - name = "1.7.7-2.tar.gz"; - sha256 = "7a1c69cc848803f8521457bb7e2d720219e38c1d7e66daa15d06f13b3b05f9b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_assembler-release"; + rev = "release/melodic/laser_assembler/1.7.7-2"; + sha256 = "sha256-05e0Obm9q3+iC1Bu0khSDb9dGdutG9I5JsL7PBVDPZA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/melodic/laser-cb-detector/default.nix b/distros/melodic/laser-cb-detector/default.nix index fb64a7b2eb..e0715782cc 100644 --- a/distros/melodic/laser-cb-detector/default.nix +++ b/distros/melodic/laser-cb-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-cb-detector"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/laser_cb_detector/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "84dfc40a2bed5cc329a50aba2e513550e8a8aa9de1b0d0719676e04ee3107d7e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/laser_cb_detector/0.10.14-0"; + sha256 = "sha256-3NnQOLmxvBKEE2zKj5n1/ZjEhBoSzFnS6IQ29AOzaMg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-filtering/default.nix b/distros/melodic/laser-filtering/default.nix index a68b9d5599..f28ab04a8d 100644 --- a/distros/melodic/laser-filtering/default.nix +++ b/distros/melodic/laser-filtering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-filtering"; version = "0.0.4"; - src = fetchurl { - url = "https://github.com/wu-robotics/laser_filtering_release/archive/release/melodic/laser_filtering/0.0.4-0.tar.gz"; - name = "0.0.4-0.tar.gz"; - sha256 = "d5aed79a7f8e17e1ffc7f9e88fa741a3d7d3a6134b822428cb8e0eab2326be62"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "laser_filtering_release"; + rev = "release/melodic/laser_filtering/0.0.4-0"; + sha256 = "sha256-JbElAsvmHdt/aNqsThNNdR2RYuVEoAwwKlnIMR3zTGo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-filters/default.nix b/distros/melodic/laser-filters/default.nix index 5a809e8cbd..b47c5186a4 100644 --- a/distros/melodic/laser-filters/default.nix +++ b/distros/melodic/laser-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-filters"; version = "1.8.12-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_filters-release/archive/release/melodic/laser_filters/1.8.12-1.tar.gz"; - name = "1.8.12-1.tar.gz"; - sha256 = "56572bc6cf37f4a6272af04a2a42b3ea757a114962cab9814077d89ebf7ed89b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_filters-release"; + rev = "release/melodic/laser_filters/1.8.12-1"; + sha256 = "sha256-dEMfdSuSjlinugxQRLf6LihpJPVg/7TIKBIqazalVwE="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/laser-geometry/default.nix b/distros/melodic/laser-geometry/default.nix index 4dab785841..6c8320cac2 100644 --- a/distros/melodic/laser-geometry/default.nix +++ b/distros/melodic/laser-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-geometry"; version = "1.6.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_geometry-release/archive/release/melodic/laser_geometry/1.6.7-1.tar.gz"; - name = "1.6.7-1.tar.gz"; - sha256 = "7c832a9a8bcb0caa67a9494b1a8945da5427b8dae18eecd6e4c5f08e0e6f09cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_geometry-release"; + rev = "release/melodic/laser_geometry/1.6.7-1"; + sha256 = "sha256-KcI82Rd7PWIfEY2IiK5EpWVcf4+HEVcttkFfaTIrH18="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-geometry-msgs ]; diff --git a/distros/melodic/laser-joint-processor/default.nix b/distros/melodic/laser-joint-processor/default.nix index 6628c9f14a..346d3bec39 100644 --- a/distros/melodic/laser-joint-processor/default.nix +++ b/distros/melodic/laser-joint-processor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-joint-processor"; version = "1.0.11-r3"; - src = fetchurl { - url = "https://github.com/UNR-RoboticsResearchLab/pr2_calibration-release/archive/release/melodic/laser_joint_processor/1.0.11-3.tar.gz"; - name = "1.0.11-3.tar.gz"; - sha256 = "cb7af2be6d05571d0e970c0f7a965ca1b5009f2b278cacc8e2ddcdfec33b8375"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UNR-RoboticsResearchLab"; + repo = "pr2_calibration-release"; + rev = "release/melodic/laser_joint_processor/1.0.11-3"; + sha256 = "sha256-VE3Niv4LcZUXCkWjAdGsDTw2YqAnoCsbOICOkvtXC0Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-joint-projector/default.nix b/distros/melodic/laser-joint-projector/default.nix index d1f125090a..4e59bd6a83 100644 --- a/distros/melodic/laser-joint-projector/default.nix +++ b/distros/melodic/laser-joint-projector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-joint-projector"; version = "1.0.11-r3"; - src = fetchurl { - url = "https://github.com/UNR-RoboticsResearchLab/pr2_calibration-release/archive/release/melodic/laser_joint_projector/1.0.11-3.tar.gz"; - name = "1.0.11-3.tar.gz"; - sha256 = "e39ed9fe09aca1b76382f081da92833adc0ca6ef95f4cdf8d3a026d89c9482d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UNR-RoboticsResearchLab"; + repo = "pr2_calibration-release"; + rev = "release/melodic/laser_joint_projector/1.0.11-3"; + sha256 = "sha256-EJExhTKIE7UT41dgEtVwLL9A1ZVW2ukmqa1rztvDryU="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp ]; diff --git a/distros/melodic/laser-ortho-projector/default.nix b/distros/melodic/laser-ortho-projector/default.nix index 04064bd3e8..d6492dab69 100644 --- a/distros/melodic/laser-ortho-projector/default.nix +++ b/distros/melodic/laser-ortho-projector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-ortho-projector"; version = "0.3.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/melodic/laser_ortho_projector/0.3.3-2.tar.gz"; - name = "0.3.3-2.tar.gz"; - sha256 = "c5f80e123b12083739cd83a6f96d06d073ff4d904463ca7bfb6f196f35a2ac97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/melodic/laser_ortho_projector/0.3.3-2"; + sha256 = "sha256-eEe1oaKKiuLndzhIBwMWpgmpOe8cmZMgYWNthK26c0g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-pipeline/default.nix b/distros/melodic/laser-pipeline/default.nix index a475561d44..36cb9e4b5c 100644 --- a/distros/melodic/laser-pipeline/default.nix +++ b/distros/melodic/laser-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-pipeline"; version = "1.6.3"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_pipeline-release/archive/release/melodic/laser_pipeline/1.6.3-0.tar.gz"; - name = "1.6.3-0.tar.gz"; - sha256 = "5d831b4e5ff12088b034f71202b7202c5d4fff9717d4a58acd5843e279f242d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_pipeline-release"; + rev = "release/melodic/laser_pipeline/1.6.3-0"; + sha256 = "sha256-6TdVR5VckqOjqi8OplCfDT58uDkR+GRhJvz0tUP5rR4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-proc/default.nix b/distros/melodic/laser-proc/default.nix index e258bd8feb..3c7041b40e 100644 --- a/distros/melodic/laser-proc/default.nix +++ b/distros/melodic/laser-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-proc"; version = "0.1.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_proc-release/archive/release/melodic/laser_proc/0.1.5-0.tar.gz"; - name = "0.1.5-0.tar.gz"; - sha256 = "bd596ebcfc3016970ba1c6abcd0d8c550e9b96a19ec6ab23ec8f5f3bc0f3d7c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_proc-release"; + rev = "release/melodic/laser_proc/0.1.5-0"; + sha256 = "sha256-425rbbJol1PAzrEJ+45thb/cPqU01ZN48E+UPJtsPY0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-scan-densifier/default.nix b/distros/melodic/laser-scan-densifier/default.nix index 278272b5de..62fe37f47e 100644 --- a/distros/melodic/laser-scan-densifier/default.nix +++ b/distros/melodic/laser-scan-densifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-scan-densifier"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/melodic/laser_scan_densifier/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "70d2de52acc0044289d74977f753415e06f93fc1e6607450849441bf034dc359"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/melodic/laser_scan_densifier/0.7.4-1"; + sha256 = "sha256-Ke0iY+fL0QKK/5WORxN6+DiAa8wP/ahyZg1mKp3OrNw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-scan-matcher/default.nix b/distros/melodic/laser-scan-matcher/default.nix index 56eb03e9f5..7b1c36464a 100644 --- a/distros/melodic/laser-scan-matcher/default.nix +++ b/distros/melodic/laser-scan-matcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-scan-matcher"; version = "0.3.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/melodic/laser_scan_matcher/0.3.3-2.tar.gz"; - name = "0.3.3-2.tar.gz"; - sha256 = "00b14d69b87fb6da8dbfd290beddf7c8f2b92adcce22fed066a5883adfe825c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/melodic/laser_scan_matcher/0.3.3-2"; + sha256 = "sha256-0DoaU2d17cy0hZBh3U4GIMZzt7o00lAH+ktCY0JDrxo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-scan-publisher-tutorial/default.nix b/distros/melodic/laser-scan-publisher-tutorial/default.nix index c8dcccece2..8ad1b6a55b 100644 --- a/distros/melodic/laser-scan-publisher-tutorial/default.nix +++ b/distros/melodic/laser-scan-publisher-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-scan-publisher-tutorial"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_tutorials-release/archive/release/melodic/laser_scan_publisher_tutorial/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "c0b0218c7cd794f7c3a06cb85c2d8d3df2fce24a5a8ebea919021ec6084d98c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_tutorials-release"; + rev = "release/melodic/laser_scan_publisher_tutorial/0.2.4-1"; + sha256 = "sha256-EqNTi1WNsONVL8yf9S2uCHq2uwclDtcHD3TlTmEsWF4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-scan-sparsifier/default.nix b/distros/melodic/laser-scan-sparsifier/default.nix index c41203456a..88a7ccbe8e 100644 --- a/distros/melodic/laser-scan-sparsifier/default.nix +++ b/distros/melodic/laser-scan-sparsifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-scan-sparsifier"; version = "0.3.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/melodic/laser_scan_sparsifier/0.3.3-2.tar.gz"; - name = "0.3.3-2.tar.gz"; - sha256 = "43fa615c88414d204c326f4bb56f75fd887dcba367211d0b00ebbd17ff2cdab9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/melodic/laser_scan_sparsifier/0.3.3-2"; + sha256 = "sha256-ZlPQsfW2+9xFA9xEaak6OSQnAAz57RTyKezMjVL/UN0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-scan-splitter/default.nix b/distros/melodic/laser-scan-splitter/default.nix index 71132d2de2..cc0fecbbe6 100644 --- a/distros/melodic/laser-scan-splitter/default.nix +++ b/distros/melodic/laser-scan-splitter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-scan-splitter"; version = "0.3.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/melodic/laser_scan_splitter/0.3.3-2.tar.gz"; - name = "0.3.3-2.tar.gz"; - sha256 = "9cc0f57c8712d129c8181e2a03c950c39d0199cc8838dd98493815d5b430ce2e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/melodic/laser_scan_splitter/0.3.3-2"; + sha256 = "sha256-f6tHTbi0RfnnhWtSJ9pHStElYS5HkBH/Csoz0BKs/2c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/laser-tilt-controller-filter/default.nix b/distros/melodic/laser-tilt-controller-filter/default.nix index 1beabf0af6..2b6b4870b7 100644 --- a/distros/melodic/laser-tilt-controller-filter/default.nix +++ b/distros/melodic/laser-tilt-controller-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-laser-tilt-controller-filter"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/laser_tilt_controller_filter/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "ded7f78a4d42917ee2799ee522172f0c1c2251450f2752f88534f6a6ea2bb2a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/laser_tilt_controller_filter/0.1.28-1"; + sha256 = "sha256-fN78fy0XV/hAaccCPLBi9VJzAnLLRN8zLmZolbFUCgY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/launchfile-switcher/default.nix b/distros/melodic/launchfile-switcher/default.nix index b551304b3e..18e4516f52 100644 --- a/distros/melodic/launchfile-switcher/default.nix +++ b/distros/melodic/launchfile-switcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-launchfile-switcher"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/rb-sapiens/launchfile_switcher-release/archive/release/melodic/launchfile_switcher/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "a34d408afad6fbd78fdf48082e7506b1deb91f05619f4f658319f1a5cb9e9132"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rb-sapiens"; + repo = "launchfile_switcher-release"; + rev = "release/melodic/launchfile_switcher/0.1.0-1"; + sha256 = "sha256-iUNtcQpbBVRplc/Azz6hYtj3t9j7tHf6N5VzEvhf0Qs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lauv-control/default.nix b/distros/melodic/lauv-control/default.nix index 6cee7a201d..fbf0eb84a8 100644 --- a/distros/melodic/lauv-control/default.nix +++ b/distros/melodic/lauv-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lauv-control"; version = "0.1.6"; - src = fetchurl { - url = "https://github.com/uuvsimulator/lauv_gazebo-release/archive/release/melodic/lauv_control/0.1.6-0.tar.gz"; - name = "0.1.6-0.tar.gz"; - sha256 = "2a5dafaa1dbc26fc3c4d0b91fc39a6a9f822b8ed8c164e5001189c881cac011d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "lauv_gazebo-release"; + rev = "release/melodic/lauv_control/0.1.6-0"; + sha256 = "sha256-UzkAxY8WnWmD6mDdbZv2GyleNJ47Zb8zUhe4srNC850="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lauv-description/default.nix b/distros/melodic/lauv-description/default.nix index 2e4ab3caef..ae470816c3 100644 --- a/distros/melodic/lauv-description/default.nix +++ b/distros/melodic/lauv-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lauv-description"; version = "0.1.6"; - src = fetchurl { - url = "https://github.com/uuvsimulator/lauv_gazebo-release/archive/release/melodic/lauv_description/0.1.6-0.tar.gz"; - name = "0.1.6-0.tar.gz"; - sha256 = "a3cd50cb68d4034daf6aa283fee53329c9e70c3177c0fe1bfdd169a236e4ab5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "lauv_gazebo-release"; + rev = "release/melodic/lauv_description/0.1.6-0"; + sha256 = "sha256-YGlRz7Bvin9qFkg5RBt7QLJVZ5+XOXxzLPpmgA+KIlQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lauv-gazebo/default.nix b/distros/melodic/lauv-gazebo/default.nix index 9468b45eb0..8eb061e838 100644 --- a/distros/melodic/lauv-gazebo/default.nix +++ b/distros/melodic/lauv-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lauv-gazebo"; version = "0.1.6"; - src = fetchurl { - url = "https://github.com/uuvsimulator/lauv_gazebo-release/archive/release/melodic/lauv_gazebo/0.1.6-0.tar.gz"; - name = "0.1.6-0.tar.gz"; - sha256 = "ba4a2d4a1567b183be8c500d5dc714ebbec6802532da93eaab20cc7cdb6a266c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "lauv_gazebo-release"; + rev = "release/melodic/lauv_gazebo/0.1.6-0"; + sha256 = "sha256-gC6cqSli0pHr2r8KBo05Z9K0xdOUy3bwz1fpWIpNsHo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/led-msgs/default.nix b/distros/melodic/led-msgs/default.nix index 537a236c8a..a10a7359bc 100644 --- a/distros/melodic/led-msgs/default.nix +++ b/distros/melodic/led-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-led-msgs"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/ros_led-release/archive/release/melodic/led_msgs/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "fb8f221ede9c60a438c079056599b6c0a106d0989462fd766c2d29bd241dcab8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "ros_led-release"; + rev = "release/melodic/led_msgs/0.0.11-1"; + sha256 = "sha256-04t5GVtPsGh5wWfRmASubhvUaNFruhoh0aIwJEswCPg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/leg-detector/default.nix b/distros/melodic/leg-detector/default.nix index 9e966a7714..9ee4fe0767 100644 --- a/distros/melodic/leg-detector/default.nix +++ b/distros/melodic/leg-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leg-detector"; version = "1.4.0-r4"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/melodic/leg_detector/1.4.0-4.tar.gz"; - name = "1.4.0-4.tar.gz"; - sha256 = "44076e4c01655df0b855678ab2f2012a6ca559b527b4c258fb382a6df739f07f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/melodic/leg_detector/1.4.0-4"; + sha256 = "sha256-n1DBRrwRvzl8Ze+pusHO/CNpL0MfFWiulK04iGE1hVQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo-bringup/default.nix b/distros/melodic/leo-bringup/default.nix index 8510015cdd..3e5eafdb81 100644 --- a/distros/melodic/leo-bringup/default.nix +++ b/distros/melodic/leo-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-bringup"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/melodic/leo_bringup/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "9f4c8a488f3d7ad25d0e3591c082f868c96b80c0b8d0f6ee7b97c537138bbcbb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_robot-release"; + rev = "release/melodic/leo_bringup/1.2.1-1"; + sha256 = "sha256-zZTwUSeJBaTVtzogShvA63peQ3O3qUQj3EXmrBxGK7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo-description/default.nix b/distros/melodic/leo-description/default.nix index ab7c5b631c..63aaa89a62 100644 --- a/distros/melodic/leo-description/default.nix +++ b/distros/melodic/leo-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-description"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_common-release/archive/release/melodic/leo_description/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "360ef65d8f1517a31541eb715af5b66a7fd923dbc776f4a125fac219c70ab23d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_common-release"; + rev = "release/melodic/leo_description/1.2.2-1"; + sha256 = "sha256-Sd4kG+BzwwzhpBh+NGnP8qLPkszMN6iBGDfQAn8MySQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo-desktop/default.nix b/distros/melodic/leo-desktop/default.nix index 5d575a7300..c544ffd1d3 100644 --- a/distros/melodic/leo-desktop/default.nix +++ b/distros/melodic/leo-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-desktop"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_desktop-release/archive/release/melodic/leo_desktop/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "828695ff682318fcd2fdf8a3228fa3ede6f04fd796a5fcff9183b750297c6aa3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_desktop-release"; + rev = "release/melodic/leo_desktop/0.2.3-1"; + sha256 = "sha256-GBIA8oy/0NvsPVdCdDI3/fme7gfNQoWVZqp+zzX/aMY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo-fw/default.nix b/distros/melodic/leo-fw/default.nix index 4962d4c8e1..24d91f8e3c 100644 --- a/distros/melodic/leo-fw/default.nix +++ b/distros/melodic/leo-fw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-fw"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/melodic/leo_fw/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "e4c46151e1c7234f2888dc20a2bb0b9014931264e0bb1fcea3a89e8505bc1049"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_robot-release"; + rev = "release/melodic/leo_fw/1.2.1-1"; + sha256 = "sha256-j7TIXAUkTHa5of56oqKCsIfmqKCChKueAI3/Dfg0Emo="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/leo-gazebo/default.nix b/distros/melodic/leo-gazebo/default.nix index f4cd5921ca..69b6da6abe 100644 --- a/distros/melodic/leo-gazebo/default.nix +++ b/distros/melodic/leo-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-gazebo"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_simulator-release/archive/release/melodic/leo_gazebo/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "fd5f430b97e02757675f5c3520f25d52511891abe1864ba393bb9d72880b23d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_simulator-release"; + rev = "release/melodic/leo_gazebo/0.2.0-1"; + sha256 = "sha256-4XCHbYTztr/h67pmAeGWdFbiJ8FzL6vtZ7TIJ1PjH1k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo-robot/default.nix b/distros/melodic/leo-robot/default.nix index 958f246e23..2cd128b24d 100644 --- a/distros/melodic/leo-robot/default.nix +++ b/distros/melodic/leo-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-robot"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/melodic/leo_robot/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "ff74d389667659898cd61e0a039ca5d3c510ba3c43bb3ce28d443dfd908f2795"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_robot-release"; + rev = "release/melodic/leo_robot/1.2.1-1"; + sha256 = "sha256-ETzxI9bIJNP7Nes7Jc/z4b+3R6eJMZ8QjjSH3EbYh1s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo-simulator/default.nix b/distros/melodic/leo-simulator/default.nix index 86d41edacc..e9410701c6 100644 --- a/distros/melodic/leo-simulator/default.nix +++ b/distros/melodic/leo-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-simulator"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_simulator-release/archive/release/melodic/leo_simulator/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "f6b09ed754080419085051822f8111afe129042eec015ae70d7f85dc5810a93e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_simulator-release"; + rev = "release/melodic/leo_simulator/0.2.0-1"; + sha256 = "sha256-+2kj9GrqfZLE9qAC8yohtxbojuDPSFAzJg6IwW2TUvs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo-teleop/default.nix b/distros/melodic/leo-teleop/default.nix index ad1b24b2bf..9b77c00059 100644 --- a/distros/melodic/leo-teleop/default.nix +++ b/distros/melodic/leo-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-teleop"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_common-release/archive/release/melodic/leo_teleop/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "038736af60665c2bcd0b9caf4b0c219ffebd1b8ad2ef1b14a3a0b65a72f0eff1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_common-release"; + rev = "release/melodic/leo_teleop/1.2.2-1"; + sha256 = "sha256-khyJwvaA7arc1UyTFYHj1Cn1xnXTPel1BbIn1CGmd0E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo-viz/default.nix b/distros/melodic/leo-viz/default.nix index 89c9cfed5f..79844c4699 100644 --- a/distros/melodic/leo-viz/default.nix +++ b/distros/melodic/leo-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo-viz"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_desktop-release/archive/release/melodic/leo_viz/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "20967228c7022965ac545e6c1b87a35b0c514aa2bb78f7e0d625e13d69103ec9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_desktop-release"; + rev = "release/melodic/leo_viz/0.2.3-1"; + sha256 = "sha256-68HDcR6Ubc9B8rpaE8x6WRyyx9xvE4gHErhX15cNac4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leo/default.nix b/distros/melodic/leo/default.nix index 950deb2377..a4b0247037 100644 --- a/distros/melodic/leo/default.nix +++ b/distros/melodic/leo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leo"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_common-release/archive/release/melodic/leo/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "d63f8049a206be39beacb794458eec54e4fb28c3ee6995f201323baf0142cc1b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_common-release"; + rev = "release/melodic/leo/1.2.2-1"; + sha256 = "sha256-rkhLBcL0RaFUlCbeIO4+OkMrkIyb+xPlBoU/V9PIHq8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leuze-bringup/default.nix b/distros/melodic/leuze-bringup/default.nix index b43cb8945d..8db96237e4 100644 --- a/distros/melodic/leuze-bringup/default.nix +++ b/distros/melodic/leuze-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leuze-bringup"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ipa-led/leuze_ros_drivers-release/archive/release/melodic/leuze_bringup/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "3ce11e52a670ce5b051f04f45d90d7eb9a1a05207a0c60733cb6d5ec8d8e2c29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa-led"; + repo = "leuze_ros_drivers-release"; + rev = "release/melodic/leuze_bringup/1.0.1-1"; + sha256 = "sha256-28ZrRc4n4BSB1ZYazjhDjqUpaXx1AlrRNL2+Wn+S07A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leuze-description/default.nix b/distros/melodic/leuze-description/default.nix index 1b9478a22e..3a16755e6d 100644 --- a/distros/melodic/leuze-description/default.nix +++ b/distros/melodic/leuze-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leuze-description"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ipa-led/leuze_ros_drivers-release/archive/release/melodic/leuze_description/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "8742c1909540d6dd922bd665fcffbbe8398525c5d6d45655690360b22b6086ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa-led"; + repo = "leuze_ros_drivers-release"; + rev = "release/melodic/leuze_description/1.0.1-1"; + sha256 = "sha256-CUIC4RfylQfLCfuKsOCQXGo22SQh1ij6hvanOnkUOxo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leuze-msgs/default.nix b/distros/melodic/leuze-msgs/default.nix index 1b402f2285..439b5fe906 100644 --- a/distros/melodic/leuze-msgs/default.nix +++ b/distros/melodic/leuze-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leuze-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ipa-led/leuze_ros_drivers-release/archive/release/melodic/leuze_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "2c27dfd9fa3cddd7aa79dbcd21f147f0e9ad7b89aeb9431a208c67d14bc90de2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa-led"; + repo = "leuze_ros_drivers-release"; + rev = "release/melodic/leuze_msgs/1.0.1-1"; + sha256 = "sha256-gJH6sBzddlMbtkJJMtS3qpSHjpdYzpbTir6KkzKwBm0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/leuze-phidget-driver/default.nix b/distros/melodic/leuze-phidget-driver/default.nix index eb57af7c97..fb81abc0f5 100644 --- a/distros/melodic/leuze-phidget-driver/default.nix +++ b/distros/melodic/leuze-phidget-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leuze-phidget-driver"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ipa-led/leuze_ros_drivers-release/archive/release/melodic/leuze_phidget_driver/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "9daae2e7e6f3a21ae1d5c9e0313e6da614eb4752541292755543c55a2e7c12f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa-led"; + repo = "leuze_ros_drivers-release"; + rev = "release/melodic/leuze_phidget_driver/1.0.1-1"; + sha256 = "sha256-PHS/mScTa5E8V+pwrPeqJUBbol/wdWmjxttGxXdiZuw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leuze-ros-drivers/default.nix b/distros/melodic/leuze-ros-drivers/default.nix index a6a71505fd..ba48bd1bcc 100644 --- a/distros/melodic/leuze-ros-drivers/default.nix +++ b/distros/melodic/leuze-ros-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leuze-ros-drivers"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ipa-led/leuze_ros_drivers-release/archive/release/melodic/leuze_ros_drivers/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "80385542d7d42cce3bfff386fea57882d92c3c1c3840bb4596539bbfb7fca638"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa-led"; + repo = "leuze_ros_drivers-release"; + rev = "release/melodic/leuze_ros_drivers/1.0.1-1"; + sha256 = "sha256-skrC3awiEfWbk4s6lD8HqmyZ+buYmW4mkCTjA6Y/UJ4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/leuze-rsl-driver/default.nix b/distros/melodic/leuze-rsl-driver/default.nix index 17ebcb5c16..9beeb9a8ed 100644 --- a/distros/melodic/leuze-rsl-driver/default.nix +++ b/distros/melodic/leuze-rsl-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-leuze-rsl-driver"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ipa-led/leuze_ros_drivers-release/archive/release/melodic/leuze_rsl_driver/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "1c43607eabb2a22a598777455812a596854a52f79eaf5d2fc585e19b8970e84c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa-led"; + repo = "leuze_ros_drivers-release"; + rev = "release/melodic/leuze_rsl_driver/1.0.1-1"; + sha256 = "sha256-14Nqmz92Bm3Quwl2rGGPX9dp8/C2/YYYvDgrg9mBfng="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lex-common-msgs/default.nix b/distros/melodic/lex-common-msgs/default.nix index 3ba5191859..b3f81a4127 100644 --- a/distros/melodic/lex-common-msgs/default.nix +++ b/distros/melodic/lex-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lex-common-msgs"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/lex_node-release/archive/release/melodic/lex_common_msgs/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "ca665d382b0694fc69c410c9b474bffebf278025ac46ac6554488870e94b23c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "lex_node-release"; + rev = "release/melodic/lex_common_msgs/2.0.2-1"; + sha256 = "sha256-gxLtjA7JDkXHDXjxRVNgOofQZzMNbxfp7UQbAOWCzbo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/lex-common/default.nix b/distros/melodic/lex-common/default.nix index 292abc2254..096b47b92c 100644 --- a/distros/melodic/lex-common/default.nix +++ b/distros/melodic/lex-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lex-common"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/lex_common-release/archive/release/melodic/lex_common/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "69a222e4226dfcaf24a2a5c923b70f37b411c95a51ae870b97a6734178cd8536"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "lex_common-release"; + rev = "release/melodic/lex_common/1.0.0-1"; + sha256 = "sha256-JowK+DVAl6wDcmiUYaNyFvck5B3QzUbKFyEROQ8VwvA="; + }; buildType = "cmake"; buildInputs = [ catkin cmake ros-environment ]; diff --git a/distros/melodic/lex-node/default.nix b/distros/melodic/lex-node/default.nix index af2fad0430..53b7526803 100644 --- a/distros/melodic/lex-node/default.nix +++ b/distros/melodic/lex-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lex-node"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/lex_node-release/archive/release/melodic/lex_node/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "24375a02bbf5b57fa1fb9765d43c4cbcf76f7c14e3f250369a738f023ab773e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "lex_node-release"; + rev = "release/melodic/lex_node/2.0.2-1"; + sha256 = "sha256-okwyg5csz6NUfytIBl0EJmL0ypb/ZdSi3dIm2/5V41o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lgsvl-msgs/default.nix b/distros/melodic/lgsvl-msgs/default.nix index 4fd843d663..3c5a9b5dc2 100644 --- a/distros/melodic/lgsvl-msgs/default.nix +++ b/distros/melodic/lgsvl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lgsvl-msgs"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/lgsvl/lgsvl_msgs-release/archive/release/melodic/lgsvl_msgs/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "eb60036c61861db1e32eeebd107b1aac889dd4b31c898ab2871aa17ea2cf9513"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lgsvl"; + repo = "lgsvl_msgs-release"; + rev = "release/melodic/lgsvl_msgs/0.0.4-1"; + sha256 = "sha256-Pd5TP0wLuUr0/m+WvLpkvURpB0d0hbik3SOPkifg8YU="; + }; buildType = "catkin"; buildInputs = [ message-generation ros-environment ]; diff --git a/distros/melodic/libcmt/default.nix b/distros/melodic/libcmt/default.nix index 015f9dab84..6f74be1b5d 100644 --- a/distros/melodic/libcmt/default.nix +++ b/distros/melodic/libcmt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libcmt"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/libcmt/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "27528289685effa72e038798c91577ca99ed3ce45912e4cb25ed10bc23554f30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/libcmt/2.1.24-2"; + sha256 = "sha256-gkt+K0PFw+jUEN0hnm1WbDLT5ngL9OzMlfB6NLzHr00="; + }; buildType = "cmake"; buildInputs = [ cacert cmake git openssl ]; diff --git a/distros/melodic/libcreate/default.nix b/distros/melodic/libcreate/default.nix index 00e6b98ce9..48ed9eca76 100644 --- a/distros/melodic/libcreate/default.nix +++ b/distros/melodic/libcreate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libcreate"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/AutonomyLab/libcreate-release/archive/release/melodic/libcreate/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "fe9eba0445a5ca618d3bc223351c7e5df5f12a1576fa671ba8c05dc0b823b35c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AutonomyLab"; + repo = "libcreate-release"; + rev = "release/melodic/libcreate/2.0.0-1"; + sha256 = "sha256-xMarg4WuO2CA8Vno3K1l6j/4sPNLQ9XTXcNHt6M8Zr8="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/libdlib/default.nix b/distros/melodic/libdlib/default.nix index 97bf66b90d..16e5fbd809 100644 --- a/distros/melodic/libdlib/default.nix +++ b/distros/melodic/libdlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libdlib"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/melodic/libdlib/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "3c2cecdfae9dd0e4ae09e63cfcd50964d29f2949591f2f9f58e9fe6bbe3049e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/melodic/libdlib/0.6.17-1"; + sha256 = "sha256-a0CIIa2/NUHi6Fxm0FQfi3V7GMkaK1Quo2VUCpXfFwc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libfranka/default.nix b/distros/melodic/libfranka/default.nix index 4951911285..041048ca2b 100644 --- a/distros/melodic/libfranka/default.nix +++ b/distros/melodic/libfranka/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libfranka"; version = "0.9.0-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "libfranka-release"; + rev = "release/melodic/libfranka/0.9.0-1"; + sha256 = "sha256-mK0cgRsFaLdV7y2lH3lTD9CxwgHG8JhVdNSEFFjCulU="; + }; buildType = "cmake"; buildInputs = [ cmake eigen ]; diff --git a/distros/melodic/libg2o/default.nix b/distros/melodic/libg2o/default.nix index 1d3876344a..02eded13d9 100644 --- a/distros/melodic/libg2o/default.nix +++ b/distros/melodic/libg2o/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libg2o"; version = "2018.3.25"; - src = fetchurl { - url = "https://github.com/ros-gbp/libg2o-release/archive/release/melodic/libg2o/2018.3.25-0.tar.gz"; - name = "2018.3.25-0.tar.gz"; - sha256 = "b904a96dd4edffa57b21856d75d7d0bf9b064921e330012922c67a545ee54f6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "libg2o-release"; + rev = "release/melodic/libg2o/2018.3.25-0"; + sha256 = "sha256-2gxC3lg9FrSJs333NGrt4UDtIEyX4ZtUqfIwd2o5E9w="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/libmavconn/default.nix b/distros/melodic/libmavconn/default.nix index 01bfc90421..b5cacc2b2f 100644 --- a/distros/melodic/libmavconn/default.nix +++ b/distros/melodic/libmavconn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libmavconn"; version = "1.15.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/melodic/libmavconn/1.15.0-1.tar.gz"; - name = "1.15.0-1.tar.gz"; - sha256 = "88f5ad9cabb5f6f13069f854eefc295e3d1d276204048a2a4044fe3d900bac9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/melodic/libmavconn/1.15.0-1"; + sha256 = "sha256-lXSx4S4P5UwUq3xokxQWr1Bg+6819eEdhWJZIaJJc2A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libmodbus/default.nix b/distros/melodic/libmodbus/default.nix index 2ad63cb7b3..24516e38db 100644 --- a/distros/melodic/libmodbus/default.nix +++ b/distros/melodic/libmodbus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libmodbus"; version = "0.8.8-r1"; - src = fetchurl { - url = "https://github.com/KITrobotics/ipr_extern-release/archive/release/melodic/libmodbus/0.8.8-1.tar.gz"; - name = "0.8.8-1.tar.gz"; - sha256 = "f5b0b1453abb1f1950ad1ca3378b061979259515d0d5bdc5958dd46a5c6b3c36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KITrobotics"; + repo = "ipr_extern-release"; + rev = "release/melodic/libmodbus/0.8.8-1"; + sha256 = "sha256-1dYHVupE6d+sHH+Do8rTZ5jg8O4dhH+5Ci7yJ0F8VJs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libnabo/default.nix b/distros/melodic/libnabo/default.nix index 0e76116887..d9f1929da3 100644 --- a/distros/melodic/libnabo/default.nix +++ b/distros/melodic/libnabo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libnabo"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/nobleo/libnabo-release/archive/release/melodic/libnabo/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "f23830669052f20e65709863bd84f355267c114f62e9982f6316fdfe5ce12731"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "libnabo-release"; + rev = "release/melodic/libnabo/1.0.7-1"; + sha256 = "sha256-Jw5AWmdPvBZQlJgcl9gIvuvYSe/MxzFT8npWLQtu1i4="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/libntcan/default.nix b/distros/melodic/libntcan/default.nix index 6cf64e262d..f933433b44 100644 --- a/distros/melodic/libntcan/default.nix +++ b/distros/melodic/libntcan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libntcan"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/melodic/libntcan/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "a54efc92a7411aaef217c0af73fa61b85d5a516c021912c383094236703b3e33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/melodic/libntcan/0.6.17-1"; + sha256 = "sha256-qxIZTpSke0QRV0FFRmuuG4Li0AMm1bIG7DszRFgKD4Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libpcan/default.nix b/distros/melodic/libpcan/default.nix index a841a51b19..895ceb1f8f 100644 --- a/distros/melodic/libpcan/default.nix +++ b/distros/melodic/libpcan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libpcan"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/melodic/libpcan/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "c7db1c327f04ef81ff88a50c4b55d73406a634f179509f2eb3bf5cf62203328a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/melodic/libpcan/0.6.17-1"; + sha256 = "sha256-BYAN04PC7G7M6pqyjv0Pzw3S3kX2Jn8sHjja2YCt6kk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libphidget21/default.nix b/distros/melodic/libphidget21/default.nix index f3d8a2f12c..bb06ff2563 100644 --- a/distros/melodic/libphidget21/default.nix +++ b/distros/melodic/libphidget21/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libphidget21"; version = "0.7.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/melodic/libphidget21/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "498fe200b0df6350e73931592f8e7b1d9971f24f22f8f8328c6d4e64548d9b92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/melodic/libphidget21/0.7.11-1"; + sha256 = "sha256-WSxGxBbBp92rU9ESErI+gH+ePKI2tck5NeAMuCoNYhs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libphidgets/default.nix b/distros/melodic/libphidgets/default.nix index a51e788b4e..5e3cd4e67c 100644 --- a/distros/melodic/libphidgets/default.nix +++ b/distros/melodic/libphidgets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libphidgets"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/melodic/libphidgets/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "b6effbdb16d9b02d375266a7b24369e8f6bea86096777146546bccedff4884e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/melodic/libphidgets/0.6.17-1"; + sha256 = "sha256-YJMk1vSGRPOq8u4DbmrTBpJVdwCHTbdVSP+ruAGsois="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libpointmatcher/default.nix b/distros/melodic/libpointmatcher/default.nix index dfb2c90636..c7b45c698b 100644 --- a/distros/melodic/libpointmatcher/default.nix +++ b/distros/melodic/libpointmatcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libpointmatcher"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/nobleo/libpointmatcher-release/archive/release/melodic/libpointmatcher/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "26af003dfa5ec17281d65835377028672f83fe45b488c7923c078856fc0c3b99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "libpointmatcher-release"; + rev = "release/melodic/libpointmatcher/1.3.1-1"; + sha256 = "sha256-96czxG0jg3fhdnnpfunDXT5SeulBTS0I2wHxgBhzunA="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/libqt-concurrent/default.nix b/distros/melodic/libqt-concurrent/default.nix index 93b665fde4..09403c40a5 100644 --- a/distros/melodic/libqt-concurrent/default.nix +++ b/distros/melodic/libqt-concurrent/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-concurrent"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_concurrent/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "0a2f5224aac3226ee88584ff99f9058aeb3cb4dd581fcf12772d3ab964d3ea19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_concurrent/1.0.1-0"; + sha256 = "sha256-d6zNPaBj/m1lHNnWpIzty3W8bgy7cojoEELM43W9tTQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libqt-core/default.nix b/distros/melodic/libqt-core/default.nix index cfd70f5071..1877726e00 100644 --- a/distros/melodic/libqt-core/default.nix +++ b/distros/melodic/libqt-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-core"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_core/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "11206b9709b7140c01b252641c7d0e4d7ca9d135dfb29fb292832c7ffa6823e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_core/1.0.1-0"; + sha256 = "sha256-CfKieRKoY0RL7Ec2rYAKxxD3TbeYaV05JpECyBEKDt4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libqt-dev/default.nix b/distros/melodic/libqt-dev/default.nix index a2da4aba4e..abed39e87b 100644 --- a/distros/melodic/libqt-dev/default.nix +++ b/distros/melodic/libqt-dev/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-dev"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_dev/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "2ebb14c7d82d9553dae205a74111b16113faf35c9c11d0db20d961f7294a3b10"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_dev/1.0.1-0"; + sha256 = "sha256-i1adUmKNiZfz6UpKQMFVFMRcgNpzhcfy1yzuy8UbL3Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libqt-gui/default.nix b/distros/melodic/libqt-gui/default.nix index ac3bb26d8f..8749db253a 100644 --- a/distros/melodic/libqt-gui/default.nix +++ b/distros/melodic/libqt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-gui"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_gui/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "a3fc2fc444b1b7b9d685e693868c3b8652420097c949bdd759f68f1f802fb903"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_gui/1.0.1-0"; + sha256 = "sha256-dvvR5cISZBfeDWzmvqGHHudHWrLI6GRAJWSJq1NiXyo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libqt-network/default.nix b/distros/melodic/libqt-network/default.nix index 06a3e12743..bf5000ad89 100644 --- a/distros/melodic/libqt-network/default.nix +++ b/distros/melodic/libqt-network/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-network"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_network/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "8c33c79ec52d6aa7513f01a41fbdc7fd770f727a854d84bfbb7a31ca4c93dbea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_network/1.0.1-0"; + sha256 = "sha256-vM1NFzT0u0zzCjfaMxvZi5Q/mBNebtlGgjTf57bpQM0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libqt-opengl-dev/default.nix b/distros/melodic/libqt-opengl-dev/default.nix index 1640a0bd13..968c2f70de 100644 --- a/distros/melodic/libqt-opengl-dev/default.nix +++ b/distros/melodic/libqt-opengl-dev/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-opengl-dev"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_opengl_dev/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "19c8c400ac8674d84b2e8d6e1f0fbdb0f3a723f8d4a7700c1a12affb3c5e19fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_opengl_dev/1.0.1-0"; + sha256 = "sha256-C7YR3UaSQV5+YsaY6Apbqk/Z8C6iMF/EPu5+HNqmqRw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libqt-opengl/default.nix b/distros/melodic/libqt-opengl/default.nix index 84b9283d4c..9af3c48673 100644 --- a/distros/melodic/libqt-opengl/default.nix +++ b/distros/melodic/libqt-opengl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-opengl"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_opengl/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "864a495c5dbc587baac58d0cbc2b936fbd18cdae8123e1c34bf005c881a29ca6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_opengl/1.0.1-0"; + sha256 = "sha256-ZbvcXAwqLlrBNYR9nS8RA1j3T76Fjr1GSxRYPfArUpg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libqt-svg-dev/default.nix b/distros/melodic/libqt-svg-dev/default.nix index 726751ba51..3ecaef3632 100644 --- a/distros/melodic/libqt-svg-dev/default.nix +++ b/distros/melodic/libqt-svg-dev/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-svg-dev"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_svg_dev/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "9650990b4fed04c6f124e9fbd4c007937351ea9b3fbb924e36a6c58aeb89cf95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_svg_dev/1.0.1-0"; + sha256 = "sha256-Z5hcHUKLEz2Ka4Dmze5HFBaNZN6IWiuM0KrGA+KO618="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libqt-widgets/default.nix b/distros/melodic/libqt-widgets/default.nix index 30fb09afd3..d3f8b904ad 100644 --- a/distros/melodic/libqt-widgets/default.nix +++ b/distros/melodic/libqt-widgets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libqt-widgets"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/libqt_widgets/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "7111ea1c30ce167523138bb317797a8fe472475671b3308673f6041d72b356c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/libqt_widgets/1.0.1-0"; + sha256 = "sha256-VyBtVUtJ5XyBNYg9V06sbg2YIiq2LeXLi9CkFuoXiKM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/librealsense2/default.nix b/distros/melodic/librealsense2/default.nix index f572305275..855df6decc 100644 --- a/distros/melodic/librealsense2/default.nix +++ b/distros/melodic/librealsense2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-librealsense2"; version = "2.50.0-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/librealsense2-release/archive/release/melodic/librealsense2/2.50.0-1.tar.gz"; - name = "2.50.0-1.tar.gz"; - sha256 = "2cf92cf8482e3621398b09dd66ae3dd96c01e34ff3e0906531b75ba71f2a5fc7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "librealsense2-release"; + rev = "release/melodic/librealsense2/2.50.0-1"; + sha256 = "sha256-7NboSDWcddQDF01zp8dnBglLNIfg2tzpaZUo8rs9gPY="; + }; buildType = "cmake"; buildInputs = [ catkin libusb1 openssl pkg-config udev ]; diff --git a/distros/melodic/libreflexxestype2/default.nix b/distros/melodic/libreflexxestype2/default.nix index 4d09e6c0dc..2674b5bf63 100644 --- a/distros/melodic/libreflexxestype2/default.nix +++ b/distros/melodic/libreflexxestype2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libreflexxestype2"; version = "0.8.8-r1"; - src = fetchurl { - url = "https://github.com/KITrobotics/ipr_extern-release/archive/release/melodic/libreflexxestype2/0.8.8-1.tar.gz"; - name = "0.8.8-1.tar.gz"; - sha256 = "ff69ec96c35d48bc4b768dc25812ea2dbece052f25a8d3de96f5460296eb0ccf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KITrobotics"; + repo = "ipr_extern-release"; + rev = "release/melodic/libreflexxestype2/0.8.8-1"; + sha256 = "sha256-5S+b9O9WqVGkRQ19BvH+MW2/6aD/5aaG3jrnLTKe32I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/librviz-tutorial/default.nix b/distros/melodic/librviz-tutorial/default.nix index 6f1a9798b6..1f6aa35129 100644 --- a/distros/melodic/librviz-tutorial/default.nix +++ b/distros/melodic/librviz-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-librviz-tutorial"; version = "0.10.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/melodic/librviz_tutorial/0.10.5-1.tar.gz"; - name = "0.10.5-1.tar.gz"; - sha256 = "32b250c099ffd4d8cad4656087bb99f96cdbf61d6e54c6b3b67b92b636d7519e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/melodic/librviz_tutorial/0.10.5-1"; + sha256 = "sha256-yYKKxG0rr/K1gVFsrBmG77x/h58vbDMVtMsI6s0zSto="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libsensors-monitor/default.nix b/distros/melodic/libsensors-monitor/default.nix index 65b994e697..46db996e7b 100644 --- a/distros/melodic/libsensors-monitor/default.nix +++ b/distros/melodic/libsensors-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libsensors-monitor"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/linux_peripheral_interfaces-release/archive/release/melodic/libsensors_monitor/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "ac985f7fcc197aa2fde6e0031c917123b145ef51f9d0c540204ce9dafbf5fab1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "linux_peripheral_interfaces-release"; + rev = "release/melodic/libsensors_monitor/0.2.1-1"; + sha256 = "sha256-ldOEcPpUn71vCvh6j1Ws8XKvY5zOTUPUzzzQoE9oDmw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libsiftfast/default.nix b/distros/melodic/libsiftfast/default.nix index 1fb3db4868..ebe152c55c 100644 --- a/distros/melodic/libsiftfast/default.nix +++ b/distros/melodic/libsiftfast/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libsiftfast"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/libsiftfast/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "e58938eb8fb2959ca83ccff2ca6d3b44f8d09b99fdd3809f47d087c9dfef2613"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/libsiftfast/2.1.24-2"; + sha256 = "sha256-8z8kZbYPLBKRGE2Q0MYfpJUXqYviVqM3rBUXqPY3boU="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosboost-cfg roslib rospack subversion ]; diff --git a/distros/melodic/libuvc-camera/default.nix b/distros/melodic/libuvc-camera/default.nix index 3b6e8f7dc2..4a30dc96bb 100644 --- a/distros/melodic/libuvc-camera/default.nix +++ b/distros/melodic/libuvc-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libuvc-camera"; version = "0.0.10-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/libuvc_ros-release/archive/release/melodic/libuvc_camera/0.0.10-1.tar.gz"; - name = "0.0.10-1.tar.gz"; - sha256 = "2ea19c5821e70fe6c63da750b35c6ae0dfff43faadca9f951c0137e5701834b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "libuvc_ros-release"; + rev = "release/melodic/libuvc_camera/0.0.10-1"; + sha256 = "sha256-CkgVxB2IqKp4/xDRQV4gJ+LOcba2Xw66STDLO4eITxg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libuvc-ros/default.nix b/distros/melodic/libuvc-ros/default.nix index a7e6ef58b8..eb128d1ef9 100644 --- a/distros/melodic/libuvc-ros/default.nix +++ b/distros/melodic/libuvc-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libuvc-ros"; version = "0.0.10-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/libuvc_ros-release/archive/release/melodic/libuvc_ros/0.0.10-1.tar.gz"; - name = "0.0.10-1.tar.gz"; - sha256 = "bcf16c5e63589493b35241bb6b6a8826db8b816d5966cc696e3c85f111339a0f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "libuvc_ros-release"; + rev = "release/melodic/libuvc_ros/0.0.10-1"; + sha256 = "sha256-UknGzSVluNiH9n9nYYQVofJabpIhGJLU4i7VCgqZ6QU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/libuvc/default.nix b/distros/melodic/libuvc/default.nix index 09f20c1591..bfd706ad00 100644 --- a/distros/melodic/libuvc/default.nix +++ b/distros/melodic/libuvc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-libuvc"; version = "0.0.6"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/libuvc-release/archive/release/melodic/libuvc/0.0.6-0.tar.gz"; - name = "0.0.6-0.tar.gz"; - sha256 = "06a553e6d043735a10fff606d5f71a20661fc9b6be392b69a06c35b8aca8d3f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "libuvc-release"; + rev = "release/melodic/libuvc/0.0.6-0"; + sha256 = "sha256-iqz5CDravbnxCPIZbnRPq+BQAfriKYYm5nmppVg/bc8="; + }; buildType = "cmake"; buildInputs = [ cmake pkg-config ]; diff --git a/distros/melodic/linksys-access-point/default.nix b/distros/melodic/linksys-access-point/default.nix index 1d885261c6..44df6b93b3 100644 --- a/distros/melodic/linksys-access-point/default.nix +++ b/distros/melodic/linksys-access-point/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-linksys-access-point"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/linksys_access_point/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "d9072a9e264d9aaf55aaaf24e4f0a40032a5d836770cd6541ae7da0f9745982e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/linksys_access_point/1.0.16-1"; + sha256 = "sha256-37Y5dUQJTRdFk0F02whGWIcMUtLvkbSA0SMv1zudTM4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/linux-networking/default.nix b/distros/melodic/linux-networking/default.nix index c440d98211..038ba8bac5 100644 --- a/distros/melodic/linux-networking/default.nix +++ b/distros/melodic/linux-networking/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-linux-networking"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/linux_networking/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "3b4d9bab93c93ee4c779b53662fb2674d7fa926cf3c19caa3d3d49fffe2dc132"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/linux_networking/1.0.16-1"; + sha256 = "sha256-PNSC3GT725wY6mEFM1guX0AklXOupX28D2fZQfEIpR8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/linux-peripheral-interfaces/default.nix b/distros/melodic/linux-peripheral-interfaces/default.nix index f3cb956da9..3908a7ba70 100644 --- a/distros/melodic/linux-peripheral-interfaces/default.nix +++ b/distros/melodic/linux-peripheral-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-linux-peripheral-interfaces"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/linux_peripheral_interfaces-release/archive/release/melodic/linux_peripheral_interfaces/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "3e2aabda03b8d3e55b36dd14b76ad3e11e2e3e3a4e0ac2ea5ecbffa512de6aba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "linux_peripheral_interfaces-release"; + rev = "release/melodic/linux_peripheral_interfaces/0.2.1-1"; + sha256 = "sha256-ovMCvViD+/vHsFo5UKb06Ztt63g3B05hzPvUbsdRUXo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lms1xx/default.nix b/distros/melodic/lms1xx/default.nix index aa8577401a..d4de904572 100644 --- a/distros/melodic/lms1xx/default.nix +++ b/distros/melodic/lms1xx/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lms1xx"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/lms1xx-release/archive/release/melodic/lms1xx/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "9a9ff8a7991afb1c4a8d05f8b4518fd5a944da3dba605db67a4f55ea6c049f76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "lms1xx-release"; + rev = "release/melodic/lms1xx/0.2.0-1"; + sha256 = "sha256-RoVS+LmbbntTHC9E8JpczFQvDkhUsv/K2qWJ9EUZ0nQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lockfree/default.nix b/distros/melodic/lockfree/default.nix index abbd04ef8e..9927499d10 100644 --- a/distros/melodic/lockfree/default.nix +++ b/distros/melodic/lockfree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lockfree"; version = "1.0.25"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/melodic/lockfree/1.0.25-0.tar.gz"; - name = "1.0.25-0.tar.gz"; - sha256 = "659c8d7707b844cc4c8c9eeab40e3e33fdd65f1ca0e07f71b471dd4dad633e4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/melodic/lockfree/1.0.25-0"; + sha256 = "sha256-/CwUQED0MsIv35TlfO0WPspHfG0BOg1NMCOoC+HKSH0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/locomotor-msgs/default.nix b/distros/melodic/locomotor-msgs/default.nix index ff948db5d6..e3fda1b695 100644 --- a/distros/melodic/locomotor-msgs/default.nix +++ b/distros/melodic/locomotor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-locomotor-msgs"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/locomotor_msgs/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "1848d229f1ab534fb38f858f17885968a31ad7543a1abf1c76026b4efbc0ec60"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/locomotor_msgs/0.3.0-1"; + sha256 = "sha256-zfJ3LoxvyYOLQe+QC9n6SZmCdtSrBiyuSHYioZDsEt8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/locomotor/default.nix b/distros/melodic/locomotor/default.nix index 562f13a5a2..96e7677a66 100644 --- a/distros/melodic/locomotor/default.nix +++ b/distros/melodic/locomotor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-locomotor"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/locomotor/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "2d6254e21d33eb956ed0457e845767e0bc9eddcc5fc2852977945986b3414b03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/locomotor/0.3.0-1"; + sha256 = "sha256-X95rZ03lKDh/jkzbkae//lqHkf2Ue+rMuCCNC2ssir0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/locomove-base/default.nix b/distros/melodic/locomove-base/default.nix index c7f8ab28f6..5b3dd26704 100644 --- a/distros/melodic/locomove-base/default.nix +++ b/distros/melodic/locomove-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-locomove-base"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/locomove_base/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "2059b2a14cbe6c59d3ae2e27c1781c5b824d354f2446fb3ccdff1cfefa9345e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/locomove_base/0.3.0-1"; + sha256 = "sha256-AaSbQzZtSxsxpLyK+unC7Sg8360Mariir5MQViLbIgk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/log-view/default.nix b/distros/melodic/log-view/default.nix index f2cecc8f3c..8c72da3c62 100644 --- a/distros/melodic/log-view/default.nix +++ b/distros/melodic/log-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-log-view"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/hatchbed/log_view-release/archive/release/melodic/log_view/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "c1e9390e841e44f84c5a55bf2ff00596abb7bbb0a663bb86027f6d901645e71d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "hatchbed"; + repo = "log_view-release"; + rev = "release/melodic/log_view/0.1.3-1"; + sha256 = "sha256-aCxYKgynCd7OZqWNJNIBW9TZk5jcCewfyQUTEc1nBP8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lpg-planner/default.nix b/distros/melodic/lpg-planner/default.nix index 9d59684323..4b0a7c858b 100644 --- a/distros/melodic/lpg-planner/default.nix +++ b/distros/melodic/lpg-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lpg-planner"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/lpg_planner/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "03da06db41df77b0f6d5537e2af8be4ef6895858dc32b1cc375d9c5bbdf8bd16"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/lpg_planner/2.1.24-2"; + sha256 = "sha256-r8Bb48kJVWOPCz7BFPnn5HkjzUoMYJUdlFNqLSnXOS0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/lsc-ros-driver/default.nix b/distros/melodic/lsc-ros-driver/default.nix index a51c8bd874..f9fd3989a0 100644 --- a/distros/melodic/lsc-ros-driver/default.nix +++ b/distros/melodic/lsc-ros-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lsc-ros-driver"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/AutonicsLiDAR-release/lsc_ros_driver-release/archive/release/melodic/lsc_ros_driver/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "32a1896f2074ea84a3cd92299deabc1e3303ec42744cd6a2c6064c857ed52e12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AutonicsLiDAR-release"; + repo = "lsc_ros_driver-release"; + rev = "release/melodic/lsc_ros_driver/1.0.2-1"; + sha256 = "sha256-xYpSqVbtrXn/3u/Xxe7aYYJnOGgMohZ2Chgf/aTFFZo="; + }; buildType = "catkin"; buildInputs = [ catkin diagnostic-updater self-test ]; diff --git a/distros/melodic/lusb/default.nix b/distros/melodic/lusb/default.nix index 087b04ae38..a90a3b52ce 100644 --- a/distros/melodic/lusb/default.nix +++ b/distros/melodic/lusb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-lusb"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/lusb-release/archive/release/melodic/lusb/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "a2b403bcddedcfb51d9c51f29f2364cd8a82997ba8bdb801a40e84bea748daf6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "lusb-release"; + rev = "release/melodic/lusb/1.1.0-0"; + sha256 = "sha256-Sf21ok/Ni8XBxm5rUB5BMgEmA691DJsaWU9Al9Qklyc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/magical-ros2-conversion-tool/default.nix b/distros/melodic/magical-ros2-conversion-tool/default.nix index 714b719156..10ccac247d 100644 --- a/distros/melodic/magical-ros2-conversion-tool/default.nix +++ b/distros/melodic/magical-ros2-conversion-tool/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-magical-ros2-conversion-tool"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/roscompile-release/archive/release/melodic/magical_ros2_conversion_tool/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "64f1110ed8827dd7a8bf2d5336683dde212b891b2bc023e09cc424125e147dcc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "roscompile-release"; + rev = "release/melodic/magical_ros2_conversion_tool/1.2.1-1"; + sha256 = "sha256-KXRVv6k4iuuI5LLTLHu4uA4foaVsYWfJQ/2RtcPD8RE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/map-laser/default.nix b/distros/melodic/map-laser/default.nix index 4168a6ced4..10ae34e7e4 100644 --- a/distros/melodic/map-laser/default.nix +++ b/distros/melodic/map-laser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-map-laser"; version = "0.0.4"; - src = fetchurl { - url = "https://github.com/wu-robotics/laser_filtering_release/archive/release/melodic/map_laser/0.0.4-0.tar.gz"; - name = "0.0.4-0.tar.gz"; - sha256 = "eea82c4a217ce37a62d9e6dc06c0a309cbe738b5da63ea573aea59d8efa25d67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "laser_filtering_release"; + rev = "release/melodic/map_laser/0.0.4-0"; + sha256 = "sha256-KubzDze6BJooR49VMA6lY/0rgGywUeaKlXQPhyQB+7c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/map-merge-3d/default.nix b/distros/melodic/map-merge-3d/default.nix index 975bfe662c..0a7d74a2ef 100644 --- a/distros/melodic/map-merge-3d/default.nix +++ b/distros/melodic/map-merge-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-map-merge-3d"; version = "0.1.1"; - src = fetchurl { - url = "https://github.com/hrnr/map-merge-release/archive/release/melodic/map_merge_3d/0.1.1-0.tar.gz"; - name = "0.1.1-0.tar.gz"; - sha256 = "7413dc94e5c7e8b52bf48c1b7be92e7b7381fac6cd5db59b93e5b9fdf5a4d163"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "hrnr"; + repo = "map-merge-release"; + rev = "release/melodic/map_merge_3d/0.1.1-0"; + sha256 = "sha256-0xb0lWqzgX/pqN10nFMcp8y3il+eewU8+EOgSlzRJ+Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/map-msgs/default.nix b/distros/melodic/map-msgs/default.nix index 0363c6e0e0..88f6e29587 100644 --- a/distros/melodic/map-msgs/default.nix +++ b/distros/melodic/map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-map-msgs"; version = "1.14.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_msgs-release/archive/release/melodic/map_msgs/1.14.1-1.tar.gz"; - name = "1.14.1-1.tar.gz"; - sha256 = "f9258be961e164b60e94b10e2965dc703d8614d360645717d099b40c2ea71de0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_msgs-release"; + rev = "release/melodic/map_msgs/1.14.1-1"; + sha256 = "sha256-7IurC6RLbfmueYraUPE0560XMCKFL7Ld61V9DfOD5eE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/map-organizer-msgs/default.nix b/distros/melodic/map-organizer-msgs/default.nix index 38a2e770ca..b75fa4b49a 100644 --- a/distros/melodic/map-organizer-msgs/default.nix +++ b/distros/melodic/map-organizer-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, nav-msgs }: buildRosPackage { pname = "ros-melodic-map-organizer-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/melodic/map_organizer_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "5b1c9308d03d5c7eb1e0e7dcc9d6c9db253a36d2da8493fe01e6df74f27ec452"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/melodic/map_organizer_msgs/0.12.0-1"; + sha256 = "sha256-yt9sQC9Hbonqb5oVmE6buwC3iPWmxhXHK3Bs11eZYb8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/map-organizer/default.nix b/distros/melodic/map-organizer/default.nix index 47b4a28dca..5130d0a2dd 100644 --- a/distros/melodic/map-organizer/default.nix +++ b/distros/melodic/map-organizer/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, eigen, geometry-msgs, map-organizer-msgs, map-server, nav-msgs, neonavigation-common, pcl, pcl-conversions, roscpp, roslint, rostest, sensor-msgs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-melodic-map-organizer"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/map_organizer/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "b14f11a6d730610d0fc2ca2d77fd5da482285b5f315e4fb770edc009c3c87686"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/map_organizer/0.12.0-1"; + sha256 = "sha256-vDLGQ4rhAjKB4zrtB3VOf93DvBkBoa9W0HiViTqEkVw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/map-server/default.nix b/distros/melodic/map-server/default.nix index 93d4509e88..0aa2807b71 100644 --- a/distros/melodic/map-server/default.nix +++ b/distros/melodic/map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-map-server"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/map_server/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "57c651e27c64c1edab5808e206dbc0e16c702161f73ee895da6efd96288e7234"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/map_server/1.16.7-1"; + sha256 = "sha256-NKlENVIFRWA+C7P9xDYTruzg4qAigj3B/+1aVEIFtY0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mapviz-plugins/default.nix b/distros/melodic/mapviz-plugins/default.nix index 9239935cc9..d169c95399 100644 --- a/distros/melodic/mapviz-plugins/default.nix +++ b/distros/melodic/mapviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mapviz-plugins"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/melodic/mapviz_plugins/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "2afe3c84ce13234d9940c410214ba6f6ca4e260d422141c9f476d94c3b64025a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/melodic/mapviz_plugins/1.4.2-1"; + sha256 = "sha256-yMfiAoI1u2L5wdxkm25ZI9zoNwhOmOt0M+xrDq7c57w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mapviz/default.nix b/distros/melodic/mapviz/default.nix index 06f5dac420..b547610bab 100644 --- a/distros/melodic/mapviz/default.nix +++ b/distros/melodic/mapviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mapviz"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/melodic/mapviz/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "3bb76b8171a87c65566aa6e2f6ae5140c6f2b20553d66189d11b0e2c6fd085c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/melodic/mapviz/1.4.2-1"; + sha256 = "sha256-LYhbsYxhTxTKtc5ttcCDiikDBdvihqj12RGBRjCnA6E="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pkg-config ]; diff --git a/distros/melodic/marker-msgs/default.nix b/distros/melodic/marker-msgs/default.nix index 17555114cd..396626b540 100644 --- a/distros/melodic/marker-msgs/default.nix +++ b/distros/melodic/marker-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-marker-msgs"; version = "0.0.6"; - src = fetchurl { - url = "https://github.com/tuw-robotics/marker_msgs-release/archive/release/melodic/marker_msgs/0.0.6-0.tar.gz"; - name = "0.0.6-0.tar.gz"; - sha256 = "97c6b32ffed3602939b7decce5e38a880e7e64a3d1dd22217512ddf2779e48c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "marker_msgs-release"; + rev = "release/melodic/marker_msgs/0.0.6-0"; + sha256 = "sha256-KFmVAhnAs7l2wJqmM4VODUrE8DpKORIt9npqoLYCApo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/marti-can-msgs/default.nix b/distros/melodic/marti-can-msgs/default.nix index bc46500f26..de1b91cbdb 100644 --- a/distros/melodic/marti-can-msgs/default.nix +++ b/distros/melodic/marti-can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-marti-can-msgs"; version = "0.11.0-r3"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/melodic/marti_can_msgs/0.11.0-3.tar.gz"; - name = "0.11.0-3.tar.gz"; - sha256 = "5b41c4e23ab23c3321ad449fe70467c468b311876780d1af1baa6f51095f58f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/melodic/marti_can_msgs/0.11.0-3"; + sha256 = "0000000000000000000000000000000000000000000000000000"; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/master-sync-fkie/default.nix b/distros/melodic/master-sync-fkie/default.nix index cc41ac8d37..dcb07e793c 100644 --- a/distros/melodic/master-sync-fkie/default.nix +++ b/distros/melodic/master-sync-fkie/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-master-sync-fkie"; version = "0.8.12"; - src = fetchurl { - url = "https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/master_sync_fkie/0.8.12-0.tar.gz"; - name = "0.8.12-0.tar.gz"; - sha256 = "14b81d9024f42cd1ad4eb7e35af79cdddc3682c38bbc867fea109156368b4814"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "multimaster_fkie-release"; + rev = "release/melodic/master_sync_fkie/0.8.12-0"; + sha256 = "sha256-BBoxMgsoejYitsKn90XvVswe32GFZak+wujwY7Lapc0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mav-comm/default.nix b/distros/melodic/mav-comm/default.nix index 52e9877904..514c14be6c 100644 --- a/distros/melodic/mav-comm/default.nix +++ b/distros/melodic/mav-comm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mav-comm"; version = "3.3.2"; - src = fetchurl { - url = "https://github.com/ethz-asl/mav_comm-release/archive/release/melodic/mav_comm/3.3.2-0.tar.gz"; - name = "3.3.2-0.tar.gz"; - sha256 = "58c58a99785c47a9b06a616dfc6d579251b7a18caf26b6acb7702fab69df27cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "mav_comm-release"; + rev = "release/melodic/mav_comm/3.3.2-0"; + sha256 = "sha256-Q0Coclx2t/mrkMOfRMGNyW+5gFMfiymfklclaB6Bxo4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mav-msgs/default.nix b/distros/melodic/mav-msgs/default.nix index 6c3bb1d171..cf2705fd32 100644 --- a/distros/melodic/mav-msgs/default.nix +++ b/distros/melodic/mav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mav-msgs"; version = "3.3.2"; - src = fetchurl { - url = "https://github.com/ethz-asl/mav_comm-release/archive/release/melodic/mav_msgs/3.3.2-0.tar.gz"; - name = "3.3.2-0.tar.gz"; - sha256 = "32087bfaf586c5c054af80c396360bbe6997998cec9f6ac44233020ce9ca4c43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "mav_comm-release"; + rev = "release/melodic/mav_msgs/3.3.2-0"; + sha256 = "sha256-+D3zeA8bwNYlARON67wxV6LKUCa2RSWDE+2xJZi+4wo="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/mav-planning-msgs/default.nix b/distros/melodic/mav-planning-msgs/default.nix index a18cea6d13..a28492a64f 100644 --- a/distros/melodic/mav-planning-msgs/default.nix +++ b/distros/melodic/mav-planning-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mav-planning-msgs"; version = "3.3.2"; - src = fetchurl { - url = "https://github.com/ethz-asl/mav_comm-release/archive/release/melodic/mav_planning_msgs/3.3.2-0.tar.gz"; - name = "3.3.2-0.tar.gz"; - sha256 = "54bf3cce82bd9924dc58e2cd95da0314127ef73818f625b56fb687ff0fe694d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "mav_comm-release"; + rev = "release/melodic/mav_planning_msgs/3.3.2-0"; + sha256 = "54bf3cce82bd9924dc58e2cd95da0314127ef73818f625b56fb687ff0fe694d0"; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mbf-utility/default.nix b/distros/melodic/mbf-utility/default.nix index 8efd1de6d8..28e9b6f80e 100644 --- a/distros/melodic/mbf-utility/default.nix +++ b/distros/melodic/mbf-utility/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mbf-utility"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/melodic/mbf_utility/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "888b8b553460d22a7a62314810e4e12b0d79102e430bbf5a458bf50d5916216c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/melodic/mbf_utility/0.4.0-1"; + sha256 = "sha256-X87dUh60k3o/3if4RI8FGEaN/HILyXQvREPQumKEfzg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mcl-3dl-msgs/default.nix b/distros/melodic/mcl-3dl-msgs/default.nix index 6d18f51197..4bb28a0d67 100644 --- a/distros/melodic/mcl-3dl-msgs/default.nix +++ b/distros/melodic/mcl-3dl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mcl-3dl-msgs"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/mcl_3dl_msgs-release/archive/release/melodic/mcl_3dl_msgs/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "ad178c99d899d9f4b493afc8dbaf7f719c04af32bd853ac59bab90b85162a833"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "mcl_3dl_msgs-release"; + rev = "release/melodic/mcl_3dl_msgs/0.6.0-1"; + sha256 = "sha256-Kam+fpj0OxRpkAKZt4JmLryUm8CefE/1iDYgcQQZcHY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/mcl-3dl/default.nix b/distros/melodic/mcl-3dl/default.nix index 18dc080d49..547f8d7784 100644 --- a/distros/melodic/mcl-3dl/default.nix +++ b/distros/melodic/mcl-3dl/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, diagnostic-updater, eigen, geometry-msgs, mcl-3dl-msgs, nav-msgs, pcl-ros, roscpp, roslint, rostest, rosunit, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros, tf2-sensor-msgs, visualization-msgs }: buildRosPackage { pname = "ros-melodic-mcl-3dl"; - version = "0.6.0-r1"; + version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/at-wat/mcl_3dl-release/archive/release/melodic/mcl_3dl/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "358c116f956375e1dc894ebfed45ea6cb4db998bdae98bf46d8a365c1ba66cec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "mcl_3dl-release"; + rev = "release/melodic/mcl_3dl/0.6.1-1"; + sha256 = "sha256-S1us03yu6Zpv2LDDUVRZwCXj3iIiJRYiAxbgII+d13Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mcmillan-airfield/default.nix b/distros/melodic/mcmillan-airfield/default.nix index ac96929ead..7a777cf4b8 100644 --- a/distros/melodic/mcmillan-airfield/default.nix +++ b/distros/melodic/mcmillan-airfield/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mcmillan-airfield"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/uav_testing-release/archive/release/melodic/mcmillan_airfield/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "68b3833258188f562362e22fb6e06645950ceace55d877c9a2f651719860152f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "uav_testing-release"; + rev = "release/melodic/mcmillan_airfield/0.0.1-1"; + sha256 = "sha256-+XIW6ZifuYCFPO7De0jCZArqdRPAlYOCf3sZmtYjQnE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/md49-base-controller/default.nix b/distros/melodic/md49-base-controller/default.nix index a99af4a216..9847748976 100644 --- a/distros/melodic/md49-base-controller/default.nix +++ b/distros/melodic/md49-base-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-md49-base-controller"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/Scheik/md49_base_controller-release/archive/release/melodic/md49_base_controller/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "dc2871ad616ad8cefde86ba1025f9b5d06059328741d2850d5503770f95700ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Scheik"; + repo = "md49_base_controller-release"; + rev = "release/melodic/md49_base_controller/0.1.4-1"; + sha256 = "sha256-3BgtWXm7pLa68elUmRy6HCgiIpseOGYRJd+rubEZUXU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/md49-messages/default.nix b/distros/melodic/md49-messages/default.nix index 35c452c172..3c056f00a9 100644 --- a/distros/melodic/md49-messages/default.nix +++ b/distros/melodic/md49-messages/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-md49-messages"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/Scheik/md49_base_controller-release/archive/release/melodic/md49_messages/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "490add7ab7660314b642b0fc9275ef33506a09326194e3d91b21f1229f86d17c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Scheik"; + repo = "md49_base_controller-release"; + rev = "release/melodic/md49_messages/0.1.4-1"; + sha256 = "sha256-StjIYxpfsqZwQYebL4hkd2o8HIVNlwqpaO63AB1tNVI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/md49-serialport/default.nix b/distros/melodic/md49-serialport/default.nix index 3e286dfe29..e3ec678fb7 100644 --- a/distros/melodic/md49-serialport/default.nix +++ b/distros/melodic/md49-serialport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-md49-serialport"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/Scheik/md49_base_controller-release/archive/release/melodic/md49_serialport/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "fa9045a3f94fdde980a537997f23ae3d74accc8f0019fa18172c007862865408"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Scheik"; + repo = "md49_base_controller-release"; + rev = "release/melodic/md49_serialport/0.1.4-1"; + sha256 = "sha256-I6/eAk0eDu8hJ672JB9L8dWxCP0RRHkUsQr6v1G4hhI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mecanum-gazebo-plugin/default.nix b/distros/melodic/mecanum-gazebo-plugin/default.nix index ebf4de61f6..4fef485d16 100644 --- a/distros/melodic/mecanum-gazebo-plugin/default.nix +++ b/distros/melodic/mecanum-gazebo-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mecanum-gazebo-plugin"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_simulator-release/archive/release/melodic/mecanum_gazebo_plugin/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "1515355b6b216079cdee86e6df026a96e661cb65ff355c26b07e877cd76f0717"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_simulator-release"; + rev = "release/melodic/mecanum_gazebo_plugin/0.1.1-1"; + sha256 = "sha256-2OA+V1/y+ivyK0kyGT9X+UTFK3W5wtm2Oqlx5m/ntus="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/media-export/default.nix b/distros/melodic/media-export/default.nix index 0f803db017..194ee05b36 100644 --- a/distros/melodic/media-export/default.nix +++ b/distros/melodic/media-export/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-media-export"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/media_export-release/archive/release/melodic/media_export/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "36831d912cd432fa1c4dcf0b50898c9cf579eaf33ee76f88e049c76bee08fff6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "media_export-release"; + rev = "release/melodic/media_export/0.3.0-1"; + sha256 = "sha256-cPOCGxFzZIs6T1ybAgpQp5lbJeYkBhTwmJTRL7dWRGI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mesh-client/default.nix b/distros/melodic/mesh-client/default.nix index 6ee0ce62f9..3c3d923831 100644 --- a/distros/melodic/mesh-client/default.nix +++ b/distros/melodic/mesh-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-client"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/melodic/mesh_client/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "48261f214dab66360d39ceb3d8ba5091f8c552600b3a484866489fa7ddce98f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/melodic/mesh_client/1.0.1-1"; + sha256 = "sha256-ivpJEfNTKMdvaeUo5BALd3xWgS0VqU91/yt6q924w3U="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/melodic/mesh-controller/default.nix b/distros/melodic/mesh-controller/default.nix index a229305c42..5db3e9b7c6 100644 --- a/distros/melodic/mesh-controller/default.nix +++ b/distros/melodic/mesh-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-controller"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/melodic/mesh_controller/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "6c14f1e1ed563f97d86cf7c10acdb45f67e76cd646965e71651bbaa3a1c7fb12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/melodic/mesh_controller/1.0.1-1"; + sha256 = "sha256-pkomKNKQWYeAlMfi9aDmJCw3172/AOsXGzTpgy6jyz0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mesh-layers/default.nix b/distros/melodic/mesh-layers/default.nix index 8a735db98d..88596b040a 100644 --- a/distros/melodic/mesh-layers/default.nix +++ b/distros/melodic/mesh-layers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-layers"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/melodic/mesh_layers/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "3670389864a814d1be85ca20826d8ac929330466268850b39a44c0bd50aceb6d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/melodic/mesh_layers/1.0.1-1"; + sha256 = "sha256-8W5HSLDDKT6r3joVN4dimh2hU/A5pHwedQNEOcJHhdU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mesh-map/default.nix b/distros/melodic/mesh-map/default.nix index cda1c83e1e..0ac6a88831 100644 --- a/distros/melodic/mesh-map/default.nix +++ b/distros/melodic/mesh-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-map"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/melodic/mesh_map/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "ced769075211598fadf2945220bde45d0e8121a8f3e8e0517e3339e50204a697"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/melodic/mesh_map/1.0.1-1"; + sha256 = "sha256-0XHNA4yMPd4Ewx5JcLv0QtUw1mg90QdP43J6txkV8TU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mesh-msgs-conversions/default.nix b/distros/melodic/mesh-msgs-conversions/default.nix index 5d1febd37b..9d59c23b06 100644 --- a/distros/melodic/mesh-msgs-conversions/default.nix +++ b/distros/melodic/mesh-msgs-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-msgs-conversions"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/melodic/mesh_msgs_conversions/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "50b2422e61e2b03c92fc2a1d3e2c77921f4c23a4d7c1859ec56ec6b604f8eb08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/melodic/mesh_msgs_conversions/1.1.0-1"; + sha256 = "sha256-QcWLafcS/hIPlcSTItRswYYpQlIgUr75HmrrFSrJZ0g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mesh-msgs-hdf5/default.nix b/distros/melodic/mesh-msgs-hdf5/default.nix index ccfb60dc35..c1b389d7f1 100644 --- a/distros/melodic/mesh-msgs-hdf5/default.nix +++ b/distros/melodic/mesh-msgs-hdf5/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-msgs-hdf5"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/melodic/mesh_msgs_hdf5/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "5edca85324e48bd277331b12eddf4955d9c7cddbb3364e5261d9aba2907e8502"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/melodic/mesh_msgs_hdf5/1.1.0-1"; + sha256 = "sha256-Kf9SeFfh5uU41UM+re99mUAJyr+edzyE8/KCkuYqR/U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mesh-msgs-transform/default.nix b/distros/melodic/mesh-msgs-transform/default.nix index 8e060c3307..692cde4c25 100644 --- a/distros/melodic/mesh-msgs-transform/default.nix +++ b/distros/melodic/mesh-msgs-transform/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-msgs-transform"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/melodic/mesh_msgs_transform/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "f3944e4d9cd70f65153df38d521afdaecd9e38e888eb4e9c9571676565fd92b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/melodic/mesh_msgs_transform/1.1.0-1"; + sha256 = "sha256-QHwpSWWeSQakmvluvES5XGrVT3piyt2FVjgnXXsssBM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mesh-msgs/default.nix b/distros/melodic/mesh-msgs/default.nix index 08f3b26384..ed3f7bfef3 100644 --- a/distros/melodic/mesh-msgs/default.nix +++ b/distros/melodic/mesh-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/melodic/mesh_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "af4b068be99fc1027125bc8e7546fcd8b2e2acb92da883a982e1e327ec64b669"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/melodic/mesh_msgs/1.1.0-1"; + sha256 = "sha256-9xmdecvsjFLEV6J8ZNnoHY7UjbTg1MTj1VQF9gtlwBU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/mesh-navigation/default.nix b/distros/melodic/mesh-navigation/default.nix index ca0d2150b2..96e71bd1a5 100644 --- a/distros/melodic/mesh-navigation/default.nix +++ b/distros/melodic/mesh-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mesh-navigation"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/melodic/mesh_navigation/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "6c561702fb3a4b4209818b4c2511463461925bd42acfb31f125c0fbca07a57ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/melodic/mesh_navigation/1.0.1-1"; + sha256 = "sha256-iqJC/Re6269IJFptqE3UVfIoCy89JawCt6u0MnVqy7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/message-filters/default.nix b/distros/melodic/message-filters/default.nix index 0bcc8caa85..60ab03703d 100644 --- a/distros/melodic/message-filters/default.nix +++ b/distros/melodic/message-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-message-filters"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/message_filters/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "240f188ace7c86f7a036d58b14b4214ee63b5c285ab008eea2dacf4f78b6e555"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/message_filters/1.14.13-1"; + sha256 = "sha256-ZNOYaJdM6+ze2Y0IEm9oV4Vbt9utmFqrP1Nn3pKfjtk="; + }; buildType = "catkin"; buildInputs = [ boost catkin rostest rosunit ]; diff --git a/distros/melodic/message-generation/default.nix b/distros/melodic/message-generation/default.nix index 2e52dcceb3..7a79d0ff53 100644 --- a/distros/melodic/message-generation/default.nix +++ b/distros/melodic/message-generation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-message-generation"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/message_generation-release/archive/release/melodic/message_generation/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "d531e1cccea1c27ddb4de2633c5a9a14c9a6f3256dc8ea3a7e3524e543091323"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "message_generation-release"; + rev = "release/melodic/message_generation/0.4.1-1"; + sha256 = "sha256-OcZUypiOwRulERTbxJV5sMzsSKXMMqWkJFWQvexUZtQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/message-relay/default.nix b/distros/melodic/message-relay/default.nix index 78e6a37dbc..df93285fc5 100644 --- a/distros/melodic/message-relay/default.nix +++ b/distros/melodic/message-relay/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-message-relay"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/cpr_multimaster_tools-release/archive/release/melodic/message_relay/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "1aa52fc974539d1900c9c31cab57960ae4461a2f07958187c1b9eae9b00d8877"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "cpr_multimaster_tools-release"; + rev = "release/melodic/message_relay/0.0.2-1"; + sha256 = "sha256-+GuTBfaE4ElXSBLajjtHcUEfgtlC0mpqbbVKQ7djq/k="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.cheetah ]; diff --git a/distros/melodic/message-runtime/default.nix b/distros/melodic/message-runtime/default.nix index 6fbb2693a0..e83cce580f 100644 --- a/distros/melodic/message-runtime/default.nix +++ b/distros/melodic/message-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-message-runtime"; version = "0.4.12"; - src = fetchurl { - url = "https://github.com/ros-gbp/message_runtime-release/archive/release/melodic/message_runtime/0.4.12-0.tar.gz"; - name = "0.4.12-0.tar.gz"; - sha256 = "70669611054c91c2d65ae94d5e2474198970929338cbb76411cb560902b1c800"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "message_runtime-release"; + rev = "release/melodic/message_runtime/0.4.12-0"; + sha256 = "sha256-HoP8ImTvmlfgIm3C0qwAr5njF2HjPQ44kO/srMIFBlY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/message-to-tf/default.nix b/distros/melodic/message-to-tf/default.nix index 1a08ed46f2..2d08e9dcf5 100644 --- a/distros/melodic/message-to-tf/default.nix +++ b/distros/melodic/message-to-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-message-to-tf"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_localization-release/archive/release/melodic/message_to_tf/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "db1502401da98e23c47743c1e00e0f6bfa3472b953b739edb67d50c51c010ec5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_localization-release"; + rev = "release/melodic/message_to_tf/0.3.0-1"; + sha256 = "sha256-x+51C1xAwUg5hKcirp3Gz0427oxWgHmdrIXyg0rjhhE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/microstrain-3dmgx2-imu/default.nix b/distros/melodic/microstrain-3dmgx2-imu/default.nix index 4c501006b8..f81c5c476a 100644 --- a/distros/melodic/microstrain-3dmgx2-imu/default.nix +++ b/distros/melodic/microstrain-3dmgx2-imu/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-microstrain-3dmgx2-imu"; version = "1.5.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/microstrain_3dmgx2_imu-release/archive/release/melodic/microstrain_3dmgx2_imu/1.5.13-1.tar.gz"; - name = "1.5.13-1.tar.gz"; - sha256 = "c0d438f4cc98005f507ce6f99dff72f69f881867b3826fbd90c356f358a9e36c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "microstrain_3dmgx2_imu-release"; + rev = "release/melodic/microstrain_3dmgx2_imu/1.5.13-1"; + sha256 = "sha256-7MKmlZuU6NLA+ZUDKedUhkyc8Xek4d9LKGqDHO2PNno="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/microstrain-inertial-driver/default.nix b/distros/melodic/microstrain-inertial-driver/default.nix index d19f2a35dd..f7900a8d87 100644 --- a/distros/melodic/microstrain-inertial-driver/default.nix +++ b/distros/melodic/microstrain-inertial-driver/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, cmake-modules, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, jq, mavros-msgs, message-generation, message-runtime, microstrain-inertial-msgs, nav-msgs, nmea-msgs, roscpp, roslint, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: +{ lib, buildRosPackage, fetchurl, catkin, cmake-modules, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, git, jq, mavros-msgs, message-generation, message-runtime, microstrain-inertial-msgs, nav-msgs, nmea-msgs, roscpp, roslint, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-melodic-microstrain-inertial-driver"; - version = "2.7.1-r1"; + version = "3.0.0-r2"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/microstrain_inertial-release/archive/release/melodic/microstrain_inertial_driver/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "d7cf511864eb1c74a2fe2249c25f2c937740db4cb5ba2852283722d249af8a73"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "microstrain_inertial-release"; + rev = "release/melodic/microstrain_inertial_driver/3.0.0-2"; + sha256 = "sha256-P9+EqIumEu2WY6+MTpggYT2mTSflt83ursjDPHV/21s="; + }; buildType = "catkin"; - buildInputs = [ catkin curl jq message-generation roslint ]; + buildInputs = [ catkin curl git jq message-generation roslint ]; propagatedBuildInputs = [ cmake-modules diagnostic-aggregator diagnostic-updater geometry-msgs mavros-msgs message-runtime microstrain-inertial-msgs nav-msgs nmea-msgs roscpp sensor-msgs std-msgs std-srvs tf2 tf2-geometry-msgs tf2-ros ]; - nativeBuildInputs = [ catkin ]; + nativeBuildInputs = [ catkin git ]; meta = { description = ''The ros_mscl package provides a driver for the LORD/Microstrain inertial products.''; diff --git a/distros/melodic/microstrain-inertial-examples/default.nix b/distros/melodic/microstrain-inertial-examples/default.nix index 4519b02702..5ae96d5b87 100644 --- a/distros/melodic/microstrain-inertial-examples/default.nix +++ b/distros/melodic/microstrain-inertial-examples/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, microstrain-inertial-msgs, roscpp, roslint, rospy, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-melodic-microstrain-inertial-examples"; - version = "2.7.1-r1"; + version = "3.0.0-r2"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/microstrain_inertial-release/archive/release/melodic/microstrain_inertial_examples/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "b844e931662692fde2e286e5c6398061db2b6b5e12086a4e0ade248d235caba6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "microstrain_inertial-release"; + rev = "release/melodic/microstrain_inertial_examples/3.0.0-2"; + sha256 = "sha256-gPe93DN4jh6MrxFe3uiA22qxYHTcTnWfVmdmZuaSyyw="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/microstrain-inertial-msgs/default.nix b/distros/melodic/microstrain-inertial-msgs/default.nix index d59a0b69b6..ecfdec8707 100644 --- a/distros/melodic/microstrain-inertial-msgs/default.nix +++ b/distros/melodic/microstrain-inertial-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-melodic-microstrain-inertial-msgs"; - version = "2.7.1-r1"; + version = "3.0.0-r2"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/microstrain_inertial-release/archive/release/melodic/microstrain_inertial_msgs/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "24b8f73e70fcb27b56299b4382b90c6ad19abd567afd6c8aace14329d92504b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "microstrain_inertial-release"; + rev = "release/melodic/microstrain_inertial_msgs/3.0.0-2"; + sha256 = "sha256-HU0Zby1GEorVJwyZdFf2/+5xaDYnpikb9T6N8pOOa/Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/microstrain-inertial-rqt/default.nix b/distros/melodic/microstrain-inertial-rqt/default.nix index 291513dd2a..7eb969c75c 100644 --- a/distros/melodic/microstrain-inertial-rqt/default.nix +++ b/distros/melodic/microstrain-inertial-rqt/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, microstrain-inertial-msgs, nav-msgs, rospy, rqt-gui, rqt-gui-py, std-msgs, tf }: buildRosPackage { pname = "ros-melodic-microstrain-inertial-rqt"; - version = "2.7.1-r1"; + version = "3.0.0-r2"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/microstrain_inertial-release/archive/release/melodic/microstrain_inertial_rqt/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "08dbb7eee67d1be9f1c44675b3a57c7d74324e1e875629da1fb0c96b703c5dff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "microstrain_inertial-release"; + rev = "release/melodic/microstrain_inertial_rqt/3.0.0-2"; + sha256 = "sha256-rEnFQo7RoQQv1o2DDcPqzTFNqTTjQftxD2/w1s8sUlM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/microstrain-mips/default.nix b/distros/melodic/microstrain-mips/default.nix index fab424b66a..7f623a1119 100644 --- a/distros/melodic/microstrain-mips/default.nix +++ b/distros/melodic/microstrain-mips/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-microstrain-mips"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/microstrain_mips-release/archive/release/melodic/microstrain_mips/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "e2515dc2da635d80ae7b579480bdd99af254238a034528dea3deb3248c806ffd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "microstrain_mips-release"; + rev = "release/melodic/microstrain_mips/0.0.3-1"; + sha256 = "sha256-QLirxUUu5CVufiyU0cW0U1p11kJp6dq6kLP/F0T+WNQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/melodic/mikrotik-swos-tools/default.nix b/distros/melodic/mikrotik-swos-tools/default.nix index 4a89d244ac..3191b57a8e 100644 --- a/distros/melodic/mikrotik-swos-tools/default.nix +++ b/distros/melodic/mikrotik-swos-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mikrotik-swos-tools"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/peci1/mikrotik_swos_tools-release/archive/release/melodic/mikrotik_swos_tools/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "59c6ba7bda87a782a15c2513cd298bfd84cc6ad3ca8d2f7c88e2d139d5171087"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "mikrotik_swos_tools-release"; + rev = "release/melodic/mikrotik_swos_tools/1.0.1-1"; + sha256 = "sha256-k/lA5/hor8SxSqtOawHzETppbCvMBEHDLZkAt3+3014="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/minas-control/default.nix b/distros/melodic/minas-control/default.nix index 50974b4a9d..d3d2257a40 100644 --- a/distros/melodic/minas-control/default.nix +++ b/distros/melodic/minas-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-minas-control"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/tork-a/minas-release/archive/release/melodic/minas_control/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "b3d7ec61f7f282359cef85b5a974807849ff747f9e2aff0d8589e8a9cbf363b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "minas-release"; + rev = "release/melodic/minas_control/1.0.10-1"; + sha256 = "sha256-s/6MFMllPJZySZM6LZn7hxnM7cD3H/jZ1yLbmLos+Zc="; + }; buildType = "catkin"; buildInputs = [ catkin soem ]; diff --git a/distros/melodic/minas/default.nix b/distros/melodic/minas/default.nix index a1eea4a08b..604c593197 100644 --- a/distros/melodic/minas/default.nix +++ b/distros/melodic/minas/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-minas"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/tork-a/minas-release/archive/release/melodic/minas/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "38395a2295e45d5de7557d8fbaf43d8d8f932f18f423d66c97a21988d9a1297b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "minas-release"; + rev = "release/melodic/minas/1.0.10-1"; + sha256 = "sha256-heOgTwAbn4cHaapFkmWd4hQX0GV7muj3JHbEw2RPe8E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mini-maxwell/default.nix b/distros/melodic/mini-maxwell/default.nix index e1c44ac395..3f0452d403 100644 --- a/distros/melodic/mini-maxwell/default.nix +++ b/distros/melodic/mini-maxwell/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mini-maxwell"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/mini_maxwell/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "d2673819f9a22a3ecdb132d8e154ce27047b60962473b51ed8b1246826269e59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/mini_maxwell/2.1.24-2"; + sha256 = "sha256-oT1hNiJifCti55ifS3qRGLvhCF4UlvL0M1A7Cw6Haik="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules roslib ]; diff --git a/distros/melodic/mir-actions/default.nix b/distros/melodic/mir-actions/default.nix index 2d58a26fc3..6d50d06a2f 100644 --- a/distros/melodic/mir-actions/default.nix +++ b/distros/melodic/mir-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mir-actions"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/mir_actions/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "b4a703d422b555e11282baf427f89cf06bc3af1c387f9a6bcd5dbe8cf168cc0f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/mir_actions/1.0.8-1"; + sha256 = "sha256-vmfM7YPtT+WKG7t/yrhljYnz2t4vjS3y44Po0pjaGhs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/mir-description/default.nix b/distros/melodic/mir-description/default.nix index 4f48211ace..5e0fbd9ef6 100644 --- a/distros/melodic/mir-description/default.nix +++ b/distros/melodic/mir-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mir-description"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/mir_description/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "2f1b0aa476e8a253cd247bf99ac572300185a8176c59627f011e526474961039"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/mir_description/1.0.8-1"; + sha256 = "sha256-vx77q15rXM+o/vjVMUx5bvup/jGIFU9xqoMWmdG8gJA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/mir-driver/default.nix b/distros/melodic/mir-driver/default.nix index cf16e0ae53..e5dd7ee8fb 100644 --- a/distros/melodic/mir-driver/default.nix +++ b/distros/melodic/mir-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mir-driver"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/mir_driver/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "784746070a1109b8fe6506717d4d9d79731c6a00ca358924b4ab400a3aaa47b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/mir_driver/1.0.8-1"; + sha256 = "sha256-fezVezsRzj1EsW9u8g28l7V/7+it6yJ1out3b/Zm5XA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/mir-dwb-critics/default.nix b/distros/melodic/mir-dwb-critics/default.nix index 25292048ca..f6e5abc154 100644 --- a/distros/melodic/mir-dwb-critics/default.nix +++ b/distros/melodic/mir-dwb-critics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mir-dwb-critics"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/mir_dwb_critics/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "248243c2b1066676650f91074be1912df017c0a3579a0d5db76c672a8f5406c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/mir_dwb_critics/1.0.8-1"; + sha256 = "sha256-BtdeiXz4DTW087taISI1TUkd62PM/vicgAqK8QxLBco="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mir-gazebo/default.nix b/distros/melodic/mir-gazebo/default.nix index 1cf2192f27..84eea4c111 100644 --- a/distros/melodic/mir-gazebo/default.nix +++ b/distros/melodic/mir-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mir-gazebo"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/mir_gazebo/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "d13b5b25f25b9320ed7f9a0ece602841cf88ee62c6d23ac62a240a1fa492afcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/mir_gazebo/1.0.8-1"; + sha256 = "sha256-FPx1iY0FidXAb14izj7b04CBCfAAMpMU8cNEvQ88SZ0="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/mir-msgs/default.nix b/distros/melodic/mir-msgs/default.nix index db96ccbedc..91121df676 100644 --- a/distros/melodic/mir-msgs/default.nix +++ b/distros/melodic/mir-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mir-msgs"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/mir_msgs/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "ad1218540844d730530c01bddc7742de371e525bcc9e33345a2a4f1f15731d51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/mir_msgs/1.0.8-1"; + sha256 = "sha256-fIldqDnhn/SClK1BhC5MlQY15WPspjYTn9sxmkEDp/4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/mir-navigation/default.nix b/distros/melodic/mir-navigation/default.nix index 6b7d8250fc..bd15182a69 100644 --- a/distros/melodic/mir-navigation/default.nix +++ b/distros/melodic/mir-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mir-navigation"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/mir_navigation/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "71f147dada6957cc290b35ee2852714e41e6a6e0ea6655fd172732ea256fe071"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/mir_navigation/1.0.8-1"; + sha256 = "sha256-e0nshEmhL+V1pl++F9qVXZTNiMO4MGCN0xfkwN6OkLY="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/mir-robot/default.nix b/distros/melodic/mir-robot/default.nix index e3a5260d11..378ad385db 100644 --- a/distros/melodic/mir-robot/default.nix +++ b/distros/melodic/mir-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mir-robot"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/mir_robot/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "6e91f38eadf2552b84a889933e602455aa0a6236a27db8f6d33974b85bf9c279"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/mir_robot/1.0.8-1"; + sha256 = "sha256-wD8mH8zJh46InPnBHqb7J6cYkvOthRL5f2czbhjKEvQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mk/default.nix b/distros/melodic/mk/default.nix index 5a37b9b277..bec1930f66 100644 --- a/distros/melodic/mk/default.nix +++ b/distros/melodic/mk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mk"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/mk/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "0c1e3e41d69fbd30193f1c231e9d0e452c2395512f9081c3e48077d039eff00a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/mk/1.14.9-1"; + sha256 = "sha256-FUpYqosBr8CffXZ+gX8s0/euITODeI9DvbCZYAnPnaM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ml-classifiers/default.nix b/distros/melodic/ml-classifiers/default.nix index 4ee9a9e2ac..f4594e91d2 100644 --- a/distros/melodic/ml-classifiers/default.nix +++ b/distros/melodic/ml-classifiers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ml-classifiers"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/astuff/ml_classifiers-release/archive/release/melodic/ml_classifiers/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "77588596b459e29cb22098164289c3b74e0a6326d372c99ce6025a422a21c564"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "ml_classifiers-release"; + rev = "release/melodic/ml_classifiers/1.0.1-1"; + sha256 = "sha256-sjoxMsPaYl6KicCS/VPN/NwLV8LX0nZ5IMat6Iuk3cc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/mobile-robot-simulator/default.nix b/distros/melodic/mobile-robot-simulator/default.nix index b1eac51f2d..bd6ae01aed 100644 --- a/distros/melodic/mobile-robot-simulator/default.nix +++ b/distros/melodic/mobile-robot-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mobile-robot-simulator"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/nobleo/mobile_robot_simulator-release/archive/release/melodic/mobile_robot_simulator/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "dfb06a08fdc913cfe76d014a149cfb5da9770cac4372ff88baa08e10ecbcac6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "mobile_robot_simulator-release"; + rev = "release/melodic/mobile_robot_simulator/1.0.1-1"; + sha256 = "sha256-Oq0f6dDI4QyXSeXB4S3He1oni35peRzDBLchC0GpvME="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mobileye-560-660-msgs/default.nix b/distros/melodic/mobileye-560-660-msgs/default.nix index b7b2926a4d..9219337539 100644 --- a/distros/melodic/mobileye-560-660-msgs/default.nix +++ b/distros/melodic/mobileye-560-660-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mobileye-560-660-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/mobileye_560_660_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "952c7980abc7d35a66fec1e791bcc1c78cc80ce737ca1db50d10664c2f011301"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/mobileye_560_660_msgs/3.0.2-1"; + sha256 = "sha256-apV2k4uZvCpjohJgOeKGgit6qAViR0LMTVzCeaXk1gk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/mocap-nokov/default.nix b/distros/melodic/mocap-nokov/default.nix index d6b2fb8a37..cf81ce26c9 100644 --- a/distros/melodic/mocap-nokov/default.nix +++ b/distros/melodic/mocap-nokov/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mocap-nokov"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/NOKOV-MOCAP/mocap_nokov_release/archive/release/melodic/mocap_nokov/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "ddceda5c625d35fb10c8602945ad88f434de467009754fb9c1a8c841445fc333"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "NOKOV-MOCAP"; + repo = "mocap_nokov_release"; + rev = "release/melodic/mocap_nokov/0.0.2-2"; + sha256 = "sha256-C3FyEsBPfjAu/Jrid9RZ44xnLmY/9Aop8tBDicKTqCA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mocap-optitrack/default.nix b/distros/melodic/mocap-optitrack/default.nix index 8a85590531..061b677dd8 100644 --- a/distros/melodic/mocap-optitrack/default.nix +++ b/distros/melodic/mocap-optitrack/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mocap-optitrack"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/mocap_optitrack-release/archive/release/melodic/mocap_optitrack/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "7b2f61f2be3055952bd3d33826704a4fe6cd3e34188a98926d23fd91c23ecf07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "mocap_optitrack-release"; + rev = "release/melodic/mocap_optitrack/0.1.4-1"; + sha256 = "sha256-IsRKzaxlPl8k1LmQ6TLQ742SWX1J/ZpiUrWWFxwYSQ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mongodb-log/default.nix b/distros/melodic/mongodb-log/default.nix index e8c042b3e7..7793888918 100644 --- a/distros/melodic/mongodb-log/default.nix +++ b/distros/melodic/mongodb-log/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mongodb-log"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/strands-project-releases/mongodb_store/archive/release/melodic/mongodb_log/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "0482630592871557d4d9d9dff8bcd61a3c8801c840cc2477f51f4a3806a7453e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "strands-project-releases"; + repo = "mongodb_store"; + rev = "release/melodic/mongodb_log/0.5.2-1"; + sha256 = "sha256-RN2xbRCcG6/UsbgYxW7XTJg9cpgyqgiKVxaBppWzzLM="; + }; buildType = "catkin"; buildInputs = [ catkin openssl ]; diff --git a/distros/melodic/mongodb-store-msgs/default.nix b/distros/melodic/mongodb-store-msgs/default.nix index d77572a1d6..3df6fb2cd9 100644 --- a/distros/melodic/mongodb-store-msgs/default.nix +++ b/distros/melodic/mongodb-store-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mongodb-store-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/strands-project-releases/mongodb_store/archive/release/melodic/mongodb_store_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "9e04a9e03d5d12af73025911fbc85aa0ba7fc03b0e44b3bc6247df1d39fb7526"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "strands-project-releases"; + repo = "mongodb_store"; + rev = "release/melodic/mongodb_store_msgs/0.5.2-1"; + sha256 = "sha256-ChG/0BVT6J6J1njwVjxPv2QphJ11m/tnKr7kx8w8bo0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/monocam-settler/default.nix b/distros/melodic/monocam-settler/default.nix index 10cf71ba50..0c01900e1b 100644 --- a/distros/melodic/monocam-settler/default.nix +++ b/distros/melodic/monocam-settler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-monocam-settler"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/monocam_settler/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "e071a63f48ee1ed211bca1e5bcd85a46afce004dc18ba4226aee484dc7e309c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/monocam_settler/0.10.14-0"; + sha256 = "sha256-Yu5a2ebrG3ugjIDTkLHM3VAz0FFwjboLREGKkN/2QRs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moose-control/default.nix b/distros/melodic/moose-control/default.nix index 2f217c334a..f9924128e0 100644 --- a/distros/melodic/moose-control/default.nix +++ b/distros/melodic/moose-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moose-control"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/moose-release/archive/release/melodic/moose_control/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "dddeeba8753258287685cba99d83f9337a546e27b0834e002367c46ea7144354"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "moose-release"; + rev = "release/melodic/moose_control/0.1.2-1"; + sha256 = "sha256-tZvjJ6JhCixVnpqfySitycU5en3PJNlAy71N/ZzcNzY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moose-description/default.nix b/distros/melodic/moose-description/default.nix index e72d307796..a3f883d9e8 100644 --- a/distros/melodic/moose-description/default.nix +++ b/distros/melodic/moose-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moose-description"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/moose-release/archive/release/melodic/moose_description/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "d80ac9eb4647a97b167fb7dacb49a567b4ed3162f3057d1822df3b6d18393a5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "moose-release"; + rev = "release/melodic/moose_description/0.1.2-1"; + sha256 = "sha256-PlcxG3JvgLd+4g5f44DDqjUti1CcFfFAXjUFvAK10xY="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/moose-desktop/default.nix b/distros/melodic/moose-desktop/default.nix index 47ee27680f..9819ae7b88 100644 --- a/distros/melodic/moose-desktop/default.nix +++ b/distros/melodic/moose-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moose-desktop"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/moose_desktop-release/archive/release/melodic/moose_desktop/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "eee8c52478443ca5259632b918c854241382a04fd8a15836f707442d4c629d30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "moose_desktop-release"; + rev = "release/melodic/moose_desktop/0.1.1-1"; + sha256 = "sha256-MBiVEFMpDrFpcCEdvYVDrUEGsAZu2jG+YVbvAjWf9rg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moose-gazebo/default.nix b/distros/melodic/moose-gazebo/default.nix index 3c11b17874..543ee07827 100644 --- a/distros/melodic/moose-gazebo/default.nix +++ b/distros/melodic/moose-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moose-gazebo"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/moose_simulator-release/archive/release/melodic/moose_gazebo/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "96224ec31a33af8058f47fc9343d99355692fed711835d8b18c1b87cb6ecfc6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "moose_simulator-release"; + rev = "release/melodic/moose_gazebo/0.1.3-1"; + sha256 = "sha256-rwxalOjXIqFdyYcr5WNTkXPe6kQLNamCJ3i+FeIAyXQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moose-msgs/default.nix b/distros/melodic/moose-msgs/default.nix index 6e035fabf6..02168385fd 100644 --- a/distros/melodic/moose-msgs/default.nix +++ b/distros/melodic/moose-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moose-msgs"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/moose-release/archive/release/melodic/moose_msgs/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "d209489cb9586c4bb2edfd3df3020fc7e2741671914f9961480a387158b9c744"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "moose-release"; + rev = "release/melodic/moose_msgs/0.1.2-1"; + sha256 = "sha256-US4nLcgw0C9DPS8+F/HRPggjJUEXpuK0xd9TIwvu9CQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/moose-simulator/default.nix b/distros/melodic/moose-simulator/default.nix index d49be25249..608569cfe9 100644 --- a/distros/melodic/moose-simulator/default.nix +++ b/distros/melodic/moose-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moose-simulator"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/moose_simulator-release/archive/release/melodic/moose_simulator/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "6e07c0ddc729792bd9f1437f7ec0498958624b2675eb966aa07d012371977070"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "moose_simulator-release"; + rev = "release/melodic/moose_simulator/0.1.3-1"; + sha256 = "sha256-U9TZwlgh4emo139idNrc4XqhrI9k+Ca7+rSu/wB82Pk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moose-viz/default.nix b/distros/melodic/moose-viz/default.nix index 8ee7a39031..d7e4860263 100644 --- a/distros/melodic/moose-viz/default.nix +++ b/distros/melodic/moose-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moose-viz"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/moose_desktop-release/archive/release/melodic/moose_viz/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "cefa5a0b9eb0d80c77df8bfa401189d41c2db797467e57e5ac77886760716829"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "moose_desktop-release"; + rev = "release/melodic/moose_viz/0.1.1-1"; + sha256 = "sha256-mKK59ny3ifwGDoGevT7wDNIS+POnauddLTHvL72QLD8="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/mouse-teleop/default.nix b/distros/melodic/mouse-teleop/default.nix index 3ce881db95..baccc96474 100644 --- a/distros/melodic/mouse-teleop/default.nix +++ b/distros/melodic/mouse-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mouse-teleop"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/melodic/mouse_teleop/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "c87ffb687d83e3ac8b63d82ec3ff641b77b085e2f6379d2bc0a01c7cd8607e20"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/melodic/mouse_teleop/0.3.1-1"; + sha256 = "sha256-iLl66nz2ojwSXJIQzHCC9/9TTdNcOjJv24pYSZrfVLA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/move-base-flex/default.nix b/distros/melodic/move-base-flex/default.nix index 258376afbd..3e5c2f21d6 100644 --- a/distros/melodic/move-base-flex/default.nix +++ b/distros/melodic/move-base-flex/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-move-base-flex"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/melodic/move_base_flex/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "d5e114c10ac44d7e47dd2b5f89a0d739cb6d7970bfbaf336a826ff5b211b899b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/melodic/move_base_flex/0.4.0-1"; + sha256 = "sha256-0iTYubCTfWaWCwoHbHiujNfqow3Z7NUxFmyKh5NLRNM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/move-base-msgs/default.nix b/distros/melodic/move-base-msgs/default.nix index ef1e368f3c..75756b7000 100644 --- a/distros/melodic/move-base-msgs/default.nix +++ b/distros/melodic/move-base-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-move-base-msgs"; version = "1.14.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_msgs-release/archive/release/melodic/move_base_msgs/1.14.1-1.tar.gz"; - name = "1.14.1-1.tar.gz"; - sha256 = "f221272c2819180557e5c21b79dd30f34d9ac83503595c6132f9fecc7b48cfcc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_msgs-release"; + rev = "release/melodic/move_base_msgs/1.14.1-1"; + sha256 = "sha256-M04IFEmWhE3/U8wT5cMz1LjWX9Vgfkc1FP0R54QQoKg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/move-base-sequence/default.nix b/distros/melodic/move-base-sequence/default.nix index be5000197e..dc0af4b76b 100644 --- a/distros/melodic/move-base-sequence/default.nix +++ b/distros/melodic/move-base-sequence/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-move-base-sequence"; version = "0.0.1-r2"; - src = fetchurl { - url = "https://github.com/MarkNaeem/move_base_sequence-release/archive/release/melodic/move_base_sequence/0.0.1-2.tar.gz"; - name = "0.0.1-2.tar.gz"; - sha256 = "0dd3d48f276425cf5c51be52e9845c7732e9a988a5c07456e3e63ca8e8e91f99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarkNaeem"; + repo = "move_base_sequence-release"; + rev = "release/melodic/move_base_sequence/0.0.1-2"; + sha256 = "sha256-oqxbZ5bmLpaSRgmTv/7TyipOXVPQgGUxoqsJpVR2hs0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/move-base/default.nix b/distros/melodic/move-base/default.nix index 8ec71565eb..7b20359e48 100644 --- a/distros/melodic/move-base/default.nix +++ b/distros/melodic/move-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-move-base"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/move_base/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "6b773a56d433a2d2df739c2b602a3928bde36f6217c9c22a2dc79f1139191082"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/move_base/1.16.7-1"; + sha256 = "sha256-r0760iejdGU+HcWfTY7GEoOvloucsrU/IjQ/Z0Jyc/g="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation tf2-geometry-msgs ]; diff --git a/distros/melodic/move-basic/default.nix b/distros/melodic/move-basic/default.nix index cf711cccbc..f9109f5c3f 100644 --- a/distros/melodic/move-basic/default.nix +++ b/distros/melodic/move-basic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-move-basic"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/move_basic-release/archive/release/melodic/move_basic/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "e7aa6c6ce08b3a9f4fd248dfa9a8763cbd58f5f11ea6fca68e631b6a5c41b372"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "move_basic-release"; + rev = "release/melodic/move_basic/0.4.1-1"; + sha256 = "sha256-dJNWbtCqjd8Dz9r3wFWL914lKbDmURmxmuQeVX3yRY4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/move-slow-and-clear/default.nix b/distros/melodic/move-slow-and-clear/default.nix index fe36be84bc..1de1c5be16 100644 --- a/distros/melodic/move-slow-and-clear/default.nix +++ b/distros/melodic/move-slow-and-clear/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-move-slow-and-clear"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/move_slow_and_clear/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "e20137bbc654b39379d03cc710b62738f1da7fce3109d1d039c6ce0a74a60288"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/move_slow_and_clear/1.16.7-1"; + sha256 = "sha256-TsCAN9qsGKU/gKbLXN9AzLnZ0GrIYDeChreMEGgBqgs="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/moveback-recovery/default.nix b/distros/melodic/moveback-recovery/default.nix index e135af9c9a..573bb757bb 100644 --- a/distros/melodic/moveback-recovery/default.nix +++ b/distros/melodic/moveback-recovery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveback-recovery"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mbf_recovery_behaviors/archive/release/melodic/moveback_recovery/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "4f8e01790e4812b87346b38c5f7d92aedb8ad318bf152e797280b065258156a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mbf_recovery_behaviors"; + rev = "release/melodic/moveback_recovery/0.1.0-1"; + sha256 = "sha256-cFpZhU4qXC89mlEOpbqW3rQp9deIiALdL3qMtdA6o0w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-chomp-optimizer-adapter/default.nix b/distros/melodic/moveit-chomp-optimizer-adapter/default.nix index 63e49b5112..1b8bdc7677 100644 --- a/distros/melodic/moveit-chomp-optimizer-adapter/default.nix +++ b/distros/melodic/moveit-chomp-optimizer-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-chomp-optimizer-adapter"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_chomp_optimizer_adapter/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "89749df53a84c6ebc9182fabcf7e45bbb26170d8bfdf69d03c468f0daa303146"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_chomp_optimizer_adapter/1.0.11-1"; + sha256 = "sha256-5arj3l8LY18JokO+BeMFCtJr08tEn2ncDDaJ+cus4Bo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-controller-manager-example/default.nix b/distros/melodic/moveit-controller-manager-example/default.nix index bead3665e2..2dec9dd8bc 100644 --- a/distros/melodic/moveit-controller-manager-example/default.nix +++ b/distros/melodic/moveit-controller-manager-example/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-controller-manager-example"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_controller_manager_example/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "94bfc82d84a00f37e49bf31a20dc34440eaa2d74e29674d510d20eb3e1c70766"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_controller_manager_example/1.0.11-1"; + sha256 = "sha256-oVcn4hZioh0VTzwQMz9r4Bpgi/kba5Kjz0ABNSQjbw4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-core/default.nix b/distros/melodic/moveit-core/default.nix index d9095d68c6..ec99d82efe 100644 --- a/distros/melodic/moveit-core/default.nix +++ b/distros/melodic/moveit-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-core"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_core/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "02292d11e48e6d171a34c6fa29b23443466a5d96e8e950af94b03fb19de6e9fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_core/1.0.11-1"; + sha256 = "sha256-XdAZN3ApePWA14GLzVXtd/NTE8FIaUZv5LlGfYWbarg="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/melodic/moveit-fake-controller-manager/default.nix b/distros/melodic/moveit-fake-controller-manager/default.nix index af4798cca2..60e32395ad 100644 --- a/distros/melodic/moveit-fake-controller-manager/default.nix +++ b/distros/melodic/moveit-fake-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-fake-controller-manager"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_fake_controller_manager/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "2dfc26b3ab77a1e71a2d88c56145b032a09f6f496d7bf591c0047b8eb4fd9ba5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_fake_controller_manager/1.0.11-1"; + sha256 = "sha256-Z2yLRt/l9SMjTpXmB3ebwkkmVW82WKpr4T05QhR1teY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-kinematics/default.nix b/distros/melodic/moveit-kinematics/default.nix index 0e5fd097e7..f6ffd3b56c 100644 --- a/distros/melodic/moveit-kinematics/default.nix +++ b/distros/melodic/moveit-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-kinematics"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_kinematics/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "6dad1b258113cbc71f71c740d62b36f0fe3902b0740b168879b86a44d26f4ba5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_kinematics/1.0.11-1"; + sha256 = "sha256-BQpZHYD5UIgaaQoK/B23Sw21ua0KDDWTvHupG2dJsFs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-msgs/default.nix b/distros/melodic/moveit-msgs/default.nix index 2e876aded9..7e977bbcc1 100644 --- a/distros/melodic/moveit-msgs/default.nix +++ b/distros/melodic/moveit-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-msgs"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_msgs-release/archive/release/melodic/moveit_msgs/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "a3b33941e139497dcc007b7a639b19334dedd78fecb233cf3c15dd890112989b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_msgs-release"; + rev = "release/melodic/moveit_msgs/0.10.1-1"; + sha256 = "sha256-EAMh+rcHrcWpCmn3wEL8nvYdGVaQ3HKYJNJp/KNsbKs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-opw-kinematics-plugin/default.nix b/distros/melodic/moveit-opw-kinematics-plugin/default.nix index 78ec091451..4b6ad7b8be 100644 --- a/distros/melodic/moveit-opw-kinematics-plugin/default.nix +++ b/distros/melodic/moveit-opw-kinematics-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-opw-kinematics-plugin"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/JeroenDM/moveit_opw_kinematics_plugin-release/archive/release/melodic/moveit_opw_kinematics_plugin/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "be8f4501932be19f3ca9c59fa427b4a40188a1cd7b4e541c598f2ba4e791e786"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JeroenDM"; + repo = "moveit_opw_kinematics_plugin-release"; + rev = "release/melodic/moveit_opw_kinematics_plugin/0.2.1-1"; + sha256 = "sha256-g4GrjZH+QWCJmZ8epOpjAeMDbH/7Kv+xrej+myzRlBw="; + }; buildType = "catkin"; buildInputs = [ catkin eigen-conversions ]; diff --git a/distros/melodic/moveit-planners-chomp/default.nix b/distros/melodic/moveit-planners-chomp/default.nix index 6ad79ca109..478b5a6e7d 100644 --- a/distros/melodic/moveit-planners-chomp/default.nix +++ b/distros/melodic/moveit-planners-chomp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-planners-chomp"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_planners_chomp/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "ce6129e039faf228ef7f4530768ac45df3e3eaf049f1a76b5ad7e47ee03e31bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_planners_chomp/1.0.11-1"; + sha256 = "sha256-gF7A6mhAwIZ0CzrqRbEB2ZooXpcDVsKpxDTOboLvXAc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-planners-ompl/default.nix b/distros/melodic/moveit-planners-ompl/default.nix index c5af828563..bba1edb561 100644 --- a/distros/melodic/moveit-planners-ompl/default.nix +++ b/distros/melodic/moveit-planners-ompl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-planners-ompl"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_planners_ompl/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "f593ac31c079e14c793684fe1d09b536b17b63e6959bf2eca05829973c8dd18a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_planners_ompl/1.0.11-1"; + sha256 = "sha256-9BDhtFAScGfj86mnK/0wE9DKwzd6ka7fA4sU7uqtIJ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-planners/default.nix b/distros/melodic/moveit-planners/default.nix index 32be57795e..33c49d7c22 100644 --- a/distros/melodic/moveit-planners/default.nix +++ b/distros/melodic/moveit-planners/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-planners"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_planners/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "faf90009cf325c99f90660a738b2f349ba8ad79b3305330864795d75de48c189"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_planners/1.0.11-1"; + sha256 = "sha256-KKOAPXmV3IVljKlHSvlzLVPuCOeSSYHZU0bJBNsQHXM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-plugins/default.nix b/distros/melodic/moveit-plugins/default.nix index 783b1e6ad4..c849969176 100644 --- a/distros/melodic/moveit-plugins/default.nix +++ b/distros/melodic/moveit-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-plugins"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_plugins/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "2950725494eac63456fc95c857463d32903ca8abc01b11b7fbb337535d10eda0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_plugins/1.0.11-1"; + sha256 = "sha256-Js2BpqE271inlB3iAIDHcFnz/96FAzcNM055KfPbiDE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-pr2/default.nix b/distros/melodic/moveit-pr2/default.nix index 33a3926fef..eb6c51a2f1 100644 --- a/distros/melodic/moveit-pr2/default.nix +++ b/distros/melodic/moveit-pr2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-pr2"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_pr2-release/archive/release/melodic/moveit_pr2/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "8a3751258daacbd61d9aeb30c604461c0b75b192e98186621eb6cbae8c9b49ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_pr2-release"; + rev = "release/melodic/moveit_pr2/0.7.3-1"; + sha256 = "sha256-moBltLpCwxDNZnC9pM10TGlrl9/thrNtTBSy+dJiWAQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources-fanuc-description/default.nix b/distros/melodic/moveit-resources-fanuc-description/default.nix index 5980cb056d..b6706c2aa0 100644 --- a/distros/melodic/moveit-resources-fanuc-description/default.nix +++ b/distros/melodic/moveit-resources-fanuc-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-fanuc-description"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_fanuc_description/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "46d8b567f40435fb3f0026564caf94f0b36403c39e1feeaf7d0a493d478420af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_fanuc_description/0.8.2-1"; + sha256 = "sha256-vqi8SzXtYbES+ys7dcZ6CIXQgrT4zzumcEOAbJ4lHAI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources-fanuc-moveit-config/default.nix b/distros/melodic/moveit-resources-fanuc-moveit-config/default.nix index 787dfb5667..46ccb34a29 100644 --- a/distros/melodic/moveit-resources-fanuc-moveit-config/default.nix +++ b/distros/melodic/moveit-resources-fanuc-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-fanuc-moveit-config"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_fanuc_moveit_config/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "1252b8c2c843e7c35bc03ea29f72edf7595bad2a9bf9976e715e39c15549e4f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_fanuc_moveit_config/0.8.2-1"; + sha256 = "sha256-KdI+ZkCV7R/zubzWEDdnPO8HajSztsxPjLj4lrsCQ8I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources-panda-description/default.nix b/distros/melodic/moveit-resources-panda-description/default.nix index cc0fcaf020..caedc99dcd 100644 --- a/distros/melodic/moveit-resources-panda-description/default.nix +++ b/distros/melodic/moveit-resources-panda-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-panda-description"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_panda_description/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "ef4c4380e52b125a695d5dce52f4fb64157cc93870d1057399b67162cb6a8d1b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_panda_description/0.8.2-1"; + sha256 = "sha256-xYeqjY/ZAk0xVPuLMy/6DOBsN4IZ6XE6vAJdDbkEpjE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources-panda-moveit-config/default.nix b/distros/melodic/moveit-resources-panda-moveit-config/default.nix index 3c6527b5e9..b78096127b 100644 --- a/distros/melodic/moveit-resources-panda-moveit-config/default.nix +++ b/distros/melodic/moveit-resources-panda-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-panda-moveit-config"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_panda_moveit_config/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "8824461643a94e960c5ad7b85d65ceaac8fefc87b7c30cef810cadb8d7522e0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_panda_moveit_config/0.8.2-1"; + sha256 = "sha256-Xn+vBeaUEWIjh8acZevbK9ecXZXN9vit7x/uPdbfK4Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources-pr2-description/default.nix b/distros/melodic/moveit-resources-pr2-description/default.nix index 8355da840f..80c7e3a80d 100644 --- a/distros/melodic/moveit-resources-pr2-description/default.nix +++ b/distros/melodic/moveit-resources-pr2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-pr2-description"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_pr2_description/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "2b5d4205ecfc223e35eb6a59d067e56a98ccb6329a92083a5f32e25b053f6244"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_pr2_description/0.8.2-1"; + sha256 = "sha256-Q+V2GvquCtjESB3cIe07yZS41RxAPl8Y3hia9/uxAoc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix b/distros/melodic/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix index 5d7fff20ff..92f9533fd1 100644 --- a/distros/melodic/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix +++ b/distros/melodic/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-prbt-ikfast-manipulator-plugin"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_prbt_ikfast_manipulator_plugin/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "ddc3e93bd54ad9ca426ee618f5b2a4dc2128473a4b16c74d24003c3cfcfc4aae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_prbt_ikfast_manipulator_plugin/0.8.2-1"; + sha256 = "sha256-asAIb4XxZsD3eXqiXs4CjRLLUp3Ly/Jp7YTCslAUAR0="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen ]; diff --git a/distros/melodic/moveit-resources-prbt-moveit-config/default.nix b/distros/melodic/moveit-resources-prbt-moveit-config/default.nix index a0dbc4cba2..aedb0c1a55 100644 --- a/distros/melodic/moveit-resources-prbt-moveit-config/default.nix +++ b/distros/melodic/moveit-resources-prbt-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-prbt-moveit-config"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_prbt_moveit_config/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "6490af49b68db504222c288e8030b21812161ba60eb3523149adea6d9919386d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_prbt_moveit_config/0.8.2-1"; + sha256 = "sha256-bIYay27qM7wc1yanGxbmi5bOPDnRY8ODil94U/COaMM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources-prbt-pg70-support/default.nix b/distros/melodic/moveit-resources-prbt-pg70-support/default.nix index a6ee706fba..21930f4e8a 100644 --- a/distros/melodic/moveit-resources-prbt-pg70-support/default.nix +++ b/distros/melodic/moveit-resources-prbt-pg70-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-prbt-pg70-support"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_prbt_pg70_support/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "bb06b8de7ca0ab018cae56af743d0c98fc824e01dc66a73d46c8b7803f4e74e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_prbt_pg70_support/0.8.2-1"; + sha256 = "sha256-IWH45Xs5jhmDag0Uio1oJZOuBXicS+t1sWIrH0XKn+I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources-prbt-support/default.nix b/distros/melodic/moveit-resources-prbt-support/default.nix index f4ed9ef966..a6eb2d28bd 100644 --- a/distros/melodic/moveit-resources-prbt-support/default.nix +++ b/distros/melodic/moveit-resources-prbt-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources-prbt-support"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources_prbt_support/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "cc497fc0af21b41b5d729bff4a7bd455dde484fb0786be1a4d1fdfcb0547d691"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources_prbt_support/0.8.2-1"; + sha256 = "sha256-d6yfXC8JVjp5keCYXz+vg77ZNiLFVU6VSCRc4tS58Q8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-resources/default.nix b/distros/melodic/moveit-resources/default.nix index 01d0f727c1..d0ecda1305 100644 --- a/distros/melodic/moveit-resources/default.nix +++ b/distros/melodic/moveit-resources/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-resources"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/melodic/moveit_resources/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "3315e9198902f386e91ac925ede9548d13a7c281fd94fdb4dac37387090f8131"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/melodic/moveit_resources/0.8.2-1"; + sha256 = "sha256-YgyRQnnB4tpizcbI0CkjxwFQwedudK+iY0ECIkXdm7Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-ros-benchmarks/default.nix b/distros/melodic/moveit-ros-benchmarks/default.nix index 8713369e94..b64d18ca9c 100644 --- a/distros/melodic/moveit-ros-benchmarks/default.nix +++ b/distros/melodic/moveit-ros-benchmarks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-benchmarks"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_benchmarks/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "2b87583bb9660dac8341a1c814295269563a9eb32edf08baf2d23237a6a64f74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_benchmarks/1.0.11-1"; + sha256 = "sha256-SKrwW+70pCrxV1RDU3vr9bkFJpyn8Whrsh3i/E3sbI4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-ros-control-interface/default.nix b/distros/melodic/moveit-ros-control-interface/default.nix index 46d7f1e622..047dd18acf 100644 --- a/distros/melodic/moveit-ros-control-interface/default.nix +++ b/distros/melodic/moveit-ros-control-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-control-interface"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_control_interface/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "bba4f52e3c6f6b35b496a93dc50d2efdc2b2bf5785e618244b4e96952a64d1d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_control_interface/1.0.11-1"; + sha256 = "sha256-/6YfguDEuRHp2RIr6oo6wDXIKMD7piVAemxkU3dhUTk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-ros-manipulation/default.nix b/distros/melodic/moveit-ros-manipulation/default.nix index 7aea04ff27..f8e31f9794 100644 --- a/distros/melodic/moveit-ros-manipulation/default.nix +++ b/distros/melodic/moveit-ros-manipulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-manipulation"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_manipulation/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "e424b25f0d9f10e438c49535ce8248e7b278c49aee64410112382ba6cc387faa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_manipulation/1.0.11-1"; + sha256 = "sha256-cXgDVz//eEdZVQOkinKWClNJ/YBTPgr6EsRixO0J7QU="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/melodic/moveit-ros-move-group/default.nix b/distros/melodic/moveit-ros-move-group/default.nix index f53ea2e1b3..a43afc0a6f 100644 --- a/distros/melodic/moveit-ros-move-group/default.nix +++ b/distros/melodic/moveit-ros-move-group/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-move-group"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_move_group/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "1685b88f790758cb9cda652a26d0d750c98eb2c202e5d8c81b8a06f1ade9773f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_move_group/1.0.11-1"; + sha256 = "sha256-KgG7JVTTB5TawaK0G8OCCHMc0qB0f1kE2cdCsRAHisA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-ros-occupancy-map-monitor/default.nix b/distros/melodic/moveit-ros-occupancy-map-monitor/default.nix index af75bdc8d3..cec5f6c16f 100644 --- a/distros/melodic/moveit-ros-occupancy-map-monitor/default.nix +++ b/distros/melodic/moveit-ros-occupancy-map-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-occupancy-map-monitor"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_occupancy_map_monitor/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "a620367fc90e687799a48b55d358b03b3ee070d94432ead0fbedd88f4ffa0782"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_occupancy_map_monitor/1.0.11-1"; + sha256 = "sha256-061YTbHLoWAEgUkvU404aeI/z8gRFxNTlQbyaYkmGzY="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/melodic/moveit-ros-perception/default.nix b/distros/melodic/moveit-ros-perception/default.nix index dc20e684c1..2e7384094f 100644 --- a/distros/melodic/moveit-ros-perception/default.nix +++ b/distros/melodic/moveit-ros-perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-perception"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_perception/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "6852547197cec873db55f22887fdae30cd87a3f253995ce81d8727713426f521"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_perception/1.0.11-1"; + sha256 = "sha256-zpbwrcIEdyGGzScPZwp1TFZSQkbPcbOlR3JfAZZ8AJg="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/melodic/moveit-ros-planning-interface/default.nix b/distros/melodic/moveit-ros-planning-interface/default.nix index 14a480f354..23cc36a733 100644 --- a/distros/melodic/moveit-ros-planning-interface/default.nix +++ b/distros/melodic/moveit-ros-planning-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-planning-interface"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_planning_interface/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "df1fec336274f651e43ae3792b81dfae30788edfff11163c52bf51d6ff3661d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_planning_interface/1.0.11-1"; + sha256 = "sha256-iy/JtwP/gpl10Ktla9G8eDCdJqQvTSBElujU7+fRT6c="; + }; buildType = "catkin"; buildInputs = [ catkin eigen pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/moveit-ros-planning/default.nix b/distros/melodic/moveit-ros-planning/default.nix index 46ab7ee763..ed90bf5401 100644 --- a/distros/melodic/moveit-ros-planning/default.nix +++ b/distros/melodic/moveit-ros-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-planning"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_planning/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "5ebd50c9121fb9f374206223ccd44c532d41144e98a663369ccd514bca7f3564"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_planning/1.0.11-1"; + sha256 = "sha256-xBCaCQr15dFFeWSqboulXD1Y9+hjtskAx1IIghFw9Vk="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/melodic/moveit-ros-robot-interaction/default.nix b/distros/melodic/moveit-ros-robot-interaction/default.nix index ea75d672bd..55c9798a47 100644 --- a/distros/melodic/moveit-ros-robot-interaction/default.nix +++ b/distros/melodic/moveit-ros-robot-interaction/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-robot-interaction"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_robot_interaction/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "23019d134d5100cbda9db345b975728863cde2c4089e3483be873e87d63355f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_robot_interaction/1.0.11-1"; + sha256 = "sha256-THl9YTi3eZlsh+3kAK3DT6cLVsKV2xvqrERJKxWQk/U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-ros-visualization/default.nix b/distros/melodic/moveit-ros-visualization/default.nix index 5e71b7f636..bafc54d0cf 100644 --- a/distros/melodic/moveit-ros-visualization/default.nix +++ b/distros/melodic/moveit-ros-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-visualization"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_visualization/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "e713239304d9b982ec4e8a5266881da0517145723c9a989587c73ac069af57d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_visualization/1.0.11-1"; + sha256 = "sha256-D6bREP4taz0HYjUZqfQQBrsRUEDnYkqLgIEQ7DcBX18="; + }; buildType = "catkin"; buildInputs = [ catkin class-loader eigen ogre1_9 pkg-config qt5.qtbase ]; diff --git a/distros/melodic/moveit-ros-warehouse/default.nix b/distros/melodic/moveit-ros-warehouse/default.nix index eb8be73919..16f5d00e1f 100644 --- a/distros/melodic/moveit-ros-warehouse/default.nix +++ b/distros/melodic/moveit-ros-warehouse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros-warehouse"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros_warehouse/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "2f3ab532edf1c7a9eb29d5b9e0579259f1b52e0587a02667ef5983ba0b38e7f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros_warehouse/1.0.11-1"; + sha256 = "sha256-LwhyUTO7Hg/Q4UM6qBwWaqRokz3PKebIbv5iUTrmClM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-ros/default.nix b/distros/melodic/moveit-ros/default.nix index ee490d1bfc..d9e8d6d8e5 100644 --- a/distros/melodic/moveit-ros/default.nix +++ b/distros/melodic/moveit-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-ros"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_ros/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "9a1a46b7042b938124db3b25d6e828463570227f6756b95413c42c4971f4aa90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_ros/1.0.11-1"; + sha256 = "sha256-maaNxU7iwtyXsIgCsn6T5xtA6vKCvyej8XrJw+52cJs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-runtime/default.nix b/distros/melodic/moveit-runtime/default.nix index dcd417d0d1..f509631455 100644 --- a/distros/melodic/moveit-runtime/default.nix +++ b/distros/melodic/moveit-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-runtime"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_runtime/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "5506c65354acd5af98468538578b7b4709605bce2cadb432c77fce588c25e744"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_runtime/1.0.11-1"; + sha256 = "sha256-vVGSiC6iKv/GJ+IKFueupjkEgtqbkbNurBAemam/LLg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-servo/default.nix b/distros/melodic/moveit-servo/default.nix index 61885bf720..32ded25d15 100644 --- a/distros/melodic/moveit-servo/default.nix +++ b/distros/melodic/moveit-servo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-servo"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_servo/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "5c2e0fc11bcedb17626eee443228904a2fe8820812b0d013f9aace193a01a87a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_servo/1.0.11-1"; + sha256 = "sha256-PXnXFuSyHlXCjeS3JWtzHdX5kqO22Qe8NPiy7MGvjmA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-setup-assistant/default.nix b/distros/melodic/moveit-setup-assistant/default.nix index 3e472dae57..ddfbf7f1eb 100644 --- a/distros/melodic/moveit-setup-assistant/default.nix +++ b/distros/melodic/moveit-setup-assistant/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-setup-assistant"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_setup_assistant/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "c4dfdb799048aee9bbc45cc017aed193f0140028c7d90725e4aeb82008b0360a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_setup_assistant/1.0.11-1"; + sha256 = "sha256-Q+sKqo/01GXj7yuAxDas5sXgk/+GIT3QlSuvx8uhuDQ="; + }; buildType = "catkin"; buildInputs = [ catkin ogre1_9 qt5.qtbase ]; diff --git a/distros/melodic/moveit-sim-controller/default.nix b/distros/melodic/moveit-sim-controller/default.nix index f66335a924..9ea0005b74 100644 --- a/distros/melodic/moveit-sim-controller/default.nix +++ b/distros/melodic/moveit-sim-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-sim-controller"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/moveit_sim_controller-release/archive/release/melodic/moveit_sim_controller/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "86cfd592c05305bb60387de3f33bcc248b800f29d8e6f7aeba371349da86372e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "moveit_sim_controller-release"; + rev = "release/melodic/moveit_sim_controller/0.2.0-1"; + sha256 = "sha256-VXgpOY/pWMUQ4jPKrYlwss8wmoC/kl/utfkieqg5X30="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/moveit-simple-controller-manager/default.nix b/distros/melodic/moveit-simple-controller-manager/default.nix index 30cc872960..44ad7767c4 100644 --- a/distros/melodic/moveit-simple-controller-manager/default.nix +++ b/distros/melodic/moveit-simple-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-simple-controller-manager"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit_simple_controller_manager/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "2f5e1fccdd0879f69bbb77cb65c8a2dde355c8a37f4437dda2fa753843875329"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit_simple_controller_manager/1.0.11-1"; + sha256 = "sha256-c7ktag5Rh89GoD+BvWlkjQP0yJIQyyYRPco2uIl9bbg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit-visual-tools/default.nix b/distros/melodic/moveit-visual-tools/default.nix index e8dd9d8a1f..9b46bff861 100644 --- a/distros/melodic/moveit-visual-tools/default.nix +++ b/distros/melodic/moveit-visual-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit-visual-tools"; version = "3.5.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_visual_tools-release/archive/release/melodic/moveit_visual_tools/3.5.2-0.tar.gz"; - name = "3.5.2-0.tar.gz"; - sha256 = "89188c2b6459781c14abe35014f937e5c199cd11f8fd45f943ff21e1b654ec84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_visual_tools-release"; + rev = "release/melodic/moveit_visual_tools/3.5.2-0"; + sha256 = "sha256-a0NJYoWnc/wwIGjc0KpOtPseZJkLs6X12kPinSwmGTU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/moveit/default.nix b/distros/melodic/moveit/default.nix index d2078a1ce2..821ab03555 100644 --- a/distros/melodic/moveit/default.nix +++ b/distros/melodic/moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-moveit"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/moveit/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "71b08dd184090589f782e542738570caacdfadf7521c1867a1232150be353fe4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/moveit/1.0.11-1"; + sha256 = "sha256-/lasI4ZJspEI+fN2bqWxRwRhejbok1ECLK/aptDju4s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/movie-publisher/default.nix b/distros/melodic/movie-publisher/default.nix index e75db25185..1fe1252622 100644 --- a/distros/melodic/movie-publisher/default.nix +++ b/distros/melodic/movie-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-movie-publisher"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/peci1/movie_publisher-release/archive/release/melodic/movie_publisher/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "917662a10f791fb87c5a3e7d42433f0c0a83365c5e9eba6aa3c05642e6df1f71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "movie_publisher-release"; + rev = "release/melodic/movie_publisher/1.3.1-1"; + sha256 = "sha256-0Zcu+GmIrUNRq0ot+uGJ4Hdr3zw10Keyj0pdIAAwue4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mpc-local-planner-examples/default.nix b/distros/melodic/mpc-local-planner-examples/default.nix index 7f64b52b51..731621a5a5 100644 --- a/distros/melodic/mpc-local-planner-examples/default.nix +++ b/distros/melodic/mpc-local-planner-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mpc-local-planner-examples"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/mpc_local_planner-release/archive/release/melodic/mpc_local_planner_examples/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "79549b550d571485d31da57e740d6d35eda56544939da69caf2c521543705430"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "mpc_local_planner-release"; + rev = "release/melodic/mpc_local_planner_examples/0.0.3-1"; + sha256 = "sha256-b0ah2/zKdH5K97yrriZ/Y2p+dSNrQfgD/p74fqlwT3o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mpc-local-planner-msgs/default.nix b/distros/melodic/mpc-local-planner-msgs/default.nix index 1e6616f303..ce87eb34e0 100644 --- a/distros/melodic/mpc-local-planner-msgs/default.nix +++ b/distros/melodic/mpc-local-planner-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mpc-local-planner-msgs"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/mpc_local_planner-release/archive/release/melodic/mpc_local_planner_msgs/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "802a95c12ab6588105f018277842d85b4325d5ef06bf0fda584beb319126a4b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "mpc_local_planner-release"; + rev = "release/melodic/mpc_local_planner_msgs/0.0.3-1"; + sha256 = "sha256-6FOcckDTHzwh756Pq/lfuT0de+nfgGD8Y+MA+VqEoDk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/mpc-local-planner/default.nix b/distros/melodic/mpc-local-planner/default.nix index ffd641214b..56e938a5e2 100644 --- a/distros/melodic/mpc-local-planner/default.nix +++ b/distros/melodic/mpc-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mpc-local-planner"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/mpc_local_planner-release/archive/release/melodic/mpc_local_planner/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "0b22647c9eb78beee9582b7f3b4c1bc9b0e1041340482b82c34a09fe4e9090aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "mpc_local_planner-release"; + rev = "release/melodic/mpc_local_planner/0.0.3-1"; + sha256 = "sha256-Jl0nXk5CrF/i/HLKUXfCvyGmxucRZz/zr25BiGihV9k="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen tf2-geometry-msgs ]; diff --git a/distros/melodic/mqtt-bridge/default.nix b/distros/melodic/mqtt-bridge/default.nix index cfb75a5105..c2284f624d 100644 --- a/distros/melodic/mqtt-bridge/default.nix +++ b/distros/melodic/mqtt-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mqtt-bridge"; version = "0.1.8-r4"; - src = fetchurl { - url = "https://github.com/groove-x/mqtt_bridge-release/archive/release/melodic/mqtt_bridge/0.1.8-4.tar.gz"; - name = "0.1.8-4.tar.gz"; - sha256 = "b6ee5c7ab85fd71dd76c4b8a59e74f17b12a6d593eff387183dc4d0d7e58dd4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "groove-x"; + repo = "mqtt_bridge-release"; + rev = "release/melodic/mqtt_bridge/0.1.8-4"; + sha256 = "sha256-dO/22C/MA8HHWA5ia6zOCoickqtOyHBBvG7GoKOLnYk="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.pip pythonPackages.setuptools ]; diff --git a/distros/melodic/mrp2-bringup/default.nix b/distros/melodic/mrp2-bringup/default.nix index 570c860c1c..3397f71235 100644 --- a/distros/melodic/mrp2-bringup/default.nix +++ b/distros/melodic/mrp2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-bringup"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_robot-release/archive/release/melodic/mrp2_bringup/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "36a087e929d36c7dd111c98414745b12b6f7840be41c28b1eaea3966ac945efd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_robot-release"; + rev = "release/melodic/mrp2_bringup/0.2.6-1"; + sha256 = "sha256-fr2Jlmr66aPAxvCnD9uCw3yYT8zCB0ST5+/JtgpTviY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-common/default.nix b/distros/melodic/mrp2-common/default.nix index 120cc4f2bc..9052b5f3c6 100644 --- a/distros/melodic/mrp2-common/default.nix +++ b/distros/melodic/mrp2-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-common"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_common-release/archive/release/melodic/mrp2_common/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "77c19936251d04af85bdbc6d3795d77c6c534a7aeaae13e9afcf044734141faf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_common-release"; + rev = "release/melodic/mrp2_common/1.0.1-1"; + sha256 = "sha256-KYZdO01TXcuBPHdWDqYGdvOtPoPKXSBSH3j6YjZXC8Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-description/default.nix b/distros/melodic/mrp2-description/default.nix index a25e7f8659..6782abe894 100644 --- a/distros/melodic/mrp2-description/default.nix +++ b/distros/melodic/mrp2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-description"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_common-release/archive/release/melodic/mrp2_description/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "013be584475464ae7a6cdb5808b43706a8eda7a1d658db790c9fea6d21c0f7fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_common-release"; + rev = "release/melodic/mrp2_description/1.0.1-1"; + sha256 = "sha256-ES0PCwmenMtLjjHODIdr0ReZMf1AScDrN65D/D7SPbU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-desktop/default.nix b/distros/melodic/mrp2-desktop/default.nix index d2931107b9..d43661bb82 100644 --- a/distros/melodic/mrp2-desktop/default.nix +++ b/distros/melodic/mrp2-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-desktop"; version = "0.2.2-r2"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_desktop-release/archive/release/melodic/mrp2_desktop/0.2.2-2.tar.gz"; - name = "0.2.2-2.tar.gz"; - sha256 = "5b88ab03947833528ff30c2794bf2539665b1a7e156e01837ad567f8ae1b93af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_desktop-release"; + rev = "release/melodic/mrp2_desktop/0.2.2-2"; + sha256 = "sha256-FXK+yytZp9pAD3/+9XWlCXsXWD5W6AwbDvAbDzN8sX8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-display/default.nix b/distros/melodic/mrp2-display/default.nix index 4d8de59e57..e274ed03d5 100644 --- a/distros/melodic/mrp2-display/default.nix +++ b/distros/melodic/mrp2-display/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-display"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_robot-release/archive/release/melodic/mrp2_display/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "d69ecf628b832b2aae53de015b6f4d19bb11926b99d5c2633797c2d85183025d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_robot-release"; + rev = "release/melodic/mrp2_display/0.2.6-1"; + sha256 = "sha256-YxjXTVtEzNHqiIJvBhlwK8ywPs5w1iUegc33r8nmWOQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/mrp2-gazebo/default.nix b/distros/melodic/mrp2-gazebo/default.nix index 005c1b530b..926a99b701 100644 --- a/distros/melodic/mrp2-gazebo/default.nix +++ b/distros/melodic/mrp2-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-gazebo"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_simulator-release/archive/release/melodic/mrp2_gazebo/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "f77fb0195ade42964f6a031678a1e7e2cff25fb9bf9b9322f9501d73bf09daa6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_simulator-release"; + rev = "release/melodic/mrp2_gazebo/1.0.1-1"; + sha256 = "sha256-KBUDPHLz5iDtJG7+au2AIPT5gXZ9cUVQgitKD5elFMc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-hardware/default.nix b/distros/melodic/mrp2-hardware/default.nix index 9d123dccb5..42b27046d8 100644 --- a/distros/melodic/mrp2-hardware/default.nix +++ b/distros/melodic/mrp2-hardware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-hardware"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_robot-release/archive/release/melodic/mrp2_hardware/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "9e24ca8d2a69bc530435b6d4cbd59a9847adfccea4c3733b414c3fcdd1d52bb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_robot-release"; + rev = "release/melodic/mrp2_hardware/0.2.6-1"; + sha256 = "sha256-of5GjGHLn4YySAF/5enI2VJKqXxOFf0L0xQDBVvmeZc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-navigation/default.nix b/distros/melodic/mrp2-navigation/default.nix index 6f3a42406a..83366ea046 100644 --- a/distros/melodic/mrp2-navigation/default.nix +++ b/distros/melodic/mrp2-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-navigation"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_common-release/archive/release/melodic/mrp2_navigation/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "c1112b94a3dbe6edf34a3f4c7befea2e5b51ade35db801a2460e7270fff724d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_common-release"; + rev = "release/melodic/mrp2_navigation/1.0.1-1"; + sha256 = "sha256-zNTELOyqOVBxdzG1P8tRofvGqln4HwwC0KbUGzcivrs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-robot/default.nix b/distros/melodic/mrp2-robot/default.nix index df39e009d9..ab530f332e 100644 --- a/distros/melodic/mrp2-robot/default.nix +++ b/distros/melodic/mrp2-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-robot"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_robot-release/archive/release/melodic/mrp2_robot/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "06050be3904e8a666c39b134259e7cd3f67208496ba9bcf3f4844b32f620876e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_robot-release"; + rev = "release/melodic/mrp2_robot/0.2.6-1"; + sha256 = "sha256-ZdqT8Mb4kz89CLB9bXBKFuzwDBX3rsHsrjrYZLmg4FI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-simulator/default.nix b/distros/melodic/mrp2-simulator/default.nix index b7b6844778..d6d209df4c 100644 --- a/distros/melodic/mrp2-simulator/default.nix +++ b/distros/melodic/mrp2-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-simulator"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_simulator-release/archive/release/melodic/mrp2_simulator/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "74d4fe6ed97f54e4168fc135452ebe756bcdab2ac11cb89000d500a1e6e7cfeb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_simulator-release"; + rev = "release/melodic/mrp2_simulator/1.0.1-1"; + sha256 = "sha256-rwry73M+eOaIvqrkOqR1d6PVdodXApjhoVpjCHDIVCU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-slam/default.nix b/distros/melodic/mrp2-slam/default.nix index 9ff87ed6fb..e4c7273b93 100644 --- a/distros/melodic/mrp2-slam/default.nix +++ b/distros/melodic/mrp2-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-slam"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_common-release/archive/release/melodic/mrp2_slam/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "207c284c5bd45d3fdff2deb47ca84513c5739991cf9082d62ec841d742e068a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_common-release"; + rev = "release/melodic/mrp2_slam/1.0.1-1"; + sha256 = "sha256-ElV4KS4ZJILHeT7GK+8nNLvYqe//5r6ZmYv6ErGh+e4="; + }; buildType = "catkin"; buildInputs = [ catkin tf ]; diff --git a/distros/melodic/mrp2-teleop/default.nix b/distros/melodic/mrp2-teleop/default.nix index a9955b4a30..e4c9b62abe 100644 --- a/distros/melodic/mrp2-teleop/default.nix +++ b/distros/melodic/mrp2-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-teleop"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_common-release/archive/release/melodic/mrp2_teleop/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "2ce1fc55f49d75f858d0933568b15a432db23769b1241f5a088468b0ca12c21c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_common-release"; + rev = "release/melodic/mrp2_teleop/1.0.1-1"; + sha256 = "sha256-145swAhbbQb9dqNWJryLDUGL1vu6wMMiDgodSIQOY2g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrp2-viz/default.nix b/distros/melodic/mrp2-viz/default.nix index 946b8294e8..a2b12f1211 100644 --- a/distros/melodic/mrp2-viz/default.nix +++ b/distros/melodic/mrp2-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrp2-viz"; version = "0.2.2-r2"; - src = fetchurl { - url = "https://github.com/milvusrobotics/mrp2_desktop-release/archive/release/melodic/mrp2_viz/0.2.2-2.tar.gz"; - name = "0.2.2-2.tar.gz"; - sha256 = "e7509655700e25e8fd79fe9c107314fc7c9a2d390e04011ff810cf0aeab6159c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "milvusrobotics"; + repo = "mrp2_desktop-release"; + rev = "release/melodic/mrp2_viz/0.2.2-2"; + sha256 = "sha256-LRHxLT/r/wBCiOHuI43iOng6l5P0esISCRJiwrn7B+o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-ekf-slam-2d/default.nix b/distros/melodic/mrpt-ekf-slam-2d/default.nix index 13fea802f0..f2a2c21ebc 100644 --- a/distros/melodic/mrpt-ekf-slam-2d/default.nix +++ b/distros/melodic/mrpt-ekf-slam-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-ekf-slam-2d"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/melodic/mrpt_ekf_slam_2d/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "6d79212d84c0e2cdb8cdfcfd2f16b0a1686692598e8008f34dea7fb120cb7a61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/melodic/mrpt_ekf_slam_2d/0.1.12-1"; + sha256 = "sha256-Uj8Ud5QpVVbQLHSEpPSyAjjGla8zFb9uoZKPK3G65K4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-ekf-slam-3d/default.nix b/distros/melodic/mrpt-ekf-slam-3d/default.nix index 6630732759..980304f49d 100644 --- a/distros/melodic/mrpt-ekf-slam-3d/default.nix +++ b/distros/melodic/mrpt-ekf-slam-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-ekf-slam-3d"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/melodic/mrpt_ekf_slam_3d/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "8415b192c8681e63926e8b73938931b29d762b8b32fae88139fd01fb5d13f7de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/melodic/mrpt_ekf_slam_3d/0.1.12-1"; + sha256 = "sha256-HOmEg7ke/YWibFUo1Ku/X/fTOyC4Sorq3IzFmPCHVBg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-generic-sensor/default.nix b/distros/melodic/mrpt-generic-sensor/default.nix index 9833bbadd0..b5fbd70fd6 100644 --- a/distros/melodic/mrpt-generic-sensor/default.nix +++ b/distros/melodic/mrpt-generic-sensor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-generic-sensor"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_sensors-release/archive/release/melodic/mrpt_generic_sensor/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "916c926cdda245d427cb9cf890177ca9d9c0db245b7aacd451c9e78777094d40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_sensors-release"; + rev = "release/melodic/mrpt_generic_sensor/0.0.2-1"; + sha256 = "sha256-TQeEDnO4mSjkLg/n3JFX25GpI5sRkTCfejPnCvONfVA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-icp-slam-2d/default.nix b/distros/melodic/mrpt-icp-slam-2d/default.nix index 97640e27b8..f82074ea22 100644 --- a/distros/melodic/mrpt-icp-slam-2d/default.nix +++ b/distros/melodic/mrpt-icp-slam-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-icp-slam-2d"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/melodic/mrpt_icp_slam_2d/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "184bccb5b6188df6fe089f0312c22b7ba313e91bec80ef27d878942786d4cb1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/melodic/mrpt_icp_slam_2d/0.1.12-1"; + sha256 = "sha256-YH+fZTUPIOgBDszuxf98cRdtP7A5x6KBbq4gzbn5UbU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-local-obstacles/default.nix b/distros/melodic/mrpt-local-obstacles/default.nix index d16c4d9d03..01b553c8b5 100644 --- a/distros/melodic/mrpt-local-obstacles/default.nix +++ b/distros/melodic/mrpt-local-obstacles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-local-obstacles"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/melodic/mrpt_local_obstacles/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "3b83801d32ab3cd2a9d4058928f76d41f1745c8a32649aef69b868eeadc3e1b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/melodic/mrpt_local_obstacles/1.0.3-1"; + sha256 = "sha256-+XelWhmpNWGN2VPwsYxvnDqE5n0evaT4N/G8w9QpAgk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-localization/default.nix b/distros/melodic/mrpt-localization/default.nix index 83c8d2866a..866773f24a 100644 --- a/distros/melodic/mrpt-localization/default.nix +++ b/distros/melodic/mrpt-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-localization"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/melodic/mrpt_localization/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "b4aa12aa07af68af304861ea58caf7efd1062ba46fea2d37f69e6554dd00623e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/melodic/mrpt_localization/1.0.3-1"; + sha256 = "sha256-WK/jEAj5/7TRKeD8CYbsiRu8Ml899vp6vHzBBeyX1+M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-map/default.nix b/distros/melodic/mrpt-map/default.nix index e5270711f4..717e151ee7 100644 --- a/distros/melodic/mrpt-map/default.nix +++ b/distros/melodic/mrpt-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-map"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/melodic/mrpt_map/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "24ef2e1113adfdd73ba8564c967eb127dc979be58553a0446113c1e1188f8692"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/melodic/mrpt_map/1.0.3-1"; + sha256 = "sha256-uVw11bzQNNLeCSkYlWpN502jdgIKwQcXt+atEOItQvw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-msgs-bridge/default.nix b/distros/melodic/mrpt-msgs-bridge/default.nix index 7a2f184d5b..b38d8db604 100644 --- a/distros/melodic/mrpt-msgs-bridge/default.nix +++ b/distros/melodic/mrpt-msgs-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-msgs-bridge"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/melodic/mrpt_msgs_bridge/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "35fe4314b5efcd7172fcad4750d00030e53020644233c9743953f7cb09541f0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/melodic/mrpt_msgs_bridge/1.0.3-1"; + sha256 = "sha256-dVjKauDC+Ln4glEsjm6Ecq5I6DjaKqn+Lavuj+rh7F4="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/melodic/mrpt-msgs/default.nix b/distros/melodic/mrpt-msgs/default.nix index 2992a16425..9c573fdd89 100644 --- a/distros/melodic/mrpt-msgs/default.nix +++ b/distros/melodic/mrpt-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-msgs"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_msgs-release/archive/release/melodic/mrpt_msgs/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "71c42945e7dc24d7a6600f9d069f1657fa5b04ed5e1a7d23c7054e5dc742eb4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_msgs-release"; + rev = "release/melodic/mrpt_msgs/0.4.4-1"; + sha256 = "sha256-FSw//54G9jpJoibViHkmDUI+/IqcjDC67ZxH4JOk4qk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/mrpt-navigation/default.nix b/distros/melodic/mrpt-navigation/default.nix index edd9fe7add..8178ad856b 100644 --- a/distros/melodic/mrpt-navigation/default.nix +++ b/distros/melodic/mrpt-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-navigation"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/melodic/mrpt_navigation/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "6d49ff754d1b5169fc887c9982d4619f39d863e48f320e33a1c639cef52cc24b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/melodic/mrpt_navigation/1.0.3-1"; + sha256 = "sha256-uiNJN999GkU9rDHDzD2qXEkyOiOiZr0Y4OhEKU/AfPc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-rawlog/default.nix b/distros/melodic/mrpt-rawlog/default.nix index 342e434620..44b1c0ee6f 100644 --- a/distros/melodic/mrpt-rawlog/default.nix +++ b/distros/melodic/mrpt-rawlog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-rawlog"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/melodic/mrpt_rawlog/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "8f78c6047035c49022fac2b1d7daa4ebab2a6e3294c25fd6b1e62f66f066abfe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/melodic/mrpt_rawlog/1.0.3-1"; + sha256 = "sha256-uuhErd4GPirrV6bwgHc6quoRNFP7wFAi7NEsaV9JfNw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-rbpf-slam/default.nix b/distros/melodic/mrpt-rbpf-slam/default.nix index f86d1025c2..63f8b63fb8 100644 --- a/distros/melodic/mrpt-rbpf-slam/default.nix +++ b/distros/melodic/mrpt-rbpf-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-rbpf-slam"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/melodic/mrpt_rbpf_slam/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "de2e658b643fe38035439a83db18a58d36f8d4604e8d377a2e0c26cf65b2905e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/melodic/mrpt_rbpf_slam/0.1.12-1"; + sha256 = "sha256-A8xJL0+3nsuPrhRlB9XM2SQWqEoypmAoZI3egI8VMUE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-reactivenav2d/default.nix b/distros/melodic/mrpt-reactivenav2d/default.nix index 86ecfaf995..846d82e3d5 100644 --- a/distros/melodic/mrpt-reactivenav2d/default.nix +++ b/distros/melodic/mrpt-reactivenav2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-reactivenav2d"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/melodic/mrpt_reactivenav2d/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "b0934b30d0c7e715d832d3daabfa32de16ad59b6c21d61e8ba35bcbbd8219e27"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/melodic/mrpt_reactivenav2d/1.0.3-1"; + sha256 = "sha256-dUdn7k6NmRqU+epcTmEkWezxr1pqlq9LjxiNQgNnhoY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-sensorlib/default.nix b/distros/melodic/mrpt-sensorlib/default.nix index 1762b2bda9..2494eb120a 100644 --- a/distros/melodic/mrpt-sensorlib/default.nix +++ b/distros/melodic/mrpt-sensorlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-sensorlib"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_sensors-release/archive/release/melodic/mrpt_sensorlib/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "a0e9b917797b73226f1b1880273bf7328b88616e9617db3c3882d6f707dc6cb5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_sensors-release"; + rev = "release/melodic/mrpt_sensorlib/0.0.2-1"; + sha256 = "sha256-qSgppjhZk98hlF7X1tscTHmd6lnIQTJkpO9MpADFCx4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-sensors/default.nix b/distros/melodic/mrpt-sensors/default.nix index ce8de993d7..f64dea3d69 100644 --- a/distros/melodic/mrpt-sensors/default.nix +++ b/distros/melodic/mrpt-sensors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-sensors"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_sensors-release/archive/release/melodic/mrpt_sensors/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "e85fc055d90365682b4d820a786ed4abb82e0e33550712670bb58de14c8ea252"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_sensors-release"; + rev = "release/melodic/mrpt_sensors/0.0.2-1"; + sha256 = "sha256-+aiZEQzrirC1eOu5md/Rkrm2wNbNutYD11mpc2RwRCI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-slam/default.nix b/distros/melodic/mrpt-slam/default.nix index d1ae729518..c7e76e131b 100644 --- a/distros/melodic/mrpt-slam/default.nix +++ b/distros/melodic/mrpt-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-slam"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/melodic/mrpt_slam/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "095d88fd8e61c6fd259a94866a6c7945099a3617243cffb6148a44e1ea16a735"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/melodic/mrpt_slam/0.1.12-1"; + sha256 = "sha256-1rWxTTtaZN/DlzX5faTtFIPpFuEDKlI1ELnP9YeWfoA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt-tutorials/default.nix b/distros/melodic/mrpt-tutorials/default.nix index eb06825ac7..6d2febb097 100644 --- a/distros/melodic/mrpt-tutorials/default.nix +++ b/distros/melodic/mrpt-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt-tutorials"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/melodic/mrpt_tutorials/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "d773ba2b3007224578954e4ec26e2d245727851cc4bd89063fbe59a288f0af31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/melodic/mrpt_tutorials/1.0.3-1"; + sha256 = "sha256-aDAE+hDZ5XU1ELITVpiKAnXbhV+H9FWx3euVqFjfXVo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mrpt1/default.nix b/distros/melodic/mrpt1/default.nix index c737a4b20e..ab46d92cdd 100644 --- a/distros/melodic/mrpt1/default.nix +++ b/distros/melodic/mrpt1/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrpt1"; version = "1.5.9-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt1-release/archive/release/melodic/mrpt1/1.5.9-1.tar.gz"; - name = "1.5.9-1.tar.gz"; - sha256 = "3b46d8c2174663f750de2c3c6533f2284fdd117b1e9f3b238f986f7363f0fe26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt1-release"; + rev = "release/melodic/mrpt1/1.5.9-1"; + sha256 = "sha256-0aPmClQk3GUqao+WQQIWznV19VMHtmrsUJ0J+GYEhpY="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/mrt-cmake-modules/default.nix b/distros/melodic/mrt-cmake-modules/default.nix index 9d7f1f3105..6ada5ae23f 100644 --- a/distros/melodic/mrt-cmake-modules/default.nix +++ b/distros/melodic/mrt-cmake-modules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mrt-cmake-modules"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/KIT-MRT/mrt_cmake_modules-release/archive/release/melodic/mrt_cmake_modules/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "72c884e7144bd8b900da5e1436fc28b2433ecbeaa8735ca7e7d16f1c9690b5c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KIT-MRT"; + repo = "mrt_cmake_modules-release"; + rev = "release/melodic/mrt_cmake_modules/1.0.4-1"; + sha256 = "sha256-HsXMI+9eH6Suh9jIyPUkkwkOrPzB7vvm5fwmFO99V7s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multi-interface-roam/default.nix b/distros/melodic/multi-interface-roam/default.nix index 38b99df19c..72dcb0eec5 100644 --- a/distros/melodic/multi-interface-roam/default.nix +++ b/distros/melodic/multi-interface-roam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multi-interface-roam"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/multi_interface_roam/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "63d583ac95a415fdd60c63c5056a5e1b11c9ec3f643028304d381bce18a3fb79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/multi_interface_roam/1.0.16-1"; + sha256 = "sha256-1L6cTx+JWhWGuKNKSSrhUiAdhyaryrdeZSTwtb810bI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multi-map-server/default.nix b/distros/melodic/multi-map-server/default.nix index cb62eb8bc2..612c533af2 100644 --- a/distros/melodic/multi-map-server/default.nix +++ b/distros/melodic/multi-map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multi-map-server"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/multi_map_server/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "48e09df586a52fb77cc5f1f9eae7e36d1087c5e2bb62a98006950e9cacc393c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/multi_map_server/2.2.12-1"; + sha256 = "sha256-e0aYLRc1kI+gHkjBn9uy+l6RrVim+ePXD+pJDLdDYNU="; + }; buildType = "catkin"; buildInputs = [ catkin jsk-tools pythonPackages.pillow pythonPackages.pyyaml rosmake ]; diff --git a/distros/melodic/multi-object-tracking-lidar/default.nix b/distros/melodic/multi-object-tracking-lidar/default.nix index 9ab287b461..82c1f5c0ab 100644 --- a/distros/melodic/multi-object-tracking-lidar/default.nix +++ b/distros/melodic/multi-object-tracking-lidar/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multi-object-tracking-lidar"; version = "1.0.4-r2"; - src = fetchurl { - url = "https://github.com/praveen-palanisamy/multi_object_tracking_lidar-release/archive/release/melodic/multi_object_tracking_lidar/1.0.4-2.tar.gz"; - name = "1.0.4-2.tar.gz"; - sha256 = "63755a5dbaa0f51fce61f80fb41810d2dbeee04ea715a685ea4e130ccb6691fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "praveen-palanisamy"; + repo = "multi_object_tracking_lidar-release"; + rev = "release/melodic/multi_object_tracking_lidar/1.0.4-2"; + sha256 = "sha256-I6R5gL5M0zk6+KVOWOoZSj0kEvqQ2K1TptYmXspLTo0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multimaster-fkie/default.nix b/distros/melodic/multimaster-fkie/default.nix index aea08ccb58..ffb5865995 100644 --- a/distros/melodic/multimaster-fkie/default.nix +++ b/distros/melodic/multimaster-fkie/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multimaster-fkie"; version = "0.8.12"; - src = fetchurl { - url = "https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/multimaster_fkie/0.8.12-0.tar.gz"; - name = "0.8.12-0.tar.gz"; - sha256 = "1119b4d51db09a0811ca344110f064d21037ada2c8b35f8535b7b6986b996356"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "multimaster_fkie-release"; + rev = "release/melodic/multimaster_fkie/0.8.12-0"; + sha256 = "sha256-fMTR7WImbVCEHdkidpL282FslohAulr3WTrWwYerLUU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multimaster-launch/default.nix b/distros/melodic/multimaster-launch/default.nix index 1147152d6b..496df3ca2e 100644 --- a/distros/melodic/multimaster-launch/default.nix +++ b/distros/melodic/multimaster-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multimaster-launch"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/cpr_multimaster_tools-release/archive/release/melodic/multimaster_launch/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "c825dbbb0b8082547b430423181630c5fc96e45e2d60f0110f94bcbb873a43cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "cpr_multimaster_tools-release"; + rev = "release/melodic/multimaster_launch/0.0.2-1"; + sha256 = "sha256-VcIcG8ter9vFA0diJf99sQD9c0ynFEeG5GkxB4yUNBU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multimaster-msgs-fkie/default.nix b/distros/melodic/multimaster-msgs-fkie/default.nix index 08a95eb8d0..cd45a295ea 100644 --- a/distros/melodic/multimaster-msgs-fkie/default.nix +++ b/distros/melodic/multimaster-msgs-fkie/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multimaster-msgs-fkie"; version = "0.8.12"; - src = fetchurl { - url = "https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/multimaster_msgs_fkie/0.8.12-0.tar.gz"; - name = "0.8.12-0.tar.gz"; - sha256 = "e69b1c634583d23b9fce4e222c7e4f1728b6849811b9fcb13ef41b0bb26bbc6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "multimaster_fkie-release"; + rev = "release/melodic/multimaster_msgs_fkie/0.8.12-0"; + sha256 = "sha256-rBXBy/KUDPobfiwqPozi2shgOJ2BCW/T+655H8IAdrg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/multimaster-msgs/default.nix b/distros/melodic/multimaster-msgs/default.nix index fa09f286dc..7e64005192 100644 --- a/distros/melodic/multimaster-msgs/default.nix +++ b/distros/melodic/multimaster-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multimaster-msgs"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/cpr_multimaster_tools-release/archive/release/melodic/multimaster_msgs/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "a54fb359f77128a68fcace506ee0da2be2b147ccd567b4f947d70ddf740bb153"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "cpr_multimaster_tools-release"; + rev = "release/melodic/multimaster_msgs/0.0.2-1"; + sha256 = "sha256-ZhEIJM0qg5NeJRAcDaQQPYg3ASlfccy/aL8O8Hsy3ZM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/multires-image/default.nix b/distros/melodic/multires-image/default.nix index e83da9d39c..689e174a65 100644 --- a/distros/melodic/multires-image/default.nix +++ b/distros/melodic/multires-image/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multires-image"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/melodic/multires_image/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "f915a51c4f1ecf3ef912fd59b1391248f355405e0a77c7694801bc61befccb44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/melodic/multires_image/1.4.2-1"; + sha256 = "sha256-aHgyyFOdYXhYq5wpO2N6SaGl5xFqZviBbhp8xYP8Ogg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multirobot-map-merge/default.nix b/distros/melodic/multirobot-map-merge/default.nix index 799dd1f705..380824f2fe 100644 --- a/distros/melodic/multirobot-map-merge/default.nix +++ b/distros/melodic/multirobot-map-merge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multirobot-map-merge"; version = "2.1.4-r1"; - src = fetchurl { - url = "https://github.com/hrnr/m-explore-release/archive/release/melodic/multirobot_map_merge/2.1.4-1.tar.gz"; - name = "2.1.4-1.tar.gz"; - sha256 = "71f20bdcdabd059e615549ff71a6706b5a2ebff64d99d14d74a62400f44e9d9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "hrnr"; + repo = "m-explore-release"; + rev = "release/melodic/multirobot_map_merge/2.1.4-1"; + sha256 = "sha256-y2/4j5S1DXEjv860XEhaPFk5KNqljNLeCYxbgkgL2XA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multisense-bringup/default.nix b/distros/melodic/multisense-bringup/default.nix index 92a2a3c832..5c64ef79c6 100644 --- a/distros/melodic/multisense-bringup/default.nix +++ b/distros/melodic/multisense-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multisense-bringup"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/melodic/multisense_bringup/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "a31b5570939129975f3b6a52091826683cc8e10302ff9c5eb77aff517489f11c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/melodic/multisense_bringup/4.0.4-1"; + sha256 = "sha256-DRQeWGJK55FxDEecBbi/78gXwkiKR84cAebkNWH9Wj4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multisense-cal-check/default.nix b/distros/melodic/multisense-cal-check/default.nix index c525fe5c5e..1e071481eb 100644 --- a/distros/melodic/multisense-cal-check/default.nix +++ b/distros/melodic/multisense-cal-check/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multisense-cal-check"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/melodic/multisense_cal_check/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "0723fc6f404b8f4a9c77ea7423a4ed157be19979ba334d03b96a1a4a1f531429"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/melodic/multisense_cal_check/4.0.4-1"; + sha256 = "sha256-eVrmxWJ9fB3mqvw/RJBLRv5FbHx2YYqOgpTk4nXT9y8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multisense-description/default.nix b/distros/melodic/multisense-description/default.nix index 7488c11e5b..29835d82ee 100644 --- a/distros/melodic/multisense-description/default.nix +++ b/distros/melodic/multisense-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multisense-description"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/melodic/multisense_description/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "9bf3337c167a47ecad0285d506b754475fb156d6278081c6b068db468276b570"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/melodic/multisense_description/4.0.4-1"; + sha256 = "sha256-Cg5RL+MCoFUMBRpVQIcKRmmwVNFZpOm9mI8mEiHKlp0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multisense-lib/default.nix b/distros/melodic/multisense-lib/default.nix index 45d40666bc..d14292c2de 100644 --- a/distros/melodic/multisense-lib/default.nix +++ b/distros/melodic/multisense-lib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multisense-lib"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/melodic/multisense_lib/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "286706a49f91483bd9f5407a9580eedd3d7fabdbdb0deef85d1cfa2019f52d52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/melodic/multisense_lib/4.0.4-1"; + sha256 = "sha256-qpYSoHcNWGEiyVV29HTtPZC9g5dab6g5K6Fubt0L0ZM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/multisense-ros/default.nix b/distros/melodic/multisense-ros/default.nix index b969371252..04c003fb0a 100644 --- a/distros/melodic/multisense-ros/default.nix +++ b/distros/melodic/multisense-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multisense-ros"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/melodic/multisense_ros/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "a88588e4550c6e557b1bb0aac32e25760bc9e0eb185662cda3c00ede3d42210f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/melodic/multisense_ros/4.0.4-1"; + sha256 = "sha256-J9JGrFWZmLhh6HFPGocH6YM2nJZU/SHhiB82gbJ0u9k="; + }; buildType = "catkin"; buildInputs = [ catkin libyamlcpp ]; diff --git a/distros/melodic/multisense/default.nix b/distros/melodic/multisense/default.nix index 48114086aa..8dc5b2828b 100644 --- a/distros/melodic/multisense/default.nix +++ b/distros/melodic/multisense/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-multisense"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/melodic/multisense/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "1b947a09139d5a7d36abbf0fae0bf58cd911427da914f6e37277d08bd2d4b127"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/melodic/multisense/4.0.4-1"; + sha256 = "sha256-6+2FVnGaBduoPvxSDLuhOh9f1C81IfBZoxEndPGDlqo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/mvsim/default.nix b/distros/melodic/mvsim/default.nix index 1650f4d082..6aa618f10e 100644 --- a/distros/melodic/mvsim/default.nix +++ b/distros/melodic/mvsim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-mvsim"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/ual-arm-ros-pkg-release/mvsim-release/archive/release/melodic/mvsim/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "36802ac8526aca1a0def4607296e0e32a652cd2fe90df954a1a3f6ff20f7c86d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ual-arm-ros-pkg-release"; + repo = "mvsim-release"; + rev = "release/melodic/mvsim/0.4.3-1"; + sha256 = "sha256-UsYz5EnFEfqiGCOAZAkr2ZcOhc/+OVX7JTk/H43DS2g="; + }; buildType = "catkin"; buildInputs = [ catkin cmake ros-environment ]; diff --git a/distros/melodic/nanomsg/default.nix b/distros/melodic/nanomsg/default.nix index 198927adbb..a7a2e3a26e 100644 --- a/distros/melodic/nanomsg/default.nix +++ b/distros/melodic/nanomsg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nanomsg"; version = "0.4.1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/nanomsg-release/archive/release/melodic/nanomsg/0.4.1-0.tar.gz"; - name = "0.4.1-0.tar.gz"; - sha256 = "0b9f6215f091598eac4c7c958693a5b4c8cb09838e18a5b18bc9feb7bf97dfff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "nanomsg-release"; + rev = "release/melodic/nanomsg/0.4.1-0"; + sha256 = "sha256-v4bzLgjcwbgA25MDz6rNdXKErt1ZGo/T0QitDhzBwVQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nao-meshes/default.nix b/distros/melodic/nao-meshes/default.nix index 1ae8baabdc..74a6659a2c 100644 --- a/distros/melodic/nao-meshes/default.nix +++ b/distros/melodic/nao-meshes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nao-meshes"; version = "0.1.12-r2"; - src = fetchurl { - url = "https://github.com/ros-naoqi/nao_meshes-release/archive/release/melodic/nao_meshes/0.1.12-2.tar.gz"; - name = "0.1.12-2.tar.gz"; - sha256 = "442942148bcf3a939a54415b7229b5785160d7e206402babd96adcab8cde90ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "nao_meshes-release"; + rev = "release/melodic/nao_meshes/0.1.12-2"; + sha256 = "sha256-5NYSxgnOQewQMYZYr+YPAzN7WzUjJMaD1ko7VadO6u8="; + }; buildType = "catkin"; buildInputs = [ catkin openjdk ]; diff --git a/distros/melodic/naoqi-bridge-msgs/default.nix b/distros/melodic/naoqi-bridge-msgs/default.nix index d1034c88bb..5d673c6522 100644 --- a/distros/melodic/naoqi-bridge-msgs/default.nix +++ b/distros/melodic/naoqi-bridge-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-naoqi-bridge-msgs"; version = "0.0.8"; - src = fetchurl { - url = "https://github.com/ros-naoqi/naoqi_bridge_msgs-release/archive/release/melodic/naoqi_bridge_msgs/0.0.8-0.tar.gz"; - name = "0.0.8-0.tar.gz"; - sha256 = "9b36db547dd06cc9c52eafddf00a9cbda189bda058671e977efdf22680d90ea8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "naoqi_bridge_msgs-release"; + rev = "release/melodic/naoqi_bridge_msgs/0.0.8-0"; + sha256 = "sha256-CZQPLxbTD19VT0vOSapXaPuEOFJWqEGi9/KQSW0MjJE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/naoqi-driver/default.nix b/distros/melodic/naoqi-driver/default.nix index fd1edadab3..531c343c04 100644 --- a/distros/melodic/naoqi-driver/default.nix +++ b/distros/melodic/naoqi-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-naoqi-driver"; version = "0.5.12-r1"; - src = fetchurl { - url = "https://github.com/ros-naoqi/naoqi_driver-release/archive/release/melodic/naoqi_driver/0.5.12-1.tar.gz"; - name = "0.5.12-1.tar.gz"; - sha256 = "1517ffa176b401ddd678425f053560707dd214d0371ed5d93472fad5f51ec665"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "naoqi_driver-release"; + rev = "release/melodic/naoqi_driver/0.5.12-1"; + sha256 = "sha256-6XRl2Q3Q1tf4SbOx6BOCV5hVkgaIbOgJvjaR0zH6oIM="; + }; buildType = "catkin"; buildInputs = [ catkin diagnostic-msgs diagnostic-updater geometry-msgs rosgraph-msgs sensor-msgs tf2-geometry-msgs tf2-msgs ]; diff --git a/distros/melodic/naoqi-libqi/default.nix b/distros/melodic/naoqi-libqi/default.nix index 1a91dfc399..4922e91efb 100644 --- a/distros/melodic/naoqi-libqi/default.nix +++ b/distros/melodic/naoqi-libqi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-naoqi-libqi"; version = "2.9.0-r8"; - src = fetchurl { - url = "https://github.com/ros-naoqi/libqi-release/archive/release/melodic/naoqi_libqi/2.9.0-8.tar.gz"; - name = "2.9.0-8.tar.gz"; - sha256 = "cdf737deff9e6e4887b3aff0c777c1fef8e9ff28c85d9b62a18c91771f8c7c07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "libqi-release"; + rev = "release/melodic/naoqi_libqi/2.9.0-8"; + sha256 = "sha256-Wa7KENxGqSTOJ7DLNOFWqlfC6x91OAf5WdR0xHHQbtU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/naoqi-libqicore/default.nix b/distros/melodic/naoqi-libqicore/default.nix index 05ac65cc41..e1bffd86ed 100644 --- a/distros/melodic/naoqi-libqicore/default.nix +++ b/distros/melodic/naoqi-libqicore/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-naoqi-libqicore"; version = "2.9.0-r5"; - src = fetchurl { - url = "https://github.com/ros-naoqi/libqicore-release/archive/release/melodic/naoqi_libqicore/2.9.0-5.tar.gz"; - name = "2.9.0-5.tar.gz"; - sha256 = "f82b0938f694cf2662f2841c9c1f2f8979d42dc596acb19aec4f2a97ffb9069e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "libqicore-release"; + rev = "release/melodic/naoqi_libqicore/2.9.0-5"; + sha256 = "sha256-YNTcg/2vAQ2eUaJQZ9/r/w2Fj7MZcm2kqt/+aSOWQ/s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-2d-msgs/default.nix b/distros/melodic/nav-2d-msgs/default.nix index db33312772..aa6a6d2737 100644 --- a/distros/melodic/nav-2d-msgs/default.nix +++ b/distros/melodic/nav-2d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-2d-msgs"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/nav_2d_msgs/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "c23cf1eba45980b80b02ed35cb823d39cefeb8d03d2832bed92e2028ad8f9ea0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/nav_2d_msgs/0.3.0-1"; + sha256 = "sha256-6wogATbnVAQIGGezE79TDqqMVpzEp85aYLAd2p6Q+cw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/nav-2d-utils/default.nix b/distros/melodic/nav-2d-utils/default.nix index 8dbca12824..47107c36a4 100644 --- a/distros/melodic/nav-2d-utils/default.nix +++ b/distros/melodic/nav-2d-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-2d-utils"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/nav_2d_utils/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "c7339128f7aedde6d0a29eb97fe08ceedb3fdefbddc60fd93a12e850d48aa2d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/nav_2d_utils/0.3.0-1"; + sha256 = "sha256-S8NMplmMbYAGeybyGZ5bkNk3FGFv0Ws0XP3MFPLThQ4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-core-adapter/default.nix b/distros/melodic/nav-core-adapter/default.nix index ade2803236..1d08a8044d 100644 --- a/distros/melodic/nav-core-adapter/default.nix +++ b/distros/melodic/nav-core-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-core-adapter"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/nav_core_adapter/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "dcd968943080ac821ac2a892c2118706155e43ea662f1f762d7867e4e0e385b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/nav_core_adapter/0.3.0-1"; + sha256 = "sha256-0GoVpkQ7uZYQ25Zi4J2lfsrYh/4YD5aaW1JkUWvKn1g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-core/default.nix b/distros/melodic/nav-core/default.nix index 9ea9435833..efe8224652 100644 --- a/distros/melodic/nav-core/default.nix +++ b/distros/melodic/nav-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-core"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/nav_core/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "b6babed0ec8c7c841843fc7dcd109e03214709fc22fbbbdd7707025510bae8af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/nav_core/1.16.7-1"; + sha256 = "sha256-/KaisCBB2letipldFWT9/BxWBS+hokupQQ2fmyFkhm4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-core2/default.nix b/distros/melodic/nav-core2/default.nix index 40101eaea8..4029b166cf 100644 --- a/distros/melodic/nav-core2/default.nix +++ b/distros/melodic/nav-core2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-core2"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/nav_core2/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "d786855deba37a64f5e5a6eaf8ed347911e6fb1e3f3970d2b50766abd6bd2408"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/nav_core2/0.3.0-1"; + sha256 = "sha256-HtN1Qepc1Z/BArsAUomEproTHbeCZj5ijrc1/AVpv2E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-grid-iterators/default.nix b/distros/melodic/nav-grid-iterators/default.nix index faad2431c2..58212495c5 100644 --- a/distros/melodic/nav-grid-iterators/default.nix +++ b/distros/melodic/nav-grid-iterators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-grid-iterators"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/nav_grid_iterators/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "e533852555ad4b53d77ea75fe175970fcaa4ab4007154fdfe19b97c9f998db7f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/nav_grid_iterators/0.3.0-1"; + sha256 = "sha256-mELqssytlBYsC7quosL5IaCw2Fc8LNmqIRYTQCS/nDc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-grid-pub-sub/default.nix b/distros/melodic/nav-grid-pub-sub/default.nix index 4150f4b75d..ea0cea1c00 100644 --- a/distros/melodic/nav-grid-pub-sub/default.nix +++ b/distros/melodic/nav-grid-pub-sub/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-grid-pub-sub"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/nav_grid_pub_sub/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "04a9f2bc803c226d1b460ffa8f5d7aeb2416729f6f8ce1c418d625aa3e34bca7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/nav_grid_pub_sub/0.3.0-1"; + sha256 = "sha256-IXz41GAYqsg8Eoqao9CJNDK7UDHu1wFkZjEVyP8A8SA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-grid-server/default.nix b/distros/melodic/nav-grid-server/default.nix index 47a3a2cd26..1cdfe44254 100644 --- a/distros/melodic/nav-grid-server/default.nix +++ b/distros/melodic/nav-grid-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-grid-server"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/nav_grid_server/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "f853f5d45d155f62bfe817eb4047035ce8b520faee18a565791f0f165883d321"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/nav_grid_server/0.3.0-1"; + sha256 = "sha256-np3BWMRhZPdmiGylhYTpS8TJD6PRe5tsjnLudPv+dMQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-grid/default.nix b/distros/melodic/nav-grid/default.nix index 8027d7bb4f..28d505ba68 100644 --- a/distros/melodic/nav-grid/default.nix +++ b/distros/melodic/nav-grid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-grid"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/nav_grid/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "3d2282bb68f6833b47ff28b642b1948bda0864816a4911694f5ff46ec3493dce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/nav_grid/0.3.0-1"; + sha256 = "sha256-3uOUhLIiKk51eU8ocjXvAa1CEAASE9rO4EoJUNysFaw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav-msgs/default.nix b/distros/melodic/nav-msgs/default.nix index cc011a4121..84b85b79f6 100644 --- a/distros/melodic/nav-msgs/default.nix +++ b/distros/melodic/nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/nav_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "3b71ca4cc31b61365ffac5472d6fafcc3daa6959b38dee02981ab60acd5f0205"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/nav_msgs/1.12.8-1"; + sha256 = "sha256-HGuKV7dV0UvB0eitwFHccqfZT5W6Xq/Yb8in5trjC48="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/nav2d-exploration/default.nix b/distros/melodic/nav2d-exploration/default.nix index 5acb59f8ad..7906c71e73 100644 --- a/distros/melodic/nav2d-exploration/default.nix +++ b/distros/melodic/nav2d-exploration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d-exploration"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d_exploration/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "a66a917dec44f5f164671346050a6c578e51625a1afc22e100a4f2e40758e8af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d_exploration/0.4.2-0"; + sha256 = "sha256-q8U3cv4VvrYJLc+zzpyW+mTUKG8eZUwznfCdhPceJM8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav2d-karto/default.nix b/distros/melodic/nav2d-karto/default.nix index 24c3e6a19d..907f5bafab 100644 --- a/distros/melodic/nav2d-karto/default.nix +++ b/distros/melodic/nav2d-karto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d-karto"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d_karto/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "43cc5478e64f5499139be34e4cdc8015fa3ca70d03bd49134c85b83e6934b0a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d_karto/0.4.2-0"; + sha256 = "sha256-6u/GPxccelVGNSR10OmMHNXu6pQD5eMTDIMcRXU9K7E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav2d-localizer/default.nix b/distros/melodic/nav2d-localizer/default.nix index 8726c4695a..d40105b5bf 100644 --- a/distros/melodic/nav2d-localizer/default.nix +++ b/distros/melodic/nav2d-localizer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d-localizer"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d_localizer/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "208e7b94f3e9a0f384f7de704056d90747e8df288e7dd48650fd1ec1b3125b98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d_localizer/0.4.2-0"; + sha256 = "sha256-09z+xKbF8x7FGsyidxsJsx2brjXmfx/FaG4B6Hc7Vgw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav2d-msgs/default.nix b/distros/melodic/nav2d-msgs/default.nix index 05b0bdc45a..126319b77b 100644 --- a/distros/melodic/nav2d-msgs/default.nix +++ b/distros/melodic/nav2d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d-msgs"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d_msgs/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "0905a0e0fde94cf6fc3876a5ff6f0f987b66dd9ffb756d578e45c71f22148b51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d_msgs/0.4.2-0"; + sha256 = "sha256-XiXVK0X91S7z2NlKOpCT0wgw9/Hsg67I0f2Ijg6i7js="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/nav2d-navigator/default.nix b/distros/melodic/nav2d-navigator/default.nix index bf1c7ee037..f3e05bb2c9 100644 --- a/distros/melodic/nav2d-navigator/default.nix +++ b/distros/melodic/nav2d-navigator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d-navigator"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d_navigator/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "d2f314f6da94486aaa5a19d27aa7c1a598950b95287b37a494359ba2911881aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d_navigator/0.4.2-0"; + sha256 = "sha256-xQX9bZdJBqHgCFwszSaG5n1vXkvKvIxOF388egBShLU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/nav2d-operator/default.nix b/distros/melodic/nav2d-operator/default.nix index 9f49da96a8..a16bf2bbef 100644 --- a/distros/melodic/nav2d-operator/default.nix +++ b/distros/melodic/nav2d-operator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d-operator"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d_operator/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "a8ba977c06ec3334210448ff31687a876686fe661f3b50f407471465c81faccd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d_operator/0.4.2-0"; + sha256 = "sha256-tkMyZaQpwvD48g0Ujc9wSlUU22rlgalk/vNAEbqbyQw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation tf2-ros ]; diff --git a/distros/melodic/nav2d-remote/default.nix b/distros/melodic/nav2d-remote/default.nix index d3ffbc4b32..beb5e4139f 100644 --- a/distros/melodic/nav2d-remote/default.nix +++ b/distros/melodic/nav2d-remote/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d-remote"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d_remote/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "91aa99978a86691724e4b4079baa5825b7f19ec127b1ca8d349af55c22cd64fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d_remote/0.4.2-0"; + sha256 = "sha256-qVAIkaFQjMX5E7AD8uZEtOktELOoBXoSV8JwRvEdqvE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav2d-tutorials/default.nix b/distros/melodic/nav2d-tutorials/default.nix index fe8a0b47f1..f5e81d4dfd 100644 --- a/distros/melodic/nav2d-tutorials/default.nix +++ b/distros/melodic/nav2d-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d-tutorials"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d_tutorials/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "ae60ec866cca40ba8cd6f96181b3dfed1bde5cac12dd9813260a77837e078b3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d_tutorials/0.4.2-0"; + sha256 = "sha256-3I9iwsru+8hJGTgj6rQwR9pxg56t9QUJNNQTRQd9LD8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nav2d/default.nix b/distros/melodic/nav2d/default.nix index 0d01673d9c..4347973854 100644 --- a/distros/melodic/nav2d/default.nix +++ b/distros/melodic/nav2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nav2d"; version = "0.4.2"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/melodic/nav2d/0.4.2-0.tar.gz"; - name = "0.4.2-0.tar.gz"; - sha256 = "290981964bfb9d4a38651fa57f321fe5b777363ac3e0b6f8dc0fd69ba4ec0a6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/melodic/nav2d/0.4.2-0"; + sha256 = "sha256-Kx2ARuG2JpAxRWAGpTmbyM5OYXfsM7Mde1/xrR922rY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/navfn/default.nix b/distros/melodic/navfn/default.nix index 3563a0f4df..240446c137 100644 --- a/distros/melodic/navfn/default.nix +++ b/distros/melodic/navfn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-navfn"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/navfn/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "af100d00a80afceac698cdba903406da3c9102e9298d98cb735c0f3b42afb70e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/navfn/1.16.7-1"; + sha256 = "sha256-oE+kRngWePrYUnqL1ILyrH2OvJVvnR6T3MSZ+7QYksI="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation netpbm ]; diff --git a/distros/melodic/navigation-experimental/default.nix b/distros/melodic/navigation-experimental/default.nix index 44359dd953..5850fa3954 100644 --- a/distros/melodic/navigation-experimental/default.nix +++ b/distros/melodic/navigation-experimental/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-navigation-experimental"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/melodic/navigation_experimental/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "67965b9d9247e010701e3ca6adf0599a8cabe7cf4711d92d4a60b5037d5e1406"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/melodic/navigation_experimental/0.3.6-1"; + sha256 = "sha256-pM1AKaSPlKjEPM1bRGcFFtGWlgVCZsNqNKnXA6W3/Ns="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/navigation-layers/default.nix b/distros/melodic/navigation-layers/default.nix index a455ff39b6..7832ae7aed 100644 --- a/distros/melodic/navigation-layers/default.nix +++ b/distros/melodic/navigation-layers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-navigation-layers"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/wu-robotics/navigation_layers_release/archive/release/melodic/navigation_layers/0.5.0-0.tar.gz"; - name = "0.5.0-0.tar.gz"; - sha256 = "e51022d7bd6b2c049f58961b026a30460ce71607b1905c283e7b2626b653f359"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "navigation_layers_release"; + rev = "release/melodic/navigation_layers/0.5.0-0"; + sha256 = "sha256-l/gS4O7DnzHKS3Twql4G5KzI9z6SyH2xp3M42r+unV0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/navigation-stage/default.nix b/distros/melodic/navigation-stage/default.nix index da332be00d..aefdd0e938 100644 --- a/distros/melodic/navigation-stage/default.nix +++ b/distros/melodic/navigation-stage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-navigation-stage"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_tutorials-release/archive/release/melodic/navigation_stage/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "7b69a708535f1a2a6fb5afa0c6cb62c8ca229a04e0d9a979b2cd3f5e65ca35a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_tutorials-release"; + rev = "release/melodic/navigation_stage/0.2.4-1"; + sha256 = "sha256-KUwKY+5l7EZ4Z+B+AtM1yE6m9PbTFiDGUk4dedhEC+s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/navigation-tutorials/default.nix b/distros/melodic/navigation-tutorials/default.nix index 97ab29d34f..4a22d2a500 100644 --- a/distros/melodic/navigation-tutorials/default.nix +++ b/distros/melodic/navigation-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-navigation-tutorials"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_tutorials-release/archive/release/melodic/navigation_tutorials/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "c6c2d22bc24f5e224dbb15758e735708f490409a2318427b00d7ac673a4bf32d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_tutorials-release"; + rev = "release/melodic/navigation_tutorials/0.2.4-1"; + sha256 = "sha256-qMpa+ySBUOPBinNqIPg5hLVRywi8KhhzdIaw1MTQsm8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/navigation/default.nix b/distros/melodic/navigation/default.nix index 41775f156a..e44cc141a7 100644 --- a/distros/melodic/navigation/default.nix +++ b/distros/melodic/navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-navigation"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/navigation/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "5e4b0af53362d7e20c04c48c9676a1e26406d364aee78f98281f293a9a36ba0a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/navigation/1.16.7-1"; + sha256 = "sha256-O6d5r7SPoQv16w6b4uYtiuDM+0ZW75zbvlXUIihqcnk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ncd-parser/default.nix b/distros/melodic/ncd-parser/default.nix index 20feb59811..e8a92320db 100644 --- a/distros/melodic/ncd-parser/default.nix +++ b/distros/melodic/ncd-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ncd-parser"; version = "0.3.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/melodic/ncd_parser/0.3.3-2.tar.gz"; - name = "0.3.3-2.tar.gz"; - sha256 = "d9450f71b29650cdf242e1a50b4489d5dc6cb66bd1b01f6798e6eee82d0829d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/melodic/ncd_parser/0.3.3-2"; + sha256 = "sha256-rOvQtd9gUVqOGi10cNgMqfMDTWJp/ZomgJe0ldLjp1c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/neo-local-planner/default.nix b/distros/melodic/neo-local-planner/default.nix index ac0d5a54a3..0c96499445 100644 --- a/distros/melodic/neo-local-planner/default.nix +++ b/distros/melodic/neo-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-neo-local-planner"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/neobotix/neo_local_planner-release/archive/release/melodic/neo_local_planner/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "9ddcb53aceee36a8d5c6a9831fcf15dc096b01975f96059d7a7574211072d250"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "neobotix"; + repo = "neo_local_planner-release"; + rev = "release/melodic/neo_local_planner/1.0.0-1"; + sha256 = "sha256-Ebug2jnX5SarTigvOmNR1XDqpPQhZJOlWySSgdexRoc="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/neobotix-usboard-msgs/default.nix b/distros/melodic/neobotix-usboard-msgs/default.nix index edce865c6d..e7d518bbb4 100644 --- a/distros/melodic/neobotix-usboard-msgs/default.nix +++ b/distros/melodic/neobotix-usboard-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-neobotix-usboard-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/neobotix_usboard_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "8e3808b58c3ad9838b1305e754baab380f6c8e95b6dd9be062f2bd9563f080d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/neobotix_usboard_msgs/3.0.2-1"; + sha256 = "sha256-FkLfNEhyjDgYfmaDBmx0zqL8Cln3la2d2JqGz8c1ZJ8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/neonavigation-common/default.nix b/distros/melodic/neonavigation-common/default.nix index 7c1a5b6227..3e4560eb2e 100644 --- a/distros/melodic/neonavigation-common/default.nix +++ b/distros/melodic/neonavigation-common/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, roscpp, roslint, rostest, std-msgs, std-srvs }: buildRosPackage { pname = "ros-melodic-neonavigation-common"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/neonavigation_common/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "c5acf47b70a75ec7c26849cfec0d33fb9191f076e670537c11d94bd024baeb31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/neonavigation_common/0.12.0-1"; + sha256 = "sha256-PxAgRTEfsZqDQ2rNBJijr73Pjgg5xMJDCHEW1tTtauQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/neonavigation-launch/default.nix b/distros/melodic/neonavigation-launch/default.nix index 4f9a93eac9..c03a41d2a3 100644 --- a/distros/melodic/neonavigation-launch/default.nix +++ b/distros/melodic/neonavigation-launch/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-cspace, map-server, planner-cspace, safety-limiter, tf2-ros, trajectory-tracker, trajectory-tracker-rviz-plugins }: buildRosPackage { pname = "ros-melodic-neonavigation-launch"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/neonavigation_launch/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "38543bce0951edb4404e41ea512521aa37d116cb45aacbf721eed2889d077a68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/neonavigation_launch/0.12.0-1"; + sha256 = "sha256-M6qLtK/VTTmIlEtLIUo0TKXDfTrjzDascW653Caa9BQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/neonavigation-msgs/default.nix b/distros/melodic/neonavigation-msgs/default.nix index 2b84c3d839..127fe772a8 100644 --- a/distros/melodic/neonavigation-msgs/default.nix +++ b/distros/melodic/neonavigation-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-cspace-msgs, map-organizer-msgs, planner-cspace-msgs, safety-limiter-msgs, trajectory-tracker-msgs }: buildRosPackage { pname = "ros-melodic-neonavigation-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/melodic/neonavigation_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "45623c8fec17c42f7de1820ac84dc5a142216652e18744091d6b2920d878ae8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/melodic/neonavigation_msgs/0.12.0-1"; + sha256 = "sha256-LSpTYJU8PPuzlU1IgaE6ayrbsAbHyjQFlcN1XeVh+04="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/neonavigation-rviz-plugins/default.nix b/distros/melodic/neonavigation-rviz-plugins/default.nix index 31e92edeea..7945569ef5 100644 --- a/distros/melodic/neonavigation-rviz-plugins/default.nix +++ b/distros/melodic/neonavigation-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-neonavigation-rviz-plugins"; version = "0.11.6-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_rviz_plugins-release/archive/release/melodic/neonavigation_rviz_plugins/0.11.6-1.tar.gz"; - name = "0.11.6-1.tar.gz"; - sha256 = "79c1f10964f90287b135a6ffaf4b990828625d5f68ed97e4d8ec7773b2c8832e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_rviz_plugins-release"; + rev = "release/melodic/neonavigation_rviz_plugins/0.11.6-1"; + sha256 = "sha256-OpxGl1p5+QI+5J6YQ2P3GuDz+0fXwJKCojzjEFmyfJo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/neonavigation/default.nix b/distros/melodic/neonavigation/default.nix index a2bd48b7c0..aca2647afe 100644 --- a/distros/melodic/neonavigation/default.nix +++ b/distros/melodic/neonavigation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-cspace, joystick-interrupt, map-organizer, neonavigation-common, neonavigation-launch, obj-to-pointcloud, planner-cspace, safety-limiter, track-odometry, trajectory-tracker }: buildRosPackage { pname = "ros-melodic-neonavigation"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/neonavigation/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "a0e933aa2d894686d607acf95f1e63d11633782a89502d0529369efa3d257baf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/neonavigation/0.12.0-1"; + sha256 = "sha256-QLtN90O/69vWaDrsQcTo9qzwEUIN00WIBTKajC4rgfo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nerian-stereo/default.nix b/distros/melodic/nerian-stereo/default.nix index 240651746a..87ec4b1053 100644 --- a/distros/melodic/nerian-stereo/default.nix +++ b/distros/melodic/nerian-stereo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, curl, cv-bridge, dynamic-reconfigure, message-generation, message-runtime, nodelet, roscpp, sensor-msgs, std-msgs, stereo-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-melodic-nerian-stereo"; - version = "3.10.0-r1"; + version = "3.11.0-r1"; - src = fetchurl { - url = "https://github.com/nerian-vision/nerian_stereo-release/archive/release/melodic/nerian_stereo/3.10.0-1.tar.gz"; - name = "3.10.0-1.tar.gz"; - sha256 = "5fe38746fbafe7c2c9a0d02f81184f9e7706b729ab3b244e99e41cceea49b8ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nerian-vision"; + repo = "nerian_stereo-release"; + rev = "release/melodic/nerian_stereo/3.11.0-1"; + sha256 = "sha256-m2ePuhLsm9GCIR91gLzZ6xJeu7fadpDeztkRS5p+06M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/network-autoconfig/default.nix b/distros/melodic/network-autoconfig/default.nix index 4d2644eff0..d2e0f77748 100644 --- a/distros/melodic/network-autoconfig/default.nix +++ b/distros/melodic/network-autoconfig/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-network-autoconfig"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/LucidOne-release/network_autoconfig/archive/release/melodic/network_autoconfig/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "e8c7683b24422a998c5e8f22bdec456f390bfd2ea7726ab051785b80b84907b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LucidOne-release"; + repo = "network_autoconfig"; + rev = "release/melodic/network_autoconfig/0.1.1-2"; + sha256 = "sha256-vgn2TCTExrx+QkX8Cu/5wQ0u14cednT+6/D+TKT+lg0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/network-control-tests/default.nix b/distros/melodic/network-control-tests/default.nix index 8d7e31dc07..6de9b8b4e0 100644 --- a/distros/melodic/network-control-tests/default.nix +++ b/distros/melodic/network-control-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-network-control-tests"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/network_control_tests/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "dee0c19262fce70a1924a6ff71c1004ed3c44e9e03a010ccf7972a9222f90034"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/network_control_tests/1.0.16-1"; + sha256 = "sha256-J3vAwINcz9MKYfAJYiZkpkgX4i3owBXWDnL9mj0Dw4M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/network-detector/default.nix b/distros/melodic/network-detector/default.nix index 62951a1eab..399e08e9e0 100644 --- a/distros/melodic/network-detector/default.nix +++ b/distros/melodic/network-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-network-detector"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/network_detector/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "3fe42df98f3203e253a6029d3fb55e86e8d0b82c482754232de296bfe1f299c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/network_detector/1.0.16-1"; + sha256 = "sha256-8ZvGDjJ+uFX9N4AfOxe0b4ljFWJh4+ZbyZtl7sI3byg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/network-interface/default.nix b/distros/melodic/network-interface/default.nix index eb24ed890a..3e6ba53b77 100644 --- a/distros/melodic/network-interface/default.nix +++ b/distros/melodic/network-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-network-interface"; version = "2.1.0"; - src = fetchurl { - url = "https://github.com/astuff/network_interface-release/archive/release/melodic/network_interface/2.1.0-0.tar.gz"; - name = "2.1.0-0.tar.gz"; - sha256 = "5998b4fc5c5a96474d6a2ab83d3c55f7f5e847af5f909f00176deda4f6612ccf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "network_interface-release"; + rev = "release/melodic/network_interface/2.1.0-0"; + sha256 = "sha256-IOievWM1ctUQGDtBnjvxLeDP2AwBeqvrV3XWlSUNq84="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/melodic/network-monitor-udp/default.nix b/distros/melodic/network-monitor-udp/default.nix index d207e0ad52..28bf7c7612 100644 --- a/distros/melodic/network-monitor-udp/default.nix +++ b/distros/melodic/network-monitor-udp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-network-monitor-udp"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/network_monitor_udp/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "6d2e8f5054923d181f20ddee18fe669fefa9bafbc3e39edf2ed77d1b629a5ea4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/network_monitor_udp/1.0.16-1"; + sha256 = "sha256-j3swFHuhaK4HLZce0WY9kU+5S/PNMXYWf5IRnKDAiIU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/network-traffic-control/default.nix b/distros/melodic/network-traffic-control/default.nix index af11cdd860..b6f3bf9083 100644 --- a/distros/melodic/network-traffic-control/default.nix +++ b/distros/melodic/network-traffic-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-network-traffic-control"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/linux_networking-release/archive/release/melodic/network_traffic_control/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "9d8832fc6ede4a2a054979e185c34e60452bb6757ed942bb907b622127d62dc7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "linux_networking-release"; + rev = "release/melodic/network_traffic_control/1.0.16-1"; + sha256 = "sha256-3HpB8YYPquv9UefVy91OQGtEKTzCDOmTTgR81s1lFEM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nextage-description/default.nix b/distros/melodic/nextage-description/default.nix index 6d89e6ff4f..d2e4cd7f8d 100644 --- a/distros/melodic/nextage-description/default.nix +++ b/distros/melodic/nextage-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nextage-description"; version = "0.8.6-r3"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_nextage-release/archive/release/melodic/nextage_description/0.8.6-3.tar.gz"; - name = "0.8.6-3.tar.gz"; - sha256 = "fc5de78839960234d82b28541e497fba5ed8f85d81e6edaaeb6da0a4acb6db43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_nextage-release"; + rev = "release/melodic/nextage_description/0.8.6-3"; + sha256 = "sha256-0zAuSvnALA9A0XjrOu6pagJdwiKmu63XYqS6LT00FWw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nextage-gazebo/default.nix b/distros/melodic/nextage-gazebo/default.nix index 33e70b6baf..d3479ef3c2 100644 --- a/distros/melodic/nextage-gazebo/default.nix +++ b/distros/melodic/nextage-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nextage-gazebo"; version = "0.8.6-r3"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_nextage-release/archive/release/melodic/nextage_gazebo/0.8.6-3.tar.gz"; - name = "0.8.6-3.tar.gz"; - sha256 = "bafdf9503709b361786350ec586dfc827e3d65b05f5c2ce69be727d093050be1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_nextage-release"; + rev = "release/melodic/nextage_gazebo/0.8.6-3"; + sha256 = "sha256-38mJaNFPXL4wRWF1y8Dkwkg8/Wxa/FgkJDnVq+kzJiE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nextage-ik-plugin/default.nix b/distros/melodic/nextage-ik-plugin/default.nix index 83e05d026a..a432755d90 100644 --- a/distros/melodic/nextage-ik-plugin/default.nix +++ b/distros/melodic/nextage-ik-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nextage-ik-plugin"; version = "0.8.6-r3"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_nextage-release/archive/release/melodic/nextage_ik_plugin/0.8.6-3.tar.gz"; - name = "0.8.6-3.tar.gz"; - sha256 = "fc2949716c46013dfd7fd58720b47bfda645c0854145e72126d0366e201a0be6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_nextage-release"; + rev = "release/melodic/nextage_ik_plugin/0.8.6-3"; + sha256 = "sha256-XW9zLx8/cC3EQ79BpViYaAu9xOzSps/o8i7Aqa8yzfA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nextage-moveit-config/default.nix b/distros/melodic/nextage-moveit-config/default.nix index fab5a9ee5a..aef05b2230 100644 --- a/distros/melodic/nextage-moveit-config/default.nix +++ b/distros/melodic/nextage-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nextage-moveit-config"; version = "0.8.6-r3"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_nextage-release/archive/release/melodic/nextage_moveit_config/0.8.6-3.tar.gz"; - name = "0.8.6-3.tar.gz"; - sha256 = "f788c840073dd3e24b8bd1fe72976ff35ae5885b88439ece7c649af799f4ee80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_nextage-release"; + rev = "release/melodic/nextage_moveit_config/0.8.6-3"; + sha256 = "sha256-T+yz7UBjk0q5yt+1rxMEIo0D6G3Y+EFmBjImRAvBZoo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nextage-ros-bridge/default.nix b/distros/melodic/nextage-ros-bridge/default.nix index 3eaf18c9b7..8fb35930e1 100644 --- a/distros/melodic/nextage-ros-bridge/default.nix +++ b/distros/melodic/nextage-ros-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nextage-ros-bridge"; version = "0.8.6-r3"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_nextage-release/archive/release/melodic/nextage_ros_bridge/0.8.6-3.tar.gz"; - name = "0.8.6-3.tar.gz"; - sha256 = "f727161636ea80db90488a1fd7d46ace9735585285f3af2cd6a8dd4fdf846f2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_nextage-release"; + rev = "release/melodic/nextage_ros_bridge/0.8.6-3"; + sha256 = "sha256-D/1PXfeCoNScw3VJanjlXxhpLQtwcaWHYq9rpzjY010="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/nlopt/default.nix b/distros/melodic/nlopt/default.nix index f0c7f3ed60..a60c37424d 100644 --- a/distros/melodic/nlopt/default.nix +++ b/distros/melodic/nlopt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nlopt"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/nlopt/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "f9128eae806b05a44d01a1e3ce57cf0e9690a0fa14a810dad22877a49383da0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/nlopt/2.1.24-2"; + sha256 = "sha256-7lcOTwpUtX4rgS9LfIovUp+EuJ0soZ+J262T5OHQWcc="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules libtool mk rosbuild rospack ]; diff --git a/distros/melodic/nmc-nlp-lite/default.nix b/distros/melodic/nmc-nlp-lite/default.nix index 6cafac2518..3ac8b71c8a 100644 --- a/distros/melodic/nmc-nlp-lite/default.nix +++ b/distros/melodic/nmc-nlp-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nmc-nlp-lite"; version = "0.0.7-r2"; - src = fetchurl { - url = "https://github.com/nmcbins/nmc_nlp_lite-release/archive/release/melodic/nmc_nlp_lite/0.0.7-2.tar.gz"; - name = "0.0.7-2.tar.gz"; - sha256 = "70672d64024f0d40ee9dc069dee925711a44a7ecbadb93b989cd25bf3bf9e306"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nmcbins"; + repo = "nmc_nlp_lite-release"; + rev = "release/melodic/nmc_nlp_lite/0.0.7-2"; + sha256 = "sha256-XK0tskFgoFaHT6WIsILbjYGX+9k++cs9MpWACi08GgY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/nmea-comms/default.nix b/distros/melodic/nmea-comms/default.nix index e4c572dfbf..3de50c8bdf 100644 --- a/distros/melodic/nmea-comms/default.nix +++ b/distros/melodic/nmea-comms/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nmea-comms"; version = "1.2.0"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/nmea_comms-release/archive/release/melodic/nmea_comms/1.2.0-0.tar.gz"; - name = "1.2.0-0.tar.gz"; - sha256 = "c8d4fd98cc921339daf7612d5d5b087f1922e0a79dea4561f483cfbb6a1b5db2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "nmea_comms-release"; + rev = "release/melodic/nmea_comms/1.2.0-0"; + sha256 = "sha256-9vpACLn+DEJ/FvjqANRAnOPnY/OqUbmBIxzKguC+Vok="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch roslint rostest ]; diff --git a/distros/melodic/nmea-gps-plugin/default.nix b/distros/melodic/nmea-gps-plugin/default.nix index 86bba01a76..02ddb29d5d 100644 --- a/distros/melodic/nmea-gps-plugin/default.nix +++ b/distros/melodic/nmea-gps-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nmea-gps-plugin"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/nmea_gps_plugin-release/archive/release/melodic/nmea_gps_plugin/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "bf0ecd5604699384b818ed34494c93bc8faee1e3645a8e3d9bd58e4e17256f8d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "nmea_gps_plugin-release"; + rev = "release/melodic/nmea_gps_plugin/0.0.2-1"; + sha256 = "sha256-3cQxjbSmyUeikEphG+FvO/8v3p0Bzj5hrW555uv1avU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nmea-msgs/default.nix b/distros/melodic/nmea-msgs/default.nix index 637150dbd2..c6ee03939f 100644 --- a/distros/melodic/nmea-msgs/default.nix +++ b/distros/melodic/nmea-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nmea-msgs"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/nmea_msgs-release/archive/release/melodic/nmea_msgs/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "40ed33263afe8cac7ccc4b58c3458cbda636f9e4ac54475b754a3c869105ba14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "nmea_msgs-release"; + rev = "release/melodic/nmea_msgs/1.1.0-0"; + sha256 = "sha256-X4Cs2+ARQU/iy6ibg7g4VwOF/Bsxs7Anqg9mLc8rWag="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/nmea-navsat-driver/default.nix b/distros/melodic/nmea-navsat-driver/default.nix index 893543ddeb..98b4df8b18 100644 --- a/distros/melodic/nmea-navsat-driver/default.nix +++ b/distros/melodic/nmea-navsat-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nmea-navsat-driver"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/nmea_navsat_driver-release/archive/release/melodic/nmea_navsat_driver/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "4bb6d7fbaf5d6d3d334c0ce1b21997c6c303d10ded2bb87c72b9dd609fbc18ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "nmea_navsat_driver-release"; + rev = "release/melodic/nmea_navsat_driver/0.5.2-1"; + sha256 = "sha256-skkGxuATydghcccB13uqHr5ak9d6JTljnmNBO74SXpA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nmea-to-geopose/default.nix b/distros/melodic/nmea-to-geopose/default.nix index bdd7cbbb9f..001817fb44 100644 --- a/distros/melodic/nmea-to-geopose/default.nix +++ b/distros/melodic/nmea-to-geopose/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nmea-to-geopose"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/nmea_to_geopose-release/archive/release/melodic/nmea_to_geopose/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "9a705961193571ef80203ffd1781ed1e7fe15da637764495484e2c4679377fc0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "nmea_to_geopose-release"; + rev = "release/melodic/nmea_to_geopose/0.0.1-1"; + sha256 = "sha256-v/ep1pCjJB7BmSmhQQNz60AiNkOQ+y4dvJzQKC0J8YY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/node-manager-fkie/default.nix b/distros/melodic/node-manager-fkie/default.nix index 1542abc56b..34341eadf2 100644 --- a/distros/melodic/node-manager-fkie/default.nix +++ b/distros/melodic/node-manager-fkie/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-node-manager-fkie"; version = "0.8.12"; - src = fetchurl { - url = "https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/node_manager_fkie/0.8.12-0.tar.gz"; - name = "0.8.12-0.tar.gz"; - sha256 = "6b4d7ed02437aa8bb4675c90822d4215267b78598d7125b49bf6b0f1b584cef0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "multimaster_fkie-release"; + rev = "release/melodic/node_manager_fkie/0.8.12-0"; + sha256 = "sha256-F+OaFhYu1rHziJbhFT8LmvfVR85qhKWD2W4NyngIpko="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nodelet-core/default.nix b/distros/melodic/nodelet-core/default.nix index 5ff968fd36..db50c05010 100644 --- a/distros/melodic/nodelet-core/default.nix +++ b/distros/melodic/nodelet-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nodelet-core"; version = "1.9.16"; - src = fetchurl { - url = "https://github.com/ros-gbp/nodelet_core-release/archive/release/melodic/nodelet_core/1.9.16-0.tar.gz"; - name = "1.9.16-0.tar.gz"; - sha256 = "a0537935c5c1b091cf655f0a31852d72ec54b245b2577d139cd66d33332eea9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "nodelet_core-release"; + rev = "release/melodic/nodelet_core/1.9.16-0"; + sha256 = "sha256-/YgWp46jEpGVCRY8miyT+qfBe6BrJiDhfopO5WJ4w7s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nodelet-topic-tools/default.nix b/distros/melodic/nodelet-topic-tools/default.nix index adfcad426a..a53106fa41 100644 --- a/distros/melodic/nodelet-topic-tools/default.nix +++ b/distros/melodic/nodelet-topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nodelet-topic-tools"; version = "1.9.16"; - src = fetchurl { - url = "https://github.com/ros-gbp/nodelet_core-release/archive/release/melodic/nodelet_topic_tools/1.9.16-0.tar.gz"; - name = "1.9.16-0.tar.gz"; - sha256 = "39f55bdfb39c520b29a3c6004ca8d359a2e2ffc8da9ed254ba38c180bd035ae3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "nodelet_core-release"; + rev = "release/melodic/nodelet_topic_tools/1.9.16-0"; + sha256 = "sha256-XUbl/EoqMK1/tCISTYB/XogqozcXugYGBeKOCbCYQVU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nodelet-tutorial-math/default.nix b/distros/melodic/nodelet-tutorial-math/default.nix index 026b8d9148..4c74e27204 100644 --- a/distros/melodic/nodelet-tutorial-math/default.nix +++ b/distros/melodic/nodelet-tutorial-math/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nodelet-tutorial-math"; version = "0.1.11"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/melodic/nodelet_tutorial_math/0.1.11-0.tar.gz"; - name = "0.1.11-0.tar.gz"; - sha256 = "399778f44a140cd9fd5b0ed41b8c88408803791a64b0c3d006bca4b174b1669f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/melodic/nodelet_tutorial_math/0.1.11-0"; + sha256 = "sha256-ACTT77cPGR8zIQa7LM4PahrLfNYx9/j8np+XlPR4JI0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/nodelet/default.nix b/distros/melodic/nodelet/default.nix index 54223e8247..72e0f4f16d 100644 --- a/distros/melodic/nodelet/default.nix +++ b/distros/melodic/nodelet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nodelet"; version = "1.9.16"; - src = fetchurl { - url = "https://github.com/ros-gbp/nodelet_core-release/archive/release/melodic/nodelet/1.9.16-0.tar.gz"; - name = "1.9.16-0.tar.gz"; - sha256 = "3a9e9701df570659d70f871eb7e1970dacd3b89c02513c456f8f0ea1a446d15a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "nodelet_core-release"; + rev = "release/melodic/nodelet/1.9.16-0"; + sha256 = "sha256-RywGQlaweMiwycZ2KwzlrRmMgDRkEZwr6+mjDqaYVjY="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/nonpersistent-voxel-layer/default.nix b/distros/melodic/nonpersistent-voxel-layer/default.nix index 152b83de3e..795ef0de58 100644 --- a/distros/melodic/nonpersistent-voxel-layer/default.nix +++ b/distros/melodic/nonpersistent-voxel-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-nonpersistent-voxel-layer"; version = "1.2.3-r2"; - src = fetchurl { - url = "https://github.com/SteveMacenski/nonpersistent_voxel_layer-release/archive/release/melodic/nonpersistent_voxel_layer/1.2.3-2.tar.gz"; - name = "1.2.3-2.tar.gz"; - sha256 = "3c8ab56ed99d7856535320eaaedb8670bbf5115258808a22a1b6531ff9308107"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "nonpersistent_voxel_layer-release"; + rev = "release/melodic/nonpersistent_voxel_layer/1.2.3-2"; + sha256 = "sha256-GVKfgrQXmKywtjL1o5ZWG5ZFCrKSz/mVz56iZnnCuk8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/novatel-gps-driver/default.nix b/distros/melodic/novatel-gps-driver/default.nix index 9f0ad49eb2..a1952e7de2 100644 --- a/distros/melodic/novatel-gps-driver/default.nix +++ b/distros/melodic/novatel-gps-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-novatel-gps-driver"; version = "3.9.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/novatel_gps_driver-release/archive/release/melodic/novatel_gps_driver/3.9.0-1.tar.gz"; - name = "3.9.0-1.tar.gz"; - sha256 = "6ef15030ebde3bece473d8bbddc617d7e58b972e4de490e48e63b1e885ad06f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/melodic/novatel_gps_driver/3.9.0-1"; + sha256 = "sha256-L8vDk9aHMXH/KBT6V1EJTvDrkppgG30LjqbvtsfwNyo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/novatel-gps-msgs/default.nix b/distros/melodic/novatel-gps-msgs/default.nix index ec10aa143d..6b338ab216 100644 --- a/distros/melodic/novatel-gps-msgs/default.nix +++ b/distros/melodic/novatel-gps-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-novatel-gps-msgs"; version = "3.9.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/novatel_gps_driver-release/archive/release/melodic/novatel_gps_msgs/3.9.0-1.tar.gz"; - name = "3.9.0-1.tar.gz"; - sha256 = "da4c54202e94ee79b9fb117b82c2deb5da65250efd71d89dc63de5a95dfb6e9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/melodic/novatel_gps_msgs/3.9.0-1"; + sha256 = "sha256-6ffgh4V6qqiJA8vtqw7QQiiP94CvFrRD2kEk4Pe43KQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/novatel-msgs/default.nix b/distros/melodic/novatel-msgs/default.nix index 72a331888a..eec8dc06c0 100644 --- a/distros/melodic/novatel-msgs/default.nix +++ b/distros/melodic/novatel-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-novatel-msgs"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/novatel_span_driver-release/archive/release/melodic/novatel_msgs/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "a72561b3f85654b4e209dc7ac5738010ee49bb976023b1a014f4e345a2206797"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "novatel_span_driver-release"; + rev = "release/melodic/novatel_msgs/1.1.0-0"; + sha256 = "sha256-9ls/xG2crJZqGTQY4zIbFGzrrmzfIFHnHr7wIUnf/rE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/novatel-oem7-driver/default.nix b/distros/melodic/novatel-oem7-driver/default.nix index ca0c9e17cb..c9b83d210d 100644 --- a/distros/melodic/novatel-oem7-driver/default.nix +++ b/distros/melodic/novatel-oem7-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-novatel-oem7-driver"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/novatel-gbp/novatel_oem7_driver-release/archive/release/melodic/novatel_oem7_driver/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "3dfcc86539028edf327362ff9ca52f5ee899d6f26adfed7a6b64f046c4b7d99b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "novatel-gbp"; + repo = "novatel_oem7_driver-release"; + rev = "release/melodic/novatel_oem7_driver/4.0.0-1"; + sha256 = "sha256-BrUlfFnQumacDophH1Itb+HJ0Bwzjk7/GReqnBWKzZs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/novatel-oem7-msgs/default.nix b/distros/melodic/novatel-oem7-msgs/default.nix index e645bbeba6..a2fe900b29 100644 --- a/distros/melodic/novatel-oem7-msgs/default.nix +++ b/distros/melodic/novatel-oem7-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-novatel-oem7-msgs"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/novatel-gbp/novatel_oem7_driver-release/archive/release/melodic/novatel_oem7_msgs/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "b1806982b4865c8c545fa1f03fc1ca794b2c41cf9f54ea38433c2fc259b47093"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "novatel-gbp"; + repo = "novatel_oem7_driver-release"; + rev = "release/melodic/novatel_oem7_msgs/4.0.0-1"; + sha256 = "sha256-tGroV/CWSJ0SuA30QZx0IneLcerfyBVSbHJJAH4aceA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ntpd-driver/default.nix b/distros/melodic/ntpd-driver/default.nix index 6e60a511c0..42679e5892 100644 --- a/distros/melodic/ntpd-driver/default.nix +++ b/distros/melodic/ntpd-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ntpd-driver"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/vooon/ntpd_driver-release/archive/release/melodic/ntpd_driver/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "ddbf892d2e11bfda0fa755a61a02868b01c5d3e05d28cf109633cf399f157de1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vooon"; + repo = "ntpd_driver-release"; + rev = "release/melodic/ntpd_driver/1.3.0-1"; + sha256 = "sha256-g/hiQyI4OvE7y4IVAAaq2ct8CenRetNeunowJvkdAX8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ntrip-client/default.nix b/distros/melodic/ntrip-client/default.nix index 5d9d47ad6c..4a2e8ae9f1 100644 --- a/distros/melodic/ntrip-client/default.nix +++ b/distros/melodic/ntrip-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ntrip-client"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/ntrip_client-release/archive/release/melodic/ntrip_client/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "46f7a64d03163ae022bfee817e0400668b25902071e87b30740b921396da3ea9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "ntrip_client-release"; + rev = "release/melodic/ntrip_client/1.2.0-1"; + sha256 = "sha256-0ZTMxpzhLHRnwI8xJbUmaFtR0wqsmCHtmboU7eTRNLw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/obj-to-pointcloud/default.nix b/distros/melodic/obj-to-pointcloud/default.nix index 7a75f95b04..d3c8e36a0e 100644 --- a/distros/melodic/obj-to-pointcloud/default.nix +++ b/distros/melodic/obj-to-pointcloud/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, eigen, geometry-msgs, neonavigation-common, pcl, pcl-conversions, roscpp, roslint, rostest, sensor-msgs }: buildRosPackage { pname = "ros-melodic-obj-to-pointcloud"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/obj_to_pointcloud/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "ca49610fc5875ccd8ac2965fb13775780376ed7e7ba12e34af0be293dc2afbf4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/obj_to_pointcloud/0.12.0-1"; + sha256 = "sha256-8iTtLyetMfUEhS/3c+8BPGmgGNBkvWjKAsM4S2ABHr0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/object-recognition-msgs/default.nix b/distros/melodic/object-recognition-msgs/default.nix index d306e1c4f6..7c1b54d3fb 100644 --- a/distros/melodic/object-recognition-msgs/default.nix +++ b/distros/melodic/object-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-object-recognition-msgs"; version = "0.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/object_recognition_msgs-release/archive/release/melodic/object_recognition_msgs/0.4.1-0.tar.gz"; - name = "0.4.1-0.tar.gz"; - sha256 = "0d4a39404ca6ce3fe26eb6a00df0edf208a58651c7605d42f20c9c6a2df9be72"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "object_recognition_msgs-release"; + rev = "release/melodic/object_recognition_msgs/0.4.1-0"; + sha256 = "sha256-L+tCDwFHh7kh6t1bfTPh8uS3/YLsSAom29fftc7FTUU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ocean-battery-driver/default.nix b/distros/melodic/ocean-battery-driver/default.nix index 62d3cdc555..6776f56aa2 100644 --- a/distros/melodic/ocean-battery-driver/default.nix +++ b/distros/melodic/ocean-battery-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ocean-battery-driver"; version = "1.1.7"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_power_drivers-release/archive/release/melodic/ocean_battery_driver/1.1.7-0.tar.gz"; - name = "1.1.7-0.tar.gz"; - sha256 = "4a494470bf4da45f24517df66b0c0fea70f79e15c14e6935e00f990d4e23b084"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_power_drivers-release"; + rev = "release/melodic/ocean_battery_driver/1.1.7-0"; + sha256 = "sha256-XzARlRmHCD+w+k133s6iGF2/iXezbMYkHM/FgPMozgM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/octomap-mapping/default.nix b/distros/melodic/octomap-mapping/default.nix index 9d6053dcd8..1bf7ee93dc 100644 --- a/distros/melodic/octomap-mapping/default.nix +++ b/distros/melodic/octomap-mapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-octomap-mapping"; version = "0.6.7-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_mapping-release/archive/release/melodic/octomap_mapping/0.6.7-2.tar.gz"; - name = "0.6.7-2.tar.gz"; - sha256 = "da9ba92aeebe8ef2e3247256afdd9afc787e0df5c51938731444a317654556ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_mapping-release"; + rev = "release/melodic/octomap_mapping/0.6.7-2"; + sha256 = "sha256-c9N7HXrthUVu655yUURBnC4E17ZoVnvSMI4k5zLSiD0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/octomap-msgs/default.nix b/distros/melodic/octomap-msgs/default.nix index 014e92c5fb..919edc4a83 100644 --- a/distros/melodic/octomap-msgs/default.nix +++ b/distros/melodic/octomap-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-octomap-msgs"; version = "0.3.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_msgs-release/archive/release/melodic/octomap_msgs/0.3.5-1.tar.gz"; - name = "0.3.5-1.tar.gz"; - sha256 = "9a17e5f2d6aa6d1e40c0e24b551b14439b03237e7913ee907d257f8bc9eedeea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_msgs-release"; + rev = "release/melodic/octomap_msgs/0.3.5-1"; + sha256 = "sha256-XBb//PZ07P6FEL1E8wNjH94EWn/NQMoxkJyppXazT7Q="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/octomap-ros/default.nix b/distros/melodic/octomap-ros/default.nix index 8cb29fb6ab..2221969053 100644 --- a/distros/melodic/octomap-ros/default.nix +++ b/distros/melodic/octomap-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-octomap-ros"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_ros-release/archive/release/melodic/octomap_ros/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "e66f9ef8bd86b238099ae4a3188262a92cabfc7e4a1294d2b843b548b0f69eb1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_ros-release"; + rev = "release/melodic/octomap_ros/0.4.1-1"; + sha256 = "sha256-OV9ySmXTXJotxv7HsYuSxMSEarPpPzkXtXvA/1BNRHo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/octomap-rviz-plugins/default.nix b/distros/melodic/octomap-rviz-plugins/default.nix index 3bf3cffae4..a6994017ac 100644 --- a/distros/melodic/octomap-rviz-plugins/default.nix +++ b/distros/melodic/octomap-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-octomap-rviz-plugins"; version = "0.2.4-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_rviz_plugins-release/archive/release/melodic/octomap_rviz_plugins/0.2.4-2.tar.gz"; - name = "0.2.4-2.tar.gz"; - sha256 = "8f5bf0f81a1734bd921fbb238890d39f32aad30f614d6b7437a42715ff8cb1b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_rviz_plugins-release"; + rev = "release/melodic/octomap_rviz_plugins/0.2.4-2"; + sha256 = "sha256-816alBU6FnAemoH9ar0U3cQIdUAZD0Ele8421wzdO7c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/octomap-server/default.nix b/distros/melodic/octomap-server/default.nix index 15d3e7b27e..aefe71e3a9 100644 --- a/distros/melodic/octomap-server/default.nix +++ b/distros/melodic/octomap-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-octomap-server"; version = "0.6.7-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_mapping-release/archive/release/melodic/octomap_server/0.6.7-2.tar.gz"; - name = "0.6.7-2.tar.gz"; - sha256 = "e3d5b8d31791cd37ab44d3e6858802b35afd4d36c7f840e83722fadf35a302df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_mapping-release"; + rev = "release/melodic/octomap_server/0.6.7-2"; + sha256 = "sha256-x7QZjnvGRm5Mg7EWwb4k+R3MA0EiT+IksrOITPdKPoI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/octomap/default.nix b/distros/melodic/octomap/default.nix index 50cbddab76..ba48b9f652 100644 --- a/distros/melodic/octomap/default.nix +++ b/distros/melodic/octomap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-octomap"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/melodic/octomap/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "deed4682029157898edbe591eada25b7c2acdef246d5097343ef79cc4f137245"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/melodic/octomap/1.9.8-1"; + sha256 = "sha256-1C49qDf+5BFNi34JzrSFN0B0kNfv1MBTmcdT/hEjkKI="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/octovis/default.nix b/distros/melodic/octovis/default.nix index e70c0b4374..811387301d 100644 --- a/distros/melodic/octovis/default.nix +++ b/distros/melodic/octovis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-octovis"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/melodic/octovis/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "ea018124bcf6f33cf750c056ff7ca5b8ebcc069b807e5b02df09db2768db27f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/melodic/octovis/1.9.8-1"; + sha256 = "sha256-B3o5qIG2TXL7n4EG8EOfFE/k4yEj6kdYAtRPXbUfB6s="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/odom-frame-publisher/default.nix b/distros/melodic/odom-frame-publisher/default.nix index 955b906e01..e213a9867a 100644 --- a/distros/melodic/odom-frame-publisher/default.nix +++ b/distros/melodic/odom-frame-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-odom-frame-publisher"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/odom_frame_publisher-release/archive/release/melodic/odom_frame_publisher/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "e91bd51c0e7df5c5f225d5957d58d33125ad5393b1e457b1f2ee677b67ebb674"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "odom_frame_publisher-release"; + rev = "release/melodic/odom_frame_publisher/0.0.1-1"; + sha256 = "sha256-1AK3NTOWdgVqNciPDSnq73csZfwrCssx5qBuyq/Exw0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/odometry-publisher-tutorial/default.nix b/distros/melodic/odometry-publisher-tutorial/default.nix index bf6a341426..198a0c59fe 100644 --- a/distros/melodic/odometry-publisher-tutorial/default.nix +++ b/distros/melodic/odometry-publisher-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-odometry-publisher-tutorial"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_tutorials-release/archive/release/melodic/odometry_publisher_tutorial/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "527ce0ada618e0e9a3109b743ceb896dd43f53e32acbe8bd948bf5cd82b23748"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_tutorials-release"; + rev = "release/melodic/odometry_publisher_tutorial/0.2.4-1"; + sha256 = "sha256-ni3mdnTCL+KQ5sCxHZ4ClJy9wYwpVomDRicHVCSb4ZY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/odva-ethernetip/default.nix b/distros/melodic/odva-ethernetip/default.nix index e5799f54de..58cd9d8196 100644 --- a/distros/melodic/odva-ethernetip/default.nix +++ b/distros/melodic/odva-ethernetip/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-odva-ethernetip"; version = "0.1.4"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/odva_ethernetip-release/archive/release/melodic/odva_ethernetip/0.1.4-0.tar.gz"; - name = "0.1.4-0.tar.gz"; - sha256 = "5ab751b07939ccd1fb02691e6d370dcf721b38371208efe92e9ec7d507481c7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "odva_ethernetip-release"; + rev = "release/melodic/odva_ethernetip/0.1.4-0"; + sha256 = "sha256-RAdaguGfKzdmcBt5chbirgqU+lVk1Kb5Ji6lQM8Vhig="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/omnibase-control/default.nix b/distros/melodic/omnibase-control/default.nix index c677bfc40c..24c42e7619 100644 --- a/distros/melodic/omnibase-control/default.nix +++ b/distros/melodic/omnibase-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-omnibase-control"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/ERC-BPGC/omnibase-release/archive/release/melodic/omnibase_control/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "a6157c6071bd5a43916f3916d44a85bba3fb38da5b5fa4ae18f54d9b50e9cec0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ERC-BPGC"; + repo = "omnibase-release"; + rev = "release/melodic/omnibase_control/1.0.2-2"; + sha256 = "sha256-yBcBcGiPBWHFC8+K/Ge5cB+qP0SXbweIB/cxFkQgvRk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/omnibase-description/default.nix b/distros/melodic/omnibase-description/default.nix index 75a1f4f123..f9b707a298 100644 --- a/distros/melodic/omnibase-description/default.nix +++ b/distros/melodic/omnibase-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-omnibase-description"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/ERC-BPGC/omnibase-release/archive/release/melodic/omnibase_description/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "5d890cefc30e7016110f00ee5972a77ca231c53f928357c4ff2187d437f15dab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ERC-BPGC"; + repo = "omnibase-release"; + rev = "release/melodic/omnibase_description/1.0.2-2"; + sha256 = "sha256-oeXPDLTnNU5P1WUWHTPgcKa9xgwdK2G9bhZrpm0YmiQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/omnibase-gazebo/default.nix b/distros/melodic/omnibase-gazebo/default.nix index 0be9f027a6..d80581db8e 100644 --- a/distros/melodic/omnibase-gazebo/default.nix +++ b/distros/melodic/omnibase-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-omnibase-gazebo"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/ERC-BPGC/omnibase-release/archive/release/melodic/omnibase_gazebo/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "6acc71a06fd1ab2fb25b723825be7a258682f8b9dc3cfe9eccdff57f4ddd65c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ERC-BPGC"; + repo = "omnibase-release"; + rev = "release/melodic/omnibase_gazebo/1.0.2-2"; + sha256 = "sha256-5Jq22C9ciOs5fIQsd4U/Mxmxvn3gkQh6/+7ya9k9jxE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ompl/default.nix b/distros/melodic/ompl/default.nix index e0affee321..521c41417a 100644 --- a/distros/melodic/ompl/default.nix +++ b/distros/melodic/ompl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ompl"; version = "1.4.2-r5"; - src = fetchurl { - url = "https://github.com/ros-gbp/ompl-release/archive/release/melodic/ompl/1.4.2-5.tar.gz"; - name = "1.4.2-5.tar.gz"; - sha256 = "9d948c9a1b3172665a402240eaa980066db8ce1ca27a5d1646d1798d083c518f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ompl-release"; + rev = "release/melodic/ompl/1.4.2-5"; + sha256 = "sha256-KQ8OmlflFYAPBwJaeDwEdE5Gco/c/KJsPteM3ZKnbMk="; + }; buildType = "cmake"; buildInputs = [ cmake pkg-config ]; diff --git a/distros/melodic/omron-os32c-driver/default.nix b/distros/melodic/omron-os32c-driver/default.nix index dcf844c667..101f84ae8a 100644 --- a/distros/melodic/omron-os32c-driver/default.nix +++ b/distros/melodic/omron-os32c-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-omron-os32c-driver"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/omron-release/archive/release/melodic/omron_os32c_driver/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "0df734134fffa43ce8c66f761be34584663afe3595c08e5275fc9c538f8825c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "omron-release"; + rev = "release/melodic/omron_os32c_driver/1.1.0-0"; + sha256 = "sha256-BV06b4o53dvlYyrb3NwHBN7Zpnd/7VxqJVtAUBUaMlA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-karto/default.nix b/distros/melodic/open-karto/default.nix index 1da02e7f81..cce3063b2b 100644 --- a/distros/melodic/open-karto/default.nix +++ b/distros/melodic/open-karto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-karto"; version = "1.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/open_karto-release/archive/release/melodic/open_karto/1.2.3-1.tar.gz"; - name = "1.2.3-1.tar.gz"; - sha256 = "9441edebe6265db0419ca9fca4e85578413ff700953145d4d22fe8d2202a0c92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "open_karto-release"; + rev = "release/melodic/open_karto/1.2.3-1"; + sha256 = "sha256-an1MHS1SO7rFm99hNFvi0T0mT1BcUPIwaaYuARY/MUs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-control-gui/default.nix b/distros/melodic/open-manipulator-control-gui/default.nix index d0e66ff2e4..e0fc20794f 100644 --- a/distros/melodic/open-manipulator-control-gui/default.nix +++ b/distros/melodic/open-manipulator-control-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-control-gui"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator-release/archive/release/melodic/open_manipulator_control_gui/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "e4dc03e16d77a2295b53e586737453f552dc2b256e064bf784c592fe58cca2cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator-release"; + rev = "release/melodic/open_manipulator_control_gui/2.0.1-0"; + sha256 = "sha256-Ami7rXI0t6SPPXNgeMnJgoS/HSBF/f/LMwfy2t3MKT4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-controller/default.nix b/distros/melodic/open-manipulator-controller/default.nix index 3a591808d1..5a66755d25 100644 --- a/distros/melodic/open-manipulator-controller/default.nix +++ b/distros/melodic/open-manipulator-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-controller"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator-release/archive/release/melodic/open_manipulator_controller/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "b19bbeab199f991d98fc26473d59f22d1501ae8954c2e413edae34a276ba334c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator-release"; + rev = "release/melodic/open_manipulator_controller/2.0.1-0"; + sha256 = "sha256-UZWoPpJEoP1/oe4kuxU0p2z5d08+O8KjFDgc1p+mu3s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-description/default.nix b/distros/melodic/open-manipulator-description/default.nix index af7a3b8fc6..c55232e999 100644 --- a/distros/melodic/open-manipulator-description/default.nix +++ b/distros/melodic/open-manipulator-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-description"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator-release/archive/release/melodic/open_manipulator_description/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "f44f4bb8965b79fffdf4906f742e4fccd178a55c8ee11e3abacc24828e5ae9c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator-release"; + rev = "release/melodic/open_manipulator_description/2.0.1-0"; + sha256 = "sha256-z5/ekMgBigzghcr+4uTbFng0Iz25O3aJp2dNsAPsTz0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-gazebo/default.nix b/distros/melodic/open-manipulator-gazebo/default.nix index b110c56b64..20beed8e06 100644 --- a/distros/melodic/open-manipulator-gazebo/default.nix +++ b/distros/melodic/open-manipulator-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-gazebo"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_simulations-release/archive/release/melodic/open_manipulator_gazebo/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "1c5055d46fc7e08fce26a98cef9ca8bd79496f0e56aa44de49ff0c3e8675be84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_simulations-release"; + rev = "release/melodic/open_manipulator_gazebo/1.1.0-1"; + sha256 = "sha256-rwOrymK46Ji6k2Irn9aVq/poyNSXs0tq0qUEzFowsyo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-libs/default.nix b/distros/melodic/open-manipulator-libs/default.nix index bf7a66668c..00ac71d64f 100644 --- a/distros/melodic/open-manipulator-libs/default.nix +++ b/distros/melodic/open-manipulator-libs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-libs"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator-release/archive/release/melodic/open_manipulator_libs/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "1e026abdb7af7fe42518d35f418754921f3231a328794e8eba9d10ab1bea3b63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator-release"; + rev = "release/melodic/open_manipulator_libs/2.0.1-0"; + sha256 = "sha256-9p1w2SEcH6jTbW6i27ZkySntmIukuGodih+nmwzbAlk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-moveit/default.nix b/distros/melodic/open-manipulator-moveit/default.nix index df56e8b6d5..e06b53a58f 100644 --- a/distros/melodic/open-manipulator-moveit/default.nix +++ b/distros/melodic/open-manipulator-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-moveit"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator-release/archive/release/melodic/open_manipulator_moveit/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "3c42db504d582107d35edba1019fc8764f4082573f47bfb41e53e89230d21488"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator-release"; + rev = "release/melodic/open_manipulator_moveit/2.0.1-0"; + sha256 = "sha256-cgnuDN6waFOge2nQvN5DGT4OuyIojuRDafPZDYoEqNM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-msgs/default.nix b/distros/melodic/open-manipulator-msgs/default.nix index a0beba0998..3985dd02da 100644 --- a/distros/melodic/open-manipulator-msgs/default.nix +++ b/distros/melodic/open-manipulator-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-msgs"; version = "1.0.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_msgs-release/archive/release/melodic/open_manipulator_msgs/1.0.0-0.tar.gz"; - name = "1.0.0-0.tar.gz"; - sha256 = "8a499c54924fdc7b81c8315d5e720e3b2179757fc5ef98e524dfef53ac9bd300"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_msgs-release"; + rev = "release/melodic/open_manipulator_msgs/1.0.0-0"; + sha256 = "sha256-dT86EXn3FDKlK3Mi/fSFhwYzgprY4eCU8Dy2XNqN3KM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/open-manipulator-p-control-gui/default.nix b/distros/melodic/open-manipulator-p-control-gui/default.nix index dfdc127d60..a3058f7bf7 100644 --- a/distros/melodic/open-manipulator-p-control-gui/default.nix +++ b/distros/melodic/open-manipulator-p-control-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-p-control-gui"; version = "1.0.0-r5"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p-release/archive/release/melodic/open_manipulator_p_control_gui/1.0.0-5.tar.gz"; - name = "1.0.0-5.tar.gz"; - sha256 = "61faa3e2665d7ce3f6d9cd2c648241df61041381da1e8d96d3435a414dbdd28e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p-release"; + rev = "release/melodic/open_manipulator_p_control_gui/1.0.0-5"; + sha256 = "sha256-S457zhCOzFuByZO7ptpJa/tGSrT6hitMJHSTAJUqFvQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-p-controller/default.nix b/distros/melodic/open-manipulator-p-controller/default.nix index 0d40195f8e..b8f8b98ad1 100644 --- a/distros/melodic/open-manipulator-p-controller/default.nix +++ b/distros/melodic/open-manipulator-p-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-p-controller"; version = "1.0.0-r5"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p-release/archive/release/melodic/open_manipulator_p_controller/1.0.0-5.tar.gz"; - name = "1.0.0-5.tar.gz"; - sha256 = "1f363bde35481b1c259a2d7c92667a6dd5dfe6f2f8794537ce7c76560f55092c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p-release"; + rev = "release/melodic/open_manipulator_p_controller/1.0.0-5"; + sha256 = "sha256-tUJXIzHLQ2IQPJZ8ZaRQDKxq9qkE7h/ZwZ8AH0x1uxo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-p-description/default.nix b/distros/melodic/open-manipulator-p-description/default.nix index ac9ad9d83f..31d5f77323 100644 --- a/distros/melodic/open-manipulator-p-description/default.nix +++ b/distros/melodic/open-manipulator-p-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-p-description"; version = "1.0.0-r5"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p-release/archive/release/melodic/open_manipulator_p_description/1.0.0-5.tar.gz"; - name = "1.0.0-5.tar.gz"; - sha256 = "1dfaddfdc6e15b0d88eb6e187a3ebaa5b6bafe59a867b8c2a48b0774488946d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p-release"; + rev = "release/melodic/open_manipulator_p_description/1.0.0-5"; + sha256 = "sha256-xZZHHc7OIRqGjZ5zHRE9nfCY+oUltKPNp8YhJaMyQgY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-p-gazebo/default.nix b/distros/melodic/open-manipulator-p-gazebo/default.nix index 27209d7ef8..3595ce1361 100644 --- a/distros/melodic/open-manipulator-p-gazebo/default.nix +++ b/distros/melodic/open-manipulator-p-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-p-gazebo"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p_simulations-release/archive/release/melodic/open_manipulator_p_gazebo/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "6f8d8bb0cbbaccba67600029b4c98cc04ddc4fb2e4a524b9cf05bb19f77d5e66"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p_simulations-release"; + rev = "release/melodic/open_manipulator_p_gazebo/1.0.0-3"; + sha256 = "sha256-ESLBvsy8xGuX0kz6xXj4KCt/Up5aFwcNn7nULjib8ks="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-p-libs/default.nix b/distros/melodic/open-manipulator-p-libs/default.nix index f4ce1f774c..c1275dbefa 100644 --- a/distros/melodic/open-manipulator-p-libs/default.nix +++ b/distros/melodic/open-manipulator-p-libs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-p-libs"; version = "1.0.0-r5"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p-release/archive/release/melodic/open_manipulator_p_libs/1.0.0-5.tar.gz"; - name = "1.0.0-5.tar.gz"; - sha256 = "cbc307680c10c285fe2837be8743da49a6bda7b41723e57db389fe977611698c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p-release"; + rev = "release/melodic/open_manipulator_p_libs/1.0.0-5"; + sha256 = "sha256-UL8+SP0oztmS+uxtbpZIiVINsCPIwqwikh20JdVvMzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-p-simulations/default.nix b/distros/melodic/open-manipulator-p-simulations/default.nix index c33a6bb78f..e0e96b94de 100644 --- a/distros/melodic/open-manipulator-p-simulations/default.nix +++ b/distros/melodic/open-manipulator-p-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-p-simulations"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p_simulations-release/archive/release/melodic/open_manipulator_p_simulations/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "acd7632a463692f6330e037e29c28ce02f73947ebd536a93857bda73e9f043ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p_simulations-release"; + rev = "release/melodic/open_manipulator_p_simulations/1.0.0-3"; + sha256 = "sha256-jFisvSI4QNwd0igZm6HhQ/KPqpmtwVVw+FtynXETpWU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-p-teleop/default.nix b/distros/melodic/open-manipulator-p-teleop/default.nix index fcabc77ee6..a91abc813f 100644 --- a/distros/melodic/open-manipulator-p-teleop/default.nix +++ b/distros/melodic/open-manipulator-p-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-p-teleop"; version = "1.0.0-r5"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p-release/archive/release/melodic/open_manipulator_p_teleop/1.0.0-5.tar.gz"; - name = "1.0.0-5.tar.gz"; - sha256 = "bf9fafcdfa007f5cd90496709b0f92fe9b1ee21af0907cbc4d72d55034a86ed1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p-release"; + rev = "release/melodic/open_manipulator_p_teleop/1.0.0-5"; + sha256 = "sha256-Lry5lx+fn8uTB0rJb+oUPPmVA9OoGpVud83lANA2HkI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-p/default.nix b/distros/melodic/open-manipulator-p/default.nix index 6b2c09a6d8..d015ea260d 100644 --- a/distros/melodic/open-manipulator-p/default.nix +++ b/distros/melodic/open-manipulator-p/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-p"; version = "1.0.0-r5"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p-release/archive/release/melodic/open_manipulator_p/1.0.0-5.tar.gz"; - name = "1.0.0-5.tar.gz"; - sha256 = "9a055910654a549879cf1d79fffd710f5270b6eca844c6299e802655ff851b49"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p-release"; + rev = "release/melodic/open_manipulator_p/1.0.0-5"; + sha256 = "sha256-qbjLZs+oxbf8CPJIFzlxKU0yKvk3jyvUc2FoiHllKiQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-simulations/default.nix b/distros/melodic/open-manipulator-simulations/default.nix index 77ef89406b..3646e89318 100644 --- a/distros/melodic/open-manipulator-simulations/default.nix +++ b/distros/melodic/open-manipulator-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-simulations"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_simulations-release/archive/release/melodic/open_manipulator_simulations/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "5e55fe725d7a194014a7ba81ec9ba3436209a0076a05799156ccf09bceb657b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_simulations-release"; + rev = "release/melodic/open_manipulator_simulations/1.1.0-1"; + sha256 = "sha256-MurZ4QjNfbFP4FYpDtHMJQaKpvLhdM63ki4QcH/H/LU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-teleop/default.nix b/distros/melodic/open-manipulator-teleop/default.nix index 20c6b1b49c..1ced3e7a97 100644 --- a/distros/melodic/open-manipulator-teleop/default.nix +++ b/distros/melodic/open-manipulator-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-teleop"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator-release/archive/release/melodic/open_manipulator_teleop/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "4ee30aac61a7e2b66ced2141c722c2c7de04cbc061d985b49387f7a205e6eac1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator-release"; + rev = "release/melodic/open_manipulator_teleop/2.0.1-0"; + sha256 = "sha256-b4exLKLRpcinU+7g24TLb+QfbLEk0rbVYvesJPuNM8M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-with-tb3-description/default.nix b/distros/melodic/open-manipulator-with-tb3-description/default.nix index 79b659660b..d180cef87e 100644 --- a/distros/melodic/open-manipulator-with-tb3-description/default.nix +++ b/distros/melodic/open-manipulator-with-tb3-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3-description"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_with_tb3-release/archive/release/melodic/open_manipulator_with_tb3_description/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "75b91b560d2d284556401d76dd7160eb216813715fd5da607f139b3fc5f6e68d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_with_tb3-release"; + rev = "release/melodic/open_manipulator_with_tb3_description/1.1.0-2"; + sha256 = "sha256-waI+zyzeq8CPG2ED4uP6JLq4mVM3jnrOF2XouYN5bcQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-with-tb3-gazebo/default.nix b/distros/melodic/open-manipulator-with-tb3-gazebo/default.nix index e71e4d3786..c7d04ce9ee 100644 --- a/distros/melodic/open-manipulator-with-tb3-gazebo/default.nix +++ b/distros/melodic/open-manipulator-with-tb3-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3-gazebo"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_with_tb3_simulations-release/archive/release/melodic/open_manipulator_with_tb3_gazebo/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "b78cf601ef185042b96bd253b246286853ed1a7d47f76c58f733f02213e64c5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_with_tb3_simulations-release"; + rev = "release/melodic/open_manipulator_with_tb3_gazebo/1.1.0-2"; + sha256 = "sha256-qfaCkoRmASVKxpixynthfpzZCAmblNI2evP5rcBOgSk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-with-tb3-simulations/default.nix b/distros/melodic/open-manipulator-with-tb3-simulations/default.nix index b99f105f22..1aed990de2 100644 --- a/distros/melodic/open-manipulator-with-tb3-simulations/default.nix +++ b/distros/melodic/open-manipulator-with-tb3-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3-simulations"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_with_tb3_simulations-release/archive/release/melodic/open_manipulator_with_tb3_simulations/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "efe76d391f38587da7c22cdd2d53fe308be8fc7ef3b59e24a231b7df5ee3b2f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_with_tb3_simulations-release"; + rev = "release/melodic/open_manipulator_with_tb3_simulations/1.1.0-2"; + sha256 = "sha256-F+2bbftCN37EYuat7EW2C3OvCNMfa6tvh3Kba7TFl3A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-with-tb3-tools/default.nix b/distros/melodic/open-manipulator-with-tb3-tools/default.nix index 3c621aaace..d9ef619070 100644 --- a/distros/melodic/open-manipulator-with-tb3-tools/default.nix +++ b/distros/melodic/open-manipulator-with-tb3-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3-tools"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_with_tb3-release/archive/release/melodic/open_manipulator_with_tb3_tools/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "6095647043adf0b59ecb69da2f441cbf996fa4729007040dbe2856d3d7341dab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_with_tb3-release"; + rev = "release/melodic/open_manipulator_with_tb3_tools/1.1.0-2"; + sha256 = "sha256-h5XlSgkrDoG5ZtYyNvhmPsL58u33ucTdCEKpQsKuXHw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix b/distros/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix index 7ed1060a60..564b338ca6 100644 --- a/distros/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix +++ b/distros/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3-waffle-moveit"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_with_tb3-release/archive/release/melodic/open_manipulator_with_tb3_waffle_moveit/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "48ccf4228562e681d256e965706ea41f90a7fc34ea1b9829ff95529fc4a4b361"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_with_tb3-release"; + rev = "release/melodic/open_manipulator_with_tb3_waffle_moveit/1.1.0-2"; + sha256 = "sha256-iGCbTikUwlmsQvMbyTAfDQEbdHYHDZWed5jLqd/a4dc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix b/distros/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix index f683bb4150..62b0568a15 100644 --- a/distros/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix +++ b/distros/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3-waffle-pi-moveit"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_with_tb3-release/archive/release/melodic/open_manipulator_with_tb3_waffle_pi_moveit/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "64d1e46dbb348ebc614e922e5fd66f0a8086e36133c4212342b01aaa7a37da79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_with_tb3-release"; + rev = "release/melodic/open_manipulator_with_tb3_waffle_pi_moveit/1.1.0-2"; + sha256 = "sha256-gyiJrttO81PbXCsb2jLTn5+rbJBkAFH5kOuSRHYumNY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator-with-tb3/default.nix b/distros/melodic/open-manipulator-with-tb3/default.nix index cf1a3a6d24..c7f1b45ba7 100644 --- a/distros/melodic/open-manipulator-with-tb3/default.nix +++ b/distros/melodic/open-manipulator-with-tb3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_with_tb3-release/archive/release/melodic/open_manipulator_with_tb3/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "92ac21aa5766a9a50f0d1db22e4585628d48d3e3fcafe7b397420e3e431ca3e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_with_tb3-release"; + rev = "release/melodic/open_manipulator_with_tb3/1.1.0-2"; + sha256 = "sha256-lIUCyzMv/GhQbgF5HFc2eHWLxbkILAaVksVquqNOfyk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/open-manipulator/default.nix b/distros/melodic/open-manipulator/default.nix index 7c922c5bf3..00a6080959 100644 --- a/distros/melodic/open-manipulator/default.nix +++ b/distros/melodic/open-manipulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-open-manipulator"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator-release/archive/release/melodic/open_manipulator/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "8de684b52de5da0e425146ae3a13c0ab79f047544aa163c5b3344b8df2284ea3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator-release"; + rev = "release/melodic/open_manipulator/2.0.1-0"; + sha256 = "sha256-wV0oBwVk7IocHqBnl55/eVTQ/k6jKrYL/aTfuEZLySo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/opencv-apps/default.nix b/distros/melodic/opencv-apps/default.nix index f1633bcdaa..7615108032 100644 --- a/distros/melodic/opencv-apps/default.nix +++ b/distros/melodic/opencv-apps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-opencv-apps"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-perception/opencv_apps-release/archive/release/melodic/opencv_apps/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "11489debf5d3b3dc194472f483d67857db62f76665f6785ad4f55882c4e4d3dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-perception"; + repo = "opencv_apps-release"; + rev = "release/melodic/opencv_apps/2.0.1-1"; + sha256 = "sha256-WcbhbZCCU+cJ20X9czIOrqnNWNfAPb9NyUdTYRMxbq4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/opengm/default.nix b/distros/melodic/opengm/default.nix index 4d25ace123..ad6a26b116 100644 --- a/distros/melodic/opengm/default.nix +++ b/distros/melodic/opengm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-opengm"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/melodic/opengm/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "e97abb94a52a22d31e3dc253e1e4865d414989200b861141ef481e28e7b60fce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/melodic/opengm/0.6.17-1"; + sha256 = "sha256-8IPE1w2ZIie/OU8CEcVkASISvA6ciEHt/ug8dTRlUKw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/openni-description/default.nix b/distros/melodic/openni-description/default.nix index c9ef2256df..201ad69ac4 100644 --- a/distros/melodic/openni-description/default.nix +++ b/distros/melodic/openni-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openni-description"; version = "1.11.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/openni_camera-release/archive/release/melodic/openni_description/1.11.1-0.tar.gz"; - name = "1.11.1-0.tar.gz"; - sha256 = "709e253ea9d2ba4d1c81fe758da31e8359a8e00f4e0105405f37a6e68e011dc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openni_camera-release"; + rev = "release/melodic/openni_description/1.11.1-0"; + sha256 = "sha256-mW4AMBSFtuaRDAZ6puWpGX3N95MAnIzsaVqs6a19P5I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/openni-launch/default.nix b/distros/melodic/openni-launch/default.nix index 05384a2000..4c23231dcc 100644 --- a/distros/melodic/openni-launch/default.nix +++ b/distros/melodic/openni-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openni-launch"; version = "1.11.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/openni_camera-release/archive/release/melodic/openni_launch/1.11.1-0.tar.gz"; - name = "1.11.1-0.tar.gz"; - sha256 = "0c4aa79a977973fc48b0c8a829358367a3ef095a8d93323eeee1972c5c8d3806"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openni_camera-release"; + rev = "release/melodic/openni_launch/1.11.1-0"; + sha256 = "sha256-UPmDcE5p6y1cZm960uo5+Pg3krFN3mKExu/uG4Hhvrw="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/openni2-camera/default.nix b/distros/melodic/openni2-camera/default.nix index 1784c0f065..3f57f8ccab 100644 --- a/distros/melodic/openni2-camera/default.nix +++ b/distros/melodic/openni2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openni2-camera"; version = "1.6.0-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/openni2_camera-release/archive/release/melodic/openni2_camera/1.6.0-2.tar.gz"; - name = "1.6.0-2.tar.gz"; - sha256 = "fa0cf0baee7eec9befcbc0d00e01a6a302f002d94063e441200b95f338a15f2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openni2_camera-release"; + rev = "release/melodic/openni2_camera/1.6.0-2"; + sha256 = "sha256-yFGreuBKZHu0EXVGogjo5RMENPQfjqGsx98r3gy/n2Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/openni2-launch/default.nix b/distros/melodic/openni2-launch/default.nix index df5f2ffa1f..62c74ae846 100644 --- a/distros/melodic/openni2-launch/default.nix +++ b/distros/melodic/openni2-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openni2-launch"; version = "1.6.0-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/openni2_camera-release/archive/release/melodic/openni2_launch/1.6.0-2.tar.gz"; - name = "1.6.0-2.tar.gz"; - sha256 = "f2b0d6a8e6264bd8c4b9b5f74695949a6c846b6fb497e0bb4f6a75cb4508280a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openni2_camera-release"; + rev = "release/melodic/openni2_launch/1.6.0-2"; + sha256 = "sha256-0gRqRIEKsWnQYDaZwSeylZSgW+znkMgGV7q/PL6jsaI="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/openrtm-aist/default.nix b/distros/melodic/openrtm-aist/default.nix index 167c083fd1..7ad37ed7aa 100644 --- a/distros/melodic/openrtm-aist/default.nix +++ b/distros/melodic/openrtm-aist/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openrtm-aist"; version = "1.1.2-r7"; - src = fetchurl { - url = "https://github.com/tork-a/openrtm_aist-release/archive/release/melodic/openrtm_aist/1.1.2-7.tar.gz"; - name = "1.1.2-7.tar.gz"; - sha256 = "8de78280affbdc5fdf3537a0be8de962d0743e3674a89f879526c614f8c78acc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "openrtm_aist-release"; + rev = "release/melodic/openrtm_aist/1.1.2-7"; + sha256 = "sha256-6SKhRKgW8NBQoaSAp/NMq+1idlrxPOd+/HT/Ys6uQ9k="; + }; buildType = "cmake"; buildInputs = [ automake cmake doxygen libtool pkg-config python ]; diff --git a/distros/melodic/openrtm-ros-bridge/default.nix b/distros/melodic/openrtm-ros-bridge/default.nix index bc0e40e75b..4ddc1c020c 100644 --- a/distros/melodic/openrtm-ros-bridge/default.nix +++ b/distros/melodic/openrtm-ros-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openrtm-ros-bridge"; version = "1.4.3-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_common-release/archive/release/melodic/openrtm_ros_bridge/1.4.3-1.tar.gz"; - name = "1.4.3-1.tar.gz"; - sha256 = "7ea540a376bea8c3571a05fa6a377fb08b527310ad3e2be525f32fe03d28f622"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_common-release"; + rev = "release/melodic/openrtm_ros_bridge/1.4.3-1"; + sha256 = "sha256-c3d873WJBsJSpVjs9N57UVc+T8hmqSlDTVfVo1yk1zI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest rtmbuild ]; diff --git a/distros/melodic/openrtm-tools/default.nix b/distros/melodic/openrtm-tools/default.nix index 7f2b797b01..83da0e6027 100644 --- a/distros/melodic/openrtm-tools/default.nix +++ b/distros/melodic/openrtm-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openrtm-tools"; version = "1.4.3-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_common-release/archive/release/melodic/openrtm_tools/1.4.3-1.tar.gz"; - name = "1.4.3-1.tar.gz"; - sha256 = "49f4aecff4ed1770796d07d505e850852fc4cd0a5d1b8e5879bbbfddc46539e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_common-release"; + rev = "release/melodic/openrtm_tools/1.4.3-1"; + sha256 = "sha256-0eDPw2hCsGg0BVEoqvuAtn/tTOKASoDPSRVVBYp9TG4="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/openslam-gmapping/default.nix b/distros/melodic/openslam-gmapping/default.nix index a9c95cdf86..e903576449 100644 --- a/distros/melodic/openslam-gmapping/default.nix +++ b/distros/melodic/openslam-gmapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openslam-gmapping"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/openslam_gmapping-release/archive/release/melodic/openslam_gmapping/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "9b61107d88d219e52ecb210abcb44d5248c760182c4c6bafd39beab1f5c78f5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openslam_gmapping-release"; + rev = "release/melodic/openslam_gmapping/0.2.1-1"; + sha256 = "sha256-MUgh9i3a5ePHLcN+RO5D6R++QoGZdURh+t8diGdkZys="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/openzen-sensor/default.nix b/distros/melodic/openzen-sensor/default.nix index 159af440d6..31d1916afe 100644 --- a/distros/melodic/openzen-sensor/default.nix +++ b/distros/melodic/openzen-sensor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-openzen-sensor"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/lp-research/openzen_sensor-release/archive/release/melodic/openzen_sensor/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "40f8a14c1626135d573751bb79540c429028d462378b39a691d2dcd7e6daec94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lp-research"; + repo = "openzen_sensor-release"; + rev = "release/melodic/openzen_sensor/1.2.0-1"; + sha256 = "sha256-cywFqPpxCyoovfWUGDFODjiWMGbey98y3cAlR4U9jTA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/opt-camera/default.nix b/distros/melodic/opt-camera/default.nix index 831f58b704..75f6340426 100644 --- a/distros/melodic/opt-camera/default.nix +++ b/distros/melodic/opt-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-opt-camera"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/opt_camera/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "30a71fe885a1d964a1b369c180a6644a6e92f17f0530f6eadd15e19fad2d3551"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/opt_camera/2.1.24-2"; + sha256 = "sha256-+VOxNFj1w7QsvE99v8PshLZ6bDx8jBhOMH5VnCpyTrg="; + }; buildType = "catkin"; buildInputs = [ catkin roslang ]; diff --git a/distros/melodic/optpp-catkin/default.nix b/distros/melodic/optpp-catkin/default.nix index b1e29356ff..63aa36b6fe 100644 --- a/distros/melodic/optpp-catkin/default.nix +++ b/distros/melodic/optpp-catkin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-optpp-catkin"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/optpp_catkin-release/archive/release/melodic/optpp_catkin/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "b910ce830859bdd106d02f6cce840ffaa18ad3dd7cdf0e6b4f8d9da024137acf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "optpp_catkin-release"; + rev = "release/melodic/optpp_catkin/2.4.0-1"; + sha256 = "sha256-upln1wsJnkQeht3sLLcNwYJnDnnd69IQh/c1vRSWdZ0="; + }; buildType = "catkin"; buildInputs = [ autoconf catkin gfortran git ]; diff --git a/distros/melodic/opw-kinematics/default.nix b/distros/melodic/opw-kinematics/default.nix index ad8130854e..3c24d0366a 100644 --- a/distros/melodic/opw-kinematics/default.nix +++ b/distros/melodic/opw-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-opw-kinematics"; version = "0.4.5-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "opw_kinematics-release"; + rev = "release/melodic/opw_kinematics/0.4.5-1"; + sha256 = "sha256-+NLXRM146ScqrZ/CdYjUm+il8hTRAnLt3Yw+LKHcXCQ="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/melodic/orocos-kdl/default.nix b/distros/melodic/orocos-kdl/default.nix index 1b6bb102c2..2fb798035b 100644 --- a/distros/melodic/orocos-kdl/default.nix +++ b/distros/melodic/orocos-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-orocos-kdl"; version = "1.4.0"; - src = fetchurl { - url = "https://github.com/orocos/orocos-kdl-release/archive/release/melodic/orocos_kdl/1.4.0-0.tar.gz"; - name = "1.4.0-0.tar.gz"; - sha256 = "aa01563f804f8c52c6403b872b0a321abd916083757aebf25ac9530c7798830a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "orocos"; + repo = "orocos-kdl-release"; + rev = "release/melodic/orocos_kdl/1.4.0-0"; + sha256 = "sha256-ffRvDGvdYmVn4nEAzebOhpfe1u6ovIT2yEuLyTQH/wQ="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/orocos-kinematics-dynamics/default.nix b/distros/melodic/orocos-kinematics-dynamics/default.nix index 2ba1b7242d..0f79cbb680 100644 --- a/distros/melodic/orocos-kinematics-dynamics/default.nix +++ b/distros/melodic/orocos-kinematics-dynamics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-orocos-kinematics-dynamics"; version = "1.4.0"; - src = fetchurl { - url = "https://github.com/orocos/orocos-kdl-release/archive/release/melodic/orocos_kinematics_dynamics/1.4.0-0.tar.gz"; - name = "1.4.0-0.tar.gz"; - sha256 = "2ba6018b3fbbced816694fafd40bf7a9eea586ee7955ec91e4de7864493a2150"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "orocos"; + repo = "orocos-kdl-release"; + rev = "release/melodic/orocos_kinematics_dynamics/1.4.0-0"; + sha256 = "sha256-Clvpb2zR9IeHpa/jY4Zi5+mw6TyA44iJ2xU1WMo4L3Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/osg-interactive-markers/default.nix b/distros/melodic/osg-interactive-markers/default.nix index bb19f4e66d..746233725f 100644 --- a/distros/melodic/osg-interactive-markers/default.nix +++ b/distros/melodic/osg-interactive-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-osg-interactive-markers"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/visualization_osg-release/archive/release/melodic/osg_interactive_markers/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "44a8e53e5774686511ade483b0c58ad488edaa6abb7d14d889f61fa0671ed9ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "visualization_osg-release"; + rev = "release/melodic/osg_interactive_markers/1.0.2-2"; + sha256 = "sha256-xqhMWo7PDjemUmE9Ua07rYUagGIA5A709FPhX5X6KoQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/osg-markers/default.nix b/distros/melodic/osg-markers/default.nix index a2489df059..b7f352b5ce 100644 --- a/distros/melodic/osg-markers/default.nix +++ b/distros/melodic/osg-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-osg-markers"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/visualization_osg-release/archive/release/melodic/osg_markers/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "173f82925c40381484abd5d53668fd56033792b15e66c5323a19f7c9ec3dc89d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "visualization_osg-release"; + rev = "release/melodic/osg_markers/1.0.2-2"; + sha256 = "sha256-8vVUb3rFlJW7kyNMO6XyEKwwg+7M1syDvN36B929OAM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/osg-utils/default.nix b/distros/melodic/osg-utils/default.nix index 160899036b..22a849d562 100644 --- a/distros/melodic/osg-utils/default.nix +++ b/distros/melodic/osg-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-osg-utils"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/visualization_osg-release/archive/release/melodic/osg_utils/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "44b9e6940bfb07236c1f66596c82406b2ef5d9df2be508248d24b560d31ac7f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "visualization_osg-release"; + rev = "release/melodic/osg_utils/1.0.2-2"; + sha256 = "sha256-AulpyytEOV8SvbxppmPReI3cLfsoAW3j2QDPNvVwMZo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/osm-cartography/default.nix b/distros/melodic/osm-cartography/default.nix index 00393651e7..3b27ffa61c 100644 --- a/distros/melodic/osm-cartography/default.nix +++ b/distros/melodic/osm-cartography/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-osm-cartography"; version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/open_street_map-release/archive/release/melodic/osm_cartography/0.2.5-1.tar.gz"; - name = "0.2.5-1.tar.gz"; - sha256 = "82a7389d369b7bbe5f2fa2f796d5b4994b7b4306ca79a1080882476ee9194d83"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "open_street_map-release"; + rev = "release/melodic/osm_cartography/0.2.5-1"; + sha256 = "sha256-MgBT9qkbh9onGKyhXplksd0MMAeeW/LoHiAtdS5IUEg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ouster-driver/default.nix b/distros/melodic/ouster-driver/default.nix index 5ceda91140..2d0322fd17 100644 --- a/distros/melodic/ouster-driver/default.nix +++ b/distros/melodic/ouster-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ouster-driver"; version = "0.1.7"; - src = fetchurl { - url = "https://github.com/CPFL/ouster-release/archive/release/melodic/ouster_driver/0.1.7-0.tar.gz"; - name = "0.1.7-0.tar.gz"; - sha256 = "7f68cc7f16bf51c84ddf73d6db82c8352089ee1da21d2e6b1da177ce3697a950"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CPFL"; + repo = "ouster-release"; + rev = "release/melodic/ouster_driver/0.1.7-0"; + sha256 = "sha256-sEN74pGThYheFj5kg2lCdPHDAjuAYKdScgZi6Le6oa8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/oxford-gps-eth/default.nix b/distros/melodic/oxford-gps-eth/default.nix index d02a16d3c1..e7e919817b 100644 --- a/distros/melodic/oxford-gps-eth/default.nix +++ b/distros/melodic/oxford-gps-eth/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-oxford-gps-eth"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/oxford_gps_eth-release/archive/release/melodic/oxford_gps_eth/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "01a2698e411ac5f0920817701cecbb4916a5c8b1dc89d8ef561befcb59f1c3cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "oxford_gps_eth-release"; + rev = "release/melodic/oxford_gps_eth/1.2.1-1"; + sha256 = "sha256-gIoKuH1fq8Wid1D0zTEmhCX0a4OuVaw8ji7zKsEzkjc="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/p2os-doc/default.nix b/distros/melodic/p2os-doc/default.nix index 29a0d0dd3e..cc8d686fbb 100644 --- a/distros/melodic/p2os-doc/default.nix +++ b/distros/melodic/p2os-doc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-p2os-doc"; version = "2.1.1-r3"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/melodic/p2os_doc/2.1.1-3.tar.gz"; - name = "2.1.1-3.tar.gz"; - sha256 = "227edf1f84b669f969f96db7c374ba1985c0ae65383edeccbae293321d80ab86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/melodic/p2os_doc/2.1.1-3"; + sha256 = "sha256-Ue0+fXcE67rZdtFmkn4tWg6dPEn1a2Qq0lJUklkt9EU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/p2os-driver/default.nix b/distros/melodic/p2os-driver/default.nix index 23f2043399..8784378f70 100644 --- a/distros/melodic/p2os-driver/default.nix +++ b/distros/melodic/p2os-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-p2os-driver"; version = "2.1.1-r3"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/melodic/p2os_driver/2.1.1-3.tar.gz"; - name = "2.1.1-3.tar.gz"; - sha256 = "6964b9f9c333b2290f586f8ea5bb23cd9bf6d3eb0e774dd33d2498624bae978d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/melodic/p2os_driver/2.1.1-3"; + sha256 = "sha256-6hfWqT4b6VNEu+Tne1UNDfu0DJ/L28REDzJco8aI0+s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/p2os-launch/default.nix b/distros/melodic/p2os-launch/default.nix index 8724df70ce..6066c85fd3 100644 --- a/distros/melodic/p2os-launch/default.nix +++ b/distros/melodic/p2os-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-p2os-launch"; version = "2.1.1-r3"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/melodic/p2os_launch/2.1.1-3.tar.gz"; - name = "2.1.1-3.tar.gz"; - sha256 = "44ce86f957548ceb122a58f2073bf32128e8e5c2ed32a95e4c76ad16ae37856f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/melodic/p2os_launch/2.1.1-3"; + sha256 = "sha256-R6ssabNcPIWBWo3mf5pnneQivmi/Uoo+mO7tgOhK9/s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/p2os-msgs/default.nix b/distros/melodic/p2os-msgs/default.nix index 5ed69ddd4a..563793509b 100644 --- a/distros/melodic/p2os-msgs/default.nix +++ b/distros/melodic/p2os-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-p2os-msgs"; version = "2.1.1-r3"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/melodic/p2os_msgs/2.1.1-3.tar.gz"; - name = "2.1.1-3.tar.gz"; - sha256 = "03bd75df3567d74a4b0e3357d73ae5cf4085fc772aa1c65e36078f4afb566b9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/melodic/p2os_msgs/2.1.1-3"; + sha256 = "sha256-GXkq+VP80sCRtsO8G+EhdBMYcJZjyQVGP7TvpKVIR5A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/p2os-teleop/default.nix b/distros/melodic/p2os-teleop/default.nix index 3e262110f4..2f88f2487f 100644 --- a/distros/melodic/p2os-teleop/default.nix +++ b/distros/melodic/p2os-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-p2os-teleop"; version = "2.1.1-r3"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/melodic/p2os_teleop/2.1.1-3.tar.gz"; - name = "2.1.1-3.tar.gz"; - sha256 = "f263fffb042a86ffea63279e319c18b59efe102b6ad0f0d2f868ddd86e754fc2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/melodic/p2os_teleop/2.1.1-3"; + sha256 = "sha256-SQmR5ONWmzEvJ5jV30M3a1UKC86k1J436mAvkfXZR8k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/p2os-urdf/default.nix b/distros/melodic/p2os-urdf/default.nix index 088dbb11aa..b9495e64cc 100644 --- a/distros/melodic/p2os-urdf/default.nix +++ b/distros/melodic/p2os-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-p2os-urdf"; version = "2.1.1-r3"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/melodic/p2os_urdf/2.1.1-3.tar.gz"; - name = "2.1.1-3.tar.gz"; - sha256 = "10b0c2e34e4c56a3816165507eb40d1424b6d77c82f9fa09729e5f5069745c11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/melodic/p2os_urdf/2.1.1-3"; + sha256 = "sha256-Y/86ZHYGfE8lb2i3pLGC+JvllQWNvInTLEWmHY7Ter4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pacmod-game-control/default.nix b/distros/melodic/pacmod-game-control/default.nix index 7494e6e48c..d49626853d 100644 --- a/distros/melodic/pacmod-game-control/default.nix +++ b/distros/melodic/pacmod-game-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pacmod-game-control"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/pacmod_game_control-release/archive/release/melodic/pacmod_game_control/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "7ac2b341575d857379b9cec72b934042fc3832bab2d608857aab922236ba3820"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "pacmod_game_control-release"; + rev = "release/melodic/pacmod_game_control/3.0.2-1"; + sha256 = "sha256-fjmJCHP9ZzgF4eaDQyqRgioCnbm8H0WGXaclaMR0Wpg="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/pacmod-msgs/default.nix b/distros/melodic/pacmod-msgs/default.nix index e57b744f73..cccd96aa77 100644 --- a/distros/melodic/pacmod-msgs/default.nix +++ b/distros/melodic/pacmod-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pacmod-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/pacmod_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "4778add999c3cc09f4961506e49e9a8d4b1d6fcfde80033e27944ee722824fcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/pacmod_msgs/3.0.2-1"; + sha256 = "sha256-gwxBoxmi0MLsrOBZ4aUc1pyf3UrTOiWKVe0X0ESOWus="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/pacmod/default.nix b/distros/melodic/pacmod/default.nix index 0c12417456..6f42c9ea15 100644 --- a/distros/melodic/pacmod/default.nix +++ b/distros/melodic/pacmod/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pacmod"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/pacmod-release/archive/release/melodic/pacmod/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "e8047a0dfa0788b2a4180a40ce209fd71798d039924e920fc0b4c96e79ba0470"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "pacmod-release"; + rev = "release/melodic/pacmod/2.1.0-1"; + sha256 = "sha256-fKKAu6vmHGq7UX8yt7+lgX31aZoSix0R3KLz8FgUNy4="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/pacmod3/default.nix b/distros/melodic/pacmod3/default.nix index e730da0e10..301b82f03b 100644 --- a/distros/melodic/pacmod3/default.nix +++ b/distros/melodic/pacmod3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pacmod3"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/pacmod3-release/archive/release/melodic/pacmod3/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "5a48a3e0b845272836125c8065b81e777bc10bf088dbd2013431168ceda276be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "pacmod3-release"; + rev = "release/melodic/pacmod3/1.3.0-1"; + sha256 = "sha256-312Ztkq2Mw8iMtvDrGmzBHKVNNcM6Amxc0j6udOmzdg="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/pal-carbon-collector/default.nix b/distros/melodic/pal-carbon-collector/default.nix index abc245082b..f38a28769e 100644 --- a/distros/melodic/pal-carbon-collector/default.nix +++ b/distros/melodic/pal-carbon-collector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pal-carbon-collector"; version = "1.4.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_statistics-release/archive/release/melodic/pal_carbon_collector/1.4.1-1.tar.gz"; - name = "1.4.1-1.tar.gz"; - sha256 = "f8b1a9f99ca84937c402791de83cca7525b73fec5cf35238d0f49dc6eba42f94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_statistics-release"; + rev = "release/melodic/pal_carbon_collector/1.4.1-1"; + sha256 = "sha256-pSfPvr68E2VfYheK81CfVDUvxmBPn0Z6QAcYUa/BVMY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pal-statistics-msgs/default.nix b/distros/melodic/pal-statistics-msgs/default.nix index 8dac64fc93..cc517b66b2 100644 --- a/distros/melodic/pal-statistics-msgs/default.nix +++ b/distros/melodic/pal-statistics-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pal-statistics-msgs"; version = "1.4.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_statistics-release/archive/release/melodic/pal_statistics_msgs/1.4.1-1.tar.gz"; - name = "1.4.1-1.tar.gz"; - sha256 = "ede295cc48b9ffa94006a5b58b768cb20b698d0d37580e927a05052a9b065a10"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_statistics-release"; + rev = "release/melodic/pal_statistics_msgs/1.4.1-1"; + sha256 = "sha256-B4nZB4bzw3qLNpEuXB6Gs3oqAmOG4PSwjrgHzDfMdE0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pal-statistics/default.nix b/distros/melodic/pal-statistics/default.nix index 424546c4d7..eb5d38c516 100644 --- a/distros/melodic/pal-statistics/default.nix +++ b/distros/melodic/pal-statistics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pal-statistics"; version = "1.4.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/pal_statistics-release/archive/release/melodic/pal_statistics/1.4.1-1.tar.gz"; - name = "1.4.1-1.tar.gz"; - sha256 = "e5fd44e5ee34381c90c5beadf22ea46cdab7332b0e168cc1bd802012f34c0cda"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "pal_statistics-release"; + rev = "release/melodic/pal_statistics/1.4.1-1"; + sha256 = "sha256-U9zQQ1sbKAp/qCGddx3/y0JG0z2hHbHyMr0af0Wj1dM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/panda-moveit-config/default.nix b/distros/melodic/panda-moveit-config/default.nix index e093ad0f53..dfe2bbb347 100644 --- a/distros/melodic/panda-moveit-config/default.nix +++ b/distros/melodic/panda-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-panda-moveit-config"; version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/panda_moveit_config-release/archive/release/melodic/panda_moveit_config/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "5c566a9e10a372cfdeba2bb6e742096888d22c385e88ffe5486d413040b744a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "panda_moveit_config-release"; + rev = "release/melodic/panda_moveit_config/0.7.8-1"; + sha256 = "sha256-nZYIiYXKznz9dmY65Nx8vczIVRn35XLN1nGrJgI1q0k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/parameter-assertions/default.nix b/distros/melodic/parameter-assertions/default.nix index ed1e388b73..3c1738d1b7 100644 --- a/distros/melodic/parameter-assertions/default.nix +++ b/distros/melodic/parameter-assertions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-parameter-assertions"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/RoboJackets/rj-ros-common-release/archive/release/melodic/parameter_assertions/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "639173429975b82767392b4c719fff84c22fc31c40aa83b04bcda8b8eeca6df8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoboJackets"; + repo = "rj-ros-common-release"; + rev = "release/melodic/parameter_assertions/0.1.0-1"; + sha256 = "sha256-C1nSLGcKuH06sWsi0lfdDJHzWYO7yxyUOOBGmXc61WY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/parameter-pa/default.nix b/distros/melodic/parameter-pa/default.nix index d48d98e85e..e58d6fa9ee 100644 --- a/distros/melodic/parameter-pa/default.nix +++ b/distros/melodic/parameter-pa/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-parameter-pa"; version = "1.2.3-r2"; - src = fetchurl { - url = "https://github.com/TUC-ProAut/ros_parameter-release/archive/release/melodic/parameter_pa/1.2.3-2.tar.gz"; - name = "1.2.3-2.tar.gz"; - sha256 = "ecf0983ae4dfc9bcb99e83c332bda449ffa5ee778c8e17e9a1b2c667d0544aa9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "TUC-ProAut"; + repo = "ros_parameter-release"; + rev = "release/melodic/parameter_pa/1.2.3-2"; + sha256 = "sha256-UdbuPA4pBgqHS9lkFd5d5E3khQw6fDibj40vHZiThAM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/parrot-arsdk/default.nix b/distros/melodic/parrot-arsdk/default.nix index fd79dc7282..a76cb2fc05 100644 --- a/distros/melodic/parrot-arsdk/default.nix +++ b/distros/melodic/parrot-arsdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-parrot-arsdk"; version = "3.14.1"; - src = fetchurl { - url = "https://github.com/AutonomyLab/parrot_arsdk-release/archive/release/melodic/parrot_arsdk/3.14.1-0.tar.gz"; - name = "3.14.1-0.tar.gz"; - sha256 = "7c12a877881ee154fb0899c3b8d365276cb5c7afc319859078e610ec06f66ec1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AutonomyLab"; + repo = "parrot_arsdk-release"; + rev = "release/melodic/parrot_arsdk/3.14.1-0"; + sha256 = "sha256-yYX6Y5AxV9JloUAzJtzBJeIFSF0qQZcBys62yDZtiGw="; + }; buildType = "catkin"; buildInputs = [ autoconf automake avahi catkin curl ffmpeg libtool nasm ncurses unzip yasm zlib ]; diff --git a/distros/melodic/pass-through-controllers/default.nix b/distros/melodic/pass-through-controllers/default.nix index 36ff5ba8f1..c38fa937e0 100644 --- a/distros/melodic/pass-through-controllers/default.nix +++ b/distros/melodic/pass-through-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pass-through-controllers"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_passthrough_controllers-release/archive/release/melodic/pass_through_controllers/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "1e0d15cfe95e465317a70c03241a729dee9eb7eee7c737e156754a711f2d0959"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_passthrough_controllers-release"; + rev = "release/melodic/pass_through_controllers/0.1.0-1"; + sha256 = "sha256-tTHapYRYN6T2c2/Ov7vNJOd10vjNRtfem1jjRImZWq4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pcl-conversions/default.nix b/distros/melodic/pcl-conversions/default.nix index 931dc5279a..5b074d3e96 100644 --- a/distros/melodic/pcl-conversions/default.nix +++ b/distros/melodic/pcl-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pcl-conversions"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/perception_pcl-release/archive/release/melodic/pcl_conversions/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "802d6bc106aac351f44e40da87ccab4e8c48c710c80123181e3f3399fbc93a5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "perception_pcl-release"; + rev = "release/melodic/pcl_conversions/1.7.4-1"; + sha256 = "sha256-wwRfvN7cyB0FR39F82KzNiWwUlEdLgJjEpTE1KgE6cY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pcl-msgs/default.nix b/distros/melodic/pcl-msgs/default.nix index 603b753d0c..f0bc93e465 100644 --- a/distros/melodic/pcl-msgs/default.nix +++ b/distros/melodic/pcl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pcl-msgs"; version = "0.2.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/pcl_msgs-release/archive/release/melodic/pcl_msgs/0.2.0-0.tar.gz"; - name = "0.2.0-0.tar.gz"; - sha256 = "e4d2bd132c08b705e38958c8fd8203311af0feefdaa2a3aeeac86cb54e4b6d2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "pcl_msgs-release"; + rev = "release/melodic/pcl_msgs/0.2.0-0"; + sha256 = "sha256-KkGWH4nu+BMWbmLFb7AsJ99h5g3a9t6xACS9p86dqZY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pcl-ros/default.nix b/distros/melodic/pcl-ros/default.nix index b7c53c5f5e..b4049e4753 100644 --- a/distros/melodic/pcl-ros/default.nix +++ b/distros/melodic/pcl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pcl-ros"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/perception_pcl-release/archive/release/melodic/pcl_ros/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "81c8f34db4e676394e91982470aaf3e88b0e23f955a4f5b49efbddbe812dada8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "perception_pcl-release"; + rev = "release/melodic/pcl_ros/1.7.4-1"; + sha256 = "sha256-wd5tKEGYlmrmK72ZMh7L9VHXF+gej2e5w47cNai0wO0="; + }; buildType = "catkin"; buildInputs = [ catkin rosconsole roslib ]; diff --git a/distros/melodic/pddl-msgs/default.nix b/distros/melodic/pddl-msgs/default.nix index 1e9f27f2b3..55b96b5a61 100644 --- a/distros/melodic/pddl-msgs/default.nix +++ b/distros/melodic/pddl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pddl-msgs"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_msgs/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "44eaf9851a6ce49a825dacbd6ed4ae64ac09161024121ae261ed5923e50fa52d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_planning-release"; + rev = "release/melodic/pddl_msgs/0.1.12-1"; + sha256 = "sha256-HOobPtLZFrdyKUg0AjVkxHy4X0pI7EJhhlcxO4v0V4I="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pddl-planner-viewer/default.nix b/distros/melodic/pddl-planner-viewer/default.nix index deff05c453..e9fd588a79 100644 --- a/distros/melodic/pddl-planner-viewer/default.nix +++ b/distros/melodic/pddl-planner-viewer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pddl-planner-viewer"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_planner_viewer/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "4496310c975f2847fc8b6ba03073810225b48e166ba3da11c06aabaa1c7031af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_planning-release"; + rev = "release/melodic/pddl_planner_viewer/0.1.12-1"; + sha256 = "sha256-/TNoX6J0na0Aoo0PCHs6BpWiCjMCj0lOgI8/B1zEILA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pddl-planner/default.nix b/distros/melodic/pddl-planner/default.nix index 8394ac449f..5563127dda 100644 --- a/distros/melodic/pddl-planner/default.nix +++ b/distros/melodic/pddl-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pddl-planner"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_planning-release/archive/release/melodic/pddl_planner/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "e686d7ea6ca73282c5a3166e1a2628f43a1e52da107fadb97fc5fcc06a27e2ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_planning-release"; + rev = "release/melodic/pddl_planner/0.1.12-1"; + sha256 = "sha256-4XFBn1mSv5v0xJRy3bRYRi6IT0J0ho9dnnEB+14Scus="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/people-msgs/default.nix b/distros/melodic/people-msgs/default.nix index a00b50a88b..4aafb4bf04 100644 --- a/distros/melodic/people-msgs/default.nix +++ b/distros/melodic/people-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-people-msgs"; version = "1.4.0-r4"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/melodic/people_msgs/1.4.0-4.tar.gz"; - name = "1.4.0-4.tar.gz"; - sha256 = "56ee89ae2ab0cf449cf03e4a3db22356a5dba6e71a28d818ce90167a206e2bb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/melodic/people_msgs/1.4.0-4"; + sha256 = "sha256-rrVjVwv65K5zjBCJYCtBxfNEK/Wua0dFLnK9s+VyZQY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/people-tracking-filter/default.nix b/distros/melodic/people-tracking-filter/default.nix index a8501e16ec..93ae729d4d 100644 --- a/distros/melodic/people-tracking-filter/default.nix +++ b/distros/melodic/people-tracking-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-people-tracking-filter"; version = "1.4.0-r4"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/melodic/people_tracking_filter/1.4.0-4.tar.gz"; - name = "1.4.0-4.tar.gz"; - sha256 = "c865fb866c756894069ec3c6565a742ce0927c3f42b2359cd0f46f31230ad87c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/melodic/people_tracking_filter/1.4.0-4"; + sha256 = "sha256-mITMNrsgbP7qohSushJID/BdNJT5GlPcBpivEhM3/hY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/people-velocity-tracker/default.nix b/distros/melodic/people-velocity-tracker/default.nix index 4b8177f606..83ac2837ef 100644 --- a/distros/melodic/people-velocity-tracker/default.nix +++ b/distros/melodic/people-velocity-tracker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-people-velocity-tracker"; version = "1.4.0-r4"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/melodic/people_velocity_tracker/1.4.0-4.tar.gz"; - name = "1.4.0-4.tar.gz"; - sha256 = "dacb341d242868f85f245a5bb14821c4eeeb205b300ed187a78d9577bf052861"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/melodic/people_velocity_tracker/1.4.0-4"; + sha256 = "sha256-43swuu1bQpHs+5nQk+SW9QqY7xmcoY+377nYDSOYp7M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/people/default.nix b/distros/melodic/people/default.nix index 2792ce4367..8501380aef 100644 --- a/distros/melodic/people/default.nix +++ b/distros/melodic/people/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-people"; version = "1.4.0-r4"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/melodic/people/1.4.0-4.tar.gz"; - name = "1.4.0-4.tar.gz"; - sha256 = "3257e4cec2b4985b1b8f0530bb4a37820ec2100a60f9694b36aff8c9df32c154"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/melodic/people/1.4.0-4"; + sha256 = "sha256-51ctmHI5vqiw8kBDkFg/3A0tyeVdYXYHptIlXM1IegY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pepper-meshes/default.nix b/distros/melodic/pepper-meshes/default.nix index 37cc259963..d42933ebcd 100644 --- a/distros/melodic/pepper-meshes/default.nix +++ b/distros/melodic/pepper-meshes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pepper-meshes"; version = "0.2.4-r3"; - src = fetchurl { - url = "https://github.com/ros-naoqi/pepper_meshes-release/archive/release/melodic/pepper_meshes/0.2.4-3.tar.gz"; - name = "0.2.4-3.tar.gz"; - sha256 = "3780fdd3757c5aff60a4c894f3ad2b390630c92ee6931b6ca561d97513d5d199"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "pepper_meshes-release"; + rev = "release/melodic/pepper_meshes/0.2.4-3"; + sha256 = "sha256-bzHZA+HCCsFwhoxm+huqu82gGWm06qoLcizhJcZ3gCg="; + }; buildType = "catkin"; buildInputs = [ catkin openjdk ]; diff --git a/distros/melodic/pepperl-fuchs-r2000/default.nix b/distros/melodic/pepperl-fuchs-r2000/default.nix index 9bb56089fa..f9976ff399 100644 --- a/distros/melodic/pepperl-fuchs-r2000/default.nix +++ b/distros/melodic/pepperl-fuchs-r2000/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pepperl-fuchs-r2000"; version = "0.1.3"; - src = fetchurl { - url = "https://github.com/dillenberger/pepperl_fuchs-release/archive/release/melodic/pepperl_fuchs_r2000/0.1.3-0.tar.gz"; - name = "0.1.3-0.tar.gz"; - sha256 = "833c1e411a45ec3640a3b9711241ef46c5ba36ceaa0ee0496d183f4fbb246c1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dillenberger"; + repo = "pepperl_fuchs-release"; + rev = "release/melodic/pepperl_fuchs_r2000/0.1.3-0"; + sha256 = "sha256-18sfMasHRxV4c33pYtWlcRkfpiqdh0kYuxbuM7hRV9U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/perception-pcl/default.nix b/distros/melodic/perception-pcl/default.nix index 51d60c3b72..c5c5b18405 100644 --- a/distros/melodic/perception-pcl/default.nix +++ b/distros/melodic/perception-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-perception-pcl"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/perception_pcl-release/archive/release/melodic/perception_pcl/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "2599983e343b30b490122b261c020ce74a17328ab748cbe840007753e9579608"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "perception_pcl-release"; + rev = "release/melodic/perception_pcl/1.7.4-1"; + sha256 = "sha256-1J5fNsyjyAPxqPE04i/TaOSRsIiQK4ZMRLRKEzEwMCU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/perception/default.nix b/distros/melodic/perception/default.nix index 8674f6b658..e7720d14b0 100644 --- a/distros/melodic/perception/default.nix +++ b/distros/melodic/perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-perception"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/melodic/perception/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "f6024982eaa029dafbe20bd1e533f46766f9731a485a837e4a450331f5594126"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/melodic/perception/1.4.1-0"; + sha256 = "sha256-iV9GU7bxZa/+bYW68lvo9NR+7ZwwMwiJX4NYDafuNP4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pf-description/default.nix b/distros/melodic/pf-description/default.nix index 0f8aee73ba..d5c1997444 100644 --- a/distros/melodic/pf-description/default.nix +++ b/distros/melodic/pf-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pf-description"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/PepperlFuchs/pf_lidar_ros_driver-release/archive/release/melodic/pf_description/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "302e3c7f6a0642e3a8819f56eef5e2c9967c1a93ac1cd3cc3055f21e29852597"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PepperlFuchs"; + repo = "pf_lidar_ros_driver-release"; + rev = "release/melodic/pf_description/1.2.0-2"; + sha256 = "sha256-Kur/IEgrsr0yInyUTpVwzW2ggO/tnlUITMr6PuaG340="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pf-driver/default.nix b/distros/melodic/pf-driver/default.nix index 7f7f5dd116..f16aaee859 100644 --- a/distros/melodic/pf-driver/default.nix +++ b/distros/melodic/pf-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pf-driver"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/PepperlFuchs/pf_lidar_ros_driver-release/archive/release/melodic/pf_driver/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "a852a67342f0e1f46a313a41a954b1540f8b8af833b23672c3ba80a0bf195706"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PepperlFuchs"; + repo = "pf_lidar_ros_driver-release"; + rev = "release/melodic/pf_driver/1.2.0-2"; + sha256 = "sha256-YIEJh7jpfsYOQ8jkmhSeJRFuBwjg6bYUTEVhcrs/YXM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/melodic/pheeno-ros-description/default.nix b/distros/melodic/pheeno-ros-description/default.nix index 5ce006b2fc..a461ccba7f 100644 --- a/distros/melodic/pheeno-ros-description/default.nix +++ b/distros/melodic/pheeno-ros-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pheeno-ros-description"; version = "0.1.0"; - src = fetchurl { - url = "https://github.com/acslaboratory/pheeno_ros_description-release/archive/release/melodic/pheeno_ros_description/0.1.0-0.tar.gz"; - name = "0.1.0-0.tar.gz"; - sha256 = "4849cdf4250dfdbd134a913bd739e1b2647446a89eb50a6dde59bdbc9632019c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "acslaboratory"; + repo = "pheeno_ros_description-release"; + rev = "release/melodic/pheeno_ros_description/0.1.0-0"; + sha256 = "sha256-q/taM6MhmN+qjSaOkuSPVdTsk8vkX+qCHk00R49V470="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/phidgets-api/default.nix b/distros/melodic/phidgets-api/default.nix index 442256f884..102715aabc 100644 --- a/distros/melodic/phidgets-api/default.nix +++ b/distros/melodic/phidgets-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-phidgets-api"; version = "0.7.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/melodic/phidgets_api/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "9d4a754230661ad607e621d6cfc94ef56549e1b9e3f0772937b1ba023195e189"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/melodic/phidgets_api/0.7.11-1"; + sha256 = "sha256-xOaIcUTjuL+f/wPhj+IY6szBK4vXT7+J7fJ13e+1VJY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/phidgets-drivers/default.nix b/distros/melodic/phidgets-drivers/default.nix index bb30b0d6c5..132bff46a9 100644 --- a/distros/melodic/phidgets-drivers/default.nix +++ b/distros/melodic/phidgets-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-phidgets-drivers"; version = "0.7.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/melodic/phidgets_drivers/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "76ba15fc6d2c454eb9f3682958cba17cc221c2c26d3b22628b4417570a3b6c8d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/melodic/phidgets_drivers/0.7.11-1"; + sha256 = "sha256-RL1szAPnVjrxC+zIpWjmQ6pyZsnFux/UYZ8qhppSjt0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/phidgets-high-speed-encoder/default.nix b/distros/melodic/phidgets-high-speed-encoder/default.nix index 6ab3908f60..36aff4f737 100644 --- a/distros/melodic/phidgets-high-speed-encoder/default.nix +++ b/distros/melodic/phidgets-high-speed-encoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-phidgets-high-speed-encoder"; version = "0.7.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/melodic/phidgets_high_speed_encoder/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "c80996cd598e2d92710bfc0a78436e790f682495072557be049b80d418054da5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/melodic/phidgets_high_speed_encoder/0.7.11-1"; + sha256 = "sha256-hfp3k2csPUcX8p6bIQCndvgGdp2VU7hJGcyIlL3HEAU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/phidgets-ik/default.nix b/distros/melodic/phidgets-ik/default.nix index 1a25232925..88f9a65a0a 100644 --- a/distros/melodic/phidgets-ik/default.nix +++ b/distros/melodic/phidgets-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-phidgets-ik"; version = "0.7.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/melodic/phidgets_ik/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "1e115c59cf1c38b6a74820fe419fe520e6807930c7b8c1cb493c7a8e2a5e21e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/melodic/phidgets_ik/0.7.11-1"; + sha256 = "sha256-W48DDQybAoWexuRGVB8mF6LfgFBzdah/dz6q0KRTH5s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/phidgets-imu/default.nix b/distros/melodic/phidgets-imu/default.nix index 8cdf618d2d..fb69eb2854 100644 --- a/distros/melodic/phidgets-imu/default.nix +++ b/distros/melodic/phidgets-imu/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-phidgets-imu"; version = "0.7.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/melodic/phidgets_imu/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "734bc239351695bffac0addd1ebbc93fa75d9c6d4f291c05e6cff41fcb4155ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/melodic/phidgets_imu/0.7.11-1"; + sha256 = "sha256-J+pWEk6/CcZmrc6UN7FgWFk5xMazH9Fk/xh6hsIIJpQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/phidgets-msgs/default.nix b/distros/melodic/phidgets-msgs/default.nix index d88a29f4fe..c43eb03c89 100644 --- a/distros/melodic/phidgets-msgs/default.nix +++ b/distros/melodic/phidgets-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-phidgets-msgs"; version = "0.7.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/melodic/phidgets_msgs/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "3a93c937d43ab6f4a715931ffb7bee9bd32cb5ab9d6e934536b89ef5e6620ece"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/melodic/phidgets_msgs/0.7.11-1"; + sha256 = "sha256-YPAtVysXHS1l/wvDUUF9G/AUJOdXS603Mt20GPQ5F9I="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/photo/default.nix b/distros/melodic/photo/default.nix index 526c85f23e..8017e8a348 100644 --- a/distros/melodic/photo/default.nix +++ b/distros/melodic/photo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-photo"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/bosch-ros-pkg/photo-release/archive/release/melodic/photo/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "61ab67a9bc3909382c062c6c93be55830c71b889b35326014bf3966b88fb354f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "bosch-ros-pkg"; + repo = "photo-release"; + rev = "release/melodic/photo/1.0.3-1"; + sha256 = "sha256-5E1FTiq5QT+FC5TsagoKJKGGX3PykZ7BoPnSHs9VOa0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pid/default.nix b/distros/melodic/pid/default.nix index 66a5652ab4..31725aa6f1 100644 --- a/distros/melodic/pid/default.nix +++ b/distros/melodic/pid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pid"; version = "0.0.27"; - src = fetchurl { - url = "https://github.com/AndyZe/pid-release/archive/release/melodic/pid/0.0.27-0.tar.gz"; - name = "0.0.27-0.tar.gz"; - sha256 = "6066703ba3197ee904f55d7e6b1fc054e1901b5ad4d826753061715945a57d62"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AndyZe"; + repo = "pid-release"; + rev = "release/melodic/pid/0.0.27-0"; + sha256 = "sha256-n34m7FnDDQVMIjCqwoSFlbYvq9nl5WPO5XMZ+pnxpNY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pilz-control/default.nix b/distros/melodic/pilz-control/default.nix index 9e702de9e7..4464557843 100644 --- a/distros/melodic/pilz-control/default.nix +++ b/distros/melodic/pilz-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-control"; version = "0.5.23-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/melodic/pilz_control/0.5.23-1.tar.gz"; - name = "0.5.23-1.tar.gz"; - sha256 = "f686fe3565c832940c04e14e35771028368963b4a88857ebeefc524b6d7f1b09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/melodic/pilz_control/0.5.23-1"; + sha256 = "sha256-5M4hwwtNn2kXxaqeNxnZW/r78obeYry1u/EHifaA+Po="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules roslint ]; diff --git a/distros/melodic/pilz-extensions/default.nix b/distros/melodic/pilz-extensions/default.nix index f2613ce3a9..ebdaf2207f 100644 --- a/distros/melodic/pilz-extensions/default.nix +++ b/distros/melodic/pilz-extensions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-extensions"; version = "0.4.14-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_industrial_motion-release/archive/release/melodic/pilz_extensions/0.4.14-1.tar.gz"; - name = "0.4.14-1.tar.gz"; - sha256 = "0c750d40f8d7e22e93f8fa7c4376001989b441e5cf55fa0bc173c011697787f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_industrial_motion-release"; + rev = "release/melodic/pilz_extensions/0.4.14-1"; + sha256 = "sha256-DJosG23d4lMn4ENr1aStrY1tjFlm6ut391R9HY5WTqE="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp ]; diff --git a/distros/melodic/pilz-industrial-motion-planner-testutils/default.nix b/distros/melodic/pilz-industrial-motion-planner-testutils/default.nix index 34563debbd..60e4181311 100644 --- a/distros/melodic/pilz-industrial-motion-planner-testutils/default.nix +++ b/distros/melodic/pilz-industrial-motion-planner-testutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-industrial-motion-planner-testutils"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/pilz_industrial_motion_planner_testutils/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "516466ee10be9ac92fdf8807a5b81788c0f0c68cfa451206f6bf15c4de1bbe8f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/pilz_industrial_motion_planner_testutils/1.0.11-1"; + sha256 = "sha256-fb/daq8tBk5TJdYKk6jH4dbi2Lx7Rim++/ADztAsfgg="; + }; buildType = "catkin"; buildInputs = [ catkin eigen-conversions ]; diff --git a/distros/melodic/pilz-industrial-motion-planner/default.nix b/distros/melodic/pilz-industrial-motion-planner/default.nix index 908a543cbc..a6f2ad4420 100644 --- a/distros/melodic/pilz-industrial-motion-planner/default.nix +++ b/distros/melodic/pilz-industrial-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-industrial-motion-planner"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/melodic/pilz_industrial_motion_planner/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "6160b3bc4f2524219d537f40039438e2e4203f2c8e91dc8f78e57387c16cfeed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/melodic/pilz_industrial_motion_planner/1.0.11-1"; + sha256 = "sha256-MNXWushyAwH9VROVlURSOcFztsybc/Jc58nwoe6cht4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pilz-industrial-motion-testutils/default.nix b/distros/melodic/pilz-industrial-motion-testutils/default.nix index 90c7726593..4d00a936cd 100644 --- a/distros/melodic/pilz-industrial-motion-testutils/default.nix +++ b/distros/melodic/pilz-industrial-motion-testutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-industrial-motion-testutils"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_common-release/archive/release/melodic/pilz_industrial_motion_testutils/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "68e505b56ef064d3714e5ad8a5a63321b6dc1fcc49230e218f6a656fba70cd10"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_common-release"; + rev = "release/melodic/pilz_industrial_motion_testutils/0.6.0-1"; + sha256 = "sha256-6EvswiecJFtXLpqcZBH0MOuozgz7gSCT8xNZUqDbC1w="; + }; buildType = "catkin"; buildInputs = [ catkin eigen-conversions ]; diff --git a/distros/melodic/pilz-industrial-motion/default.nix b/distros/melodic/pilz-industrial-motion/default.nix index b5d7a6e8b2..0d6c8862fc 100644 --- a/distros/melodic/pilz-industrial-motion/default.nix +++ b/distros/melodic/pilz-industrial-motion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-industrial-motion"; version = "0.4.14-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_industrial_motion-release/archive/release/melodic/pilz_industrial_motion/0.4.14-1.tar.gz"; - name = "0.4.14-1.tar.gz"; - sha256 = "d934fc24dca066e31c7c49f2d59c4ee22d52e38b4afb0b10fedaca0418c3ee63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_industrial_motion-release"; + rev = "release/melodic/pilz_industrial_motion/0.4.14-1"; + sha256 = "sha256-AcPS9BU0LBfZpJBUGP0JAZdGHfsl7V3L2HEQbxh5l6E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pilz-msgs/default.nix b/distros/melodic/pilz-msgs/default.nix index eb24a47781..be6d7b11de 100644 --- a/distros/melodic/pilz-msgs/default.nix +++ b/distros/melodic/pilz-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-msgs"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_common-release/archive/release/melodic/pilz_msgs/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "df5cbc23f0122a008312aac5df69b4a16aac322dee0758d7b4c8b6b4e304c538"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_common-release"; + rev = "release/melodic/pilz_msgs/0.6.0-1"; + sha256 = "sha256-A92d+h//cbqHtIfy32mslSahdV0qQ37dFbZxF2hwS+Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pilz-robot-programming/default.nix b/distros/melodic/pilz-robot-programming/default.nix index 0f3f0ec715..7a8b074d1d 100644 --- a/distros/melodic/pilz-robot-programming/default.nix +++ b/distros/melodic/pilz-robot-programming/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-robot-programming"; version = "0.4.14-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_industrial_motion-release/archive/release/melodic/pilz_robot_programming/0.4.14-1.tar.gz"; - name = "0.4.14-1.tar.gz"; - sha256 = "746fc5780070faca34e79c98fcf856245f241f32748529f7a7eda3474549b18c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_industrial_motion-release"; + rev = "release/melodic/pilz_robot_programming/0.4.14-1"; + sha256 = "sha256-b2vN0d36pDII6sz0ZeFVV6CSex5ZecK6/N+LyXjwWbU="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/pilz-robots/default.nix b/distros/melodic/pilz-robots/default.nix index 0afc851732..c098edee95 100644 --- a/distros/melodic/pilz-robots/default.nix +++ b/distros/melodic/pilz-robots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-robots"; version = "0.5.23-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/melodic/pilz_robots/0.5.23-1.tar.gz"; - name = "0.5.23-1.tar.gz"; - sha256 = "ab98a25dedb5a104fecaaf4ed3631f09764186a5e1c5da9e87f32b8a7fb73e5a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/melodic/pilz_robots/0.5.23-1"; + sha256 = "sha256-tylNnRltXTxWhsW897f5pHIZgvj8h8CcQhyEkrmyLkU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pilz-status-indicator-rqt/default.nix b/distros/melodic/pilz-status-indicator-rqt/default.nix index 12e8e8a30d..afe150bfdf 100644 --- a/distros/melodic/pilz-status-indicator-rqt/default.nix +++ b/distros/melodic/pilz-status-indicator-rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-status-indicator-rqt"; version = "0.5.23-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/melodic/pilz_status_indicator_rqt/0.5.23-1.tar.gz"; - name = "0.5.23-1.tar.gz"; - sha256 = "6665eb85e1a85d1e33bf9f3611435a209a21cc418c96d5fcae88c4faeb58970a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/melodic/pilz_status_indicator_rqt/0.5.23-1"; + sha256 = "sha256-2Fs6ThSiMz4dcc8zubrCMbl8tl69E5AgHskNw88OQVY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pilz-store-positions/default.nix b/distros/melodic/pilz-store-positions/default.nix index 0aa8f06693..6d901c2833 100644 --- a/distros/melodic/pilz-store-positions/default.nix +++ b/distros/melodic/pilz-store-positions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-store-positions"; version = "0.4.14-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_industrial_motion-release/archive/release/melodic/pilz_store_positions/0.4.14-1.tar.gz"; - name = "0.4.14-1.tar.gz"; - sha256 = "e5b3f77c5955899145e6fd06dc5ba7fab918b651d543aeb27e7b90e4987293f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_industrial_motion-release"; + rev = "release/melodic/pilz_store_positions/0.4.14-1"; + sha256 = "sha256-xQzGZkL+EBm8GSc/87XWgS9W5Yy8twBcIKauQnmRf4M="; + }; buildType = "catkin"; buildInputs = [ catkin roslint std-msgs ]; diff --git a/distros/melodic/pilz-testutils/default.nix b/distros/melodic/pilz-testutils/default.nix index a21fc927a3..f3f5863719 100644 --- a/distros/melodic/pilz-testutils/default.nix +++ b/distros/melodic/pilz-testutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-testutils"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_common-release/archive/release/melodic/pilz_testutils/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "852c503a5de03f9fd4985710ea0b0526d89baa6dea09e0c967cdeea783372005"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_common-release"; + rev = "release/melodic/pilz_testutils/0.6.0-1"; + sha256 = "sha256-caHeVKahvbuTXgAf+LamGOh9hAHd+WyGnY2fhoQDmWE="; + }; buildType = "catkin"; buildInputs = [ catkin pilz-utils roscpp sensor-msgs ]; diff --git a/distros/melodic/pilz-trajectory-generation/default.nix b/distros/melodic/pilz-trajectory-generation/default.nix index 76ff5ccb10..c15e4f132b 100644 --- a/distros/melodic/pilz-trajectory-generation/default.nix +++ b/distros/melodic/pilz-trajectory-generation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-trajectory-generation"; version = "0.4.14-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_industrial_motion-release/archive/release/melodic/pilz_trajectory_generation/0.4.14-1.tar.gz"; - name = "0.4.14-1.tar.gz"; - sha256 = "55c630f7cee97d09abb77f22ef40b4aebdebcccf56fa6bcc93363bbc9bfc4c97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_industrial_motion-release"; + rev = "release/melodic/pilz_trajectory_generation/0.4.14-1"; + sha256 = "sha256-6NN8PF071q8OZAaNeV2gih4oXJmoyx6Mm4NmBfW0E70="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pilz-utils/default.nix b/distros/melodic/pilz-utils/default.nix index c8b7575a51..b00649b89b 100644 --- a/distros/melodic/pilz-utils/default.nix +++ b/distros/melodic/pilz-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pilz-utils"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_common-release/archive/release/melodic/pilz_utils/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "1d9c69d9031b3672f7eba222b81ed50fef31a7c8188e310e476889ee1d3131c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_common-release"; + rev = "release/melodic/pilz_utils/0.6.0-1"; + sha256 = "sha256-h8lKL5VQv5Dbr2Xbczbs+8GeFe3KDIiZiH72b0hA8D4="; + }; buildType = "catkin"; buildInputs = [ catkin clang roscpp ]; diff --git a/distros/melodic/pincher-arm-bringup/default.nix b/distros/melodic/pincher-arm-bringup/default.nix index 48f1b0bdd1..af5f3c6eb5 100644 --- a/distros/melodic/pincher-arm-bringup/default.nix +++ b/distros/melodic/pincher-arm-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pincher-arm-bringup"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/melodic/pincher_arm_bringup/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "017d7c5373dd32b42e8c6ee119691c56f61cd48eb7532c1dabb0350da70c17ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/melodic/pincher_arm_bringup/0.2.0-1"; + sha256 = "sha256-eFpmmfRgmkJrH2Sik9lRKqmpAhFwoHgGHkN2bJ90JE8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pincher-arm-description/default.nix b/distros/melodic/pincher-arm-description/default.nix index 01fe46b6e7..a4d4d715b9 100644 --- a/distros/melodic/pincher-arm-description/default.nix +++ b/distros/melodic/pincher-arm-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pincher-arm-description"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/melodic/pincher_arm_description/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "bbd4818fa00f7ba0830a82f40e9364e8032887fbbbc6d528deae126e3317f756"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/melodic/pincher_arm_description/0.2.0-1"; + sha256 = "sha256-MdQyDNZzz9WikKS6YvpI9vKT7HJGccuKspkTzQNJ8J8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pincher-arm-ikfast-plugin/default.nix b/distros/melodic/pincher-arm-ikfast-plugin/default.nix index 7093cea87d..bb90e97387 100644 --- a/distros/melodic/pincher-arm-ikfast-plugin/default.nix +++ b/distros/melodic/pincher-arm-ikfast-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pincher-arm-ikfast-plugin"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/melodic/pincher_arm_ikfast_plugin/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "935742ac590504e21f75c1bebd03f380e2d33b5e62ae395b0122718b3fb283aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/melodic/pincher_arm_ikfast_plugin/0.2.0-1"; + sha256 = "sha256-YPMdLXfqe3HujZW+F5ShqGpKCv7F0zD+6VrVn+Uz9Rc="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen tf2-kdl ]; diff --git a/distros/melodic/pincher-arm-moveit-config/default.nix b/distros/melodic/pincher-arm-moveit-config/default.nix index 7957842f6d..4d792e2801 100644 --- a/distros/melodic/pincher-arm-moveit-config/default.nix +++ b/distros/melodic/pincher-arm-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pincher-arm-moveit-config"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/melodic/pincher_arm_moveit_config/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "a4d2ce813322d6be8cc38a862407c9999b2539d665799a515071ab95508a0551"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/melodic/pincher_arm_moveit_config/0.2.0-1"; + sha256 = "sha256-QIXYMNcL/cZ4whjCE18pFf4tWDVLle1EuXEqQmvuPEM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pincher-arm-moveit-demos/default.nix b/distros/melodic/pincher-arm-moveit-demos/default.nix index 5ebf98b10a..7eee4ddfd5 100644 --- a/distros/melodic/pincher-arm-moveit-demos/default.nix +++ b/distros/melodic/pincher-arm-moveit-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pincher-arm-moveit-demos"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/melodic/pincher_arm_moveit_demos/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "71db59332ad1cd4687367377a52827753a0b625b2dfa4f8bef31d53440daec93"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/melodic/pincher_arm_moveit_demos/0.2.0-1"; + sha256 = "sha256-+pmwb0EqJTb2bQ6M/HmLmQWdJ61qq2y5s2T6big7ix0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pincher-arm/default.nix b/distros/melodic/pincher-arm/default.nix index 374eb8b4ab..d992bbcced 100644 --- a/distros/melodic/pincher-arm/default.nix +++ b/distros/melodic/pincher-arm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pincher-arm"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/melodic/pincher_arm/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "7ba2563e83f8fb00c6071aa005888c7746fb5a23bf73b488178e3c6cb71a56d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/melodic/pincher_arm/0.2.0-1"; + sha256 = "sha256-M13EHfXPoBG75tR50Toawzt+D7tWgtHGc6BVES08HFU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pinocchio/default.nix b/distros/melodic/pinocchio/default.nix index 19e65c8ee0..415c6c3c37 100644 --- a/distros/melodic/pinocchio/default.nix +++ b/distros/melodic/pinocchio/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, clang, cmake, doxygen, eigen, eigenpy, git, hpp-fcl, python, pythonPackages, urdfdom }: buildRosPackage { pname = "ros-melodic-pinocchio"; - version = "2.6.12-r1"; + version = "2.6.14-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/pinocchio-ros-release/archive/release/melodic/pinocchio/2.6.12-1.tar.gz"; - name = "2.6.12-1.tar.gz"; - sha256 = "f6cd3591215a961e7c96fcac7cb801d56d21d395393c1fd5c79f84b8eb30356a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "pinocchio-ros-release"; + rev = "release/melodic/pinocchio/2.6.14-1"; + sha256 = "sha256-B+YEHl7O0u6gSO/dyzRYer4KC+yBa775XzsYg9yNYhg="; + }; buildType = "cmake"; buildInputs = [ clang cmake doxygen git ]; diff --git a/distros/melodic/planner-cspace-msgs/default.nix b/distros/melodic/planner-cspace-msgs/default.nix index add38cdb7d..02d6b42d74 100644 --- a/distros/melodic/planner-cspace-msgs/default.nix +++ b/distros/melodic/planner-cspace-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-melodic-planner-cspace-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/melodic/planner_cspace_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "8dd9bd2422d97b8701cf6b417e2a204548d3430c26a156654c5b220fd53bfedd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/melodic/planner_cspace_msgs/0.12.0-1"; + sha256 = "sha256-CO9XcIQ6PCAUokury0btDNVMjlB1onJJdqjwtWfciGY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/planner-cspace/default.nix b/distros/melodic/planner-cspace/default.nix index e0e7ce4621..733cccfd1f 100644 --- a/distros/melodic/planner-cspace/default.nix +++ b/distros/melodic/planner-cspace/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, costmap-cspace, costmap-cspace-msgs, diagnostic-updater, geometry-msgs, map-server, move-base-msgs, nav-msgs, neonavigation-common, planner-cspace-msgs, roscpp, roslint, rostest, sensor-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros, trajectory-msgs, trajectory-tracker, trajectory-tracker-msgs }: buildRosPackage { pname = "ros-melodic-planner-cspace"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/planner_cspace/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "4205e3b004fac5a4307d30285ccdaba929f3371871d13404882a94db2f9a4902"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/planner_cspace/0.12.0-1"; + sha256 = "sha256-uhbVC+ezq4+bwIC6WUfP/vrEMvK6EXVb9npkGrrYm+8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/play-motion-builder-msgs/default.nix b/distros/melodic/play-motion-builder-msgs/default.nix index d0e675f57c..19a60e1c9b 100644 --- a/distros/melodic/play-motion-builder-msgs/default.nix +++ b/distros/melodic/play-motion-builder-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-play-motion-builder-msgs"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-robotics/play_motion_builder-release/archive/release/melodic/play_motion_builder_msgs/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "6306b6896ac2e6c7455dc94b499552b70e699c7794b7b21da133dd27ba7fba05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-robotics"; + repo = "play_motion_builder-release"; + rev = "release/melodic/play_motion_builder_msgs/1.0.2-1"; + sha256 = "sha256-/pkeLQca48B0hEGVxbGEyVcpzyoEx6s/H2Ys58kSYxs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/play-motion-builder/default.nix b/distros/melodic/play-motion-builder/default.nix index 0d5bc7593c..10bc38b50d 100644 --- a/distros/melodic/play-motion-builder/default.nix +++ b/distros/melodic/play-motion-builder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-play-motion-builder"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-robotics/play_motion_builder-release/archive/release/melodic/play_motion_builder/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "9e608aa00a7d516c67dee948ddc923a6190e20148f75ce7d84fd596105045cb6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-robotics"; + repo = "play_motion_builder-release"; + rev = "release/melodic/play_motion_builder/1.0.2-1"; + sha256 = "sha256-FpAofk8ckVRXAG4mwSKzoVT0C01xxmKxCRPWNA1k8r0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/play-motion-msgs/default.nix b/distros/melodic/play-motion-msgs/default.nix index ff34d4e032..4a90f5a138 100644 --- a/distros/melodic/play-motion-msgs/default.nix +++ b/distros/melodic/play-motion-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-play-motion-msgs"; version = "0.4.8-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/play_motion-release2/archive/release/melodic/play_motion_msgs/0.4.8-1.tar.gz"; - name = "0.4.8-1.tar.gz"; - sha256 = "7e6f882bf2331299faacfb24f7b1c8fab04dc7588e3226421daac237382d3a0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "play_motion-release2"; + rev = "release/melodic/play_motion_msgs/0.4.8-1"; + sha256 = "sha256-go4elR910BzISgWRy3r5mOhleLWfnt+DivRao8iL5LE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/play-motion/default.nix b/distros/melodic/play-motion/default.nix index 5da5543990..0fb4c9a125 100644 --- a/distros/melodic/play-motion/default.nix +++ b/distros/melodic/play-motion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-play-motion"; version = "0.4.8-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/play_motion-release2/archive/release/melodic/play_motion/0.4.8-1.tar.gz"; - name = "0.4.8-1.tar.gz"; - sha256 = "bc3bb1a2030e2aa9213c26556c1fd012399c58cdc5f1dc592ec4b1786c8267aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "play_motion-release2"; + rev = "release/melodic/play_motion/0.4.8-1"; + sha256 = "sha256-4/ACaqXD+i1NjMQNV9c/s8w+KpD6audHA7Wd8iNBNOU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/plotjuggler-msgs/default.nix b/distros/melodic/plotjuggler-msgs/default.nix index b59b7adc15..e254552f60 100644 --- a/distros/melodic/plotjuggler-msgs/default.nix +++ b/distros/melodic/plotjuggler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-plotjuggler-msgs"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/facontidavide/plotjuggler_msgs-release/archive/release/melodic/plotjuggler_msgs/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "2754a3a1a90ad84be9e6e470d5201f7e1e7da603a325b8b082925f84829b33d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "plotjuggler_msgs-release"; + rev = "release/melodic/plotjuggler_msgs/0.2.1-1"; + sha256 = "sha256-LOj/zO/kVp+PLBNkVl/UyunkoA3npudzqmvzwcH5E9Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/plotjuggler-ros/default.nix b/distros/melodic/plotjuggler-ros/default.nix index 6a25b12c55..18fe165d98 100644 --- a/distros/melodic/plotjuggler-ros/default.nix +++ b/distros/melodic/plotjuggler-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-plotjuggler-ros"; version = "1.7.0-r1"; - src = fetchurl { - url = "https://github.com/PlotJuggler/plotjuggler-ros-plugins-release/archive/release/melodic/plotjuggler_ros/1.7.0-1.tar.gz"; - name = "1.7.0-1.tar.gz"; - sha256 = "fe397262c02adcf66c4d02cb76fb1711c26d52ec54f7d376594da403cbf5e3cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PlotJuggler"; + repo = "plotjuggler-ros-plugins-release"; + rev = "release/melodic/plotjuggler_ros/1.7.0-1"; + sha256 = "sha256-kL86S4hw8+vC32Dh0EgrWHXUQPY2iPGT3vVRD9EN3PI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/plotjuggler/default.nix b/distros/melodic/plotjuggler/default.nix index 2b00528a14..839c7bbdbb 100644 --- a/distros/melodic/plotjuggler/default.nix +++ b/distros/melodic/plotjuggler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-plotjuggler"; version = "3.6.0-r1"; - src = fetchurl { - url = "https://github.com/facontidavide/plotjuggler-release/archive/release/melodic/plotjuggler/3.6.0-1.tar.gz"; - name = "3.6.0-1.tar.gz"; - sha256 = "4c121e9e05c06a734773f922bb792853ac950889143cfd134deaaa36045b3a0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "plotjuggler-release"; + rev = "release/melodic/plotjuggler/3.6.0-1"; + sha256 = "sha256-nHSTE9bbmkR6byd/ACSbE16oscBg2pMgQIEUMdXFpg0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pluginlib-tutorials/default.nix b/distros/melodic/pluginlib-tutorials/default.nix index f8f9aa3a8b..0926556fc9 100644 --- a/distros/melodic/pluginlib-tutorials/default.nix +++ b/distros/melodic/pluginlib-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pluginlib-tutorials"; version = "0.1.11"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/melodic/pluginlib_tutorials/0.1.11-0.tar.gz"; - name = "0.1.11-0.tar.gz"; - sha256 = "2a421d7ea4d04ba27c7221abd753f1ebbe040227df1e4c87a3df559064002c17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/melodic/pluginlib_tutorials/0.1.11-0"; + sha256 = "sha256-pIa5P5rM4SAZa9eJUOAHo6UHDZb0rsfkMQE+PidkcZQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pluginlib/default.nix b/distros/melodic/pluginlib/default.nix index ab00bb38f5..5c51e630c3 100644 --- a/distros/melodic/pluginlib/default.nix +++ b/distros/melodic/pluginlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pluginlib"; version = "1.12.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/pluginlib-release/archive/release/melodic/pluginlib/1.12.1-0.tar.gz"; - name = "1.12.1-0.tar.gz"; - sha256 = "51ad8cc72b954cf0fb32b8e562eaa2f24d830ce72832320582ec2075b95958e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "pluginlib-release"; + rev = "release/melodic/pluginlib/1.12.1-0"; + sha256 = "sha256-kKxD05XoElNkNpozh1qWPKD5oPwslSccXbCfMOGZdho="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/point-cloud-publisher-tutorial/default.nix b/distros/melodic/point-cloud-publisher-tutorial/default.nix index 53fa11ffa5..d16d269edf 100644 --- a/distros/melodic/point-cloud-publisher-tutorial/default.nix +++ b/distros/melodic/point-cloud-publisher-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-point-cloud-publisher-tutorial"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_tutorials-release/archive/release/melodic/point_cloud_publisher_tutorial/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "f7cacd1a860ecf30ebb011da43d04f9992cf1cfed04b8ff1e5b6d1ccb55f0680"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_tutorials-release"; + rev = "release/melodic/point_cloud_publisher_tutorial/0.2.4-1"; + sha256 = "sha256-JyrIyt8qDQu56k/gY/J0UB+zjivZS2qYA2nDt5JCTy8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pointcloud-to-laserscan/default.nix b/distros/melodic/pointcloud-to-laserscan/default.nix index 2b6147f162..90d583ff8f 100644 --- a/distros/melodic/pointcloud-to-laserscan/default.nix +++ b/distros/melodic/pointcloud-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pointcloud-to-laserscan"; version = "1.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/pointcloud_to_laserscan-release/archive/release/melodic/pointcloud_to_laserscan/1.4.1-1.tar.gz"; - name = "1.4.1-1.tar.gz"; - sha256 = "50bebd62ff6e696bde5dd47a8787709a756d894d6826615b8cbbc54abe7edce4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "pointcloud_to_laserscan-release"; + rev = "release/melodic/pointcloud_to_laserscan/1.4.1-1"; + sha256 = "sha256-nbLSYZaMRpvQ4Jp9vmiZXIq+J8Rjjh68l09lpekS/lM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pointgrey-camera-description/default.nix b/distros/melodic/pointgrey-camera-description/default.nix index 4f1c067555..2dd8efeabd 100644 --- a/distros/melodic/pointgrey-camera-description/default.nix +++ b/distros/melodic/pointgrey-camera-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pointgrey-camera-description"; version = "0.14.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/melodic/pointgrey_camera_description/0.14.2-1.tar.gz"; - name = "0.14.2-1.tar.gz"; - sha256 = "8947475ceebb51e8a17bcf6628f885def747bb5c30e35c713694b82d1158da88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/melodic/pointgrey_camera_description/0.14.2-1"; + sha256 = "sha256-/8LZi8VDz84yyMF4YahDFQwFvZw424VlgQKYT8efu78="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pointgrey-camera-driver/default.nix b/distros/melodic/pointgrey-camera-driver/default.nix index 7a192d071b..3d32a02d84 100644 --- a/distros/melodic/pointgrey-camera-driver/default.nix +++ b/distros/melodic/pointgrey-camera-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pointgrey-camera-driver"; version = "0.14.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/melodic/pointgrey_camera_driver/0.14.2-1.tar.gz"; - name = "0.14.2-1.tar.gz"; - sha256 = "8430fc5a117b73fad6f2bf228d3d892879b3c1cb0b1f731ee755b116c07d09d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/melodic/pointgrey_camera_driver/0.14.2-1"; + sha256 = "sha256-oHEsmyCGWDZL0XJAxk5uVmN3jI/gp+4ZbHswoPWbsHE="; + }; buildType = "catkin"; buildInputs = [ catkin curl dpkg ]; diff --git a/distros/melodic/points-preprocessor/default.nix b/distros/melodic/points-preprocessor/default.nix index 19a50ab4d5..afcdf0a67d 100644 --- a/distros/melodic/points-preprocessor/default.nix +++ b/distros/melodic/points-preprocessor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-points-preprocessor"; version = "1.14.15-r1"; - src = fetchurl { - url = "https://github.com/nobleo/core_perception-release/archive/release/melodic/points_preprocessor/1.14.15-1.tar.gz"; - name = "1.14.15-1.tar.gz"; - sha256 = "ee99435ac069adf5eec07434497732d6206558dcde942241b331d44cd478c17b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "core_perception-release"; + rev = "release/melodic/points_preprocessor/1.14.15-1"; + sha256 = "sha256-hJMt8UNuVGoyY4gbhfZpiaXii4hrSAOWUXWwXtajROQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/polar-scan-matcher/default.nix b/distros/melodic/polar-scan-matcher/default.nix index 6f0d65458a..e9b0f18b30 100644 --- a/distros/melodic/polar-scan-matcher/default.nix +++ b/distros/melodic/polar-scan-matcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-polar-scan-matcher"; version = "0.3.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/melodic/polar_scan_matcher/0.3.3-2.tar.gz"; - name = "0.3.3-2.tar.gz"; - sha256 = "20762e0309884c1cfc3cc2370939cbb4493238a13ba62af0c6a6748c9ee4d19a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/melodic/polar_scan_matcher/0.3.3-2"; + sha256 = "sha256-Yp0SMPPD1m1o279HCJSTygOmAdVd+QDgf93Fg9Y+6gc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/polled-camera/default.nix b/distros/melodic/polled-camera/default.nix index 576562dd2e..0519535d67 100644 --- a/distros/melodic/polled-camera/default.nix +++ b/distros/melodic/polled-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-polled-camera"; version = "1.11.13"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/melodic/polled_camera/1.11.13-0.tar.gz"; - name = "1.11.13-0.tar.gz"; - sha256 = "87717ae0569b27aeccb0c84c372ef5e5b16ea23e4549f918d7a2ad1ba88464f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/melodic/polled_camera/1.11.13-0"; + sha256 = "sha256-LinPhzCfuIvge0oPBe3/NhWIKBKyT0aEkjTQDJGCdfY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pose-base-controller/default.nix b/distros/melodic/pose-base-controller/default.nix index d5016c235e..1557147a5c 100644 --- a/distros/melodic/pose-base-controller/default.nix +++ b/distros/melodic/pose-base-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pose-base-controller"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/melodic/pose_base_controller/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "c4b91b8662f7e704d08a4a4a18f11464df444907d10299a2883cd35b5f40552b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/melodic/pose_base_controller/0.3.6-1"; + sha256 = "sha256-zUB5cFXfPNsBBeq0FVF5ehvNSU8Z3/+fxOwuHDpwMG0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pose-cov-ops/default.nix b/distros/melodic/pose-cov-ops/default.nix index 5e88dff524..0eed1728b0 100644 --- a/distros/melodic/pose-cov-ops/default.nix +++ b/distros/melodic/pose-cov-ops/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pose-cov-ops"; version = "0.3.8-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/pose_cov_ops-release/archive/release/melodic/pose_cov_ops/0.3.8-1.tar.gz"; - name = "0.3.8-1.tar.gz"; - sha256 = "f1bc88e04571b4f900da2d32a44f28dcb6819bbbabea31d3d944ab3d80284a01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "pose_cov_ops-release"; + rev = "release/melodic/pose_cov_ops/0.3.8-1"; + sha256 = "sha256-PedCn7b0uRpfsVpaUyJ5yPWogpyzEvsBI6xR2g6O7RE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake ros-environment ]; diff --git a/distros/melodic/pose-follower/default.nix b/distros/melodic/pose-follower/default.nix index a0052c19a1..2a3ad25455 100644 --- a/distros/melodic/pose-follower/default.nix +++ b/distros/melodic/pose-follower/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pose-follower"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/melodic/pose_follower/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "d2d883103ef47535e1dcf8c09c0473d1123354f8e6b19452ed95c1beeb771a57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/melodic/pose_follower/0.3.6-1"; + sha256 = "sha256-bC9soEQchLTLRT4/9sg3mJa+Ou0iCcEjr9/JP68GqNU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/posedetection-msgs/default.nix b/distros/melodic/posedetection-msgs/default.nix index 12816fd77f..737524366a 100644 --- a/distros/melodic/posedetection-msgs/default.nix +++ b/distros/melodic/posedetection-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-posedetection-msgs"; version = "4.3.1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/melodic/posedetection_msgs/4.3.1-0.tar.gz"; - name = "4.3.1-0.tar.gz"; - sha256 = "1538ca360bd31dcfa85392ba78374d072d64a3426425c64b08d8db149ea5cd3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/melodic/posedetection_msgs/4.3.1-0"; + sha256 = "sha256-hkSlrRiTuLzKdNW/Qabk3wToXnaEkT9C6uZl/p7ydaw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/position-controllers/default.nix b/distros/melodic/position-controllers/default.nix index 02a8c09e0b..2ae2f7e4d9 100644 --- a/distros/melodic/position-controllers/default.nix +++ b/distros/melodic/position-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-position-controllers"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/position_controllers/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "ff766d80dd25382f0cb374a6d861fe529df1e78616bff2f7c67055b54278e6d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/position_controllers/0.17.2-1"; + sha256 = "sha256-MdA3pEsvthXOZ+05EsL7+DDgSR3o5rsG6blKGD6N7q4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/power-monitor/default.nix b/distros/melodic/power-monitor/default.nix index 172f5032c1..14bdf2bf18 100644 --- a/distros/melodic/power-monitor/default.nix +++ b/distros/melodic/power-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-power-monitor"; version = "1.1.7"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_power_drivers-release/archive/release/melodic/power_monitor/1.1.7-0.tar.gz"; - name = "1.1.7-0.tar.gz"; - sha256 = "f77e8657675508e110c8e9d34d404a6f786b46fb91ccbec84ca6b8e2cd7ff444"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_power_drivers-release"; + rev = "release/melodic/power_monitor/1.1.7-0"; + sha256 = "sha256-MzmSvODkWm+b4JxRXo/UoyDL2HfUeajpHZRDh6DKCo8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/power-msgs/default.nix b/distros/melodic/power-msgs/default.nix index 1feb21b9c0..de66455edb 100644 --- a/distros/melodic/power-msgs/default.nix +++ b/distros/melodic/power-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-power-msgs"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/power_msgs-release/archive/release/melodic/power_msgs/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "77dade4006aa8238980b62f305d04ffbcfd460fedaed7dba6ebd9db7bb59a299"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "power_msgs-release"; + rev = "release/melodic/power_msgs/0.4.0-1"; + sha256 = "sha256-PnrRd4P1smgrACPBwW+yrHfWf7JDA9lPUPWItgh/Ku8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-app-manager/default.nix b/distros/melodic/pr2-app-manager/default.nix index 52f7f7367b..f53837bb83 100644 --- a/distros/melodic/pr2-app-manager/default.nix +++ b/distros/melodic/pr2-app-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-app-manager"; version = "0.6.1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/melodic/pr2_app_manager/0.6.1-0.tar.gz"; - name = "0.6.1-0.tar.gz"; - sha256 = "efb64b17c3475ef039056ad31ceeebc17296ff0be259a5507b0b8e6fdcffb93b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/melodic/pr2_app_manager/0.6.1-0"; + sha256 = "sha256-EfQqym8J4tBRzcpbK4Jg99pwT2NwXUIHI/W0H7UblJU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-apps/default.nix b/distros/melodic/pr2-apps/default.nix index 4c766e54b4..0de22e5ab3 100644 --- a/distros/melodic/pr2-apps/default.nix +++ b/distros/melodic/pr2-apps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-apps"; version = "0.6.1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/melodic/pr2_apps/0.6.1-0.tar.gz"; - name = "0.6.1-0.tar.gz"; - sha256 = "a471719fbd2ecf7326f9e8fa12dcb54af210539ab199fb080a2f942825665d8a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/melodic/pr2_apps/0.6.1-0"; + sha256 = "sha256-n4lM0/2qHupjYDPHhit8zpgVnJUF3bVEG9Zjvyisjy0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-arm-kinematics/default.nix b/distros/melodic/pr2-arm-kinematics/default.nix index 6c314779a0..2a5f03c895 100644 --- a/distros/melodic/pr2-arm-kinematics/default.nix +++ b/distros/melodic/pr2-arm-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-arm-kinematics"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_kinematics-release/archive/release/melodic/pr2_arm_kinematics/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "ad182e7a84e3e1448a25ab252edae3155e4cb6d27180b1c16e56ce29c656677d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_kinematics-release"; + rev = "release/melodic/pr2_arm_kinematics/1.0.10-0"; + sha256 = "sha256-giy8qAQ99FTlCVaLUbpBuNejtU6y5cc6ATIjZagnH2s="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/pr2-arm-move-ik/default.nix b/distros/melodic/pr2-arm-move-ik/default.nix index ad9b1642a6..7294754a15 100644 --- a/distros/melodic/pr2-arm-move-ik/default.nix +++ b/distros/melodic/pr2-arm-move-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-arm-move-ik"; version = "0.0.11"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/melodic/pr2_arm_move_ik/0.0.11-0.tar.gz"; - name = "0.0.11-0.tar.gz"; - sha256 = "8051d2f766e269e465921bb3b85eb08ab5a8f24c1e9e0f2ee7422665e5f23eee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/melodic/pr2_arm_move_ik/0.0.11-0"; + sha256 = "sha256-YbCITHIaouXm/Y4q+oS2PtNa8LyW3sYV0QKA6usC6vQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-bringup-tests/default.nix b/distros/melodic/pr2-bringup-tests/default.nix index dbe3765425..6e75215ace 100644 --- a/distros/melodic/pr2-bringup-tests/default.nix +++ b/distros/melodic/pr2-bringup-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-bringup-tests"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/melodic/pr2_bringup_tests/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "7f6580eba23820b9db17fc9cf6874215eeafbb29fa3604a7b1eeb1c0737a35f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/melodic/pr2_bringup_tests/1.0.15-1"; + sha256 = "sha256-mGA3SQ2YUu5uhY3ucL7JS3QLlFen9+Y/RhsGr+B3B9o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-bringup/default.nix b/distros/melodic/pr2-bringup/default.nix index d6e1c16375..298c3a6fe6 100644 --- a/distros/melodic/pr2-bringup/default.nix +++ b/distros/melodic/pr2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-bringup"; version = "1.6.31-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/melodic/pr2_bringup/1.6.31-1.tar.gz"; - name = "1.6.31-1.tar.gz"; - sha256 = "dd9de187a87540c72a35f9250c1c8b617efbe79a02c025742f81998b9eeaf128"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/melodic/pr2_bringup/1.6.31-1"; + sha256 = "sha256-6jqCx91Bi5gFlyWsSRliXJtxD5/Ky/GcrOe4bl3rVKg="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch rostest ]; diff --git a/distros/melodic/pr2-calibration-controllers/default.nix b/distros/melodic/pr2-calibration-controllers/default.nix index 88e3e8ddf9..6c3390ce6e 100644 --- a/distros/melodic/pr2-calibration-controllers/default.nix +++ b/distros/melodic/pr2-calibration-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-calibration-controllers"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/pr2_calibration_controllers/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "70bf36f81db6cb6ce2ca9a2a1f6517b05e1355a6423287ae8f5d114a7ef21d3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/pr2_calibration_controllers/1.10.17-1"; + sha256 = "sha256-vKF69zTU+VufuvR0ggyt/3mzhJhCK7At35w7bcgv3CU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-calibration-launch/default.nix b/distros/melodic/pr2-calibration-launch/default.nix index 6c2a0d0084..c406ff7ccf 100644 --- a/distros/melodic/pr2-calibration-launch/default.nix +++ b/distros/melodic/pr2-calibration-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-calibration-launch"; version = "1.0.11-r3"; - src = fetchurl { - url = "https://github.com/UNR-RoboticsResearchLab/pr2_calibration-release/archive/release/melodic/pr2_calibration_launch/1.0.11-3.tar.gz"; - name = "1.0.11-3.tar.gz"; - sha256 = "837c7337131f079244deacf4ac3d5e8314fe8f2e9453a9852ceeb53f9491b59a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UNR-RoboticsResearchLab"; + repo = "pr2_calibration-release"; + rev = "release/melodic/pr2_calibration_launch/1.0.11-3"; + sha256 = "sha256-RAJP8zSdqe5DxXuLC5iud2OHSXx9Tn6tYjMlIGWzY8M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-calibration/default.nix b/distros/melodic/pr2-calibration/default.nix index 504b4a1283..19fc85ea65 100644 --- a/distros/melodic/pr2-calibration/default.nix +++ b/distros/melodic/pr2-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-calibration"; version = "1.0.11-r3"; - src = fetchurl { - url = "https://github.com/UNR-RoboticsResearchLab/pr2_calibration-release/archive/release/melodic/pr2_calibration/1.0.11-3.tar.gz"; - name = "1.0.11-3.tar.gz"; - sha256 = "4fc3cd24252ad180ed0f1c688330c45bb102d47273bb586aa52764de0f62c745"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UNR-RoboticsResearchLab"; + repo = "pr2_calibration-release"; + rev = "release/melodic/pr2_calibration/1.0.11-3"; + sha256 = "sha256-pUboVSJPz7fgIzF0WgdEmDOhS8QDOy3FytJhk6gTf+k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-camera-synchronizer/default.nix b/distros/melodic/pr2-camera-synchronizer/default.nix index 59e72fd3ca..fe7650bed8 100644 --- a/distros/melodic/pr2-camera-synchronizer/default.nix +++ b/distros/melodic/pr2-camera-synchronizer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-camera-synchronizer"; version = "1.6.31-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/melodic/pr2_camera_synchronizer/1.6.31-1.tar.gz"; - name = "1.6.31-1.tar.gz"; - sha256 = "8f46811d2e5f2730cb58f1da99382bb709d97cea3ee13bd3337788e34ebc1594"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/melodic/pr2_camera_synchronizer/1.6.31-1"; + sha256 = "sha256-R3+Z39SKLoHHXkJGFhCKmK+MKPMEIag8YNU+v+c6uWE="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/pr2-common-action-msgs/default.nix b/distros/melodic/pr2-common-action-msgs/default.nix index 8a3213896b..e652785c9d 100644 --- a/distros/melodic/pr2-common-action-msgs/default.nix +++ b/distros/melodic/pr2-common-action-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-common-action-msgs"; version = "0.0.11"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/melodic/pr2_common_action_msgs/0.0.11-0.tar.gz"; - name = "0.0.11-0.tar.gz"; - sha256 = "65824648cd967a5c46b6861c1d0e9c76920d68ee4e28aff2783962c87f21dc3f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/melodic/pr2_common_action_msgs/0.0.11-0"; + sha256 = "sha256-8KktRsZbAEX1CQ+wWMiBGpxk2jIE/H4unymKIos7Pqg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-common-actions/default.nix b/distros/melodic/pr2-common-actions/default.nix index e35f5bfb34..9f897773d7 100644 --- a/distros/melodic/pr2-common-actions/default.nix +++ b/distros/melodic/pr2-common-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-common-actions"; version = "0.0.11"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/melodic/pr2_common_actions/0.0.11-0.tar.gz"; - name = "0.0.11-0.tar.gz"; - sha256 = "80fd608e81e3b4797e06188ddba9351c1cd1937e04985ff61c6c4d72e8a546ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/melodic/pr2_common_actions/0.0.11-0"; + sha256 = "sha256-BssSJZlFQb+mBwD4rlZepULoWBqOkywCoqVjlHE+Gtk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-common/default.nix b/distros/melodic/pr2-common/default.nix index 4288c89bd0..f0b579b5ba 100644 --- a/distros/melodic/pr2-common/default.nix +++ b/distros/melodic/pr2-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-common"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/melodic/pr2_common/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "6edfb18191b7e0dfa2515d3cb3ee27c25d7199617beedc923494a7fd2e95bc89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/melodic/pr2_common/1.13.1-1"; + sha256 = "sha256-nRXelHM0Ch/NlpPDDfUrb6IwU55CCbaAalhX/LqpXZw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-computer-monitor/default.nix b/distros/melodic/pr2-computer-monitor/default.nix index 4124d944f1..ebfa3a47f6 100644 --- a/distros/melodic/pr2-computer-monitor/default.nix +++ b/distros/melodic/pr2-computer-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-computer-monitor"; version = "1.6.31-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/melodic/pr2_computer_monitor/1.6.31-1.tar.gz"; - name = "1.6.31-1.tar.gz"; - sha256 = "d20f5a31e78189fbb94c72d1dac29332944a7e157a59401530cbce29aba6ff8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/melodic/pr2_computer_monitor/1.6.31-1"; + sha256 = "sha256-b/54nLSoxCwv7i5IXJYx1mykga9ViC1BCVO7aMUbyjk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-controller-configuration-gazebo/default.nix b/distros/melodic/pr2-controller-configuration-gazebo/default.nix index 5c2b5b82c6..a1c7f2054b 100644 --- a/distros/melodic/pr2-controller-configuration-gazebo/default.nix +++ b/distros/melodic/pr2-controller-configuration-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-controller-configuration-gazebo"; version = "2.0.14"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_simulator-release/archive/release/melodic/pr2_controller_configuration_gazebo/2.0.14-0.tar.gz"; - name = "2.0.14-0.tar.gz"; - sha256 = "5c439cea522e3fdbd04cb520d3adb886513eff5a52619491b6a2f4e3d84f38fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_simulator-release"; + rev = "release/melodic/pr2_controller_configuration_gazebo/2.0.14-0"; + sha256 = "sha256-vSErMQX2kpoZCt2mo7BVrfoKyIWQODl1YEL52v397aE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-controller-configuration/default.nix b/distros/melodic/pr2-controller-configuration/default.nix index 51ca0c5d42..f65d7d9207 100644 --- a/distros/melodic/pr2-controller-configuration/default.nix +++ b/distros/melodic/pr2-controller-configuration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-controller-configuration"; version = "1.6.31-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/melodic/pr2_controller_configuration/1.6.31-1.tar.gz"; - name = "1.6.31-1.tar.gz"; - sha256 = "a7712dbec4dc9242e79c7539c21464675ecf6dedc5fd383195663a4edab8efc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/melodic/pr2_controller_configuration/1.6.31-1"; + sha256 = "sha256-2U/NhA/Kp8sqY9C0TPVg7hUQhSN2yK9mjHq82tDQfFQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/pr2-controller-interface/default.nix b/distros/melodic/pr2-controller-interface/default.nix index fa41eae335..6dce1dbeaa 100644 --- a/distros/melodic/pr2-controller-interface/default.nix +++ b/distros/melodic/pr2-controller-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-controller-interface"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/melodic/pr2_controller_interface/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "cd8ca8d577d00d71e7dd1a4bd3b922988892b95e14e2c5e49a00e5f2326fad83"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/melodic/pr2_controller_interface/1.8.21-1"; + sha256 = "sha256-5jMSsUc65dvgHNzQGsh8PlQKMUj7jbFiMIa2oRzYHEY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-controller-manager/default.nix b/distros/melodic/pr2-controller-manager/default.nix index a8100c36a2..a55443cf7f 100644 --- a/distros/melodic/pr2-controller-manager/default.nix +++ b/distros/melodic/pr2-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-controller-manager"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/melodic/pr2_controller_manager/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "9651055d1018467c24f5ae4bd31849371199779f3488968dfad85cf994bcd243"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/melodic/pr2_controller_manager/1.8.21-1"; + sha256 = "sha256-T3qmvTLPyz+4l0cVVa1e8w87sgtoWWWmHLmvchpvI54="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules rostest ]; diff --git a/distros/melodic/pr2-controllers-msgs/default.nix b/distros/melodic/pr2-controllers-msgs/default.nix index 7c8b7212dd..27e8731df6 100644 --- a/distros/melodic/pr2-controllers-msgs/default.nix +++ b/distros/melodic/pr2-controllers-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-controllers-msgs"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/pr2_controllers_msgs/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "82561cde4b79968a9d87697c9a87487b9252480f072ae084497f383be300167f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/pr2_controllers_msgs/1.10.17-1"; + sha256 = "sha256-zK4WORRCQHg0/z5qa/djiEN5OzmT2dSNZAa5Iuo36Ek="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-controllers/default.nix b/distros/melodic/pr2-controllers/default.nix index e98b142d0d..49d499d770 100644 --- a/distros/melodic/pr2-controllers/default.nix +++ b/distros/melodic/pr2-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-controllers"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/pr2_controllers/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "4ca1b1f88af452339502ec5babb46695425d6247dc2eab2e08a787fc4155bace"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/pr2_controllers/1.10.17-1"; + sha256 = "sha256-LuxluNxAFCpvPAYgalY3ZobtI/PnIzJLEu/QZz5Ifvg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-counterbalance-check/default.nix b/distros/melodic/pr2-counterbalance-check/default.nix index 4a305db3bb..b179146d1d 100644 --- a/distros/melodic/pr2-counterbalance-check/default.nix +++ b/distros/melodic/pr2-counterbalance-check/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-counterbalance-check"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/melodic/pr2_counterbalance_check/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "6698890b4bd9f1f68de5d8d19e7e4b466f67c7399bd65504701a059f622411fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/melodic/pr2_counterbalance_check/1.0.15-1"; + sha256 = "sha256-e+XFN5xpI3IKnd+BOeAlFjON7OLQRSxE1lQyo45hap8="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/pr2-dashboard-aggregator/default.nix b/distros/melodic/pr2-dashboard-aggregator/default.nix index 755d597b0a..81a461c92d 100644 --- a/distros/melodic/pr2-dashboard-aggregator/default.nix +++ b/distros/melodic/pr2-dashboard-aggregator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-dashboard-aggregator"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/melodic/pr2_dashboard_aggregator/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "33e0d27029cd93024bf4ef3834a9d782f710206c87fd9e72e6b671618864df51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/melodic/pr2_dashboard_aggregator/1.13.1-1"; + sha256 = "sha256-jwWX2KShYOMNLypUEOTNTRjyzyyXfem8J+jop6mcoHs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-dense-laser-snapshotter/default.nix b/distros/melodic/pr2-dense-laser-snapshotter/default.nix index 623bc36bc8..ba3fc9c060 100644 --- a/distros/melodic/pr2-dense-laser-snapshotter/default.nix +++ b/distros/melodic/pr2-dense-laser-snapshotter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-dense-laser-snapshotter"; version = "1.0.11-r3"; - src = fetchurl { - url = "https://github.com/UNR-RoboticsResearchLab/pr2_calibration-release/archive/release/melodic/pr2_dense_laser_snapshotter/1.0.11-3.tar.gz"; - name = "1.0.11-3.tar.gz"; - sha256 = "a40e1a007d63427cfc72b218f652aaef205545937a028252b4672b45b971bfd0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UNR-RoboticsResearchLab"; + repo = "pr2_calibration-release"; + rev = "release/melodic/pr2_dense_laser_snapshotter/1.0.11-3"; + sha256 = "sha256-pJxLInUGSN9oRHZPGFEq9YYSg7VknFFV7uWc8Q+ZoYk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-description/default.nix b/distros/melodic/pr2-description/default.nix index 59f59f5225..0cdfb25094 100644 --- a/distros/melodic/pr2-description/default.nix +++ b/distros/melodic/pr2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-description"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/melodic/pr2_description/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "a7c187585634cc2b1ed1fc61e1466def6ec89254d5795f570b45617c06db0e48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/melodic/pr2_description/1.13.1-1"; + sha256 = "sha256-rUqVXmV7lxttZeaQuYfhqeX1vj3EF/d0UaEQSJzfEY0="; + }; buildType = "catkin"; buildInputs = [ catkin convex-decomposition ivcon ]; diff --git a/distros/melodic/pr2-ethercat-drivers/default.nix b/distros/melodic/pr2-ethercat-drivers/default.nix index c53a152968..95398ce87f 100644 --- a/distros/melodic/pr2-ethercat-drivers/default.nix +++ b/distros/melodic/pr2-ethercat-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-ethercat-drivers"; version = "1.8.19-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_ethercat_drivers-release/archive/release/melodic/pr2_ethercat_drivers/1.8.19-1.tar.gz"; - name = "1.8.19-1.tar.gz"; - sha256 = "e28b1bb1eb08c709820f7a571ca092a5ccf5035f877019f105ef2f3f485ff049"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_ethercat_drivers-release"; + rev = "release/melodic/pr2_ethercat_drivers/1.8.19-1"; + sha256 = "sha256-r1MeAlPCfV4MoETZWjitUCHgX44l3PQL/tjAsuoHF6A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-ethercat/default.nix b/distros/melodic/pr2-ethercat/default.nix index 29ef8fb0d9..9464b39fec 100644 --- a/distros/melodic/pr2-ethercat/default.nix +++ b/distros/melodic/pr2-ethercat/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-ethercat"; version = "1.6.31-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/melodic/pr2_ethercat/1.6.31-1.tar.gz"; - name = "1.6.31-1.tar.gz"; - sha256 = "3be50304622a7ea7154af500078e617541a8dcccdd7673d45e6cb525bdd5e1d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/melodic/pr2_ethercat/1.6.31-1"; + sha256 = "sha256-ThDBv+47NEp9Yk0BfFgD2YvS128CCGfjyh7kO1N56M4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-gazebo-plugins/default.nix b/distros/melodic/pr2-gazebo-plugins/default.nix index d9d90a8f06..7ffa076f1b 100644 --- a/distros/melodic/pr2-gazebo-plugins/default.nix +++ b/distros/melodic/pr2-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-gazebo-plugins"; version = "2.0.14"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_simulator-release/archive/release/melodic/pr2_gazebo_plugins/2.0.14-0.tar.gz"; - name = "2.0.14-0.tar.gz"; - sha256 = "f13b8d70bb7029d167343772dc662a7aff687349c40ecb02e27020a36a8a784b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_simulator-release"; + rev = "release/melodic/pr2_gazebo_plugins/2.0.14-0"; + sha256 = "sha256-ZkPFuc76I1S7CTOXio9w/ICm6uQUJUSzBaKr7X/tOU4="; + }; buildType = "catkin"; buildInputs = [ catkin std-srvs ]; diff --git a/distros/melodic/pr2-gazebo/default.nix b/distros/melodic/pr2-gazebo/default.nix index 81ddda45ab..8d309f5250 100644 --- a/distros/melodic/pr2-gazebo/default.nix +++ b/distros/melodic/pr2-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-gazebo"; version = "2.0.14"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_simulator-release/archive/release/melodic/pr2_gazebo/2.0.14-0.tar.gz"; - name = "2.0.14-0.tar.gz"; - sha256 = "65a61813255f0e2fd52200aceb94b18f0e19ed5e4f9c07c521558541015392a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_simulator-release"; + rev = "release/melodic/pr2_gazebo/2.0.14-0"; + sha256 = "sha256-bDbZQe9mWsjZ8We4ezqDHD5O18bXr5opIO0QhH5Ma8I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-gripper-action/default.nix b/distros/melodic/pr2-gripper-action/default.nix index 08a60833fd..c77f1e0851 100644 --- a/distros/melodic/pr2-gripper-action/default.nix +++ b/distros/melodic/pr2-gripper-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-gripper-action"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/pr2_gripper_action/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "98833a8e129e9fc682976c109d577841fb18d99d50acafe8c898e85337443ed8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/pr2_gripper_action/1.10.17-1"; + sha256 = "sha256-pUgxOaxh6w0BLa8ILfE6kcaE31G98qvpzbj/WII1kac="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-gripper-sensor-action/default.nix b/distros/melodic/pr2-gripper-sensor-action/default.nix index 3899cb8dd8..7368ca3889 100644 --- a/distros/melodic/pr2-gripper-sensor-action/default.nix +++ b/distros/melodic/pr2-gripper-sensor-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-gripper-sensor-action"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_gripper_sensor-release/archive/release/melodic/pr2_gripper_sensor_action/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "0682a7eac228a00a8b89c01cb4208ac6831965277ec97dcdaaf392490189a27a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_gripper_sensor-release"; + rev = "release/melodic/pr2_gripper_sensor_action/1.0.11-1"; + sha256 = "sha256-vA3YEDd0gipEvFAkvGCgFc/TXxB8NwXt/4GQ5GP6qvU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-gripper-sensor-controller/default.nix b/distros/melodic/pr2-gripper-sensor-controller/default.nix index e0d3d7f500..8855319ebc 100644 --- a/distros/melodic/pr2-gripper-sensor-controller/default.nix +++ b/distros/melodic/pr2-gripper-sensor-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-gripper-sensor-controller"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_gripper_sensor-release/archive/release/melodic/pr2_gripper_sensor_controller/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "3e681c304070ead6e875be6fa66bf85ca38897dac7d332fbfab2714755b42c99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_gripper_sensor-release"; + rev = "release/melodic/pr2_gripper_sensor_controller/1.0.11-1"; + sha256 = "sha256-1bCtmSvjVgItidpA/d4YwkW97mCCXFcU748JRUQ/D1I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-gripper-sensor-msgs/default.nix b/distros/melodic/pr2-gripper-sensor-msgs/default.nix index 3929024e3e..fe814ae72e 100644 --- a/distros/melodic/pr2-gripper-sensor-msgs/default.nix +++ b/distros/melodic/pr2-gripper-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-gripper-sensor-msgs"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_gripper_sensor-release/archive/release/melodic/pr2_gripper_sensor_msgs/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "73b4e57e83829b425005008b01ce603b6c62ef1783e84a28e6af72e18092fd53"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_gripper_sensor-release"; + rev = "release/melodic/pr2_gripper_sensor_msgs/1.0.11-1"; + sha256 = "sha256-9Z4tCrT/gqRZv5YwXn7ckLmR1pgqgBgITDtrlNdnL9Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-gripper-sensor/default.nix b/distros/melodic/pr2-gripper-sensor/default.nix index 91fe6175e6..c0bb52b269 100644 --- a/distros/melodic/pr2-gripper-sensor/default.nix +++ b/distros/melodic/pr2-gripper-sensor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-gripper-sensor"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_gripper_sensor-release/archive/release/melodic/pr2_gripper_sensor/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "d27388ef2f16ca671e6490422924065a3555335d61e3fe1916611e6176d256ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_gripper_sensor-release"; + rev = "release/melodic/pr2_gripper_sensor/1.0.11-1"; + sha256 = "sha256-f12DJRX9dp2IxQCzn5jyYShVNa/HSghWCefvJAe4kIk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-hardware-interface/default.nix b/distros/melodic/pr2-hardware-interface/default.nix index f50bf1502e..281e979126 100644 --- a/distros/melodic/pr2-hardware-interface/default.nix +++ b/distros/melodic/pr2-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-hardware-interface"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/melodic/pr2_hardware_interface/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "0c5975d128782c1c16eb7423855e0c17f4b317eb8faa67868e126170fdcb8d27"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/melodic/pr2_hardware_interface/1.8.21-1"; + sha256 = "sha256-zZ3EFEwumyf5IxInahyPlMe5i9ZoYeNImb1dUvXV0MI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-head-action/default.nix b/distros/melodic/pr2-head-action/default.nix index 47a3598c24..6a5d8ed4c7 100644 --- a/distros/melodic/pr2-head-action/default.nix +++ b/distros/melodic/pr2-head-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-head-action"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/pr2_head_action/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "424a5a18ed18b42bcde7b0f810213435066b8250169b2ff65886802760c7421d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/pr2_head_action/1.10.17-1"; + sha256 = "sha256-yR5x7fEeubJI8gc/0JavBXsiE1qpXaInmutGYWBouT0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-kinematics/default.nix b/distros/melodic/pr2-kinematics/default.nix index 77fda3d421..78922257d4 100644 --- a/distros/melodic/pr2-kinematics/default.nix +++ b/distros/melodic/pr2-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-kinematics"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_kinematics-release/archive/release/melodic/pr2_kinematics/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "a1103dc191b832b2a06bb07d9eb6d4c54a948377e0796b9d1f556e7ee3635c2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_kinematics-release"; + rev = "release/melodic/pr2_kinematics/1.0.10-0"; + sha256 = "sha256-zBNA2O/k0++V1AEvjIlkuyKZIaMqLPhr3xfj2D/RL7g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-machine/default.nix b/distros/melodic/pr2-machine/default.nix index 9803ba8ea8..215359946d 100644 --- a/distros/melodic/pr2-machine/default.nix +++ b/distros/melodic/pr2-machine/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-machine"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/melodic/pr2_machine/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "9833870b936c19b4a17be04b1220e7106f5f81463737c5d68690ed0b3e05471f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/melodic/pr2_machine/1.13.1-1"; + sha256 = "sha256-17o10Esp/xkazOyDsAvJ/HwHHZ3MAL3nahc6QGNjLNA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-mannequin-mode/default.nix b/distros/melodic/pr2-mannequin-mode/default.nix index 869ea71543..bc20ef9ada 100644 --- a/distros/melodic/pr2-mannequin-mode/default.nix +++ b/distros/melodic/pr2-mannequin-mode/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-mannequin-mode"; version = "0.6.1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/melodic/pr2_mannequin_mode/0.6.1-0.tar.gz"; - name = "0.6.1-0.tar.gz"; - sha256 = "bd942a926267442a2232ac55b6019f8aa0e6494879ca4030ab18837c93e1f37f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/melodic/pr2_mannequin_mode/0.6.1-0"; + sha256 = "sha256-eRgSygOIIIMOASynRFFFyBPMDVyEhYtBPQ1C9IruVVs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-mechanism-controllers/default.nix b/distros/melodic/pr2-mechanism-controllers/default.nix index b7d9d8abe2..531e902084 100644 --- a/distros/melodic/pr2-mechanism-controllers/default.nix +++ b/distros/melodic/pr2-mechanism-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-mechanism-controllers"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/pr2_mechanism_controllers/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "213c8983bad691bed5ffb69f027bf2035927a2ff2b45a7b87fd0547444c5db14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/pr2_mechanism_controllers/1.10.17-1"; + sha256 = "sha256-3kqA4xkH0LSRRBpwYA0sq3Iwe3pNJmQAJmxdg1MT0u4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-mechanism-diagnostics/default.nix b/distros/melodic/pr2-mechanism-diagnostics/default.nix index b346e7510d..afbabd5190 100644 --- a/distros/melodic/pr2-mechanism-diagnostics/default.nix +++ b/distros/melodic/pr2-mechanism-diagnostics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-mechanism-diagnostics"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/melodic/pr2_mechanism_diagnostics/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "3badb0392210f96cb78d66bbc1b3e6fd5f1d4b07d162612225c02529d66ad395"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/melodic/pr2_mechanism_diagnostics/1.8.21-1"; + sha256 = "sha256-hCyfSKsZj4bNbqfLN+Ri7mX7c8mUfu2cSRu7RIXaDYM="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/pr2-mechanism-model/default.nix b/distros/melodic/pr2-mechanism-model/default.nix index bd895ad1b3..08ad04041b 100644 --- a/distros/melodic/pr2-mechanism-model/default.nix +++ b/distros/melodic/pr2-mechanism-model/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-mechanism-model"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/melodic/pr2_mechanism_model/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "b84afbaecefda7be65c217c9af6c759906caf111538828d363877659854903d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/melodic/pr2_mechanism_model/1.8.21-1"; + sha256 = "sha256-6tOfLbR3ePlkXuPq6m1fg9oasGlrvLgUZYZ0Goj87ws="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules rostest rosunit ]; diff --git a/distros/melodic/pr2-mechanism-msgs/default.nix b/distros/melodic/pr2-mechanism-msgs/default.nix index 41a76cbeba..229327d7e7 100644 --- a/distros/melodic/pr2-mechanism-msgs/default.nix +++ b/distros/melodic/pr2-mechanism-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-mechanism-msgs"; version = "1.8.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/pr2_mechanism_msgs-release/archive/release/melodic/pr2_mechanism_msgs/1.8.2-0.tar.gz"; - name = "1.8.2-0.tar.gz"; - sha256 = "ed530def634447f8d6970857f1f33b8ddfadefc07cffd6e4ce01e71e179df4cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "pr2_mechanism_msgs-release"; + rev = "release/melodic/pr2_mechanism_msgs/1.8.2-0"; + sha256 = "sha256-eKaRMpfyKkOAMpTlbgQIZFfrLdgbFGwnpWQxLqruhjY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-mechanism/default.nix b/distros/melodic/pr2-mechanism/default.nix index 215762e264..0913f18ea5 100644 --- a/distros/melodic/pr2-mechanism/default.nix +++ b/distros/melodic/pr2-mechanism/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-mechanism"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/melodic/pr2_mechanism/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "7b282ac39621bcdf976a9913c0d3308add9e15b15c72be8400308d4fe9951cdb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/melodic/pr2_mechanism/1.8.21-1"; + sha256 = "sha256-hjcv//Amj4NPiaL05WCAhg62JgE0gQ4t6f97Uiu7itA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-motor-diagnostic-tool/default.nix b/distros/melodic/pr2-motor-diagnostic-tool/default.nix index 37c83f1516..bfd78bf173 100644 --- a/distros/melodic/pr2-motor-diagnostic-tool/default.nix +++ b/distros/melodic/pr2-motor-diagnostic-tool/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-motor-diagnostic-tool"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/melodic/pr2_motor_diagnostic_tool/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "e75790673805832f38a80872b25fabef1aa2022bea66ee125c370be5fe1fbbc7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/melodic/pr2_motor_diagnostic_tool/1.0.15-1"; + sha256 = "sha256-5/DmXkwkphIODg+r/GVnWBBFwgrf+oZMOZpX6JZK1UE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-move-base/default.nix b/distros/melodic/pr2-move-base/default.nix index 3c1d56cd27..dbb1894d0f 100644 --- a/distros/melodic/pr2-move-base/default.nix +++ b/distros/melodic/pr2-move-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-move-base"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_move_base/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "e1b1654f060a9205616412a5edaa451b341e1da5c98fcec3ff0fff2b702d888c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_move_base/0.1.28-1"; + sha256 = "sha256-KHDieNBRpcKpFAK1MZ6JPUGXY7O8IfnHttL/Yy9LGNQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-moveit-config/default.nix b/distros/melodic/pr2-moveit-config/default.nix index 5d5479959a..cd37d13cf5 100644 --- a/distros/melodic/pr2-moveit-config/default.nix +++ b/distros/melodic/pr2-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-moveit-config"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_pr2-release/archive/release/melodic/pr2_moveit_config/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "543b47308b8307b9cc4a0c08fba6e1a90c8cd7040e0ef01ec5dc746cb3336194"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_pr2-release"; + rev = "release/melodic/pr2_moveit_config/0.7.3-1"; + sha256 = "sha256-gaUAEypm5HnNSK29D9VCjS4ylGZwPiTIcSM8ypkVdAQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-moveit-plugins/default.nix b/distros/melodic/pr2-moveit-plugins/default.nix index 8f55b17ff6..7048fb0344 100644 --- a/distros/melodic/pr2-moveit-plugins/default.nix +++ b/distros/melodic/pr2-moveit-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-moveit-plugins"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_pr2-release/archive/release/melodic/pr2_moveit_plugins/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "c780573ef3305b96d9ef18be3a5fb1e8024324808209728e840457c047ecdb78"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_pr2-release"; + rev = "release/melodic/pr2_moveit_plugins/0.7.3-1"; + sha256 = "sha256-s9GhFS41PEPfyjcmiGCbrlMcu6GtcS/cjicDBTe9rZA="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/pr2-msgs/default.nix b/distros/melodic/pr2-msgs/default.nix index 9af85f5c8f..8fa7089e61 100644 --- a/distros/melodic/pr2-msgs/default.nix +++ b/distros/melodic/pr2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/melodic/pr2_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "8adba3825ebdcf37188406c2ee0c886418de51817be170a4d2e0bd35f59d3b24"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/melodic/pr2_msgs/1.13.1-1"; + sha256 = "sha256-ODekMftIC3ysPKUfCCGksc/tAVyure2rCl86gJAZvKc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-navigation-config/default.nix b/distros/melodic/pr2-navigation-config/default.nix index db7a703652..3b7c57505a 100644 --- a/distros/melodic/pr2-navigation-config/default.nix +++ b/distros/melodic/pr2-navigation-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-navigation-config"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_navigation_config/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "1df639c4470fe66bbcb909d0adba8b5d868e4122598992ee162467b357a95f2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_navigation_config/0.1.28-1"; + sha256 = "sha256-675fisnDXUYznaZiHyva0pqIIPBRZV+JSXkIcpAl9xA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-navigation-global/default.nix b/distros/melodic/pr2-navigation-global/default.nix index 39cdb9fd25..baea5a8603 100644 --- a/distros/melodic/pr2-navigation-global/default.nix +++ b/distros/melodic/pr2-navigation-global/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-navigation-global"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_navigation_global/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "29ba1baa16b77e54bc44ea4820ebab78e8d5ea1c87535d99aefd065912f9f8b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_navigation_global/0.1.28-1"; + sha256 = "sha256-fVbi28JiPaKaci7j1QiLLZ2TlM3YqQ5QiJ3FmFMx4vg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-navigation-local/default.nix b/distros/melodic/pr2-navigation-local/default.nix index 453d02bb82..7c2f51def2 100644 --- a/distros/melodic/pr2-navigation-local/default.nix +++ b/distros/melodic/pr2-navigation-local/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-navigation-local"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_navigation_local/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "1c6411bd2d1fce5a45a9a803bbcc502798392734c699402a88ae6c5121d4f290"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_navigation_local/0.1.28-1"; + sha256 = "sha256-+nPmORZVI9R7Ef4dfJ7WqDVZcCOCaLELUMrcX+cionA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-navigation-perception/default.nix b/distros/melodic/pr2-navigation-perception/default.nix index 306cc363ed..0c08b3cb06 100644 --- a/distros/melodic/pr2-navigation-perception/default.nix +++ b/distros/melodic/pr2-navigation-perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-navigation-perception"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_navigation_perception/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "a9280acbedabad691bea60b8c18e5230cf267c6714b4f9137ec0d15f77ff9956"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_navigation_perception/0.1.28-1"; + sha256 = "sha256-XEr+SjG93kHpUBcmiD2HT0HVkImS0/b2SvDDweCzpTs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-navigation-self-filter/default.nix b/distros/melodic/pr2-navigation-self-filter/default.nix index b9255145dd..aa3b60b3bd 100644 --- a/distros/melodic/pr2-navigation-self-filter/default.nix +++ b/distros/melodic/pr2-navigation-self-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-navigation-self-filter"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_navigation_self_filter/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "fa7dddab1eb837577b59dbbca219f5dec1815a69fb26456830837bfe60d182c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_navigation_self_filter/0.1.28-1"; + sha256 = "sha256-pL+qVYIfhHzfFxf+mnBCMULo7xhZ7WUsM1LE2hHDMXw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-navigation-slam/default.nix b/distros/melodic/pr2-navigation-slam/default.nix index 8092c270f1..ba303ec8f0 100644 --- a/distros/melodic/pr2-navigation-slam/default.nix +++ b/distros/melodic/pr2-navigation-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-navigation-slam"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_navigation_slam/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "c96912eb50fe6f2bf5d043a6d5ce2b5face3eb73207bbfc43d91d18b972d903d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_navigation_slam/0.1.28-1"; + sha256 = "sha256-QtzxROYzRfMlcSsjBV8FMcmhhbnEoCkro0sRYlH2llA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-navigation-teleop/default.nix b/distros/melodic/pr2-navigation-teleop/default.nix index c4be2a6ba9..e02cdc4897 100644 --- a/distros/melodic/pr2-navigation-teleop/default.nix +++ b/distros/melodic/pr2-navigation-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-navigation-teleop"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_navigation_teleop/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "20494894d2fee4d8cc3f031c7bfe15dd0e4c0375246cc7fd145c4ba3e4c04614"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_navigation_teleop/0.1.28-1"; + sha256 = "sha256-tdXx0NwpLGtH1wMfVSg+EAchlwaJPKGj7ZS0hc+Iu80="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-navigation/default.nix b/distros/melodic/pr2-navigation/default.nix index 3fd364b4f7..65948cf2da 100644 --- a/distros/melodic/pr2-navigation/default.nix +++ b/distros/melodic/pr2-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-navigation"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/pr2_navigation/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "d99a3c4a1cdff802f0fcc74407c5595b1c7549aee95093c4314b827217f8eb32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/pr2_navigation/0.1.28-1"; + sha256 = "sha256-n4j1J14BGLymWab3zkUkfpJ072WXz140q/VPvj0CHDg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-position-scripts/default.nix b/distros/melodic/pr2-position-scripts/default.nix index 7760ab632d..65a920528c 100644 --- a/distros/melodic/pr2-position-scripts/default.nix +++ b/distros/melodic/pr2-position-scripts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-position-scripts"; version = "0.6.1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/melodic/pr2_position_scripts/0.6.1-0.tar.gz"; - name = "0.6.1-0.tar.gz"; - sha256 = "8a6dddf6474456caf8bc7efdec66febbabfc1c4f5c4ca533a0520dcc5b6b660c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/melodic/pr2_position_scripts/0.6.1-0"; + sha256 = "sha256-1sj067bxjkBIlqr/tXm8VojtTxurpGM8Raf+qSLOf64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-power-board/default.nix b/distros/melodic/pr2-power-board/default.nix index dec308bb1e..d1b18b63fc 100644 --- a/distros/melodic/pr2-power-board/default.nix +++ b/distros/melodic/pr2-power-board/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-power-board"; version = "1.1.7"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_power_drivers-release/archive/release/melodic/pr2_power_board/1.1.7-0.tar.gz"; - name = "1.1.7-0.tar.gz"; - sha256 = "9e6596dd8cdea88ca5abd93ecf2d567d34b89e97a4ffa32dbfdc8f001ce0cea9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_power_drivers-release"; + rev = "release/melodic/pr2_power_board/1.1.7-0"; + sha256 = "sha256-LlxzWccusj0MllE3PH9TxALq76gEqiOy9ggcd3bqN0g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-power-drivers/default.nix b/distros/melodic/pr2-power-drivers/default.nix index 7f033e5656..7fa5d45bd6 100644 --- a/distros/melodic/pr2-power-drivers/default.nix +++ b/distros/melodic/pr2-power-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-power-drivers"; version = "1.1.7"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_power_drivers-release/archive/release/melodic/pr2_power_drivers/1.1.7-0.tar.gz"; - name = "1.1.7-0.tar.gz"; - sha256 = "a9c7ac432f7b7adbc1d91393381847c11f2ef23301a4ed5213b661d8855ed12c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_power_drivers-release"; + rev = "release/melodic/pr2_power_drivers/1.1.7-0"; + sha256 = "sha256-yBMQ4CWfY5hQn29EWlHqSzkMqBnZjPlTm6D973NuRSg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-robot/default.nix b/distros/melodic/pr2-robot/default.nix index a87c0730ad..586078f8c5 100644 --- a/distros/melodic/pr2-robot/default.nix +++ b/distros/melodic/pr2-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-robot"; version = "1.6.31-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/melodic/pr2_robot/1.6.31-1.tar.gz"; - name = "1.6.31-1.tar.gz"; - sha256 = "9b7ce00c9c77872f1a8a4231af6debcba86564af37509f0dcae56e0c76953ae6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/melodic/pr2_robot/1.6.31-1"; + sha256 = "sha256-hRPCGGt39pXr9GF/3UCteAZD7ifaq8nai+Nw7MpFegI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-run-stop-auto-restart/default.nix b/distros/melodic/pr2-run-stop-auto-restart/default.nix index a63fdd4cd5..607fd92748 100644 --- a/distros/melodic/pr2-run-stop-auto-restart/default.nix +++ b/distros/melodic/pr2-run-stop-auto-restart/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-run-stop-auto-restart"; version = "1.6.31-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/melodic/pr2_run_stop_auto_restart/1.6.31-1.tar.gz"; - name = "1.6.31-1.tar.gz"; - sha256 = "fa853451175edde8c733e2088e19c6cb7eede021117b6a65fbdf95b514db6a3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/melodic/pr2_run_stop_auto_restart/1.6.31-1"; + sha256 = "sha256-3lydsKmgnO0OHUmf9FC3IdD20gGWxRecA5/TAi12wXA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-se-calibration-launch/default.nix b/distros/melodic/pr2-se-calibration-launch/default.nix index 27036f8c0c..616777311e 100644 --- a/distros/melodic/pr2-se-calibration-launch/default.nix +++ b/distros/melodic/pr2-se-calibration-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-se-calibration-launch"; version = "1.0.11-r3"; - src = fetchurl { - url = "https://github.com/UNR-RoboticsResearchLab/pr2_calibration-release/archive/release/melodic/pr2_se_calibration_launch/1.0.11-3.tar.gz"; - name = "1.0.11-3.tar.gz"; - sha256 = "c76aa428bb37415f4c538c72ee1e6cc5b16a1c18eb24dca7bb4be53b4d7c81b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UNR-RoboticsResearchLab"; + repo = "pr2_calibration-release"; + rev = "release/melodic/pr2_se_calibration_launch/1.0.11-3"; + sha256 = "sha256-5sCZFW0EeBGrDlLZbdwzGXKeHtphroYaC4kLRRJM6t8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-self-test-msgs/default.nix b/distros/melodic/pr2-self-test-msgs/default.nix index ce1f035606..8d7bef2473 100644 --- a/distros/melodic/pr2-self-test-msgs/default.nix +++ b/distros/melodic/pr2-self-test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-self-test-msgs"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/melodic/pr2_self_test_msgs/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "de71f082718fea8f61e7054fb4713e43fe8128c28bf66fccc47e33166db7f19a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/melodic/pr2_self_test_msgs/1.0.15-1"; + sha256 = "sha256-NdVcXF4v7qEuv/vIKPeIz9KmpBYNdP1zqfCblCekNOc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-self-test/default.nix b/distros/melodic/pr2-self-test/default.nix index c918fdb7c0..cce9606fc0 100644 --- a/distros/melodic/pr2-self-test/default.nix +++ b/distros/melodic/pr2-self-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-self-test"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/melodic/pr2_self_test/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "cfb06ed51a6fe0252689d276c2302fb691f2928b2a009c92abcde0c0e74afd67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/melodic/pr2_self_test/1.0.15-1"; + sha256 = "sha256-QKGI4UV3Lgp6swZDwW8P8JeEbWs19pBB4OU0AnluY3c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-simulator/default.nix b/distros/melodic/pr2-simulator/default.nix index 11d5410ce4..e093526869 100644 --- a/distros/melodic/pr2-simulator/default.nix +++ b/distros/melodic/pr2-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-simulator"; version = "2.0.14"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_simulator-release/archive/release/melodic/pr2_simulator/2.0.14-0.tar.gz"; - name = "2.0.14-0.tar.gz"; - sha256 = "4502d2d3680adc3ad5bb876120527c7deb7642208da743e0c853353d8524b0cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_simulator-release"; + rev = "release/melodic/pr2_simulator/2.0.14-0"; + sha256 = "sha256-wIErbJRB+Xom7dWe+MPGQhyQCaVT4RzUBHsJiyOWlWM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-teleop-general/default.nix b/distros/melodic/pr2-teleop-general/default.nix index 8c9ccbe348..6a905f608b 100644 --- a/distros/melodic/pr2-teleop-general/default.nix +++ b/distros/melodic/pr2-teleop-general/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-teleop-general"; version = "0.6.1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/melodic/pr2_teleop_general/0.6.1-0.tar.gz"; - name = "0.6.1-0.tar.gz"; - sha256 = "e3ae1cbc8602721113121e1546387c770995bf51dda293c8d593919c38ba9863"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/melodic/pr2_teleop_general/0.6.1-0"; + sha256 = "sha256-kFE3Kg5Z0lHfnY8h7gEvEC27xFQ0Wq6gS/24/9PFpSU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-teleop/default.nix b/distros/melodic/pr2-teleop/default.nix index ccd7d0549f..d8bc0e2c9a 100644 --- a/distros/melodic/pr2-teleop/default.nix +++ b/distros/melodic/pr2-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-teleop"; version = "0.6.1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/melodic/pr2_teleop/0.6.1-0.tar.gz"; - name = "0.6.1-0.tar.gz"; - sha256 = "58621f94cdf383410e0b4e896be17b09320461196422f8e14e28e19a58680625"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/melodic/pr2_teleop/0.6.1-0"; + sha256 = "sha256-wrbEaXrVFoRroKkshNDh9FJ2113Omqq0pTmy5EuBxX0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-tilt-laser-interface/default.nix b/distros/melodic/pr2-tilt-laser-interface/default.nix index 341b6cc292..619e2c5083 100644 --- a/distros/melodic/pr2-tilt-laser-interface/default.nix +++ b/distros/melodic/pr2-tilt-laser-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-tilt-laser-interface"; version = "0.0.11"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/melodic/pr2_tilt_laser_interface/0.0.11-0.tar.gz"; - name = "0.0.11-0.tar.gz"; - sha256 = "8d25bddf370f8550b5ddac3e38c98c17d4880893c20bc601f8fd8b86c5bc4c2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/melodic/pr2_tilt_laser_interface/0.0.11-0"; + sha256 = "sha256-YWW1bsD8R7akWfzuBfJQTdI3VXJS4kXDW8Kgcry7AIQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/pr2-tuck-arms-action/default.nix b/distros/melodic/pr2-tuck-arms-action/default.nix index a9b15c07c7..5a847ca8aa 100644 --- a/distros/melodic/pr2-tuck-arms-action/default.nix +++ b/distros/melodic/pr2-tuck-arms-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-tuck-arms-action"; version = "0.0.11"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/melodic/pr2_tuck_arms_action/0.0.11-0.tar.gz"; - name = "0.0.11-0.tar.gz"; - sha256 = "12d791a5cb70ca8bce9093e6dddc5cd0fc718b1d440f62c6006071bd736629e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/melodic/pr2_tuck_arms_action/0.0.11-0"; + sha256 = "sha256-tqYIHCCWRBGw30zWG71SpPaHp4evybIyvG1Nc0qXIc4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2-tuckarm/default.nix b/distros/melodic/pr2-tuckarm/default.nix index acdad7b8e5..e0712ab6b3 100644 --- a/distros/melodic/pr2-tuckarm/default.nix +++ b/distros/melodic/pr2-tuckarm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2-tuckarm"; version = "0.6.1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/melodic/pr2_tuckarm/0.6.1-0.tar.gz"; - name = "0.6.1-0.tar.gz"; - sha256 = "b03495a901d77fa4ed63ddd47ac3d1000dd43d7458eceeb5910f4c989397ee30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/melodic/pr2_tuckarm/0.6.1-0"; + sha256 = "sha256-ZwsMlZxu6UILJtxORbyh7z3Xa6aOnQM53vWH3DvUI7U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2eus-moveit/default.nix b/distros/melodic/pr2eus-moveit/default.nix index e5bc4e293e..3595495ca4 100644 --- a/distros/melodic/pr2eus-moveit/default.nix +++ b/distros/melodic/pr2eus-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2eus-moveit"; version = "0.3.14-r3"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_pr2eus-release/archive/release/melodic/pr2eus_moveit/0.3.14-3.tar.gz"; - name = "0.3.14-3.tar.gz"; - sha256 = "94e4eea9aa6fad2ae767226e050f40e01790fba0afe0c0717ff9cf90bb218b1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_pr2eus-release"; + rev = "release/melodic/pr2eus_moveit/0.3.14-3"; + sha256 = "sha256-WVK0pjBdxMTp1ppyi43PilQBC5ZMAXU3WLPWFp8ownY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2eus-tutorials/default.nix b/distros/melodic/pr2eus-tutorials/default.nix index d3f25bcfc9..4ca82dd69c 100644 --- a/distros/melodic/pr2eus-tutorials/default.nix +++ b/distros/melodic/pr2eus-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2eus-tutorials"; version = "0.3.14-r3"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_pr2eus-release/archive/release/melodic/pr2eus_tutorials/0.3.14-3.tar.gz"; - name = "0.3.14-3.tar.gz"; - sha256 = "0c93d0988fc81f1157defca391eb97fa1df1b0534fa85bd524053964f06b30ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_pr2eus-release"; + rev = "release/melodic/pr2eus_tutorials/0.3.14-3"; + sha256 = "sha256-CWuDwOQuod+AbJwVizq2SmlOmIppTC7W33RPsvVRfl0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pr2eus/default.nix b/distros/melodic/pr2eus/default.nix index 15d9e55f37..c3233be92c 100644 --- a/distros/melodic/pr2eus/default.nix +++ b/distros/melodic/pr2eus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pr2eus"; version = "0.3.14-r3"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_pr2eus-release/archive/release/melodic/pr2eus/0.3.14-3.tar.gz"; - name = "0.3.14-3.tar.gz"; - sha256 = "893fd05c7b1c9fce063437fe74f2eae8c9fe750a2a85f5bac5413fafd88dd710"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_pr2eus-release"; + rev = "release/melodic/pr2eus/0.3.14-3"; + sha256 = "sha256-iXBm3aNSIwMIk7adqRCNrJ6EzW9PFE3BfBMmPHbaM+w="; + }; buildType = "catkin"; buildInputs = [ catkin rosgraph-msgs ]; diff --git a/distros/melodic/prbt-gazebo/default.nix b/distros/melodic/prbt-gazebo/default.nix index e9696b4198..19e2a2b865 100644 --- a/distros/melodic/prbt-gazebo/default.nix +++ b/distros/melodic/prbt-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prbt-gazebo"; version = "0.5.23-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/melodic/prbt_gazebo/0.5.23-1.tar.gz"; - name = "0.5.23-1.tar.gz"; - sha256 = "fd6264498b55c274405e379cb95641be0598b418512a6311012e69d5060b02a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/melodic/prbt_gazebo/0.5.23-1"; + sha256 = "sha256-UfI1WxRWoxu78Q2ywZiG+DQZuhaGQQ/taLZ48OBadXA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/prbt-grippers/default.nix b/distros/melodic/prbt-grippers/default.nix index 9cbc73b625..7823d26db3 100644 --- a/distros/melodic/prbt-grippers/default.nix +++ b/distros/melodic/prbt-grippers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prbt-grippers"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/prbt_grippers-release/archive/release/melodic/prbt_grippers/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "6765306ed7868e1f6005ffaacebc8a0161eb24cf8fcbfefff9f587ccc10a6e52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "prbt_grippers-release"; + rev = "release/melodic/prbt_grippers/0.0.4-1"; + sha256 = "sha256-99AeTc1nkvQsCHDW4CAGiUUD6w1yRj9qvUuh2mg58dE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/prbt-hardware-support/default.nix b/distros/melodic/prbt-hardware-support/default.nix index 56fe43463b..6a89150fed 100644 --- a/distros/melodic/prbt-hardware-support/default.nix +++ b/distros/melodic/prbt-hardware-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prbt-hardware-support"; version = "0.5.23-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/melodic/prbt_hardware_support/0.5.23-1.tar.gz"; - name = "0.5.23-1.tar.gz"; - sha256 = "cae651e8cca5fb59f8a85526191d845a1096a967859de5e70847eedf4892bef4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/melodic/prbt_hardware_support/0.5.23-1"; + sha256 = "sha256-Y/CLzvKXtmTVqRQPyAy7lAahASqLef1zGUFsob0qqyE="; + }; buildType = "catkin"; buildInputs = [ canopen-chain-node catkin dynamic-reconfigure libmodbus message-filters message-generation pilz-utils tf2 tf2-geometry-msgs tf2-ros urdf ]; diff --git a/distros/melodic/prbt-ikfast-manipulator-plugin/default.nix b/distros/melodic/prbt-ikfast-manipulator-plugin/default.nix index cf46c5fa6f..4718d3a633 100644 --- a/distros/melodic/prbt-ikfast-manipulator-plugin/default.nix +++ b/distros/melodic/prbt-ikfast-manipulator-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prbt-ikfast-manipulator-plugin"; version = "0.5.23-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/melodic/prbt_ikfast_manipulator_plugin/0.5.23-1.tar.gz"; - name = "0.5.23-1.tar.gz"; - sha256 = "aab1ab20938b11048170850f082682fef0fd4fb6e7895712a9875080cbbb7bb6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/melodic/prbt_ikfast_manipulator_plugin/0.5.23-1"; + sha256 = "sha256-jnBUvkchJ16IMLF/ThDo/3UZxj97MCZJIFbyRFNGU1Q="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen ]; diff --git a/distros/melodic/prbt-moveit-config/default.nix b/distros/melodic/prbt-moveit-config/default.nix index 419832dc02..0ca2bb2081 100644 --- a/distros/melodic/prbt-moveit-config/default.nix +++ b/distros/melodic/prbt-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prbt-moveit-config"; version = "0.5.23-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/melodic/prbt_moveit_config/0.5.23-1.tar.gz"; - name = "0.5.23-1.tar.gz"; - sha256 = "ac90dce368fc651dfcd6ae85eeddbba21c982e95ae556d85602d8322069d22ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/melodic/prbt_moveit_config/0.5.23-1"; + sha256 = "sha256-bh8XEV7o/U48LTELZn8tODOXK0BwHinQh6z3+WLTW08="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/prbt-pg70-support/default.nix b/distros/melodic/prbt-pg70-support/default.nix index bb7daf5d1f..4f606dfeb6 100644 --- a/distros/melodic/prbt-pg70-support/default.nix +++ b/distros/melodic/prbt-pg70-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prbt-pg70-support"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/prbt_grippers-release/archive/release/melodic/prbt_pg70_support/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "71d12733360cd04b208ed6cf976217fcbaea7231298f5ad006b7dc10be3ab7b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "prbt_grippers-release"; + rev = "release/melodic/prbt_pg70_support/0.0.4-1"; + sha256 = "sha256-CkNS7qydSKc7lkDUnlJ5iAgaQWAuVc2yqI6/Hi8Z0Js="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/prbt-support/default.nix b/distros/melodic/prbt-support/default.nix index ce8a91f59b..04f44f2019 100644 --- a/distros/melodic/prbt-support/default.nix +++ b/distros/melodic/prbt-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prbt-support"; version = "0.5.23-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/melodic/prbt_support/0.5.23-1.tar.gz"; - name = "0.5.23-1.tar.gz"; - sha256 = "ab99d8c017856a4e336cf0ee323f428b148400317422ae3c1ec3e33cd4156a5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/melodic/prbt_support/0.5.23-1"; + sha256 = "sha256-2p2wj6yyAihn/Ue4We7XOOnDKphPC5WBdJV+TKEBIiE="; + }; buildType = "catkin"; buildInputs = [ canopen-chain-node catkin pilz-utils roslint sensor-msgs ]; diff --git a/distros/melodic/prosilica-camera/default.nix b/distros/melodic/prosilica-camera/default.nix index 5cd1906320..3e60907f60 100644 --- a/distros/melodic/prosilica-camera/default.nix +++ b/distros/melodic/prosilica-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prosilica-camera"; version = "1.9.4-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/prosilica_driver-release/archive/release/melodic/prosilica_camera/1.9.4-1.tar.gz"; - name = "1.9.4-1.tar.gz"; - sha256 = "7c2aafe58194390d9dbaaf25cf54cf5ba4060742e2ef9f10a0bb207c377d8202"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "prosilica_driver-release"; + rev = "release/melodic/prosilica_camera/1.9.4-1"; + sha256 = "sha256-dFhXCk4FGtfSQk8kvb+pn9DzZRJdJRU7iocGkvWNK9Q="; + }; buildType = "catkin"; buildInputs = [ catkin rosconsole ]; diff --git a/distros/melodic/prosilica-gige-sdk/default.nix b/distros/melodic/prosilica-gige-sdk/default.nix index 6957e679ad..e261683f32 100644 --- a/distros/melodic/prosilica-gige-sdk/default.nix +++ b/distros/melodic/prosilica-gige-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-prosilica-gige-sdk"; version = "1.26.3-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/prosilica_gige_sdk-release/archive/release/melodic/prosilica_gige_sdk/1.26.3-1.tar.gz"; - name = "1.26.3-1.tar.gz"; - sha256 = "3ba1f4695e70b0a8d831ec38c0e76b5d018e589d74cbf0436c828ce934e0ab3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "prosilica_gige_sdk-release"; + rev = "release/melodic/prosilica_gige_sdk/1.26.3-1"; + sha256 = "sha256-cX85yiPAgi7o6+4ejYv642BsMbesKjHlXtP3ZJ4bkQM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ps3joy/default.nix b/distros/melodic/ps3joy/default.nix index c5d6eebfea..62073e5148 100644 --- a/distros/melodic/ps3joy/default.nix +++ b/distros/melodic/ps3joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ps3joy"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joystick_drivers-release/archive/release/melodic/ps3joy/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "2bd4850de3aeef1b9696fe5fbacab24f716c454dc5abd648ad59fb29009349be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joystick_drivers-release"; + rev = "release/melodic/ps3joy/1.14.0-1"; + sha256 = "sha256-HDAID2JtpjpEot/FAhBb73kELbbQTiNJN8vAJMET/VE="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/psen-scan-v2/default.nix b/distros/melodic/psen-scan-v2/default.nix index 3423668a86..7ac7ab32e2 100644 --- a/distros/melodic/psen-scan-v2/default.nix +++ b/distros/melodic/psen-scan-v2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-psen-scan-v2"; version = "0.10.2-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/psen_scan_v2-release/archive/release/melodic/psen_scan_v2/0.10.2-1.tar.gz"; - name = "0.10.2-1.tar.gz"; - sha256 = "15f5b76b8f5e2b4a121051dad537c4f3916a7af8a7bd96ec6fe0a886277d46fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "psen_scan_v2-release"; + rev = "release/melodic/psen_scan_v2/0.10.2-1"; + sha256 = "sha256-Ufw3h/3Yl7IeD+f7U132XgTHjticFhuMQskiyohjrkk="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/psen-scan/default.nix b/distros/melodic/psen-scan/default.nix index 9d4ddc13c1..d98c7a2d4f 100644 --- a/distros/melodic/psen-scan/default.nix +++ b/distros/melodic/psen-scan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-psen-scan"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/psen_scan-release/archive/release/melodic/psen_scan/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "3832ccbea8e5d6cedd18abceb0d12cd451031c2e46879e984cc2930fdaf3eb16"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "psen_scan-release"; + rev = "release/melodic/psen_scan/1.0.8-1"; + sha256 = "sha256-yV4y3RrwfI5tS/kqC94ksc+/Dqub09ZCWvJS6qXkJ1Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/px4-msgs/default.nix b/distros/melodic/px4-msgs/default.nix index a8aa4700e8..cac90481cb 100644 --- a/distros/melodic/px4-msgs/default.nix +++ b/distros/melodic/px4-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-px4-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/PX4/px4_msgs-release/archive/release/melodic/px4_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "b1a2be52c973b4225c9716650da59f0f9c0eea2acef55a86f762864db8cf4bca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PX4"; + repo = "px4_msgs-release"; + rev = "release/melodic/px4_msgs/1.0.0-1"; + sha256 = "sha256-xuUVe4bMvIz0hEWr1101KL7jz1rYrNyH/TFvwyWVBwo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/py-trees-msgs/default.nix b/distros/melodic/py-trees-msgs/default.nix index 2dc0947d58..93f480f057 100644 --- a/distros/melodic/py-trees-msgs/default.nix +++ b/distros/melodic/py-trees-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-py-trees-msgs"; version = "0.3.6"; - src = fetchurl { - url = "https://github.com/stonier/py_trees_msgs-release/archive/release/melodic/py_trees_msgs/0.3.6-0.tar.gz"; - name = "0.3.6-0.tar.gz"; - sha256 = "71d8d3b25202546af7f8f085a532d72bf3fc35a591958d88927c6506571f3b37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees_msgs-release"; + rev = "release/melodic/py_trees_msgs/0.3.6-0"; + sha256 = "sha256-OQse0n46c5OXEjmgApcrXX4aIkZLGP/kKjEUpiL1BQk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/py-trees-ros/default.nix b/distros/melodic/py-trees-ros/default.nix index 0b367e6fb2..da6ad99f44 100644 --- a/distros/melodic/py-trees-ros/default.nix +++ b/distros/melodic/py-trees-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-py-trees-ros"; version = "0.5.21-r1"; - src = fetchurl { - url = "https://github.com/stonier/py_trees_ros-release/archive/release/melodic/py_trees_ros/0.5.21-1.tar.gz"; - name = "0.5.21-1.tar.gz"; - sha256 = "d74455aaa4da3ca549de5950044da474e75293c666a3bc0c89bf3f00d2484a54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees_ros-release"; + rev = "release/melodic/py_trees_ros/0.5.21-1"; + sha256 = "sha256-NzN7FigW2Rx516FP1NhCVitVmiO042cEllEEsU8dX2k="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/py-trees/default.nix b/distros/melodic/py-trees/default.nix index a9cafa61b6..763fbf6419 100644 --- a/distros/melodic/py-trees/default.nix +++ b/distros/melodic/py-trees/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-py-trees"; version = "0.6.9-r1"; - src = fetchurl { - url = "https://github.com/stonier/py_trees-release/archive/release/melodic/py_trees/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "55341ff9dcd20854b5b6625cef13b5b4bc891c2ac046b0514bb592c473f0c00a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees-release"; + rev = "release/melodic/py_trees/0.6.9-1"; + sha256 = "sha256-y25WxxvMximtgh//CGUEEGhGAckoJQQP5Nz4wvQbtLw="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/pybind11-catkin/default.nix b/distros/melodic/pybind11-catkin/default.nix index f9c354ccfc..b5239a2349 100644 --- a/distros/melodic/pybind11-catkin/default.nix +++ b/distros/melodic/pybind11-catkin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pybind11-catkin"; version = "2.4.3-r1"; - src = fetchurl { - url = "https://github.com/wxmerkt/pybind11_catkin-release/archive/release/melodic/pybind11_catkin/2.4.3-1.tar.gz"; - name = "2.4.3-1.tar.gz"; - sha256 = "3a64a46a9f2ab342f823f98a3efa8fff416d34d9e86f322cdbe0d2cf8055958d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wxmerkt"; + repo = "pybind11_catkin-release"; + rev = "release/melodic/pybind11_catkin/2.4.3-1"; + sha256 = "sha256-GmB8ippoT8In2jceuOj8QpdWfNlW1UyM7RRJ015ZylQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pyquaternion/default.nix b/distros/melodic/pyquaternion/default.nix index 22f28380e4..730584317d 100644 --- a/distros/melodic/pyquaternion/default.nix +++ b/distros/melodic/pyquaternion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pyquaternion"; version = "0.9.6-r1"; - src = fetchurl { - url = "https://github.com/Achllle/pyquaternion-release/archive/release/melodic/pyquaternion/0.9.6-1.tar.gz"; - name = "0.9.6-1.tar.gz"; - sha256 = "951aa79d9675b3a3bcd33c6554bb52ebfd0364ab26765a5607b5f4802c3a4185"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Achllle"; + repo = "pyquaternion-release"; + rev = "release/melodic/pyquaternion/0.9.6-1"; + sha256 = "sha256-B95hgJLtQ2OvbMzkzmKTUs+TNZilxXLqf73usJfThcI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/pyros-test/default.nix b/distros/melodic/pyros-test/default.nix index 6a56e371d2..1636b57f8b 100644 --- a/distros/melodic/pyros-test/default.nix +++ b/distros/melodic/pyros-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-pyros-test"; version = "0.0.6-r1"; - src = fetchurl { - url = "https://github.com/pyros-dev/pyros-test-release/archive/release/melodic/pyros_test/0.0.6-1.tar.gz"; - name = "0.0.6-1.tar.gz"; - sha256 = "9f1c355999d96debda08aa9cc999dade80d4c8ba9de137fabd122eb9050c35ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pyros-dev"; + repo = "pyros-test-release"; + rev = "release/melodic/pyros_test/0.0.6-1"; + sha256 = "sha256-12Wn1ZrTcwE+CDqJNMOR8WTf9XFGDE/JuJDYkgQ3O2g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/melodic/python-orocos-kdl/default.nix b/distros/melodic/python-orocos-kdl/default.nix index 01178355b2..3413b751d9 100644 --- a/distros/melodic/python-orocos-kdl/default.nix +++ b/distros/melodic/python-orocos-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-python-orocos-kdl"; version = "1.4.0"; - src = fetchurl { - url = "https://github.com/orocos/orocos-kdl-release/archive/release/melodic/python_orocos_kdl/1.4.0-0.tar.gz"; - name = "1.4.0-0.tar.gz"; - sha256 = "e2f7f6fafccaf26d88863ac50b826301c14db71f61e4caff757a482e304a62a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "orocos"; + repo = "orocos-kdl-release"; + rev = "release/melodic/python_orocos_kdl/1.4.0-0"; + sha256 = "sha256-e69GqpbNlxwewDvXFOxVS7bPTuM5vzIrFvfarEXH4bs="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/python-qt-binding/default.nix b/distros/melodic/python-qt-binding/default.nix index 03d0500b5e..313068c08f 100644 --- a/distros/melodic/python-qt-binding/default.nix +++ b/distros/melodic/python-qt-binding/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-python-qt-binding"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/python_qt_binding-release/archive/release/melodic/python_qt_binding/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "81666239682642c2c08f0a507f113efe4df1cd7f2cb778d3d02d913bcfa68478"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "python_qt_binding-release"; + rev = "release/melodic/python_qt_binding/0.4.4-1"; + sha256 = "sha256-jshBly6YLRxj7Pz//RIsW77viz0Sbw2Lypm7P97Ox50="; + }; buildType = "catkin"; buildInputs = [ qt5.qtbase rosbuild ]; diff --git a/distros/melodic/qb-device-bringup/default.nix b/distros/melodic/qb-device-bringup/default.nix index 42de374826..74a84ff686 100644 --- a/distros/melodic/qb-device-bringup/default.nix +++ b/distros/melodic/qb-device-bringup/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-melodic-qb-device-bringup"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_bringup/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "443a0556f062e710b5f7d7dc73d706cf568d89df0fd7ad5166709f879da7949b"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_bringup/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "739787fa85aa1c7f90acafab362eb8942949223ae1505db215494250b4d1e75f"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-device-control/default.nix b/distros/melodic/qb-device-control/default.nix index af57722582..620d8a3380 100644 --- a/distros/melodic/qb-device-control/default.nix +++ b/distros/melodic/qb-device-control/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, combined-robot-hw, control-msgs, controller-manager, qb-device-hardware-interface, qb-device-utils, roscpp }: buildRosPackage { pname = "ros-melodic-qb-device-control"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_control/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "aa15f86f450ad62174010eae97ce5ba325a52e62a638a01ae3b7a100ec406a6b"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_control/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "a96efadce59a669be94ac6c146de9767db584c1364a7e7f5cfaedeeada025e69"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-device-description/default.nix b/distros/melodic/qb-device-description/default.nix index b00e749239..cb0acd31f9 100644 --- a/distros/melodic/qb-device-description/default.nix +++ b/distros/melodic/qb-device-description/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-melodic-qb-device-description"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_description/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "68b1656670c1a86828fc13dd7ad3943209f3b95df25079c632717d2a3a326aea"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_description/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "305bbe654cefed0f5b3723cfd535c0092f63f5665e4f049185984ebc37397d5a"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-device-driver/default.nix b/distros/melodic/qb-device-driver/default.nix index e506a16ee0..49ee95d1ba 100644 --- a/distros/melodic/qb-device-driver/default.nix +++ b/distros/melodic/qb-device-driver/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, qb-device-srvs, qb-device-utils, roscpp }: buildRosPackage { pname = "ros-melodic-qb-device-driver"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_driver/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "5b3ec2c7b2ecf6aa8e1b99156423cb9f88208eb8d02024c2b30b8c6b1570e5d4"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_driver/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "a46ac74de73d49ed33f2cab3036c3fddcdceb83cfca9e4dfb5efbeb0ed41a099"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-device-gazebo/default.nix b/distros/melodic/qb-device-gazebo/default.nix index a9fcfae19f..6fefa1a590 100644 --- a/distros/melodic/qb-device-gazebo/default.nix +++ b/distros/melodic/qb-device-gazebo/default.nix @@ -1,16 +1,16 @@ -# Copyright 2022 Open Source Robotics Foundation +# Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license { lib, buildRosPackage, fetchurl, catkin, controller-manager, gazebo-ros-control, roscpp }: buildRosPackage { pname = "ros-melodic-qb-device-gazebo"; - version = "3.0.5-r1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_gazebo/3.0.5-1.tar.gz"; - name = "3.0.5-1.tar.gz"; - sha256 = "a45cbe6a017aeb024ff0c019e5bd6d39979e3545cadd8e71eec07cf1036f3804"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_gazebo/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "0e95d49bf21c437ddc502e2d24e8699240fc79f39b4c2b34e22042810a36c98e"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-device-hardware-interface/default.nix b/distros/melodic/qb-device-hardware-interface/default.nix index 616de35bfd..95f0cf016c 100644 --- a/distros/melodic/qb-device-hardware-interface/default.nix +++ b/distros/melodic/qb-device-hardware-interface/default.nix @@ -2,21 +2,21 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, hardware-interface, joint-limits-interface, qb-device-msgs, qb-device-srvs, roscpp, rostest, transmission-interface, urdf }: +{ lib, buildRosPackage, fetchurl, catkin, control-msgs, hardware-interface, joint-limits-interface, qb-device-msgs, qb-device-srvs, roscpp, rostest, transmission-interface, urdf }: buildRosPackage { pname = "ros-melodic-qb-device-hardware-interface"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_hardware_interface/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "16e0d28b4e8b145ae272049cdf232830fd7e6ffc50145bcb04a1570fa1e0f791"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_hardware_interface/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "762f67ac3f6df8067295b492a63c59786f22050ec42ee28e6c39e4ea8c128ba3"; }; buildType = "catkin"; buildInputs = [ catkin ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ hardware-interface joint-limits-interface qb-device-msgs qb-device-srvs roscpp transmission-interface urdf ]; + propagatedBuildInputs = [ control-msgs hardware-interface joint-limits-interface qb-device-msgs qb-device-srvs roscpp transmission-interface urdf ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/melodic/qb-device-msgs/default.nix b/distros/melodic/qb-device-msgs/default.nix index a3abb06e63..4e071ed8a6 100644 --- a/distros/melodic/qb-device-msgs/default.nix +++ b/distros/melodic/qb-device-msgs/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-melodic-qb-device-msgs"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_msgs/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "0a101007de0e30caec152ebe1d7f6bd676382b6b9df4e8353acb6a061bb57ab6"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_msgs/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "4410e37b9dd31747c38a8cbea039862b5e24ec8ff5ae0575111f68209deb0520"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-device-srvs/default.nix b/distros/melodic/qb-device-srvs/default.nix index f37638e658..ac7645a863 100644 --- a/distros/melodic/qb-device-srvs/default.nix +++ b/distros/melodic/qb-device-srvs/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, qb-device-msgs, std-srvs }: buildRosPackage { pname = "ros-melodic-qb-device-srvs"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_srvs/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "3368262c75e15bb0fe756a1a54ae5dbef310d58c351c97e62766135641c68cab"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_srvs/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "372be435863e3cafdfb3a21d5afeac3eda4ddab8df20fc94fadfe99ba6c02911"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-device-utils/default.nix b/distros/melodic/qb-device-utils/default.nix index 3306a196a0..c106708c6a 100644 --- a/distros/melodic/qb-device-utils/default.nix +++ b/distros/melodic/qb-device-utils/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, roscpp }: buildRosPackage { pname = "ros-melodic-qb-device-utils"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_utils/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "b7ece361d35ee477a65ab530192408ac5a4fb3f8813c52a48a911989568fd0cf"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device_utils/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "83e0ccbddcbdfbbbf0b8a7bfdf6e650ff3080989ab0806c82c6752202c6a75ed"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-device/default.nix b/distros/melodic/qb-device/default.nix index 869d835923..fafb839104 100644 --- a/distros/melodic/qb-device/default.nix +++ b/distros/melodic/qb-device/default.nix @@ -2,20 +2,20 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, qb-device-bringup, qb-device-control, qb-device-description, qb-device-driver, qb-device-hardware-interface, qb-device-msgs, qb-device-srvs }: +{ lib, buildRosPackage, fetchurl, catkin, qb-device-bringup, qb-device-control, qb-device-description, qb-device-driver, qb-device-gazebo, qb-device-hardware-interface, qb-device-msgs, qb-device-srvs, qb-device-utils }: buildRosPackage { pname = "ros-melodic-qb-device"; - version = "2.0.1"; + version = "3.0.5-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "732baae03ff35decece845d122f21d7b7b86d2c31f726cfce269be208c306724"; + url = "https://bitbucket.org/qbrobotics/qbdevice-ros-release/get/release/melodic/qb_device/3.0.5-2.tar.gz"; + name = "3.0.5-2.tar.gz"; + sha256 = "e4150988f95ea6b51d8e809d652f413d601f2d4bfb225efd4a7e947b2b2ad47a"; }; buildType = "catkin"; buildInputs = [ catkin ]; - propagatedBuildInputs = [ qb-device-bringup qb-device-control qb-device-description qb-device-driver qb-device-hardware-interface qb-device-msgs qb-device-srvs ]; + propagatedBuildInputs = [ qb-device-bringup qb-device-control qb-device-description qb-device-driver qb-device-gazebo qb-device-hardware-interface qb-device-msgs qb-device-srvs qb-device-utils ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/melodic/qb-hand-control/default.nix b/distros/melodic/qb-hand-control/default.nix index c711a5ed48..8f34d4e487 100644 --- a/distros/melodic/qb-hand-control/default.nix +++ b/distros/melodic/qb-hand-control/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-melodic-qb-hand-control"; - version = "2.0.0-r1"; + version = "3.0.2-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand_control/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "b8ceb134cabb1903f8f236fa03e0b74c0f7555506bb3842ba586590f9e844790"; + url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand_control/3.0.2-2.tar.gz"; + name = "3.0.2-2.tar.gz"; + sha256 = "0dce06afb79273217c7058a4ca2de890b8440a7947f1e910bec90b580217e608"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-hand-description/default.nix b/distros/melodic/qb-hand-description/default.nix index 28e6e2472d..1c79cecb79 100644 --- a/distros/melodic/qb-hand-description/default.nix +++ b/distros/melodic/qb-hand-description/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-melodic-qb-hand-description"; - version = "2.0.0-r1"; + version = "3.0.2-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand_description/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "95d0fbcd6f6d04fdae88fb2e6087f57ba833fb10d788a396c21dbe04c731120a"; + url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand_description/3.0.2-2.tar.gz"; + name = "3.0.2-2.tar.gz"; + sha256 = "f2a968984e49a8b094bec8b0da400ec63489182f830b705409f6b28b64d86bf2"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-hand-gazebo/default.nix b/distros/melodic/qb-hand-gazebo/default.nix new file mode 100644 index 0000000000..4932e697b0 --- /dev/null +++ b/distros/melodic/qb-hand-gazebo/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, controller-manager, gazebo-ros-control, qb-device-gazebo, qb-device-hardware-interface, roscpp }: +buildRosPackage { + pname = "ros-melodic-qb-hand-gazebo"; + version = "3.0.2-r2"; + + src = fetchurl { + url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand_gazebo/3.0.2-2.tar.gz"; + name = "3.0.2-2.tar.gz"; + sha256 = "96c55044156774248bf33f0f00a90f18f6fd878cae824c916f83fa5d095b6089"; + }; + + buildType = "catkin"; + buildInputs = [ catkin ]; + propagatedBuildInputs = [ controller-manager gazebo-ros-control qb-device-gazebo qb-device-hardware-interface roscpp ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''This package contains the Gazebo ROS control plugins for qbrobotics® SoftHand device.''; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/distros/melodic/qb-hand-hardware-interface/default.nix b/distros/melodic/qb-hand-hardware-interface/default.nix index 69bedbc659..b901c65fa8 100644 --- a/distros/melodic/qb-hand-hardware-interface/default.nix +++ b/distros/melodic/qb-hand-hardware-interface/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, control-toolbox, hardware-interface, qb-device-hardware-interface, roscpp, transmission-interface }: buildRosPackage { pname = "ros-melodic-qb-hand-hardware-interface"; - version = "2.0.0-r1"; + version = "3.0.2-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand_hardware_interface/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "88138eb2c19395bcb633d026f37a60414f12797a08392c17d9cb967f13bef9c5"; + url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand_hardware_interface/3.0.2-2.tar.gz"; + name = "3.0.2-2.tar.gz"; + sha256 = "8d9c259d406ad9818d07b42d0a9348f66c954e5eba16ec6a4e02716a1535e258"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-hand/default.nix b/distros/melodic/qb-hand/default.nix index e64effbb21..8d6cb769a8 100644 --- a/distros/melodic/qb-hand/default.nix +++ b/distros/melodic/qb-hand/default.nix @@ -2,20 +2,20 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, qb-hand-control, qb-hand-description, qb-hand-hardware-interface }: +{ lib, buildRosPackage, fetchurl, catkin, qb-hand-control, qb-hand-description, qb-hand-gazebo, qb-hand-hardware-interface }: buildRosPackage { pname = "ros-melodic-qb-hand"; - version = "2.0.0-r1"; + version = "3.0.2-r2"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "aabf19f098662ae7195c61133104fbb799d47e58f9fcc52a069fcd08978b3cc9"; + url = "https://bitbucket.org/qbrobotics/qbhand-ros-release/get/release/melodic/qb_hand/3.0.2-2.tar.gz"; + name = "3.0.2-2.tar.gz"; + sha256 = "cd31ab5d8261ae143b9400f210339e043746a8c5d465b0486dda672a9dd381cc"; }; buildType = "catkin"; buildInputs = [ catkin ]; - propagatedBuildInputs = [ qb-hand-control qb-hand-description qb-hand-hardware-interface ]; + propagatedBuildInputs = [ qb-hand-control qb-hand-description qb-hand-gazebo qb-hand-hardware-interface ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/melodic/qb-move-control/default.nix b/distros/melodic/qb-move-control/default.nix index 54eda5798e..532986c897 100644 --- a/distros/melodic/qb-move-control/default.nix +++ b/distros/melodic/qb-move-control/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-melodic-qb-move-control"; - version = "2.0.0-r1"; + version = "3.0.0-r1"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move_control/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "d7df8abcb9d4579698e9452e057d58e12d8da5ad622c6bdaf5066cd9525f5499"; + url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move_control/3.0.0-1.tar.gz"; + name = "3.0.0-1.tar.gz"; + sha256 = "fbd7a73d5c80364c9a177d20c478834460244ee88cfbe8cee076b48fc49618be"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-move-description/default.nix b/distros/melodic/qb-move-description/default.nix index b3f3d25997..52edea8044 100644 --- a/distros/melodic/qb-move-description/default.nix +++ b/distros/melodic/qb-move-description/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-melodic-qb-move-description"; - version = "2.0.0-r1"; + version = "3.0.0-r1"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move_description/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "2d1f33dc9544f001b41cd0c45f89465a068bda8b7a5948953d21581639069f5c"; + url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move_description/3.0.0-1.tar.gz"; + name = "3.0.0-1.tar.gz"; + sha256 = "764ed1db3b405ec2dd97851e385e1ed79225f6fcf197d270fa25e6e233a0e456"; }; buildType = "catkin"; diff --git a/distros/melodic/qb-move-gazebo/default.nix b/distros/melodic/qb-move-gazebo/default.nix new file mode 100644 index 0000000000..8641cc7d87 --- /dev/null +++ b/distros/melodic/qb-move-gazebo/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, controller-manager, gazebo-ros-control, qb-device-gazebo, qb-device-hardware-interface, roscpp }: +buildRosPackage { + pname = "ros-melodic-qb-move-gazebo"; + version = "3.0.0-r1"; + + src = fetchurl { + url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move_gazebo/3.0.0-1.tar.gz"; + name = "3.0.0-1.tar.gz"; + sha256 = "fb5f2dfdd2525eccf7b15878d5bffbea4686aff325e60878aa9e999cb0b2c166"; + }; + + buildType = "catkin"; + buildInputs = [ catkin ]; + propagatedBuildInputs = [ controller-manager gazebo-ros-control qb-device-gazebo qb-device-hardware-interface roscpp ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''This package contains the Gazebo ROS control plugins for qbrobotics® qbmove device.''; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/distros/melodic/qb-move-hardware-interface/default.nix b/distros/melodic/qb-move-hardware-interface/default.nix index e2407331c8..538a7576ff 100644 --- a/distros/melodic/qb-move-hardware-interface/default.nix +++ b/distros/melodic/qb-move-hardware-interface/default.nix @@ -2,20 +2,20 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, control-toolbox, hardware-interface, qb-device-hardware-interface, roscpp, transmission-interface }: +{ lib, buildRosPackage, fetchurl, catkin, control-toolbox, hardware-interface, interactive-markers, qb-device-hardware-interface, roscpp, tf2, tf2-geometry-msgs, transmission-interface }: buildRosPackage { pname = "ros-melodic-qb-move-hardware-interface"; - version = "2.0.0-r1"; + version = "3.0.0-r1"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move_hardware_interface/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "f286bcac0739c1e7f8572d5e8abd413d25b541e3d54efa3b9805482543cd9c97"; + url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move_hardware_interface/3.0.0-1.tar.gz"; + name = "3.0.0-1.tar.gz"; + sha256 = "b6d8969c96b05f146254f6d09819dcc557f5cb7d8dc1dc2199111308ba76aa37"; }; buildType = "catkin"; buildInputs = [ catkin ]; - propagatedBuildInputs = [ control-toolbox hardware-interface qb-device-hardware-interface roscpp transmission-interface ]; + propagatedBuildInputs = [ control-toolbox hardware-interface interactive-markers qb-device-hardware-interface roscpp tf2 tf2-geometry-msgs transmission-interface ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/melodic/qb-move/default.nix b/distros/melodic/qb-move/default.nix index 6d66e13f2a..26b55f22ea 100644 --- a/distros/melodic/qb-move/default.nix +++ b/distros/melodic/qb-move/default.nix @@ -2,20 +2,20 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, qb-move-control, qb-move-description, qb-move-hardware-interface }: +{ lib, buildRosPackage, fetchurl, catkin, qb-move-control, qb-move-description, qb-move-gazebo, qb-move-hardware-interface }: buildRosPackage { pname = "ros-melodic-qb-move"; - version = "2.0.0-r1"; + version = "3.0.0-r1"; src = fetchurl { - url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "1a320423c63420ddd649d7df7f9e5a973078788f6ca6f4ef5d0675eb69c4b62c"; + url = "https://bitbucket.org/qbrobotics/qbmove-ros-release/get/release/melodic/qb_move/3.0.0-1.tar.gz"; + name = "3.0.0-1.tar.gz"; + sha256 = "9e1491309cb6956fb2ffb867bafbecbc65a051c160a54c7f715526eccb7b3812"; }; buildType = "catkin"; buildInputs = [ catkin ]; - propagatedBuildInputs = [ qb-move-control qb-move-description qb-move-hardware-interface ]; + propagatedBuildInputs = [ qb-move-control qb-move-description qb-move-gazebo qb-move-hardware-interface ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/melodic/qpmad/default.nix b/distros/melodic/qpmad/default.nix index 7814fcadf4..8aaabc01be 100644 --- a/distros/melodic/qpmad/default.nix +++ b/distros/melodic/qpmad/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qpmad"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/asherikov/qpmad-release/archive/release/melodic/qpmad/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "1be4d73c57ea15ec2c65241d783e2f93f881083138da4b1982e9a6c730743683"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "asherikov"; + repo = "qpmad-release"; + rev = "release/melodic/qpmad/1.0.2-1"; + sha256 = "sha256-E+0gbE4lyVwlvDoGnPsuYtOv2ZdWZ+3W/MRMByasR1s="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/qpoases-vendor/default.nix b/distros/melodic/qpoases-vendor/default.nix index c56aa990b7..922e0a50a4 100644 --- a/distros/melodic/qpoases-vendor/default.nix +++ b/distros/melodic/qpoases-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qpoases-vendor"; version = "3.2.1-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/qpoases_vendor-release/archive/release/melodic/qpoases_vendor/3.2.1-1.tar.gz"; - name = "3.2.1-1.tar.gz"; - sha256 = "085113fdfc8befacc6d6f4d4dfe7458f008510f3944fc07e6e7952240d100880"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "qpoases_vendor-release"; + rev = "release/melodic/qpoases_vendor/3.2.1-1"; + sha256 = "sha256-5vC2LEfIy6E56ZDbtAG93p6nsA+Wcus1SGR7dI5fhI8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/qt-build/default.nix b/distros/melodic/qt-build/default.nix index 612a7a963c..6b9ff9afae 100644 --- a/distros/melodic/qt-build/default.nix +++ b/distros/melodic/qt-build/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-build"; version = "0.2.10-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/qt_ros-release/archive/release/melodic/qt_build/0.2.10-1.tar.gz"; - name = "0.2.10-1.tar.gz"; - sha256 = "8efbd3e986cd99b3cd997e6dc4bd94babe0885f4bcc5c4571b5558ad5273c98e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "qt_ros-release"; + rev = "release/melodic/qt_build/0.2.10-1"; + sha256 = "sha256-r3oiMwz3b+7dlO0TPsDtgEE2mpEYkRTjVc6O3W85Uzk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/qt-create/default.nix b/distros/melodic/qt-create/default.nix index 798a9afb01..36128fa287 100644 --- a/distros/melodic/qt-create/default.nix +++ b/distros/melodic/qt-create/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-create"; version = "0.2.10-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/qt_ros-release/archive/release/melodic/qt_create/0.2.10-1.tar.gz"; - name = "0.2.10-1.tar.gz"; - sha256 = "cec2e88476fc8894e4baa333e77479cd10b8c21938d751914127f3fdd20a2dea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "qt_ros-release"; + rev = "release/melodic/qt_create/0.2.10-1"; + sha256 = "sha256-pHJvEQRxiMeoWr6JuM6ybu4FTp6Rm4mN7cNcSGsDSQs="; + }; buildType = "catkin"; buildInputs = [ catkin qt-build ]; diff --git a/distros/melodic/qt-dotgraph/default.nix b/distros/melodic/qt-dotgraph/default.nix index dcc5eafccc..357d77e2ee 100644 --- a/distros/melodic/qt-dotgraph/default.nix +++ b/distros/melodic/qt-dotgraph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-dotgraph"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/melodic/qt_dotgraph/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "b79f1f8cc31a3161e9adeb92baa0f9dcef8c42688eb095352d846455bc96c55e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/melodic/qt_dotgraph/0.4.2-1"; + sha256 = "sha256-dkAg/cFhTaG/z2BBkDeDk117Si29jRwrPt/iA+F0h14="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/qt-gui-app/default.nix b/distros/melodic/qt-gui-app/default.nix index 7f15419009..268e78b076 100644 --- a/distros/melodic/qt-gui-app/default.nix +++ b/distros/melodic/qt-gui-app/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-gui-app"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/melodic/qt_gui_app/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "1a3688850927819c2149581859f6a053358d99f8ffe836da25013a45feacf093"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/melodic/qt_gui_app/0.4.2-1"; + sha256 = "sha256-LnJNTjtCbVpIhggFL/rUzrhonYEVKUjb1Qtr/DdcYAg="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/qt-gui-core/default.nix b/distros/melodic/qt-gui-core/default.nix index 9e618d2c11..ea5241ada0 100644 --- a/distros/melodic/qt-gui-core/default.nix +++ b/distros/melodic/qt-gui-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-gui-core"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/melodic/qt_gui_core/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "122f12c7245807826c39fc1e452a828b0d055f3712a629ed98077291b0383e98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/melodic/qt_gui_core/0.4.2-1"; + sha256 = "sha256-5JXWAdVUnDG1d465MxDmvGOTUf4rp1AHXft1FQGZ7ww="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/qt-gui-cpp/default.nix b/distros/melodic/qt-gui-cpp/default.nix index 8f8bd41c61..476fb28545 100644 --- a/distros/melodic/qt-gui-cpp/default.nix +++ b/distros/melodic/qt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-gui-cpp"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/melodic/qt_gui_cpp/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "83431ed54b1389a4071841ea4f95c30fa47ff31e9df50cf85e8a978b1fecbfcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/melodic/qt_gui_cpp/0.4.2-1"; + sha256 = "sha256-ubGKO0iQMzc67IEIOiIccxCAHTdk70EId1spz9ILyMQ="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules pkg-config python-qt-binding pythonPackages.setuptools qt5.qtbase ]; diff --git a/distros/melodic/qt-gui-py-common/default.nix b/distros/melodic/qt-gui-py-common/default.nix index 0e889dd3bf..08cffd49b6 100644 --- a/distros/melodic/qt-gui-py-common/default.nix +++ b/distros/melodic/qt-gui-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-gui-py-common"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/melodic/qt_gui_py_common/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "4fec98db01f50771f764be8e101246648724a6383feaaef5eb13b3b9bf91d253"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/melodic/qt_gui_py_common/0.4.2-1"; + sha256 = "sha256-JQ5AXh8nUZ047nuylxw7S/1b+QidmSxnj/sApb9OvNM="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/qt-gui/default.nix b/distros/melodic/qt-gui/default.nix index 323f0c869e..8440e8860b 100644 --- a/distros/melodic/qt-gui/default.nix +++ b/distros/melodic/qt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-gui"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/melodic/qt_gui/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "25f883aaa0621d629cabdd188d4f00845aa749127c104dbaf58b3b617f04fa70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/melodic/qt_gui/0.4.2-1"; + sha256 = "sha256-CRyxDJ4uVKMNBcNOtvz1V3hvGeo58xmfjOk7GyINgSU="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.pyqt5 pythonPackages.setuptools qt5.qtbase ]; diff --git a/distros/melodic/qt-paramedit/default.nix b/distros/melodic/qt-paramedit/default.nix index fc78d3037f..e8ea178a49 100644 --- a/distros/melodic/qt-paramedit/default.nix +++ b/distros/melodic/qt-paramedit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-paramedit"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/dornhege/rqt_paramedit-release/archive/release/melodic/qt_paramedit/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "5d12d8619f12fb8a6c4490bfdc556e0ba4d8a93458abf1f9950876288913164a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dornhege"; + repo = "rqt_paramedit-release"; + rev = "release/melodic/qt_paramedit/1.0.1-1"; + sha256 = "sha256-UuDP8EDx1pLkX0S+NWf3nL3v5JVF9Lx6j6VYQAtMoKI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/qt-qmake/default.nix b/distros/melodic/qt-qmake/default.nix index 27e9dae99f..4154e522b7 100644 --- a/distros/melodic/qt-qmake/default.nix +++ b/distros/melodic/qt-qmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-qmake"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/qt_metapackages-release/archive/release/melodic/qt_qmake/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "3127a54e42092a17e28881b430bda34704caec1e599a866fe37338ea3a1b5f14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "qt_metapackages-release"; + rev = "release/melodic/qt_qmake/1.0.1-0"; + sha256 = "sha256-uV4i6u4WR11jWKBZnNq8+wB6whv4OKaZFK0Hrqh7xCQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/qt-ros/default.nix b/distros/melodic/qt-ros/default.nix index 33c215ed3c..c46b89f76a 100644 --- a/distros/melodic/qt-ros/default.nix +++ b/distros/melodic/qt-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-ros"; version = "0.2.10-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/qt_ros-release/archive/release/melodic/qt_ros/0.2.10-1.tar.gz"; - name = "0.2.10-1.tar.gz"; - sha256 = "40bab49c3f46bf6a0e3f0585e58e195ade2251fc3d69ca4c231157cef5b9ee09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "qt_ros-release"; + rev = "release/melodic/qt_ros/0.2.10-1"; + sha256 = "sha256-dn9Zjm82vrgdPLE4+NVQKbjNWkbEjuW2y8ycBWp77Z4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/qt-tutorials/default.nix b/distros/melodic/qt-tutorials/default.nix index 7d17ec8dcb..edc43e4fe0 100644 --- a/distros/melodic/qt-tutorials/default.nix +++ b/distros/melodic/qt-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qt-tutorials"; version = "0.2.10-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/qt_ros-release/archive/release/melodic/qt_tutorials/0.2.10-1.tar.gz"; - name = "0.2.10-1.tar.gz"; - sha256 = "95d2b5fca0298fc52e2c506d08e83c4a43b055058e2a9166ec1606c4058238be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "qt_ros-release"; + rev = "release/melodic/qt_tutorials/0.2.10-1"; + sha256 = "sha256-sq6agqTgEWbREd5P4tN7bcNcLQ+kEVACMpgQdbr57Cs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/quanergy-client-ros/default.nix b/distros/melodic/quanergy-client-ros/default.nix index d4b815f40e..236ea1bcd2 100644 --- a/distros/melodic/quanergy-client-ros/default.nix +++ b/distros/melodic/quanergy-client-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-quanergy-client-ros"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/QuanergySystems/quanergy_client_ros-release/archive/release/melodic/quanergy_client_ros/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "e93e0ae57bbbc6819454155c86e139d73706ea44e0f1ef9af6cb39416fe8e9b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "QuanergySystems"; + repo = "quanergy_client_ros-release"; + rev = "release/melodic/quanergy_client_ros/4.0.1-1"; + sha256 = "sha256-PWFYfKcMTOwDw7g5rHruzrBcX5EFJEsNr5zD+x2IisU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/quanergy-client/default.nix b/distros/melodic/quanergy-client/default.nix index 185092cc2b..ee15f92ae9 100644 --- a/distros/melodic/quanergy-client/default.nix +++ b/distros/melodic/quanergy-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-quanergy-client"; version = "5.0.0-r2"; - src = fetchurl { - url = "https://github.com/QuanergySystems/quanergy_client-release/archive/release/melodic/quanergy_client/5.0.0-2.tar.gz"; - name = "5.0.0-2.tar.gz"; - sha256 = "f9374cfdbfd688147cc1135673f55a7935a746ef8376123c3be4133c353d5c5d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "QuanergySystems"; + repo = "quanergy_client-release"; + rev = "release/melodic/quanergy_client/5.0.0-2"; + sha256 = "sha256-AvobCVq5Du1Z7XFAEZNur9O/rxy6apcOoOCz1arYjcM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/quaternion-operation/default.nix b/distros/melodic/quaternion-operation/default.nix index b08feb1a35..61f2e79700 100644 --- a/distros/melodic/quaternion-operation/default.nix +++ b/distros/melodic/quaternion-operation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-quaternion-operation"; version = "0.0.3-r2"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/quaternion_operation-release/archive/release/melodic/quaternion_operation/0.0.3-2.tar.gz"; - name = "0.0.3-2.tar.gz"; - sha256 = "db2cc70403a27df5a67db21c742c28728723a67b4c8f0ab51384e99d6692b32f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "quaternion_operation-release"; + rev = "release/melodic/quaternion_operation/0.0.3-2"; + sha256 = "sha256-backXkAatEIWcXu7beYIjhyEfbhDC7j2QFBLvg+DQeQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/qwt-dependency/default.nix b/distros/melodic/qwt-dependency/default.nix index 51e186c8b6..156f0e0f87 100644 --- a/distros/melodic/qwt-dependency/default.nix +++ b/distros/melodic/qwt-dependency/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-qwt-dependency"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/qwt_dependency-release/archive/release/melodic/qwt_dependency/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "7d171d5a7bb5226de322e8146262b5ca73461ec9c71afc3675c5b353e90e42f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qwt_dependency-release"; + rev = "release/melodic/qwt_dependency/1.1.0-0"; + sha256 = "sha256-OzFpC/loWAcTp/b3j7ZyNR90mZIItFWQnuJGEAZWraw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/radar-msgs/default.nix b/distros/melodic/radar-msgs/default.nix index 226b70a19e..a1c2b7b329 100644 --- a/distros/melodic/radar-msgs/default.nix +++ b/distros/melodic/radar-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-radar-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/melodic/radar_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "c55597681355351a5e26d6398459265c6d477134c8eeb3f0d70ec22b175feac8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/melodic/radar_msgs/3.0.2-1"; + sha256 = "sha256-caz+CTBIOG7+GK6sEnw2iq3tSAfgRJ8BNIcdKjU57YQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/radar-omnipresense/default.nix b/distros/melodic/radar-omnipresense/default.nix index c64251c580..1feb0828e9 100644 --- a/distros/melodic/radar-omnipresense/default.nix +++ b/distros/melodic/radar-omnipresense/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-radar-omnipresense"; version = "0.3.0"; - src = fetchurl { - url = "https://github.com/SCU-RSL-ROS/radar_omnipresense-release/archive/release/melodic/radar_omnipresense/0.3.0-0.tar.gz"; - name = "0.3.0-0.tar.gz"; - sha256 = "f82a2ead3bd79d78a4b0e123824adb03e08ca62c227ed8359c866e7f7e6fc56d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SCU-RSL-ROS"; + repo = "radar_omnipresense-release"; + rev = "release/melodic/radar_omnipresense/0.3.0-0"; + sha256 = "sha256-+10LMY4hFNcCm4ZSWVxSpJbBHSEfoDyOf+J3FXmpfgo="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/radial-menu-backend/default.nix b/distros/melodic/radial-menu-backend/default.nix index b6198a3731..4612c3a93e 100644 --- a/distros/melodic/radial-menu-backend/default.nix +++ b/distros/melodic/radial-menu-backend/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-radial-menu-backend"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/radial_menu_ros-release/archive/release/melodic/radial_menu_backend/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "70a38ac71cefd6d8a944e095aa7f2ad495366d0dc24067d82428c61f89bed862"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "radial_menu_ros-release"; + rev = "release/melodic/radial_menu_backend/0.4.1-1"; + sha256 = "sha256-mVjCsCgs60aQih3Vb7AibbzVp2gEmqPMMIv02Azs0Bw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/radial-menu-example/default.nix b/distros/melodic/radial-menu-example/default.nix index 70291991d0..68eb786b0c 100644 --- a/distros/melodic/radial-menu-example/default.nix +++ b/distros/melodic/radial-menu-example/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-radial-menu-example"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/radial_menu_ros-release/archive/release/melodic/radial_menu_example/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "375fbdb750b80900178b98b0511deca80b1940a379cb110fcd48aff33e390f06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "radial_menu_ros-release"; + rev = "release/melodic/radial_menu_example/0.4.1-1"; + sha256 = "sha256-5fJFTDm8ybBonAm7XJlU7EZrrkqEpp6BHZFBf9pLXaQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/radial-menu-model/default.nix b/distros/melodic/radial-menu-model/default.nix index 7a1c16a690..179c7a5a61 100644 --- a/distros/melodic/radial-menu-model/default.nix +++ b/distros/melodic/radial-menu-model/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-radial-menu-model"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/radial_menu_ros-release/archive/release/melodic/radial_menu_model/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "7dc9b116058f1be47bec8b9c15beeb055e8ac3fb0e932844f6c968b4d13f1af0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "radial_menu_ros-release"; + rev = "release/melodic/radial_menu_model/0.4.1-1"; + sha256 = "sha256-GPEEKAWaPv38aqFbBLzcui6be8p9ZK8LmqowTA4JyHY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/radial-menu-msgs/default.nix b/distros/melodic/radial-menu-msgs/default.nix index 3a0d215746..60f0bd3307 100644 --- a/distros/melodic/radial-menu-msgs/default.nix +++ b/distros/melodic/radial-menu-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-radial-menu-msgs"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/radial_menu_ros-release/archive/release/melodic/radial_menu_msgs/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "b131109e301f64e71373f7109ac28a6c5be97c7c5d42bd0f17df2f96cc3996ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "radial_menu_ros-release"; + rev = "release/melodic/radial_menu_msgs/0.4.1-1"; + sha256 = "sha256-F9JWDtW1NX6N/XYbnkANFNnZAsveUVLKGpnNEEJuRok="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/radial-menu-rviz/default.nix b/distros/melodic/radial-menu-rviz/default.nix index 1fabf0c9ea..ef776091a0 100644 --- a/distros/melodic/radial-menu-rviz/default.nix +++ b/distros/melodic/radial-menu-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-radial-menu-rviz"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/radial_menu_ros-release/archive/release/melodic/radial_menu_rviz/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "175a893d0a2ff10d77b64d4dc598bbdc8488c382f33ae234fbb3cff07df54e0f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "radial_menu_ros-release"; + rev = "release/melodic/radial_menu_rviz/0.4.1-1"; + sha256 = "sha256-T7ObtnV4U4sId+8umaQWBsv+Y6rGbHfvMK4LemmIV4Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/radial-menu/default.nix b/distros/melodic/radial-menu/default.nix index c58d503ff6..524612dcef 100644 --- a/distros/melodic/radial-menu/default.nix +++ b/distros/melodic/radial-menu/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-radial-menu"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/radial_menu_ros-release/archive/release/melodic/radial_menu/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "4df8cfccfbe84a0dfd2158c4497254f5face7eee36ad1ca80a23322ea143432f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "radial_menu_ros-release"; + rev = "release/melodic/radial_menu/0.4.1-1"; + sha256 = "sha256-PVmA9ErC+EKSsbifjFtDQ4Q9yrz+jEOt83Rr43lgemw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rail-manipulation-msgs/default.nix b/distros/melodic/rail-manipulation-msgs/default.nix index 8c6c073918..0f3787e8cf 100644 --- a/distros/melodic/rail-manipulation-msgs/default.nix +++ b/distros/melodic/rail-manipulation-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rail-manipulation-msgs"; version = "0.0.14-r1"; - src = fetchurl { - url = "https://github.com/gt-rail-release/rail_manipulation_msgs-release/archive/release/melodic/rail_manipulation_msgs/0.0.14-1.tar.gz"; - name = "0.0.14-1.tar.gz"; - sha256 = "37dfdcee92e63c8bdb5f83315c2d96936813f40d158a3afbd68e35fceb6e2965"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gt-rail-release"; + repo = "rail_manipulation_msgs-release"; + rev = "release/melodic/rail_manipulation_msgs/0.0.14-1"; + sha256 = "sha256-0/2RbRMbmLw91NWYti/DDjH5BjYOM1TiqGZPEra31FY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rail-mesh-icp/default.nix b/distros/melodic/rail-mesh-icp/default.nix index c58342ccae..8ed856ae5d 100644 --- a/distros/melodic/rail-mesh-icp/default.nix +++ b/distros/melodic/rail-mesh-icp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rail-mesh-icp"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/gt-rail-release/rail_mesh_icp-release/archive/release/melodic/rail_mesh_icp/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "eecb7c4d0910a7e240f7fa4da616ca4fc3306cea4e0bd2485f417dca3e5ba9a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gt-rail-release"; + repo = "rail_mesh_icp-release"; + rev = "release/melodic/rail_mesh_icp/0.0.4-1"; + sha256 = "sha256-DlHOGtNxwFmOypGlx+MaJiEHg3FzMXvRF1SxrUnKNvg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rail-segmentation/default.nix b/distros/melodic/rail-segmentation/default.nix index adaea5cd4b..89b0e674a8 100644 --- a/distros/melodic/rail-segmentation/default.nix +++ b/distros/melodic/rail-segmentation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rail-segmentation"; version = "0.1.15-r1"; - src = fetchurl { - url = "https://github.com/gt-rail-release/rail_segmentation/archive/release/melodic/rail_segmentation/0.1.15-1.tar.gz"; - name = "0.1.15-1.tar.gz"; - sha256 = "90dbf547d486e651a658a8c6819f15b03c6a0d48cf217a559bd772689a768ed6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gt-rail-release"; + repo = "rail_segmentation"; + rev = "release/melodic/rail_segmentation/0.1.15-1"; + sha256 = "sha256-lMh+bogc6kaORTZ6K9WGeJKwfPI/kwfXuU8f4u+IrE0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pkg-config ]; diff --git a/distros/melodic/random-numbers/default.nix b/distros/melodic/random-numbers/default.nix index 488c513fe2..c61528e304 100644 --- a/distros/melodic/random-numbers/default.nix +++ b/distros/melodic/random-numbers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-random-numbers"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/random_numbers-release/archive/release/melodic/random_numbers/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "989cf481e8bd4c7b44278d73a549554fd874479c1f28e8d26f77fa905a43e409"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "random_numbers-release"; + rev = "release/melodic/random_numbers/0.3.2-0"; + sha256 = "sha256-Ahi8HGqZdCpFcqJ7cKYqmlBf0xTZ1tyUfXC38Nq715A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/range-sensor-layer/default.nix b/distros/melodic/range-sensor-layer/default.nix index 2081fe164c..e8e8d617da 100644 --- a/distros/melodic/range-sensor-layer/default.nix +++ b/distros/melodic/range-sensor-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-range-sensor-layer"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/wu-robotics/navigation_layers_release/archive/release/melodic/range_sensor_layer/0.5.0-0.tar.gz"; - name = "0.5.0-0.tar.gz"; - sha256 = "8e94872327b9579a9ca65c6aefe659bfffb7544a61ddca67580e8707af85d2e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "navigation_layers_release"; + rev = "release/melodic/range_sensor_layer/0.5.0-0"; + sha256 = "sha256-8SiulEXW0dKWiBN9w64+zEtibfr1LHau3juuhKAx3nw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/raw-description/default.nix b/distros/melodic/raw-description/default.nix index 3f74901e6f..869c4533b4 100644 --- a/distros/melodic/raw-description/default.nix +++ b/distros/melodic/raw-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-raw-description"; version = "0.7.4-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/melodic/raw_description/0.7.4-1.tar.gz"; - name = "0.7.4-1.tar.gz"; - sha256 = "9970063dc5f8426e1cde0beed70f8534fcd1c7702b85dbdd2e88b72ad795a9df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/melodic/raw_description/0.7.4-1"; + sha256 = "sha256-BqKfRlD3vqCAdWVEcPFkuRd7AvCK8PM0RWfvCiWofxA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/razor-imu-9dof/default.nix b/distros/melodic/razor-imu-9dof/default.nix index 06657eab30..c017f3783c 100644 --- a/distros/melodic/razor-imu-9dof/default.nix +++ b/distros/melodic/razor-imu-9dof/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-razor-imu-9dof"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ENSTABretagneRobotics/razor_imu_9dof-release/archive/release/melodic/razor_imu_9dof/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "7b9cf9527dede1fa4eecc2da794eee2ce4acfdff994b5f3416b7870e6751a224"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ENSTABretagneRobotics"; + repo = "razor_imu_9dof-release"; + rev = "release/melodic/razor_imu_9dof/1.3.0-2"; + sha256 = "sha256-Rw43NOBQa8g1j28eWJtP1kpR8oEEMBxehjwTafyOkTg="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rc-cloud-accumulator/default.nix b/distros/melodic/rc-cloud-accumulator/default.nix index e912b770e6..70dd0ac73a 100644 --- a/distros/melodic/rc-cloud-accumulator/default.nix +++ b/distros/melodic/rc-cloud-accumulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-cloud-accumulator"; version = "1.0.4"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_cloud_accumulator-release/archive/release/melodic/rc_cloud_accumulator/1.0.4-0.tar.gz"; - name = "1.0.4-0.tar.gz"; - sha256 = "6356622f9801312add690a710948202c253adab5a5540ae0875e9bca83c8ee40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_cloud_accumulator-release"; + rev = "release/melodic/rc_cloud_accumulator/1.0.4-0"; + sha256 = "sha256-N/riIF4CM0RjExxTEMJOgB1Ds0YYHTsat1kdQQnz0hI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rc-common-msgs/default.nix b/distros/melodic/rc-common-msgs/default.nix index a2028402f0..82395876e6 100644 --- a/distros/melodic/rc-common-msgs/default.nix +++ b/distros/melodic/rc-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-common-msgs"; version = "0.5.3-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_common_msgs-release/archive/release/melodic/rc_common_msgs/0.5.3-1.tar.gz"; - name = "0.5.3-1.tar.gz"; - sha256 = "c8469fe24f36076591174b2e99a4a7a00077caa57c067d534c50295a243ee475"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_common_msgs-release"; + rev = "release/melodic/rc_common_msgs/0.5.3-1"; + sha256 = "sha256-G47WPj4ioKwiG3LBDBwvrWSQ3ESzCoOfIl70QuepuBs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rc-dynamics-api/default.nix b/distros/melodic/rc-dynamics-api/default.nix index 9256821eef..2aae0bede8 100644 --- a/distros/melodic/rc-dynamics-api/default.nix +++ b/distros/melodic/rc-dynamics-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-dynamics-api"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_dynamics_api-release/archive/release/melodic/rc_dynamics_api/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "251805e98f63e6b31fcb8d7a56dbf855c366c52026cee71888d6181b1bfdfc34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_dynamics_api-release"; + rev = "release/melodic/rc_dynamics_api/0.10.0-1"; + sha256 = "sha256-eK2OxT5XpS509Sbn1Yi7rfJnZmf0ShEgmcguVQFcF3Q="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/rc-genicam-api/default.nix b/distros/melodic/rc-genicam-api/default.nix index 9a53656b15..d656706f47 100644 --- a/distros/melodic/rc-genicam-api/default.nix +++ b/distros/melodic/rc-genicam-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-genicam-api"; version = "2.5.12-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_genicam_api-release/archive/release/melodic/rc_genicam_api/2.5.12-1.tar.gz"; - name = "2.5.12-1.tar.gz"; - sha256 = "8c9d0a6bf77ddb0dc4f00a375d8aab35d4c60d0cb43fb4a12c71c320e80a0953"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_genicam_api-release"; + rev = "release/melodic/rc_genicam_api/2.5.12-1"; + sha256 = "sha256-YkKXiMMUXT+aUMsQJFQ3PcRm8kWdFZTFd4NM5JLRheA="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/rc-genicam-camera/default.nix b/distros/melodic/rc-genicam-camera/default.nix index 085a49e2d2..af45217888 100644 --- a/distros/melodic/rc-genicam-camera/default.nix +++ b/distros/melodic/rc-genicam-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-genicam-camera"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_genicam_camera-release/archive/release/melodic/rc_genicam_camera/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "9918f3dfd9322a017ac49220611b830db09e7a7d1f1b0f5c0de23feb56fe25bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_genicam_camera-release"; + rev = "release/melodic/rc_genicam_camera/1.3.0-1"; + sha256 = "sha256-SvadPZn8p/Ps2Akqw6I1dVQ4eBQu4+3gm/07jpDGriw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rc-genicam-driver/default.nix b/distros/melodic/rc-genicam-driver/default.nix index dc8f438234..75b904232d 100644 --- a/distros/melodic/rc-genicam-driver/default.nix +++ b/distros/melodic/rc-genicam-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-genicam-driver"; version = "0.6.3-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_genicam_driver_ros-release/archive/release/melodic/rc_genicam_driver/0.6.3-1.tar.gz"; - name = "0.6.3-1.tar.gz"; - sha256 = "4d65f8a833a5ca220b564c5c663951e571bc7f969f3d27ead05be5d49982d747"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_genicam_driver_ros-release"; + rev = "release/melodic/rc_genicam_driver/0.6.3-1"; + sha256 = "sha256-+juoW7DS6unNyDU13+ZMIxiHdrBy1aUAJ78xL1PmDzs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rc-hand-eye-calibration-client/default.nix b/distros/melodic/rc-hand-eye-calibration-client/default.nix index f8d7191980..cf52a96379 100644 --- a/distros/melodic/rc-hand-eye-calibration-client/default.nix +++ b/distros/melodic/rc-hand-eye-calibration-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-hand-eye-calibration-client"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/melodic/rc_hand_eye_calibration_client/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "fb232ac60c53b009cb08673770bdae7341e0fc13d47278f2e8a32ab0edf7f835"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/melodic/rc_hand_eye_calibration_client/3.3.2-1"; + sha256 = "sha256-I+dC+lnTUq9qNVaKFlLKb0nWmRdo9sGmI9Ysy1EkVSw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rc-pick-client/default.nix b/distros/melodic/rc-pick-client/default.nix index ac60fa1e75..88a975e54d 100644 --- a/distros/melodic/rc-pick-client/default.nix +++ b/distros/melodic/rc-pick-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-pick-client"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/melodic/rc_pick_client/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "be84042c33ef8cc42deccd464eaa87ed3afdb4eef6800f0d69a5df81d97d8e59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/melodic/rc_pick_client/3.3.2-1"; + sha256 = "sha256-vbcKyiWWms+VGMRQW7iPacZKxZPEHAGU0r4CmkY8bdE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rc-reason-clients/default.nix b/distros/melodic/rc-reason-clients/default.nix index 3d1bc46952..101a8afdb8 100644 --- a/distros/melodic/rc-reason-clients/default.nix +++ b/distros/melodic/rc-reason-clients/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-reason-clients"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_reason_clients_ros-release/archive/release/melodic/rc_reason_clients/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "5680aca20acb26716ada6a8fb89a11b099535eab0eea9976e07cb35e2379feb9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_reason_clients_ros-release"; + rev = "release/melodic/rc_reason_clients/0.3.0-1"; + sha256 = "sha256-Xi3fJ4LQil6Zd0rsZ1cuocX4lrcmUJkhaShsNL+zYII="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rc-reason-msgs/default.nix b/distros/melodic/rc-reason-msgs/default.nix index 237d9afaa9..7eb4e19ccf 100644 --- a/distros/melodic/rc-reason-msgs/default.nix +++ b/distros/melodic/rc-reason-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-reason-msgs"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_reason_clients_ros-release/archive/release/melodic/rc_reason_msgs/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "ed41aa1d94c1f1f73d7b36a780e835adebd9fb42dbcce24e1be957b952f6e684"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_reason_clients_ros-release"; + rev = "release/melodic/rc_reason_msgs/0.3.0-1"; + sha256 = "sha256-uu+5yzSLHPPvfrzC9MLUH+Q1eZcKO3nlc2ceSHXlDSU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rc-silhouettematch-client/default.nix b/distros/melodic/rc-silhouettematch-client/default.nix index 51eef1b369..7505cfa25b 100644 --- a/distros/melodic/rc-silhouettematch-client/default.nix +++ b/distros/melodic/rc-silhouettematch-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-silhouettematch-client"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/melodic/rc_silhouettematch_client/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "4f31e5a42f44da9901d820e17448ee41e39d607b16b5492753f3f2b6811c66d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/melodic/rc_silhouettematch_client/3.3.2-1"; + sha256 = "sha256-qbXXttEhKp/my4mMmsa5YNssUJoNHOJOqWgMY3oD4FM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rc-tagdetect-client/default.nix b/distros/melodic/rc-tagdetect-client/default.nix index a7512fa759..cab43b20ab 100644 --- a/distros/melodic/rc-tagdetect-client/default.nix +++ b/distros/melodic/rc-tagdetect-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-tagdetect-client"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/melodic/rc_tagdetect_client/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "c90144b107c0f214cbe64bf2ed19ffe396933dfb57687f1e93fd087d1c85afda"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/melodic/rc_tagdetect_client/3.3.2-1"; + sha256 = "sha256-2ate1pj6VFEnEXle4235BJND9YYoYs5NtWWxyHB1OVE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rc-visard-description/default.nix b/distros/melodic/rc-visard-description/default.nix index bd8f16b80f..fdcd812e6d 100644 --- a/distros/melodic/rc-visard-description/default.nix +++ b/distros/melodic/rc-visard-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-visard-description"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/melodic/rc_visard_description/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "7fbdf5d64f7f81ce9291cb869a6777032fa5b615bca5cb0617b8f5db9e51b27e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/melodic/rc_visard_description/3.3.2-1"; + sha256 = "sha256-4uDuVtTv4G6Xg3AHZna9JecmNMQrIBrLACOOdR0OoRs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rc-visard-driver/default.nix b/distros/melodic/rc-visard-driver/default.nix index 6213fe77db..71797ce25b 100644 --- a/distros/melodic/rc-visard-driver/default.nix +++ b/distros/melodic/rc-visard-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-visard-driver"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/melodic/rc_visard_driver/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "7cd237104d69a96c1cfd0a248d08639b23822a93755c7a73e1078734c7674b17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/melodic/rc_visard_driver/3.3.2-1"; + sha256 = "sha256-13pcUqqSU2rWlZCP2QywUfY/o/hHrG0WGrvmOWCFr9I="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rc-visard/default.nix b/distros/melodic/rc-visard/default.nix index cc8ab0f357..3dfaf4a981 100644 --- a/distros/melodic/rc-visard/default.nix +++ b/distros/melodic/rc-visard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rc-visard"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/melodic/rc_visard/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "d01ef11e5b53a04e2dddd4876abe79b9255319a552259a372fad5d1a8aa1a36d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/melodic/rc_visard/3.3.2-1"; + sha256 = "sha256-pdB0aLJNp8TdeE1xR+khVTKl0t3Kdksnt67FPbMHxHM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rcdiscover/default.nix b/distros/melodic/rcdiscover/default.nix index d0213d25da..bc39640758 100644 --- a/distros/melodic/rcdiscover/default.nix +++ b/distros/melodic/rcdiscover/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rcdiscover"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rcdiscover-release/archive/release/melodic/rcdiscover/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "ea2fa0724a29e95475715069e2e149ed146fa7f9c6b60b15ed8a578c89ba7ee8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rcdiscover-release"; + rev = "release/melodic/rcdiscover/1.1.4-1"; + sha256 = "sha256-IzHfwuLyT18CS/9Qj/yMlO3ghLUflM1FesXkbpqXruE="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/realsense2-camera/default.nix b/distros/melodic/realsense2-camera/default.nix index 0c9a025ad1..c9e5df20a5 100644 --- a/distros/melodic/realsense2-camera/default.nix +++ b/distros/melodic/realsense2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-realsense2-camera"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/melodic/realsense2_camera/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "481e740a9e28f8241e1ed5009090839286e3a0e50589414c5f4b6ecac6f07d12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/melodic/realsense2_camera/2.3.2-1"; + sha256 = "sha256-My96v7R1TsuqQAkUC7ZyVCcfGG1OmhuJGnHJESXvwqY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/realsense2-description/default.nix b/distros/melodic/realsense2-description/default.nix index dfd38a4b05..26f8061332 100644 --- a/distros/melodic/realsense2-description/default.nix +++ b/distros/melodic/realsense2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-realsense2-description"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/melodic/realsense2_description/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "a759b19b2843ec5eba48734b1f30c1be35691d41f040f6622d33ef62adea20b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/melodic/realsense2_description/2.3.2-1"; + sha256 = "sha256-XMrc90iRdG8V56ZFQS8RDqPLXBLjAR33LQXCxkuQo6Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/realtime-tools/default.nix b/distros/melodic/realtime-tools/default.nix index e506912a22..337d06002b 100644 --- a/distros/melodic/realtime-tools/default.nix +++ b/distros/melodic/realtime-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-realtime-tools"; version = "1.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/realtime_tools-release/archive/release/melodic/realtime_tools/1.15.1-1.tar.gz"; - name = "1.15.1-1.tar.gz"; - sha256 = "acf2cb7827b85a846c7fb3f01879260c2eae38576856e0059ce983521eda99d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "realtime_tools-release"; + rev = "release/melodic/realtime_tools/1.15.1-1"; + sha256 = "sha256-GtLhDRuH2C0t/aYseBkrs/M2RjklknwAfV78M8y40YM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/recorder-msgs/default.nix b/distros/melodic/recorder-msgs/default.nix index 2a0b3d9a33..281b33bc36 100644 --- a/distros/melodic/recorder-msgs/default.nix +++ b/distros/melodic/recorder-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-recorder-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/rosbag_uploader-release/archive/release/melodic/recorder_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "f5a741c359bf9420a8bdb479bc65c235a72e3af4f510eb8a8f3716f832019246"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "rosbag_uploader-release"; + rev = "release/melodic/recorder_msgs/1.0.1-1"; + sha256 = "sha256-5e75LWx06gTpJ329aFVG+JYTTm2UMIu35uVfslahwz0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation std-msgs ]; diff --git a/distros/melodic/remote-rosbag-record/default.nix b/distros/melodic/remote-rosbag-record/default.nix index 1a8f4deb77..ec2bdcfb55 100644 --- a/distros/melodic/remote-rosbag-record/default.nix +++ b/distros/melodic/remote-rosbag-record/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-remote-rosbag-record"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/remote_rosbag_record-release/archive/release/melodic/remote_rosbag_record/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "a94f1d10d7a46c46afb268a1c2de5eb8c0d0bf15abe6f72678c959da87ef3447"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "remote_rosbag_record-release"; + rev = "release/melodic/remote_rosbag_record/0.0.4-1"; + sha256 = "sha256-jBhblCeYMHjojhhvwM3zrV8yCnMBhHHMsD6MCqx7sOU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/resized-image-transport/default.nix b/distros/melodic/resized-image-transport/default.nix index 662f5b114a..195be52aec 100644 --- a/distros/melodic/resized-image-transport/default.nix +++ b/distros/melodic/resized-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-resized-image-transport"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/melodic/resized_image_transport/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "9d309c167c2b324d9603b0212fc3f4d0923f2c670d02f9ab3695a6721f4731d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/melodic/resized_image_transport/1.2.15-1"; + sha256 = "sha256-RJV5zmMTKiygVxeQObnXK4bn4Iu2PoRrCwu58yVo9GE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/resource-retriever/default.nix b/distros/melodic/resource-retriever/default.nix index 31ca8d4bc2..dcc4834dd7 100644 --- a/distros/melodic/resource-retriever/default.nix +++ b/distros/melodic/resource-retriever/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-resource-retriever"; version = "1.12.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/resource_retriever-release/archive/release/melodic/resource_retriever/1.12.7-1.tar.gz"; - name = "1.12.7-1.tar.gz"; - sha256 = "ec0e86be440fb9dc95054a7d1257b19be7753b60fa1165de8988c6804ad5e255"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "resource_retriever-release"; + rev = "release/melodic/resource_retriever/1.12.7-1"; + sha256 = "sha256-3lgELVCPlXE3y8t2/h247oO8rwiqJ+AR3HG0gHgpNN8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rexrov2-control/default.nix b/distros/melodic/rexrov2-control/default.nix index 0fe6b10006..39fb4dbc15 100644 --- a/distros/melodic/rexrov2-control/default.nix +++ b/distros/melodic/rexrov2-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rexrov2-control"; version = "0.1.3"; - src = fetchurl { - url = "https://github.com/uuvsimulator/rexrov2-release/archive/release/melodic/rexrov2_control/0.1.3-0.tar.gz"; - name = "0.1.3-0.tar.gz"; - sha256 = "9a67201f385a31d026e498160846d97db310a798104f41aa97173e6827211ae6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "rexrov2-release"; + rev = "release/melodic/rexrov2_control/0.1.3-0"; + sha256 = "sha256-Dfz5UO60mxqUjCya0WB9SC0mtX3Gw9nXTt+tzxCa2aE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rexrov2-description/default.nix b/distros/melodic/rexrov2-description/default.nix index 059ea4c6b2..e3c10c10da 100644 --- a/distros/melodic/rexrov2-description/default.nix +++ b/distros/melodic/rexrov2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rexrov2-description"; version = "0.1.3"; - src = fetchurl { - url = "https://github.com/uuvsimulator/rexrov2-release/archive/release/melodic/rexrov2_description/0.1.3-0.tar.gz"; - name = "0.1.3-0.tar.gz"; - sha256 = "a4da8b1fd519c66c4156c38ff1107731858cf630ef0194fd3fe2e5950a450940"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "rexrov2-release"; + rev = "release/melodic/rexrov2_description/0.1.3-0"; + sha256 = "sha256-X7IeRgHunwNWb2Izya25P2RfWd2ZA14NrWJvgw40vPo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rexrov2-gazebo/default.nix b/distros/melodic/rexrov2-gazebo/default.nix index ed75c30afb..5c1c899583 100644 --- a/distros/melodic/rexrov2-gazebo/default.nix +++ b/distros/melodic/rexrov2-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rexrov2-gazebo"; version = "0.1.3"; - src = fetchurl { - url = "https://github.com/uuvsimulator/rexrov2-release/archive/release/melodic/rexrov2_gazebo/0.1.3-0.tar.gz"; - name = "0.1.3-0.tar.gz"; - sha256 = "ae244517e996486264c129ef22354f23c9e84f3e32be10a5fd7fa193bd0b15d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "rexrov2-release"; + rev = "release/melodic/rexrov2_gazebo/0.1.3-0"; + sha256 = "sha256-LL3g2owe7Qw8QCwneZAGf73vgu5JO/KynBWRbmRBOs0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rgbd-launch/default.nix b/distros/melodic/rgbd-launch/default.nix index 110533745c..7d85753052 100644 --- a/distros/melodic/rgbd-launch/default.nix +++ b/distros/melodic/rgbd-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rgbd-launch"; version = "2.2.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/rgbd_launch-release/archive/release/melodic/rgbd_launch/2.2.2-0.tar.gz"; - name = "2.2.2-0.tar.gz"; - sha256 = "973d8f054d8b7447e8951b5dc8dc65d860a3ce48431789fee0f582d8d56d7f68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rgbd_launch-release"; + rev = "release/melodic/rgbd_launch/2.2.2-0"; + sha256 = "sha256-bqV2wiSh8gxQysp0d7u40EWt+ei/8YOqZwF1w2evFwE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ridgeback-cartographer-navigation/default.nix b/distros/melodic/ridgeback-cartographer-navigation/default.nix index 5c2482c446..5c98153ece 100644 --- a/distros/melodic/ridgeback-cartographer-navigation/default.nix +++ b/distros/melodic/ridgeback-cartographer-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-cartographer-navigation"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_cartographer_navigation-release/archive/release/melodic/ridgeback_cartographer_navigation/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "a5776efee86c57980a6469149c1ab30079b9fbc36e90cbcf7b0e9b4476d0ad10"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_cartographer_navigation-release"; + rev = "release/melodic/ridgeback_cartographer_navigation/0.0.1-1"; + sha256 = "sha256-KlVSyAKMKfIa6zfmTtwgXava2Vgl54QPAz+KLdLAgqM="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/ridgeback-control/default.nix b/distros/melodic/ridgeback-control/default.nix index 6b18ff7c1a..3d1ee323a2 100644 --- a/distros/melodic/ridgeback-control/default.nix +++ b/distros/melodic/ridgeback-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-control"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback-release/archive/release/melodic/ridgeback_control/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "cf97c8e257c9bf8b9a6bf864c5fa95a74a8d6806ddecdd4d729a0e3756258839"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback-release"; + rev = "release/melodic/ridgeback_control/0.3.2-1"; + sha256 = "sha256-ttPoxAvIEjMzVzXH07iiQ0NPgfkVvVCa62E1EBUS3Ww="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ridgeback-description/default.nix b/distros/melodic/ridgeback-description/default.nix index 247d47c654..4b9729ed76 100644 --- a/distros/melodic/ridgeback-description/default.nix +++ b/distros/melodic/ridgeback-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-description"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback-release/archive/release/melodic/ridgeback_description/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "1c00ca0f22cf8185c034c172bff114c9380a54253663a56b4c3908c1410274bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback-release"; + rev = "release/melodic/ridgeback_description/0.3.2-1"; + sha256 = "sha256-08fNaVb8ChCA0Nt02RPiV1HC9r6URu0jlhbSr1GJIlE="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/ridgeback-desktop/default.nix b/distros/melodic/ridgeback-desktop/default.nix index eb6ac91667..1a37f9c324 100644 --- a/distros/melodic/ridgeback-desktop/default.nix +++ b/distros/melodic/ridgeback-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-desktop"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_desktop-release/archive/release/melodic/ridgeback_desktop/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "373a75ac21b797cac2276f52e99c391d9da32553373cf4f407ab8fc4bfc940fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_desktop-release"; + rev = "release/melodic/ridgeback_desktop/0.1.3-1"; + sha256 = "sha256-wkTNhcyAIfUpjEwb8rKH0moWumGb9difvre3pv+kfqU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ridgeback-gazebo-plugins/default.nix b/distros/melodic/ridgeback-gazebo-plugins/default.nix index f009fc7e4d..92c6a31cd9 100644 --- a/distros/melodic/ridgeback-gazebo-plugins/default.nix +++ b/distros/melodic/ridgeback-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-gazebo-plugins"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_simulator-release/archive/release/melodic/ridgeback_gazebo_plugins/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "bf4b3d2bcb95826a3070b8483a2eca8402086da9b69401cfc5dccf11866ad75a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_simulator-release"; + rev = "release/melodic/ridgeback_gazebo_plugins/0.1.1-1"; + sha256 = "sha256-8+B/k0GLnKlkCYtQZQTCZcGtukY83l2MagxdYwPvht8="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo_9 std-srvs ]; diff --git a/distros/melodic/ridgeback-gazebo/default.nix b/distros/melodic/ridgeback-gazebo/default.nix index 0c4474a034..ca125ae5d3 100644 --- a/distros/melodic/ridgeback-gazebo/default.nix +++ b/distros/melodic/ridgeback-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-gazebo"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_simulator-release/archive/release/melodic/ridgeback_gazebo/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "cf6027f7ce85fff3e7b09d773138d47f26010b4b0b832a37a10a93d157b8abdc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_simulator-release"; + rev = "release/melodic/ridgeback_gazebo/0.1.1-1"; + sha256 = "sha256-QBI3RKi+VCqhQ1+wszGLXeRwpY1xH/+ZdKtcO1xqklY="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/ridgeback-msgs/default.nix b/distros/melodic/ridgeback-msgs/default.nix index 125874b760..1e952958b1 100644 --- a/distros/melodic/ridgeback-msgs/default.nix +++ b/distros/melodic/ridgeback-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-msgs"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback-release/archive/release/melodic/ridgeback_msgs/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "88ea366355a09e1704a4ee00f5fd8dbf6150209651e5ee960d066f114a8c7f9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback-release"; + rev = "release/melodic/ridgeback_msgs/0.3.2-1"; + sha256 = "sha256-9AdMPbHoE4N6jtsXL8GjsODsMhPZ0jg4J2MA95KotOk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ridgeback-navigation/default.nix b/distros/melodic/ridgeback-navigation/default.nix index 747830a013..7ca099f513 100644 --- a/distros/melodic/ridgeback-navigation/default.nix +++ b/distros/melodic/ridgeback-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-navigation"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback-release/archive/release/melodic/ridgeback_navigation/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "638bc9dc6920e842218860fdb839489729c727d1bafc7f5b1c73b55713fe525c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback-release"; + rev = "release/melodic/ridgeback_navigation/0.3.2-1"; + sha256 = "sha256-HPEAtJhVxV4qmSiOQAAsD/JbwE/TK9UhUEvvnFfgw0E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ridgeback-simulator/default.nix b/distros/melodic/ridgeback-simulator/default.nix index 640fd59b69..657393f0cb 100644 --- a/distros/melodic/ridgeback-simulator/default.nix +++ b/distros/melodic/ridgeback-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-simulator"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_simulator-release/archive/release/melodic/ridgeback_simulator/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "243d1e99e7d210045a1673304ab5b250996854a3b1437ffc41def7ad5526463f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_simulator-release"; + rev = "release/melodic/ridgeback_simulator/0.1.1-1"; + sha256 = "sha256-Ljvvf3tFBaZks4686NSWZEe2NI3f5d5CgH3hHr8XWLA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ridgeback-viz/default.nix b/distros/melodic/ridgeback-viz/default.nix index 0df50a5bde..195279e205 100644 --- a/distros/melodic/ridgeback-viz/default.nix +++ b/distros/melodic/ridgeback-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ridgeback-viz"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_desktop-release/archive/release/melodic/ridgeback_viz/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "475858d5eeeb3bfd11319044e2768307aba08fcb411925b754b89831dd3710db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_desktop-release"; + rev = "release/melodic/ridgeback_viz/0.1.3-1"; + sha256 = "sha256-AvOgkIebvPzXU78zKHIewcdgm3AAee2vpGI86zL6RV8="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/robomaker-simulation-msgs/default.nix b/distros/melodic/robomaker-simulation-msgs/default.nix index 78df1ae564..1f609a4f53 100644 --- a/distros/melodic/robomaker-simulation-msgs/default.nix +++ b/distros/melodic/robomaker-simulation-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robomaker-simulation-msgs"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/aws-gbp/aws_robomaker_simulation_ros_pkgs-release/archive/release/melodic/robomaker_simulation_msgs/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "51c3f5d70c599369c912d428ae4a12cfbc97930e27714f041c58fb0c47449233"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "aws_robomaker_simulation_ros_pkgs-release"; + rev = "release/melodic/robomaker_simulation_msgs/1.1.1-2"; + sha256 = "sha256-o2IfM6mCs02fJrJyGZ4IUIxkb/JcLHgnCviwI6pP3zg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/robosense-description/default.nix b/distros/melodic/robosense-description/default.nix index a5b897dee5..947a788209 100644 --- a/distros/melodic/robosense-description/default.nix +++ b/distros/melodic/robosense-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robosense-description"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/tomlogan501/robosense_simulator_release/archive/release/melodic/robosense_description/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "711a171a2514b9963b1d059222720ba135ee23f6a1f54cf010625922aac6eebe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tomlogan501"; + repo = "robosense_simulator_release"; + rev = "release/melodic/robosense_description/1.0.0-1"; + sha256 = "sha256-HxOJvGb0dlWiJyhJ01ucwnENknD2m7ngLwbohilmFW8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robosense-gazebo-plugins/default.nix b/distros/melodic/robosense-gazebo-plugins/default.nix index e950a451c6..8e9ad04557 100644 --- a/distros/melodic/robosense-gazebo-plugins/default.nix +++ b/distros/melodic/robosense-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robosense-gazebo-plugins"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/tomlogan501/robosense_simulator_release/archive/release/melodic/robosense_gazebo_plugins/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "2f3b09cdb5ec908834e24c2275e594c57373ee10482f8dbf2ba3f13177da0900"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tomlogan501"; + repo = "robosense_simulator_release"; + rev = "release/melodic/robosense_gazebo_plugins/1.0.0-1"; + sha256 = "sha256-txECBSl4BgtXZTb7hHQC6eCa/VbArXVhgimv6quXVPs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robosense-simulator/default.nix b/distros/melodic/robosense-simulator/default.nix index 1ee96d2035..de46a70641 100644 --- a/distros/melodic/robosense-simulator/default.nix +++ b/distros/melodic/robosense-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robosense-simulator"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/tomlogan501/robosense_simulator_release/archive/release/melodic/robosense_simulator/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "c95c9480f493d51240fb78b6993fc5e36344da3768d3c13bf6ded4b438378b0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tomlogan501"; + repo = "robosense_simulator_release"; + rev = "release/melodic/robosense_simulator/1.0.0-1"; + sha256 = "sha256-dq4zElzwHpOrx4PqJCSySdIaZ/xkP0Eekm6OvuAa0nw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-activity-msgs/default.nix b/distros/melodic/robot-activity-msgs/default.nix index b49d614566..7b412f0195 100644 --- a/distros/melodic/robot-activity-msgs/default.nix +++ b/distros/melodic/robot-activity-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-activity-msgs"; version = "0.1.1"; - src = fetchurl { - url = "https://github.com/snt-robotics/robot_activity-release/archive/release/melodic/robot_activity_msgs/0.1.1-0.tar.gz"; - name = "0.1.1-0.tar.gz"; - sha256 = "c7047f132a865f58489413a1bb4e9c08ffe2014f3d404b4874f399eefeb9872e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "snt-robotics"; + repo = "robot_activity-release"; + rev = "release/melodic/robot_activity_msgs/0.1.1-0"; + sha256 = "sha256-sBgY9FBXZ6gUi/VqwgLf5unTPcJ10Uq7UPUXa8Mc3iE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-activity-tutorials/default.nix b/distros/melodic/robot-activity-tutorials/default.nix index 995ff10be3..7506687873 100644 --- a/distros/melodic/robot-activity-tutorials/default.nix +++ b/distros/melodic/robot-activity-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-activity-tutorials"; version = "0.1.1"; - src = fetchurl { - url = "https://github.com/snt-robotics/robot_activity-release/archive/release/melodic/robot_activity_tutorials/0.1.1-0.tar.gz"; - name = "0.1.1-0.tar.gz"; - sha256 = "8d4cb4eb59c9bbcb053aef3cd75652525a4f7276d424cc3600a4d0e443807fd2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "snt-robotics"; + repo = "robot_activity-release"; + rev = "release/melodic/robot_activity_tutorials/0.1.1-0"; + sha256 = "sha256-FU/jGiL87m78t1STkbHHwErph1ndPpV1EdJS3XfbQEQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/robot-activity/default.nix b/distros/melodic/robot-activity/default.nix index c6a3385c37..d20da17627 100644 --- a/distros/melodic/robot-activity/default.nix +++ b/distros/melodic/robot-activity/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-activity"; version = "0.1.1"; - src = fetchurl { - url = "https://github.com/snt-robotics/robot_activity-release/archive/release/melodic/robot_activity/0.1.1-0.tar.gz"; - name = "0.1.1-0.tar.gz"; - sha256 = "9aea7f4b03a74445c52faddfcd58ea086b7ad8af058a6a3749e9b992849a5361"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "snt-robotics"; + repo = "robot_activity-release"; + rev = "release/melodic/robot_activity/0.1.1-0"; + sha256 = "sha256-6bBmJGz/ExLYYjrjRFs/mNin+WR4zrxkZvM3iUBQxlc="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/robot-body-filter/default.nix b/distros/melodic/robot-body-filter/default.nix index 169fa0977e..0d86c1ac95 100644 --- a/distros/melodic/robot-body-filter/default.nix +++ b/distros/melodic/robot-body-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-body-filter"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/peci1/robot_body_filter-release/archive/release/melodic/robot_body_filter/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "8522c45afb9acfc59b1f6a247d3d458dba2a2ff1fd6d0bcf70c48868abd33915"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "robot_body_filter-release"; + rev = "release/melodic/robot_body_filter/1.2.2-1"; + sha256 = "sha256-FOKTaqcAj+/wnxtKFX6UbIEfvQRFz+2iIVBTJBml7m4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pkg-config tf2-eigen tf2-sensor-msgs ]; diff --git a/distros/melodic/robot-calibration-msgs/default.nix b/distros/melodic/robot-calibration-msgs/default.nix index adfe97f0b8..fdf2b108c4 100644 --- a/distros/melodic/robot-calibration-msgs/default.nix +++ b/distros/melodic/robot-calibration-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-calibration-msgs"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/robot_calibration-release/archive/release/melodic/robot_calibration_msgs/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "b4dd12056bdc00277601ac794c2c95da87c269ae1457634029dc22fda28b3092"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "robot_calibration-release"; + rev = "release/melodic/robot_calibration_msgs/0.7.2-1"; + sha256 = "sha256-TcMd42tEe9LOT+m4e9F0iC+SoNpLt+YYrfn3fj//p04="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/robot-calibration/default.nix b/distros/melodic/robot-calibration/default.nix index 7018cfb2c3..964eb24bea 100644 --- a/distros/melodic/robot-calibration/default.nix +++ b/distros/melodic/robot-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-calibration"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/robot_calibration-release/archive/release/melodic/robot_calibration/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "06146a338ddf51c3827f12533b6e9bb9f44a477b28556012b352131f095fc18d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "robot_calibration-release"; + rev = "release/melodic/robot_calibration/0.7.2-1"; + sha256 = "sha256-WDMgwHYSuq8ngMl5Xlb0QJk1O3fwiqa8pwFmK9CW/+w="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/melodic/robot-controllers-interface/default.nix b/distros/melodic/robot-controllers-interface/default.nix index 3fd353e8e4..8cd8ae5fee 100644 --- a/distros/melodic/robot-controllers-interface/default.nix +++ b/distros/melodic/robot-controllers-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-controllers-interface"; version = "0.6.0"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-release/archive/release/melodic/robot_controllers_interface/0.6.0-0.tar.gz"; - name = "0.6.0-0.tar.gz"; - sha256 = "e32be3bf72bffa92847724a0d2ca5fa70a636b9a80b836a28d6ccf244888c8a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-release"; + rev = "release/melodic/robot_controllers_interface/0.6.0-0"; + sha256 = "sha256-dOR7btAmG3Y40avAVqBAaXwgHhZnJg9bke6nYwkXHNs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-controllers-msgs/default.nix b/distros/melodic/robot-controllers-msgs/default.nix index 0d71816290..b89b46b3c7 100644 --- a/distros/melodic/robot-controllers-msgs/default.nix +++ b/distros/melodic/robot-controllers-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-controllers-msgs"; version = "0.6.0"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-release/archive/release/melodic/robot_controllers_msgs/0.6.0-0.tar.gz"; - name = "0.6.0-0.tar.gz"; - sha256 = "e4e27516f3adeed4b5e046e2660975a999082fd1d0322b5c1f5ca0c9c2f0759b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-release"; + rev = "release/melodic/robot_controllers_msgs/0.6.0-0"; + sha256 = "sha256-IP5hDGdnR9cDKPD7JkrfRUU2SBJr1k1JME70y4j+tYc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/robot-controllers/default.nix b/distros/melodic/robot-controllers/default.nix index 5fc5f95b6b..280ea3a85a 100644 --- a/distros/melodic/robot-controllers/default.nix +++ b/distros/melodic/robot-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-controllers"; version = "0.6.0"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-release/archive/release/melodic/robot_controllers/0.6.0-0.tar.gz"; - name = "0.6.0-0.tar.gz"; - sha256 = "8b8bbd122bf7977a8b16518c7eb79ad915969f5d69fed23f85100fb33f58865f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-release"; + rev = "release/melodic/robot_controllers/0.6.0-0"; + sha256 = "sha256-iwNAfwlet6nGMGb7KxMITui8+gSYlXVsKML48EiS1ds="; + }; buildType = "catkin"; buildInputs = [ angles catkin ]; diff --git a/distros/melodic/robot-localization/default.nix b/distros/melodic/robot-localization/default.nix index bfe56fdb6d..22b24ff105 100644 --- a/distros/melodic/robot-localization/default.nix +++ b/distros/melodic/robot-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-localization"; version = "2.6.12-r1"; - src = fetchurl { - url = "https://github.com/cra-ros-pkg/robot_localization-release/archive/release/melodic/robot_localization/2.6.12-1.tar.gz"; - name = "2.6.12-1.tar.gz"; - sha256 = "9335cdc8055565d1d2011eca64a358b37d97bd7eac74f53396e45a9f27a9c30f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cra-ros-pkg"; + repo = "robot_localization-release"; + rev = "release/melodic/robot_localization/2.6.12-1"; + sha256 = "sha256-MbtYf1QvNOAyc/stqBFaUhRuSdaHKuiDKi/9Pd7iiPM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.catkin-pkg roslint ]; diff --git a/distros/melodic/robot-mechanism-controllers/default.nix b/distros/melodic/robot-mechanism-controllers/default.nix index 8ae2ed8848..5159c5bb06 100644 --- a/distros/melodic/robot-mechanism-controllers/default.nix +++ b/distros/melodic/robot-mechanism-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-mechanism-controllers"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/robot_mechanism_controllers/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "9872fd46f89691f6d95342683735e9963d8f170889c5ccc2f2e9a01d437e3800"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/robot_mechanism_controllers/1.10.17-1"; + sha256 = "sha256-bOUk6B3oa0q9t5tO9LLQlV46xj5BHRnPWS+nxAk3TIs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/robot-nav-rviz-plugins/default.nix b/distros/melodic/robot-nav-rviz-plugins/default.nix index 2a6aeeb4f2..8f453ca2e8 100644 --- a/distros/melodic/robot-nav-rviz-plugins/default.nix +++ b/distros/melodic/robot-nav-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-nav-rviz-plugins"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/robot_nav_rviz_plugins/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "ce70e9c70a0b2d32e64567a5bf2f80cce958aa7a6d62e7bc92755243287b43d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/robot_nav_rviz_plugins/0.3.0-1"; + sha256 = "sha256-cU44drxsrYNBEktA+LSsUSX48jG9Z9+3x7NJHO5QxtI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-nav-tools/default.nix b/distros/melodic/robot-nav-tools/default.nix index ed1a12b6af..dd18fff3a5 100644 --- a/distros/melodic/robot-nav-tools/default.nix +++ b/distros/melodic/robot-nav-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-nav-tools"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/robot_nav_tools/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "ec2c54c729dc7a39ceb2b55d3f1b261b68fa7e91d6d8b2b4c6a2c067dcd29204"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/robot_nav_tools/0.3.0-1"; + sha256 = "sha256-Yeq/YTXPWZcfD4J0JS6aT3aEwvmbzaMkT807mkC+8Ok="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-nav-viz-demos/default.nix b/distros/melodic/robot-nav-viz-demos/default.nix index 72f66aa05f..b54f1f68f4 100644 --- a/distros/melodic/robot-nav-viz-demos/default.nix +++ b/distros/melodic/robot-nav-viz-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-nav-viz-demos"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/robot_nav_viz_demos/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "baf7e7445b4420d69bff113107f7c33c6716e2fe33dca4494411b7487e8449bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/robot_nav_viz_demos/0.3.0-1"; + sha256 = "sha256-F7DVlBad50iXh+OfyhHtyEqWmMF1QwgupXkUKElYMO0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-navigation/default.nix b/distros/melodic/robot-navigation/default.nix index dba6b7652f..eed368ae39 100644 --- a/distros/melodic/robot-navigation/default.nix +++ b/distros/melodic/robot-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-navigation"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/melodic/robot_navigation/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "c4ceadac4059b43980d9192841059207f0637b65c62e4eb7b4f10b1ff742529b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/melodic/robot_navigation/0.3.0-1"; + sha256 = "sha256-8ncx0N64Q/96bnM0HQ0RtlwMLfFOmSqC8+E38W5cRoI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-one/default.nix b/distros/melodic/robot-one/default.nix index 3e1184992d..0a41f71ad1 100644 --- a/distros/melodic/robot-one/default.nix +++ b/distros/melodic/robot-one/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-one"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/AlexanderSilvaB/robot-one-ros-release/archive/release/melodic/robot_one/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "8577070c2981b950d02c6e8353edea64dc1724952a8981d82d980a7de21109d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AlexanderSilvaB"; + repo = "robot-one-ros-release"; + rev = "release/melodic/robot_one/0.1.1-1"; + sha256 = "sha256-gZwiT4F/JzsV5GptmidK8jcWD0E3yAaM6E591ddQ1F0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/robot-pose-ekf/default.nix b/distros/melodic/robot-pose-ekf/default.nix index df93a1117b..1195615628 100644 --- a/distros/melodic/robot-pose-ekf/default.nix +++ b/distros/melodic/robot-pose-ekf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-pose-ekf"; version = "1.14.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/robot_pose_ekf-release/archive/release/melodic/robot_pose_ekf/1.14.5-0.tar.gz"; - name = "1.14.5-0.tar.gz"; - sha256 = "5c00ee700ca2a69ca46e5162fa0bf0570a730ff566808059d7c6358fe350844a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "robot_pose_ekf-release"; + rev = "release/melodic/robot_pose_ekf/1.14.5-0"; + sha256 = "sha256-943sFhdMcym8w2I2vs4RLKzAzoY4Tox4cwB75He5v34="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/robot-self-filter/default.nix b/distros/melodic/robot-self-filter/default.nix index 35ea2633bb..873e6ee44a 100644 --- a/distros/melodic/robot-self-filter/default.nix +++ b/distros/melodic/robot-self-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-self-filter"; version = "0.1.31"; - src = fetchurl { - url = "https://github.com/pr2-gbp/robot_self_filter-gbp/archive/release/melodic/robot_self_filter/0.1.31-0.tar.gz"; - name = "0.1.31-0.tar.gz"; - sha256 = "8a6538dd30770242d25476003332f8ac072fbb0837e50cdde55600dc7d063150"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "robot_self_filter-gbp"; + rev = "release/melodic/robot_self_filter/0.1.31-0"; + sha256 = "sha256-fSOJ641jMpQY0E3vOqszw4Sp6GUk8N9otjtEjp/AwVs="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/robot-setup-tf-tutorial/default.nix b/distros/melodic/robot-setup-tf-tutorial/default.nix index 38975c8fce..5656538234 100644 --- a/distros/melodic/robot-setup-tf-tutorial/default.nix +++ b/distros/melodic/robot-setup-tf-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-setup-tf-tutorial"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_tutorials-release/archive/release/melodic/robot_setup_tf_tutorial/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "fed0dd85c06de7584585f1940e91a5f591c8c2d33375aae4d83beaee5725ad65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_tutorials-release"; + rev = "release/melodic/robot_setup_tf_tutorial/0.2.4-1"; + sha256 = "sha256-QaYglsQNDJYMXThFFbPway7lRq+RkQ/nWG18mWbGhSo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-state-publisher/default.nix b/distros/melodic/robot-state-publisher/default.nix index ec09738dcf..46af2b4761 100644 --- a/distros/melodic/robot-state-publisher/default.nix +++ b/distros/melodic/robot-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-state-publisher"; version = "1.14.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/robot_state_publisher-release/archive/release/melodic/robot_state_publisher/1.14.1-1.tar.gz"; - name = "1.14.1-1.tar.gz"; - sha256 = "76dca47e16db4a89542e6f14ecbb5a1211b8948acd00ae6554a2f6a4e100ce48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "robot_state_publisher-release"; + rev = "release/melodic/robot_state_publisher/1.14.1-1"; + sha256 = "sha256-/s4kthynyA1m9ZLHBzVT2USw4RpOcyBAtGVL901g2EQ="; + }; buildType = "catkin"; buildInputs = [ urdfdom-headers ]; diff --git a/distros/melodic/robot-statemachine/default.nix b/distros/melodic/robot-statemachine/default.nix index 07441bbbeb..8686cfcb00 100644 --- a/distros/melodic/robot-statemachine/default.nix +++ b/distros/melodic/robot-statemachine/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-statemachine"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/MarcoStb1993/robot_statemachine-release/archive/release/melodic/robot_statemachine/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "17b2b75b637ab16cf0594fec59df9717ac924de0813239f204239fe68567ca34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarcoStb1993"; + repo = "robot_statemachine-release"; + rev = "release/melodic/robot_statemachine/1.2.1-1"; + sha256 = "sha256-0hGryP4Y4sjkPAOkME0z4/AJYaBuig8kZOckNOlvy5w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot-upstart/default.nix b/distros/melodic/robot-upstart/default.nix index ae64be5a27..6de1150778 100644 --- a/distros/melodic/robot-upstart/default.nix +++ b/distros/melodic/robot-upstart/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot-upstart"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/robot_upstart-release/archive/release/melodic/robot_upstart/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "5c691943bed1f9d4c20a817d902bd00460705f7836d6fc2f3142de8f1c4c8153"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "robot_upstart-release"; + rev = "release/melodic/robot_upstart/0.3.3-1"; + sha256 = "sha256-XXbKOeP6wvYrVsSzttEDEuknNURVX3iUvyRv/RjjjsM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robot/default.nix b/distros/melodic/robot/default.nix index c4b66f9a5f..8eb63698d9 100644 --- a/distros/melodic/robot/default.nix +++ b/distros/melodic/robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robot"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/melodic/robot/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "4f0efd47cf90e8a1f56602612d73ba032fbb231dec3091f53b795a7d67cbe02b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/melodic/robot/1.4.1-0"; + sha256 = "sha256-BsE2fdWFopj9YpUR57iR+hUbHav6Ic0o17eTDdbuN2o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roboticsgroup-upatras-gazebo-plugins/default.nix b/distros/melodic/roboticsgroup-upatras-gazebo-plugins/default.nix index cedbe9a647..4be996284f 100644 --- a/distros/melodic/roboticsgroup-upatras-gazebo-plugins/default.nix +++ b/distros/melodic/roboticsgroup-upatras-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roboticsgroup-upatras-gazebo-plugins"; version = "0.2.0-r2"; - src = fetchurl { - url = "https://github.com/roboticsgroup/roboticsgroup_upatras_gazebo_plugins-release/archive/release/melodic/roboticsgroup_upatras_gazebo_plugins/0.2.0-2.tar.gz"; - name = "0.2.0-2.tar.gz"; - sha256 = "e4f47fc8d72fdb832caca41aebd503cb32b4d8420fcb1f3d3a9725f98eb42fb0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboticsgroup"; + repo = "roboticsgroup_upatras_gazebo_plugins-release"; + rev = "release/melodic/roboticsgroup_upatras_gazebo_plugins/0.2.0-2"; + sha256 = "sha256-9skr5rgzU90ggoYGDTBM/0AXhkgdo3EMZCt8bC8yZLA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robotis-manipulator/default.nix b/distros/melodic/robotis-manipulator/default.nix index 5d1a603956..1560b3d4dd 100644 --- a/distros/melodic/robotis-manipulator/default.nix +++ b/distros/melodic/robotis-manipulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robotis-manipulator"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/robotis_manipulator-release/archive/release/melodic/robotis_manipulator/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "1319f6251991f69621cc96ddef7769430fae53fc8686db0fe10e92d6524e504f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "robotis_manipulator-release"; + rev = "release/melodic/robotis_manipulator/1.1.0-0"; + sha256 = "sha256-DeYk4rvo6ROntaSRCJUmbh0zI/zhBgHvVsiCYpHu3JY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robotont-description/default.nix b/distros/melodic/robotont-description/default.nix index ea094ff36c..b09e934f37 100644 --- a/distros/melodic/robotont-description/default.nix +++ b/distros/melodic/robotont-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robotont-description"; version = "0.0.8-r1"; - src = fetchurl { - url = "https://github.com/robotont-release/robotont_description-release/archive/release/melodic/robotont_description/0.0.8-1.tar.gz"; - name = "0.0.8-1.tar.gz"; - sha256 = "687044fd179f21de474782aa93b3e18f6619e3e9fd473c5d293e54396dedee5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotont-release"; + repo = "robotont_description-release"; + rev = "release/melodic/robotont_description/0.0.8-1"; + sha256 = "sha256-jT/rmUG7UA79Fx6nxn6Ky5GMlteOcZfwS/vHN6t+ogI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robotont-gazebo/default.nix b/distros/melodic/robotont-gazebo/default.nix index e8699fa230..f06342065b 100644 --- a/distros/melodic/robotont-gazebo/default.nix +++ b/distros/melodic/robotont-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robotont-gazebo"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/robotont-release/robotont_gazebo-release/archive/release/melodic/robotont_gazebo/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "9acf2202f009b66f50b21d81ae548fca3aa49a6f0aa3831a185eb784d1ca867c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotont-release"; + repo = "robotont_gazebo-release"; + rev = "release/melodic/robotont_gazebo/0.0.2-1"; + sha256 = "sha256-LXgQ3IOlTBrylr12nOhSNdAmYD5+ENGePJ1LA79v+A0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/robotont-msgs/default.nix b/distros/melodic/robotont-msgs/default.nix index a2de4625dd..e5df77acd0 100644 --- a/distros/melodic/robotont-msgs/default.nix +++ b/distros/melodic/robotont-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robotont-msgs"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/robotont-release/robotont_msgs-release/archive/release/melodic/robotont_msgs/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "d85d437992d72b72614b66241a1be1aafa7066e561a6539fbdf7b404838d00b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotont-release"; + repo = "robotont_msgs-release"; + rev = "release/melodic/robotont_msgs/0.0.2-1"; + sha256 = "sha256-A37dFaxRXwDBPU94C/LW59YNeZes/EZdUHOKQEr0n7E="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/robotont-nuc-description/default.nix b/distros/melodic/robotont-nuc-description/default.nix index c8cf17c01d..840401f1a1 100644 --- a/distros/melodic/robotont-nuc-description/default.nix +++ b/distros/melodic/robotont-nuc-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-robotont-nuc-description"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/robotont-release/robotont_nuc_description-release/archive/release/melodic/robotont_nuc_description/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "42cf0d4084d5f9ca70c91321e9cfb723d6dd0659c8b313d8c6f3c676382f08d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotont-release"; + repo = "robotont_nuc_description-release"; + rev = "release/melodic/robotont_nuc_description/0.0.2-1"; + sha256 = "sha256-PFLNfO56Pkf9tf2YuWVyEHWiiwKCs7OoHEkqdd3oLW0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rocon-app-manager-msgs/default.nix b/distros/melodic/rocon-app-manager-msgs/default.nix index c177d7398c..390b8bdf4e 100644 --- a/distros/melodic/rocon-app-manager-msgs/default.nix +++ b/distros/melodic/rocon-app-manager-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-app-manager-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/rocon_app_manager_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "dd9cbe7dd36e32d793f7429a581102e9e0f0cf8dd0dd3ff3baa12f3a03b4c8f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/rocon_app_manager_msgs/0.9.0-0"; + sha256 = "sha256-Dksb6OaiK8uFDrfNQNNp+WQhJ2oDiW1mAu6EhvVSqGc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rocon-bubble-icons/default.nix b/distros/melodic/rocon-bubble-icons/default.nix index 703698598b..e9b5681d14 100644 --- a/distros/melodic/rocon-bubble-icons/default.nix +++ b/distros/melodic/rocon-bubble-icons/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-bubble-icons"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_bubble_icons/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "4f454f561a9f325246e487e1499d05c6c43cf16aac9a4926029211f8c41b6ad1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_bubble_icons/0.3.2-0"; + sha256 = "sha256-/0IP2p+iBgHuS/nosc5bu4Oic9URQwY7Mg0UOGhf4aQ="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rocon-console/default.nix b/distros/melodic/rocon-console/default.nix index 26577865ee..c95eae9f93 100644 --- a/distros/melodic/rocon-console/default.nix +++ b/distros/melodic/rocon-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-console"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_console/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "f9c8de84b23bb19b26971bf0e516cee5c1af7509519db44874fc8c062a742684"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_console/0.3.2-0"; + sha256 = "sha256-HVjBA7Nad/OwcSJnfHnnUFfNSfj4hBZxUIKOyR16XsU="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rocon-device-msgs/default.nix b/distros/melodic/rocon-device-msgs/default.nix index ebf947ffb8..5db687aa0e 100644 --- a/distros/melodic/rocon-device-msgs/default.nix +++ b/distros/melodic/rocon-device-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-device-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/rocon_device_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "e2b55ec1c00c3c40fe7df6c19206e676fd8a3abff63bcd1bcd9531ddbb1036e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/rocon_device_msgs/0.9.0-0"; + sha256 = "sha256-dy/Onl+ztpW30qdfmcN+0b80+jwQH5zzHTTGbjp+u3o="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rocon-ebnf/default.nix b/distros/melodic/rocon-ebnf/default.nix index f2a798467d..2bbe25019c 100644 --- a/distros/melodic/rocon-ebnf/default.nix +++ b/distros/melodic/rocon-ebnf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-ebnf"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_ebnf/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "90319996d97b66a6313bc7ac6a4c9377ca608582bce668f3040d671e8c49bad6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_ebnf/0.3.2-0"; + sha256 = "sha256-3pefRkUHcxAktikNgDOTdOgRyirAcIYN3GfTedRxQGk="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rocon-icons/default.nix b/distros/melodic/rocon-icons/default.nix index 2c9ce3203d..6b983b30ea 100644 --- a/distros/melodic/rocon-icons/default.nix +++ b/distros/melodic/rocon-icons/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-icons"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_icons/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "06a97efd4802a2cd6b1e27fe7d1fa81a67923d0affb7ac21b53954225dace487"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_icons/0.3.2-0"; + sha256 = "sha256-rPMdyaQz5MCo1af9I0AMoEMuSLKTHXChQ9YrMggz5tU="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rocon-interaction-msgs/default.nix b/distros/melodic/rocon-interaction-msgs/default.nix index d01ee1d9cc..81c3c87b08 100644 --- a/distros/melodic/rocon-interaction-msgs/default.nix +++ b/distros/melodic/rocon-interaction-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-interaction-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/rocon_interaction_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "b33c21e3c041db8fed2c23d369b2d9233da6f1f4008d82940be8a1fe236a9efb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/rocon_interaction_msgs/0.9.0-0"; + sha256 = "sha256-UtBF6oetRMlkwZ71vx8mCnCGKTrLih19vFLlyCg3MbE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rocon-interactions/default.nix b/distros/melodic/rocon-interactions/default.nix index f441890508..3b031e2243 100644 --- a/distros/melodic/rocon-interactions/default.nix +++ b/distros/melodic/rocon-interactions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-interactions"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_interactions/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "bbfd5de04fbedd3259af8cc8d03812de838a6a9cc3d38c48772640218cfbe1b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_interactions/0.3.2-0"; + sha256 = "sha256-i3ZJuqBhEcZjmzaA8VHlWyxiJBcCFjFi3axSByPIGY0="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg roslint rostest ]; diff --git a/distros/melodic/rocon-launch/default.nix b/distros/melodic/rocon-launch/default.nix index 8eabd7a629..112751ec48 100644 --- a/distros/melodic/rocon-launch/default.nix +++ b/distros/melodic/rocon-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-launch"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_launch/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "8239a56fd334d32336db287785c12fa526ce2e4c792fb91ff2c3687dec8b2945"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_launch/0.3.2-0"; + sha256 = "sha256-0lIpCeOrOq1C0tDLVeyr/1ZOEM7Fe8LvrJcEdmGy0tQ="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rocon-master-info/default.nix b/distros/melodic/rocon-master-info/default.nix index 0f9e389bbf..8a883482e2 100644 --- a/distros/melodic/rocon-master-info/default.nix +++ b/distros/melodic/rocon-master-info/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-master-info"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_master_info/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "accae02c60a70a23f1d4970a961c780c0acc172430d73af57718ed904ba50a70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_master_info/0.3.2-0"; + sha256 = "sha256-iFSfbwMiTrXWxQHQOJD0cW6p1oWjxukoS08ny10JQhc="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rocon-msgs/default.nix b/distros/melodic/rocon-msgs/default.nix index c17e1be40e..017299d129 100644 --- a/distros/melodic/rocon-msgs/default.nix +++ b/distros/melodic/rocon-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/rocon_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "5eca94dc0ac40d38a417f7e804e77d25f3abb25ceda463b681ad24186a0444c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/rocon_msgs/0.9.0-0"; + sha256 = "sha256-AMsXEOV49zOw6+a+doG79b0kykK8nQJmpUFGtmVSoFM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rocon-python-comms/default.nix b/distros/melodic/rocon-python-comms/default.nix index 1a81f137b3..8d3f4f8494 100644 --- a/distros/melodic/rocon-python-comms/default.nix +++ b/distros/melodic/rocon-python-comms/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-python-comms"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_python_comms/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "9592f4282b01f537108ca98200116db495421ad1d7da6c63016e315229a37394"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_python_comms/0.3.2-0"; + sha256 = "sha256-lZUcn7QkLczvbOrSlTAuwRkXCFEFbpktP2E4JfpuOJE="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg rostest ]; diff --git a/distros/melodic/rocon-python-redis/default.nix b/distros/melodic/rocon-python-redis/default.nix index 294df8a0e8..d800521daf 100644 --- a/distros/melodic/rocon-python-redis/default.nix +++ b/distros/melodic/rocon-python-redis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-python-redis"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_python_redis/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "1a4191ef365c4c05d0bc6cc96bf5754a4f6a0b787dedb55e80676cbc03aa71ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_python_redis/0.3.2-0"; + sha256 = "sha256-7Iaa2CHxSPlYepJ2va5P8R6kI19fagHTjznIOennXMg="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rocon-python-utils/default.nix b/distros/melodic/rocon-python-utils/default.nix index 95c1a515e7..344c262c08 100644 --- a/distros/melodic/rocon-python-utils/default.nix +++ b/distros/melodic/rocon-python-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-python-utils"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_python_utils/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "276c59565857a8553d7b92113ae9c7567bcb2eeee5ea5f517e91066a3346704f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_python_utils/0.3.2-0"; + sha256 = "sha256-SbsgwPKfNmi8Nx7qIJX41HYTbgrv8jxzRXwBAAmDOfo="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/rocon-python-wifi/default.nix b/distros/melodic/rocon-python-wifi/default.nix index 903153dc08..c1e9b76ae6 100644 --- a/distros/melodic/rocon-python-wifi/default.nix +++ b/distros/melodic/rocon-python-wifi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-python-wifi"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_python_wifi/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "a0fe115a173a08330e7680b085161aae0bde090b2749f58fbd5ee764fedc3765"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_python_wifi/0.3.2-0"; + sha256 = "sha256-0cFuu+0ZUMYLNRye4y8OioN2AB1X+8NYP8uU3IV7JWk="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rocon-semantic-version/default.nix b/distros/melodic/rocon-semantic-version/default.nix index cba6f1941c..0a828c3b2d 100644 --- a/distros/melodic/rocon-semantic-version/default.nix +++ b/distros/melodic/rocon-semantic-version/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-semantic-version"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_semantic_version/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "ede22535e402aab843576c2189701ec11878f469e61d6f1055d6822779d2f4c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_semantic_version/0.3.2-0"; + sha256 = "sha256-/u25yYKPeHlkQvYvweEiNvaMtByrBY8TlYHZ9auT5SE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rocon-service-pair-msgs/default.nix b/distros/melodic/rocon-service-pair-msgs/default.nix index 0ad43030e4..6db2928158 100644 --- a/distros/melodic/rocon-service-pair-msgs/default.nix +++ b/distros/melodic/rocon-service-pair-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-service-pair-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/rocon_service_pair_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "28ec43f8619ea41e4562b0940174cf0cf8ff4c331ac0cda0dc9f1fb2dad5b0b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/rocon_service_pair_msgs/0.9.0-0"; + sha256 = "sha256-xs/70e38DTrSjYXJhMeJ8XmUbHSguXju8tbIf3HO+gk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rocon-std-msgs/default.nix b/distros/melodic/rocon-std-msgs/default.nix index fa732ececd..51a24bd87d 100644 --- a/distros/melodic/rocon-std-msgs/default.nix +++ b/distros/melodic/rocon-std-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-std-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/rocon_std_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "6f2aa4bddb42919a924d828b30e6eb4a2d25066bafe4d707c4a394393e138f18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/rocon_std_msgs/0.9.0-0"; + sha256 = "sha256-QT9y2hUcOFhMs6TbYceMs+yP2q/mLIsIEobTXS2wh0Q="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rocon-tools/default.nix b/distros/melodic/rocon-tools/default.nix index 01dab24625..aab0e083f3 100644 --- a/distros/melodic/rocon-tools/default.nix +++ b/distros/melodic/rocon-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-tools"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_tools/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "688fc316688135e08e1fd33312879d6059122f1fd9122c4ded28dd4177b59cce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_tools/0.3.2-0"; + sha256 = "sha256-lLBnd2BXe4Qaj0Dy6Gx3kKHt+mm1E6U1z/HwZG0owzk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rocon-tutorial-msgs/default.nix b/distros/melodic/rocon-tutorial-msgs/default.nix index 9394340b8b..b5c972d956 100644 --- a/distros/melodic/rocon-tutorial-msgs/default.nix +++ b/distros/melodic/rocon-tutorial-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-tutorial-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/rocon_tutorial_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "dd66eaad5af5cbccfcd60f6d2fe5152c3b560f2aa87e471da4a195c4f1ba1870"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/rocon_tutorial_msgs/0.9.0-0"; + sha256 = "sha256-UsRzPfpfoU5mGzqztvGoLlNZ77nJe9Jkui6gABRNkYI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rocon-uri/default.nix b/distros/melodic/rocon-uri/default.nix index c0c729186b..270f0466f6 100644 --- a/distros/melodic/rocon-uri/default.nix +++ b/distros/melodic/rocon-uri/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rocon-uri"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_tools-release/archive/release/melodic/rocon_uri/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "bdaecc320ad45d56c33e3b5d3ad2448ac7e3952dca5c8e3fd34d3adee125c69c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_tools-release"; + rev = "release/melodic/rocon_uri/0.3.2-0"; + sha256 = "sha256-sjSP63feWtHqbzDkUmIjP6rW6NgufmtMOV3tTWnN6tI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roomba-stage/default.nix b/distros/melodic/roomba-stage/default.nix index 2afd067d29..533d708827 100644 --- a/distros/melodic/roomba-stage/default.nix +++ b/distros/melodic/roomba-stage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roomba-stage"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_tutorials-release/archive/release/melodic/roomba_stage/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "36ce4d4177e886417214af1136d05abf9c665f404b3ae0037020b0b2675693ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_tutorials-release"; + rev = "release/melodic/roomba_stage/0.2.4-1"; + sha256 = "sha256-cD+Dv6Qv9hN1Qhm+7ETaNSMUjqu+F8GeNSDI8I27oKE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-babel-fish-test-msgs/default.nix b/distros/melodic/ros-babel-fish-test-msgs/default.nix index 2b36022ec8..2d665e6a50 100644 --- a/distros/melodic/ros-babel-fish-test-msgs/default.nix +++ b/distros/melodic/ros-babel-fish-test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-babel-fish-test-msgs"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/StefanFabian/ros_babel_fish-release/archive/release/melodic/ros_babel_fish_test_msgs/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "7f7108fb6abb6252ecbcd985fad242d85b8b61a18626cbed814d93cd363bdf9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "StefanFabian"; + repo = "ros_babel_fish-release"; + rev = "release/melodic/ros_babel_fish_test_msgs/0.9.3-1"; + sha256 = "sha256-+IMs/suyQngfY9u5HXc+MuV9+iFMljF0rfMuTlobT5g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ros-babel-fish/default.nix b/distros/melodic/ros-babel-fish/default.nix index c990aed7a5..0434c8fc2f 100644 --- a/distros/melodic/ros-babel-fish/default.nix +++ b/distros/melodic/ros-babel-fish/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-babel-fish"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/StefanFabian/ros_babel_fish-release/archive/release/melodic/ros_babel_fish/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "52f42f185f4f8f1a838bdfa1057bbd33d2927b5a24d236fa8bff867dff011a05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "StefanFabian"; + repo = "ros_babel_fish-release"; + rev = "release/melodic/ros_babel_fish/0.9.3-1"; + sha256 = "sha256-+xeOjDeg3TplCq9bs36KVK4svNzdUIPrFfutRjE1gCA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-base/default.nix b/distros/melodic/ros-base/default.nix index 686f622413..72991a4e9b 100644 --- a/distros/melodic/ros-base/default.nix +++ b/distros/melodic/ros-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-base"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/melodic/ros_base/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "0b0cab7cb298a642bd33a0c4d7e17f10ac6533a1a59745a11e96c58d238f47eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/melodic/ros_base/1.4.1-0"; + sha256 = "sha256-Rx6p3zz1LS88OnLuFpdogyVIaEAfN+6R6V4Q9oAGqiM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-canopen/default.nix b/distros/melodic/ros-canopen/default.nix index 7e5fd1d630..197deb3669 100644 --- a/distros/melodic/ros-canopen/default.nix +++ b/distros/melodic/ros-canopen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-canopen"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/melodic/ros_canopen/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "6c0b9823cc2602239e88dbe44cf288525e7311f518cb721505bdad20bfeba7c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/melodic/ros_canopen/0.8.5-1"; + sha256 = "sha256-kQMfJsVFsKgnXM9FheiRVd//HZJVC6rSyzs8sndkBKE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-comm/default.nix b/distros/melodic/ros-comm/default.nix index a080df9fe7..61dc4cb0e0 100644 --- a/distros/melodic/ros-comm/default.nix +++ b/distros/melodic/ros-comm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-comm"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/ros_comm/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "7410a95617d455542568170e450b9282d4beb0404e8fcec172f766befcc26750"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/ros_comm/1.14.13-1"; + sha256 = "sha256-Gg+OdxG+uhXt3+DYIoPAabzfVlGgQFIKgNU+YBljm2o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-control-boilerplate/default.nix b/distros/melodic/ros-control-boilerplate/default.nix index 040113775f..2af36d2298 100644 --- a/distros/melodic/ros-control-boilerplate/default.nix +++ b/distros/melodic/ros-control-boilerplate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-control-boilerplate"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/ros_control_boilerplate-release/archive/release/melodic/ros_control_boilerplate/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "32bc71c9a5eea76b805a56072ea0e638cdf78f8ea2d8de13fb8c0c72fc512514"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "ros_control_boilerplate-release"; + rev = "release/melodic/ros_control_boilerplate/0.5.2-1"; + sha256 = "sha256-XuRMXyv88A55fdYtvL66dwjaYfe9HJd6mU1JJJHSGL4="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules gflags ]; diff --git a/distros/melodic/ros-control/default.nix b/distros/melodic/ros-control/default.nix index 4dc3ea4332..1ff82fe18f 100644 --- a/distros/melodic/ros-control/default.nix +++ b/distros/melodic/ros-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-control"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/ros_control/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "3f1eedc90b71c32c00741cd89d1f597a3fa84916416fdf705171b9a775d5e2c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/ros_control/0.18.4-1"; + sha256 = "sha256-H1J2oByuchf/kbUEKn+moZE020TCnf3be1/OpK1qM/g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-controllers-cartesian/default.nix b/distros/melodic/ros-controllers-cartesian/default.nix index 5bf9981a94..0ca8f8ba1a 100644 --- a/distros/melodic/ros-controllers-cartesian/default.nix +++ b/distros/melodic/ros-controllers-cartesian/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-controllers-cartesian"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/melodic/ros_controllers_cartesian/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "e3597c556925f2afd4b288b328f82e70e65f205646eaaf58734a332fc6ece64a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/melodic/ros_controllers_cartesian/0.1.5-1"; + sha256 = "sha256-LlTAuMyx/GJd2Rpf38IBGJ7Np4M2/0WsHC3ufyTj2yw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-controllers/default.nix b/distros/melodic/ros-controllers/default.nix index dd45edfdcc..80523c70c2 100644 --- a/distros/melodic/ros-controllers/default.nix +++ b/distros/melodic/ros-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-controllers"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/ros_controllers/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "a7b4e753197be0734e0703db5b7254c6fed1661d1df9653bb3083d6e378e0069"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/ros_controllers/0.17.2-1"; + sha256 = "sha256-Jfjf0HZ4e8AMiU9rJ9ZLheI7EAHDPT6pqfqaNew+llA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-core/default.nix b/distros/melodic/ros-core/default.nix index 8caf1030a3..95f7e20ddf 100644 --- a/distros/melodic/ros-core/default.nix +++ b/distros/melodic/ros-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-core"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/melodic/ros_core/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "390d24da9397fce3a11f1dc7a0a23fb0886b81a4cfd2473906508358a670782d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/melodic/ros_core/1.4.1-0"; + sha256 = "sha256-EshoXxvlz860QvWDGuwU9W/Y3qqb88CaF2fEzeWs7SA="; + }; buildType = "catkin"; propagatedBuildInputs = [ catkin class-loader cmake-modules common-msgs gencpp geneus genlisp genmsg gennodejs genpy message-generation message-runtime pluginlib ros ros-comm rosbag-migration-rule rosconsole rosconsole-bridge roscpp-core rosgraph-msgs roslisp rospack std-msgs std-srvs ]; diff --git a/distros/melodic/ros-emacs-utils/default.nix b/distros/melodic/ros-emacs-utils/default.nix index c846f8bdd3..a4a48e5718 100644 --- a/distros/melodic/ros-emacs-utils/default.nix +++ b/distros/melodic/ros-emacs-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-emacs-utils"; version = "0.4.16-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/melodic/ros_emacs_utils/0.4.16-1.tar.gz"; - name = "0.4.16-1.tar.gz"; - sha256 = "89c647ad2f3cd9c745050bd6740fdf726a4de063970e3f18c7de93ac38b788a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/melodic/ros_emacs_utils/0.4.16-1"; + sha256 = "sha256-yi9efXbmcNsPEpGcOQ3udsQuRJW8xIcPBgjEoNraAsI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-environment/default.nix b/distros/melodic/ros-environment/default.nix index 676a4c35d2..5c168cfee5 100644 --- a/distros/melodic/ros-environment/default.nix +++ b/distros/melodic/ros-environment/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-environment"; version = "1.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_environment-release/archive/release/melodic/ros_environment/1.2.3-1.tar.gz"; - name = "1.2.3-1.tar.gz"; - sha256 = "73dcd7530b240a850ef81f26d87a1bb38b34a4c59d31ac7ecefc64c90b3d88dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_environment-release"; + rev = "release/melodic/ros_environment/1.2.3-1"; + sha256 = "sha256-0YiYHQaktdDuOL4/xZ8sOlR1ix0mv0zL3iVZ0IxC/uI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-ethercat-eml/default.nix b/distros/melodic/ros-ethercat-eml/default.nix index 7b895ed345..732f5c8e01 100644 --- a/distros/melodic/ros-ethercat-eml/default.nix +++ b/distros/melodic/ros-ethercat-eml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-ethercat-eml"; version = "0.3.2-r5"; - src = fetchurl { - url = "https://github.com/shadow-robot/ros_ethercat_eml-release/archive/release/melodic/ros_ethercat_eml/0.3.2-5.tar.gz"; - name = "0.3.2-5.tar.gz"; - sha256 = "8c65cc97f3af73cbf143fce894efe44f3206f68a7bf93393c9db04e214d86fd2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "shadow-robot"; + repo = "ros_ethercat_eml-release"; + rev = "release/melodic/ros_ethercat_eml/0.3.2-5"; + sha256 = "sha256-XC9f8fOo4jNEjuH388PHLku3cC7y6vCuIC74PEn56+0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-industrial-cmake-boilerplate/default.nix b/distros/melodic/ros-industrial-cmake-boilerplate/default.nix index 42fa012ae3..6672395da6 100644 --- a/distros/melodic/ros-industrial-cmake-boilerplate/default.nix +++ b/distros/melodic/ros-industrial-cmake-boilerplate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-industrial-cmake-boilerplate"; version = "0.2.15-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_industrial_cmake_boilerplate-release/archive/release/melodic/ros_industrial_cmake_boilerplate/0.2.15-1.tar.gz"; - name = "0.2.15-1.tar.gz"; - sha256 = "c1fd60526708c9dc43dd084f70c339615ce93cea4861bc291a7735966eeb0c2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_industrial_cmake_boilerplate-release"; + rev = "release/melodic/ros_industrial_cmake_boilerplate/0.2.15-1"; + sha256 = "sha256-rTJLeyQ5OOI2Coj1bz1/087xo5l9J//K0UQDWsoMFRg="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/ros-introspection/default.nix b/distros/melodic/ros-introspection/default.nix index 9595fb5d57..7779acae1b 100644 --- a/distros/melodic/ros-introspection/default.nix +++ b/distros/melodic/ros-introspection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-introspection"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/roscompile-release/archive/release/melodic/ros_introspection/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "6c9df1bb401d4d3f2f564502df7e1ab10bf7b8e623bfe1aef63c5e7deac5bb55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "roscompile-release"; + rev = "release/melodic/ros_introspection/1.2.1-1"; + sha256 = "sha256-9ytXGNds/guHnN2+qEvZi8TaE4Va58o8rV1/rEJ1eKQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-monitoring-msgs/default.nix b/distros/melodic/ros-monitoring-msgs/default.nix index 0d0ebf0ff3..f7cc5b79b6 100644 --- a/distros/melodic/ros-monitoring-msgs/default.nix +++ b/distros/melodic/ros-monitoring-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-monitoring-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/ros_monitoring_msgs-release/archive/release/melodic/ros_monitoring_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "d9215590fe7e1d5c0dadd7a19195db12250e64327bd5423ad6292c0a7e920165"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "ros_monitoring_msgs-release"; + rev = "release/melodic/ros_monitoring_msgs/1.0.1-1"; + sha256 = "sha256-t+GjAeKLu9MXQG7GjURoa4HFquwjMxpvXOFOeilCMs4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ros-numpy/default.nix b/distros/melodic/ros-numpy/default.nix index 3a25248d22..3d40f14ccf 100644 --- a/distros/melodic/ros-numpy/default.nix +++ b/distros/melodic/ros-numpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-numpy"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/eric-wieser/ros_numpy-release/archive/release/melodic/ros_numpy/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "2db40c8a7b9a22d6549cddf49c74ab88285ea20b1c9afecbad3e3f2d53a8b451"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "eric-wieser"; + repo = "ros_numpy-release"; + rev = "release/melodic/ros_numpy/0.0.3-1"; + sha256 = "sha256-+QchJ7zFWfZIrnc6LG3CKmuJ0jd125PL9E+yKn8cO0c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-pytest/default.nix b/distros/melodic/ros-pytest/default.nix index 79dae6505a..fa72fb35a4 100644 --- a/distros/melodic/ros-pytest/default.nix +++ b/distros/melodic/ros-pytest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-pytest"; version = "0.2.0"; - src = fetchurl { - url = "https://github.com/machinekoder/ros_pytest-release/archive/release/melodic/ros_pytest/0.2.0-0.tar.gz"; - name = "0.2.0-0.tar.gz"; - sha256 = "ba602e2fda979ab6f3097bfdad4c9cc589a7f0781f784cd46a1462de3636dc84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "machinekoder"; + repo = "ros_pytest-release"; + rev = "release/melodic/ros_pytest/0.2.0-0"; + sha256 = "sha256-Yjf2MdwZSmbDvz0FTb2pmd3RYIC6Xwj5T9LHpVwrhcY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-realtime/default.nix b/distros/melodic/ros-realtime/default.nix index 3280849d9c..5ab52bf9bf 100644 --- a/distros/melodic/ros-realtime/default.nix +++ b/distros/melodic/ros-realtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-realtime"; version = "1.0.25"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/melodic/ros_realtime/1.0.25-0.tar.gz"; - name = "1.0.25-0.tar.gz"; - sha256 = "7106572a7a1fc86e47f9df7ab27badd45a0f8b55c3bbff666fdb8c7a5d0a72e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/melodic/ros_realtime/1.0.25-0"; + sha256 = "sha256-cSPJq35ndIuCxfW/qa08dpOhEvEk0rlT+bOWNUBVBGc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-reflexxes/default.nix b/distros/melodic/ros-reflexxes/default.nix index 5c8d0c720c..e135705131 100644 --- a/distros/melodic/ros-reflexxes/default.nix +++ b/distros/melodic/ros-reflexxes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-reflexxes"; version = "0.8.8-r1"; - src = fetchurl { - url = "https://github.com/KITrobotics/ipr_extern-release/archive/release/melodic/ros_reflexxes/0.8.8-1.tar.gz"; - name = "0.8.8-1.tar.gz"; - sha256 = "76626c036fcf97fd86efb214887ddffe715d343b660a6117eddd0f833ef11fda"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KITrobotics"; + repo = "ipr_extern-release"; + rev = "release/melodic/ros_reflexxes/0.8.8-1"; + sha256 = "sha256-wYms2OhjSbdBrHQwTe3qis9h2Hhuyrj+qZCBKnDO5j0="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/ros-tutorials/default.nix b/distros/melodic/ros-tutorials/default.nix index 1c787db280..6eabd1c365 100644 --- a/distros/melodic/ros-tutorials/default.nix +++ b/distros/melodic/ros-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-tutorials"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_tutorials-release/archive/release/melodic/ros_tutorials/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "b11578f25330eb352df3f4a08c5b1eceb4c9693d2e84bbccf3ce06e4c19940f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_tutorials-release"; + rev = "release/melodic/ros_tutorials/0.9.3-1"; + sha256 = "sha256-of3E5at+se5yBRg6TBLz8yrXpNygX1ATEweB8JofSG0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros-type-introspection/default.nix b/distros/melodic/ros-type-introspection/default.nix index d3a8c3ccb5..b9b912e5c3 100644 --- a/distros/melodic/ros-type-introspection/default.nix +++ b/distros/melodic/ros-type-introspection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros-type-introspection"; version = "2.1.0-r2"; - src = fetchurl { - url = "https://github.com/facontidavide/ros_type_introspection-release/archive/release/melodic/ros_type_introspection/2.1.0-2.tar.gz"; - name = "2.1.0-2.tar.gz"; - sha256 = "81cd82a8df36832ba0f7d8d385a4b32858bdeb120a93d76991cfcdedd4f592e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "ros_type_introspection-release"; + rev = "release/melodic/ros_type_introspection/2.1.0-2"; + sha256 = "sha256-sZBFF00eC6WRh+jtaRw+Ci9LYlu6IIq9k8FnAcylIa8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ros/default.nix b/distros/melodic/ros/default.nix index ba47e50f10..0cbc3eddf6 100644 --- a/distros/melodic/ros/default.nix +++ b/distros/melodic/ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ros"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/ros/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "925ce4054a71f0a39d6692ce8d8a52abbcc977b33dd77a4249ad9264b48ef164"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/ros/1.14.9-1"; + sha256 = "sha256-DYaD9s5U9fM22hSal5F7X4klkSQeVdis0aVq47dgJHU="; + }; buildType = "catkin"; propagatedBuildInputs = [ catkin mk rosbash rosboost-cfg rosbuild rosclean roscreate roslang roslib rosmake rosunit ]; diff --git a/distros/melodic/rosapi/default.nix b/distros/melodic/rosapi/default.nix index 30ae5b21db..1cf43d2299 100644 --- a/distros/melodic/rosapi/default.nix +++ b/distros/melodic/rosapi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosapi"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/melodic/rosapi/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "95a3e49276d45b279f078361a7cc083c08dd24162c9b87bee632efc3f9989129"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/melodic/rosapi/0.11.16-2"; + sha256 = "sha256-cIXAIsW+W39WHva0irEy7YWxlikWPs+d7W6V+jB9KTs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.setuptools ]; diff --git a/distros/melodic/rosatomic/default.nix b/distros/melodic/rosatomic/default.nix index 3830abec2d..db4c109961 100644 --- a/distros/melodic/rosatomic/default.nix +++ b/distros/melodic/rosatomic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosatomic"; version = "1.0.25"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/melodic/rosatomic/1.0.25-0.tar.gz"; - name = "1.0.25-0.tar.gz"; - sha256 = "d4f38df7e64e7cef90ce597674a5832653f0e564dbc4163f5232fa180215b4d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/melodic/rosatomic/1.0.25-0"; + sha256 = "sha256-+xjGLnELF3OhXp1TesY/exuwe42otRu/u1+letSQUnU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosauth/default.nix b/distros/melodic/rosauth/default.nix index 99565d6c26..52f90e8173 100644 --- a/distros/melodic/rosauth/default.nix +++ b/distros/melodic/rosauth/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosauth"; version = "1.0.1"; - src = fetchurl { - url = "https://github.com/gt-rail-release/rosauth-release/archive/release/melodic/rosauth/1.0.1-0.tar.gz"; - name = "1.0.1-0.tar.gz"; - sha256 = "0ca3669ec558cc5222bad792320e30bb7e7d0321282b1abe49a0ff9b68fb5986"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gt-rail-release"; + repo = "rosauth-release"; + rev = "release/melodic/rosauth/1.0.1-0"; + sha256 = "sha256-k6rlgHzOtIixFOZAXYcjZimrp6cFUKE1p7MCPhzpIME="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation openssl ]; diff --git a/distros/melodic/rosbag-cloud-recorders/default.nix b/distros/melodic/rosbag-cloud-recorders/default.nix index dd2acdf1fc..e921c10370 100644 --- a/distros/melodic/rosbag-cloud-recorders/default.nix +++ b/distros/melodic/rosbag-cloud-recorders/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag-cloud-recorders"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/rosbag_uploader-release/archive/release/melodic/rosbag_cloud_recorders/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "7558cdb87a1dc7a56a0dc4eaeedc550724cdb293a0b56a7e5a44a707adcb8e9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "rosbag_uploader-release"; + rev = "release/melodic/rosbag_cloud_recorders/1.0.1-1"; + sha256 = "sha256-CJsXGvthcbLrBJbEwJliBY0Ck0Yo3qr50BYMHDK0an4="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/rosbag-editor/default.nix b/distros/melodic/rosbag-editor/default.nix index 562f0dc843..e8836c140c 100644 --- a/distros/melodic/rosbag-editor/default.nix +++ b/distros/melodic/rosbag-editor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag-editor"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/facontidavide/rosbag_editor-release/archive/release/melodic/rosbag_editor/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "a14354ca2721cf4793619775a5ab3fe46348104f6436f33bfa52779f56406e70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "rosbag_editor-release"; + rev = "release/melodic/rosbag_editor/0.4.2-1"; + sha256 = "sha256-3CzFYNDWE6F29Yw3MCGuWeH2zNDSZT0TN1wUbfoVLCA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosbag-fancy/default.nix b/distros/melodic/rosbag-fancy/default.nix index da27f486cb..23091e7e54 100644 --- a/distros/melodic/rosbag-fancy/default.nix +++ b/distros/melodic/rosbag-fancy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag-fancy"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosbag_fancy-release/archive/release/melodic/rosbag_fancy/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "839e4c131c6da7f0ea872b61667ce56b81e6db21a3aa5e0c3145ed9e9097eb40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosbag_fancy-release"; + rev = "release/melodic/rosbag_fancy/0.2.0-1"; + sha256 = "sha256-AJtL3UrlTzffPR5wZErOiecGR2K4cKqctovCyQTlhH0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosbag-migration-rule/default.nix b/distros/melodic/rosbag-migration-rule/default.nix index d309edb996..68b9500bc6 100644 --- a/distros/melodic/rosbag-migration-rule/default.nix +++ b/distros/melodic/rosbag-migration-rule/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag-migration-rule"; version = "1.0.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosbag_migration_rule-release/archive/release/melodic/rosbag_migration_rule/1.0.0-0.tar.gz"; - name = "1.0.0-0.tar.gz"; - sha256 = "985744e58043e42585c195d72c7f8c0a265b646ca9dbfdf7d67d4488ed2a2a11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosbag_migration_rule-release"; + rev = "release/melodic/rosbag_migration_rule/1.0.0-0"; + sha256 = "sha256-dk1tz86FGMa1XwsdqrDMvURDEifzY9dK7Kanr6VZTXA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosbag-pandas/default.nix b/distros/melodic/rosbag-pandas/default.nix index 3ad271d56d..be96b83c3f 100644 --- a/distros/melodic/rosbag-pandas/default.nix +++ b/distros/melodic/rosbag-pandas/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag-pandas"; version = "0.5.3"; - src = fetchurl { - url = "https://github.com/eurogroep/rosbag_pandas-release/archive/release/melodic/rosbag_pandas/0.5.3-0.tar.gz"; - name = "0.5.3-0.tar.gz"; - sha256 = "a1e49a019fe7770b6a4de2ba9c8551c78e6288b2a32f7da4227f97d48e929a9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "eurogroep"; + repo = "rosbag_pandas-release"; + rev = "release/melodic/rosbag_pandas/0.5.3-0"; + sha256 = "sha256-Mf0gzn+eS8RrSOeCR7ZeQi9tebnS2dzzLTczYhK8dds="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosbag-snapshot-msgs/default.nix b/distros/melodic/rosbag-snapshot-msgs/default.nix index fc0d766c29..354031b9ad 100644 --- a/distros/melodic/rosbag-snapshot-msgs/default.nix +++ b/distros/melodic/rosbag-snapshot-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag-snapshot-msgs"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosbag_snapshot-release/archive/release/melodic/rosbag_snapshot_msgs/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "39f0bb1c63f100662d2e0adb8a8f60dd498c164974c6febc848cccdea9b7414f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosbag_snapshot-release"; + rev = "release/melodic/rosbag_snapshot_msgs/1.0.4-1"; + sha256 = "sha256-SHHdVyr5zYyIyNnHyeJ+/GM8ohYgljDREbpKQAaxz3g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rosbag-snapshot/default.nix b/distros/melodic/rosbag-snapshot/default.nix index 011e984bc9..bcd536f10f 100644 --- a/distros/melodic/rosbag-snapshot/default.nix +++ b/distros/melodic/rosbag-snapshot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag-snapshot"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosbag_snapshot-release/archive/release/melodic/rosbag_snapshot/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "3e14fb72af8e6f077fd2c6982e9d4b6737d01fa361168e3130d27e1c3c74be33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosbag_snapshot-release"; + rev = "release/melodic/rosbag_snapshot/1.0.4-1"; + sha256 = "sha256-edqGPY5C+67t9+vfvrkVCx87Porq5nIAGIlU2aihRRM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosbag-storage/default.nix b/distros/melodic/rosbag-storage/default.nix index 3574f55399..0645c400b5 100644 --- a/distros/melodic/rosbag-storage/default.nix +++ b/distros/melodic/rosbag-storage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag-storage"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosbag_storage/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "26772126a2f259a82eaf5e0b484c6508242dbf485476a1f14631a5ec67aa711d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosbag_storage/1.14.13-1"; + sha256 = "sha256-euIauiSLzmWQCDgvCOFM7b+q2/SWtZbg7Txe+ppdPj4="; + }; buildType = "catkin"; buildInputs = [ catkin rostest std-msgs ]; diff --git a/distros/melodic/rosbag/default.nix b/distros/melodic/rosbag/default.nix index bcf2f72813..f6e8db624d 100644 --- a/distros/melodic/rosbag/default.nix +++ b/distros/melodic/rosbag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbag"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosbag/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "708e10e44c85f701d83d4e7984d1df37602a2a75c33c389a98be28ec1752d0fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosbag/1.14.13-1"; + sha256 = "sha256-f/0lDF2WFUTfADtl1vczQY2ZaFon7qt8pZbL+ySd/Z0="; + }; buildType = "catkin"; buildInputs = [ catkin cpp-common pythonPackages.pillow roscpp-serialization ]; diff --git a/distros/melodic/rosbaglive/default.nix b/distros/melodic/rosbaglive/default.nix index 6d1aecc77f..8ebcd3ceba 100644 --- a/distros/melodic/rosbaglive/default.nix +++ b/distros/melodic/rosbaglive/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbaglive"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/melodic/rosbaglive/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "c7493934d67cb74ec6c94a40eb7089f647945123c38dd4f3e61f597eb05316fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/melodic/rosbaglive/0.2.6-1"; + sha256 = "sha256-CAb2UyKf/xGLOdVeyk+zr8i9YcENc4rwlKPmuF/H7+A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosbash-params/default.nix b/distros/melodic/rosbash-params/default.nix index 1b56b00390..289486b148 100644 --- a/distros/melodic/rosbash-params/default.nix +++ b/distros/melodic/rosbash-params/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbash-params"; version = "1.0.2"; - src = fetchurl { - url = "https://github.com/peci1/rosbash_params-release/archive/release/melodic/rosbash_params/1.0.2-0.tar.gz"; - name = "1.0.2-0.tar.gz"; - sha256 = "af9e6ee8c0ffae32824fbbfa2dfcbb6483e0ad1757282f347ca744db60dcb9a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "rosbash_params-release"; + rev = "release/melodic/rosbash_params/1.0.2-0"; + sha256 = "sha256-EkL/7jIZv0XMWSc/SHkmGnN9ta7d2ddWD1ah38LyCd8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosbash/default.nix b/distros/melodic/rosbash/default.nix index 0f4f87cee2..2127d30cee 100644 --- a/distros/melodic/rosbash/default.nix +++ b/distros/melodic/rosbash/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbash"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/rosbash/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "6a46f7fa9ddd7a2122e55dc4b4998650375c4814f7fb8539f7719ebb6e62a046"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/rosbash/1.14.9-1"; + sha256 = "sha256-LCNq3j+XFx6WWZ5zK6531+ND2qjN7zvNFMWGaPesphM="; + }; buildType = "catkin"; propagatedBuildInputs = [ catkin rospack ]; diff --git a/distros/melodic/rosboost-cfg/default.nix b/distros/melodic/rosboost-cfg/default.nix index b90197c6bc..e9c9c73deb 100644 --- a/distros/melodic/rosboost-cfg/default.nix +++ b/distros/melodic/rosboost-cfg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosboost-cfg"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/rosboost_cfg/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "042fd5681840c37a41a7642ebdea54882c0c49dbbd71c241760f5eea71175b92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/rosboost_cfg/1.14.9-1"; + sha256 = "sha256-KhurXf2mkFRH8dPpV8a7lGnYx4Q6PfsnSEjq3qQjuzU="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/rosbridge-library/default.nix b/distros/melodic/rosbridge-library/default.nix index 9e4e420555..6d078c501c 100644 --- a/distros/melodic/rosbridge-library/default.nix +++ b/distros/melodic/rosbridge-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbridge-library"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/melodic/rosbridge_library/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "a707fa37febd58803c65498b56779a6ff38a62cc3e10c44e1d0ff2289f152bf3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/melodic/rosbridge_library/0.11.16-2"; + sha256 = "sha256-LZdHa91uSZCI4xCobrhmbbSktDrXCWJRg+eKwYhWmIo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.setuptools ]; diff --git a/distros/melodic/rosbridge-msgs/default.nix b/distros/melodic/rosbridge-msgs/default.nix index c408fa5134..e8a8015936 100644 --- a/distros/melodic/rosbridge-msgs/default.nix +++ b/distros/melodic/rosbridge-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbridge-msgs"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/melodic/rosbridge_msgs/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "7142ed3e666afae3424471a5ac779065406e691382d6b48705e2792443b81e35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/melodic/rosbridge_msgs/0.11.16-2"; + sha256 = "sha256-xH6vLqsmuMRQDpoUQkxI8ewMPt5iFe3dyGzNgkWdlkI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rosbridge-server/default.nix b/distros/melodic/rosbridge-server/default.nix index a3cc857538..744366e6b2 100644 --- a/distros/melodic/rosbridge-server/default.nix +++ b/distros/melodic/rosbridge-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbridge-server"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/melodic/rosbridge_server/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "3d6c126140f38d740d8fa69c8f6dfcf6c955965e2f9b9bb0c63f867ae0794697"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/melodic/rosbridge_server/0.11.16-2"; + sha256 = "sha256-6B6RomED+NHHu7I281ZFKd3CqVhE2XfmIAqziqRlj20="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/rosbridge-suite/default.nix b/distros/melodic/rosbridge-suite/default.nix index afbad2c741..ba82e70881 100644 --- a/distros/melodic/rosbridge-suite/default.nix +++ b/distros/melodic/rosbridge-suite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbridge-suite"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/melodic/rosbridge_suite/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "750a40ad2c07173f5f5de3bb9ac49039315b310c4c6a85432c69b1169522e9ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/melodic/rosbridge_suite/0.11.16-2"; + sha256 = "sha256-5I+jCJEjUkoxuERAkSfsm30eQqxPmxsfwuyLd6ltXRE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosbuild/default.nix b/distros/melodic/rosbuild/default.nix index 8be7b205e4..c02952ed26 100644 --- a/distros/melodic/rosbuild/default.nix +++ b/distros/melodic/rosbuild/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosbuild"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/rosbuild/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "34effeb0596f1cc1fb841b7e399fc8fda0f38c8ed3ea1c021172b68a38d5eeec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/rosbuild/1.14.9-1"; + sha256 = "sha256-BKlR8DTs/rLJ+oSYKZi7s/hmcGmmYfbvcB9XOLoHGTs="; + }; buildType = "catkin"; buildInputs = [ pkg-config ]; diff --git a/distros/melodic/rosclean/default.nix b/distros/melodic/rosclean/default.nix index 60e64e6147..1aea05b291 100644 --- a/distros/melodic/rosclean/default.nix +++ b/distros/melodic/rosclean/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosclean"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/rosclean/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "69d89a7d3199d11214c208c177f56e7cbcc42fb349fe76df6992c869ceca5bbe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/rosclean/1.14.9-1"; + sha256 = "sha256-LSZfG/CUvtCMRLwK/3qM58+u9NICIzu97aLPab+4ZDI="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/roscompile/default.nix b/distros/melodic/roscompile/default.nix index 66cf27e65f..a24bb16ae7 100644 --- a/distros/melodic/roscompile/default.nix +++ b/distros/melodic/roscompile/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roscompile"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/roscompile-release/archive/release/melodic/roscompile/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "d80525c66aab6b4152f9d4002a4dbec3d0c2742858c4f80206780f634cf691a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "roscompile-release"; + rev = "release/melodic/roscompile/1.2.1-1"; + sha256 = "sha256-ByXxHE2jb+wWplB1Qo+vRu2V/NUnU2FH/sejPcjtEp0="; + }; buildType = "catkin"; buildInputs = [ pythonPackages.setuptools ]; diff --git a/distros/melodic/rosconsole-bridge/default.nix b/distros/melodic/rosconsole-bridge/default.nix index 3559683c6a..5876586a61 100644 --- a/distros/melodic/rosconsole-bridge/default.nix +++ b/distros/melodic/rosconsole-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosconsole-bridge"; version = "0.5.3"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosconsole_bridge-release/archive/release/melodic/rosconsole_bridge/0.5.3-0.tar.gz"; - name = "0.5.3-0.tar.gz"; - sha256 = "d47fadd37a04d4f165bef5173d536190baa3006dac2fa0235a14527d32169afc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosconsole_bridge-release"; + rev = "release/melodic/rosconsole_bridge/0.5.3-0"; + sha256 = "sha256-Fp4Axd/6P0pkKc7jw5+PC7fj0FTQHmzQgZqckkA7aD0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosconsole/default.nix b/distros/melodic/rosconsole/default.nix index 0e25328a46..4c35a01e95 100644 --- a/distros/melodic/rosconsole/default.nix +++ b/distros/melodic/rosconsole/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosconsole"; version = "1.13.18-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosconsole-release/archive/release/melodic/rosconsole/1.13.18-1.tar.gz"; - name = "1.13.18-1.tar.gz"; - sha256 = "9b544ea97f1e97680d2474a4cedb3c9c2a0b19c3ad70f5d11fd7c886bd4fe4c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosconsole-release"; + rev = "release/melodic/rosconsole/1.13.18-1"; + sha256 = "sha256-CZiOS61WSQLcTdd1CkvAlqDy++D3DtAYUkibsan1qgg="; + }; buildType = "catkin"; buildInputs = [ catkin rosunit ]; diff --git a/distros/melodic/roscpp-core/default.nix b/distros/melodic/roscpp-core/default.nix index 5e4a8906ce..17e20d9b7a 100644 --- a/distros/melodic/roscpp-core/default.nix +++ b/distros/melodic/roscpp-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roscpp-core"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_core/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "da4778ab1171d31224051712ac0ea9c0dd996179175faa56c143991aa8cdae1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/melodic/roscpp_core/0.6.14-1"; + sha256 = "sha256-TxoaQrmB8dHUl9nHmX9sQB8wue5owm+Iid+WzEfZmzA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roscpp-serialization/default.nix b/distros/melodic/roscpp-serialization/default.nix index cc2a967bfc..b52bfdf1c3 100644 --- a/distros/melodic/roscpp-serialization/default.nix +++ b/distros/melodic/roscpp-serialization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roscpp-serialization"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_serialization/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "3e66fa241b33a6ee8745695bbcc1e159dbcfbd6be7c0dad64d5d503ae286cd0d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/melodic/roscpp_serialization/0.6.14-1"; + sha256 = "sha256-gzlGxHQnA98J3ZU1vi35hhUnGJDK2H0Xd3JaXv8rzJw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roscpp-traits/default.nix b/distros/melodic/roscpp-traits/default.nix index 556831074f..b2ca30001f 100644 --- a/distros/melodic/roscpp-traits/default.nix +++ b/distros/melodic/roscpp-traits/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roscpp-traits"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_traits/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "e4d18c464c480a0b8955412ef84f15435ebe52b9a0690a8c10384c604b56d174"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/melodic/roscpp_traits/0.6.14-1"; + sha256 = "sha256-+PVti+M23W4HH/5gxAiVP1BQ/+STzu65db17IckPra0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roscpp-tutorials/default.nix b/distros/melodic/roscpp-tutorials/default.nix index f140be88f6..cbbf255413 100644 --- a/distros/melodic/roscpp-tutorials/default.nix +++ b/distros/melodic/roscpp-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roscpp-tutorials"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_tutorials-release/archive/release/melodic/roscpp_tutorials/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "4c048335f780e354abaa395fd83a98335d9e94441950bbc9f487e163edf50cb2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_tutorials-release"; + rev = "release/melodic/roscpp_tutorials/0.9.3-1"; + sha256 = "sha256-LDriqiShX0oVasXcr4Dz8QddsHudNQ8wQCcmq+n4ifY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/roscpp/default.nix b/distros/melodic/roscpp/default.nix index 5f803919b1..565799d017 100644 --- a/distros/melodic/roscpp/default.nix +++ b/distros/melodic/roscpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roscpp"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roscpp/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "a99b07fcd568c729b2ad2a98af780072f698bcb1de34df839eb421e970f82463"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/roscpp/1.14.13-1"; + sha256 = "sha256-KtvBPGblCIOJEJ+Z0Cmmc4ffzt0u1XCyQfaBTEiGCxs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pkg-config roslang ]; diff --git a/distros/melodic/roscreate/default.nix b/distros/melodic/roscreate/default.nix index 877ba62ed9..e9607048ce 100644 --- a/distros/melodic/roscreate/default.nix +++ b/distros/melodic/roscreate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roscreate"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/roscreate/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "5be3e124f93f53ad14096e6ae8d58bea596b7fe9850ed94e33295604a4987b26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/roscreate/1.14.9-1"; + sha256 = "sha256-E8dHCs6VCiDshGzYdo3AkRcHOFyUyoKSnm8y72raw+U="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/rosdiagnostic/default.nix b/distros/melodic/rosdiagnostic/default.nix index a90b6b2649..b3a399ce8d 100644 --- a/distros/melodic/rosdiagnostic/default.nix +++ b/distros/melodic/rosdiagnostic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosdiagnostic"; version = "1.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/rosdiagnostic/1.9.7-1.tar.gz"; - name = "1.9.7-1.tar.gz"; - sha256 = "82844fa5c5ea517247d21e6276b7ebd9047b1ded877206ac3c0a027b176b5bcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/melodic/rosdiagnostic/1.9.7-1"; + sha256 = "sha256-Q9pBwNP+1kvRVV4jOVZdk3Uy50rSb9PF/8wwOP+hB2I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosee-msg/default.nix b/distros/melodic/rosee-msg/default.nix index 05f2ef7e61..af5cc15fa6 100644 --- a/distros/melodic/rosee-msg/default.nix +++ b/distros/melodic/rosee-msg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosee-msg"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ADVRHumanoids/rosee_msg-release/archive/release/melodic/rosee_msg/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "5a08f47967aa20234b992f8c945d4e05f1a6bc45f70ea76b923fabcb93c35818"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ADVRHumanoids"; + repo = "rosee_msg-release"; + rev = "release/melodic/rosee_msg/1.0.2-1"; + sha256 = "sha256-MiMLAVJ6lOeT0ntJritd6RydPoQLD70gNZt6UVZb/7U="; + }; buildType = "catkin"; buildInputs = [ catkin geometry-msgs std-msgs std-srvs ]; diff --git a/distros/melodic/rosemacs/default.nix b/distros/melodic/rosemacs/default.nix index dcbaabd956..eadf8a2692 100644 --- a/distros/melodic/rosemacs/default.nix +++ b/distros/melodic/rosemacs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosemacs"; version = "0.4.16-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/melodic/rosemacs/0.4.16-1.tar.gz"; - name = "0.4.16-1.tar.gz"; - sha256 = "ceebd187f93e5787f70dc2b79f0afaffab866b752acbe7d8aacce36b5c2c0e30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/melodic/rosemacs/0.4.16-1"; + sha256 = "sha256-efE67s2F8Rysz7X1Gp7S7cHtDKmZ54rOAhl3BWii3hc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roseus-mongo/default.nix b/distros/melodic/roseus-mongo/default.nix index 23e373accd..9f8a675557 100644 --- a/distros/melodic/roseus-mongo/default.nix +++ b/distros/melodic/roseus-mongo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roseus-mongo"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/melodic/roseus_mongo/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "c86e4bbe0fc1f27a7c71715c22a50174fd9ba1ba38c47acb80d7c7403e2515d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/melodic/roseus_mongo/1.7.4-1"; + sha256 = "sha256-lBzTLlNnA5xz1ZO89lxkiYHWiru3vkte2PuzsyvZ2ww="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/roseus-smach/default.nix b/distros/melodic/roseus-smach/default.nix index 80d1f46f87..e3cbaee8ee 100644 --- a/distros/melodic/roseus-smach/default.nix +++ b/distros/melodic/roseus-smach/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roseus-smach"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/melodic/roseus_smach/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "d174a427c36c766fcc47ceb18a95cc3dda75a74b04550a7b7d2b8de78af3edde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/melodic/roseus_smach/1.7.4-1"; + sha256 = "sha256-JsSwAXxA64pUYiSc+UHIRV4NyzOmsEUAz44q1hb3E2I="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/roseus-tutorials/default.nix b/distros/melodic/roseus-tutorials/default.nix index ffe9b946fa..7cee535123 100644 --- a/distros/melodic/roseus-tutorials/default.nix +++ b/distros/melodic/roseus-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roseus-tutorials"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/melodic/roseus_tutorials/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "636febaa5696e25a61c0a8ecb98ecff1de97646c6d8b255956b3013758fd6be8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/melodic/roseus_tutorials/1.7.4-1"; + sha256 = "sha256-d4YRj9NPIZWTA6VqpyNefpJeva9LraVwK/KqD/l4q98="; + }; buildType = "catkin"; buildInputs = [ catkin roseus ]; diff --git a/distros/melodic/roseus/default.nix b/distros/melodic/roseus/default.nix index 14080ed1ff..7e54ae3fce 100644 --- a/distros/melodic/roseus/default.nix +++ b/distros/melodic/roseus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roseus"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/melodic/roseus/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "02ba052b195e8a7bc3f83807425b5293a11b32283f7d8f5673ad742bc41e8c20"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/melodic/roseus/1.7.4-1"; + sha256 = "sha256-zOq9bIchRpzK+pNdojywghqKiiwCYEwqgcxiLopZK98="; + }; buildType = "catkin"; buildInputs = [ angles catkin coreutils message-generation mk rosbuild rostopic ]; diff --git a/distros/melodic/rosflight-firmware/default.nix b/distros/melodic/rosflight-firmware/default.nix index 5e3a135a41..c43e814a0b 100644 --- a/distros/melodic/rosflight-firmware/default.nix +++ b/distros/melodic/rosflight-firmware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosflight-firmware"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/rosflight/rosflight-release/archive/release/melodic/rosflight_firmware/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "213ec9686d4046dbfc0caf442b617cfef900f5ce3e9e5cc02ada4ef1c3b3cf8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosflight"; + repo = "rosflight-release"; + rev = "release/melodic/rosflight_firmware/1.3.1-1"; + sha256 = "sha256-4jeuY/nbFBONJgcmIlIC5MhC70qM1jKj0Z2ROjKGAsQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosflight-msgs/default.nix b/distros/melodic/rosflight-msgs/default.nix index 6d82de7198..ef7a02df0f 100644 --- a/distros/melodic/rosflight-msgs/default.nix +++ b/distros/melodic/rosflight-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosflight-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/rosflight/rosflight-release/archive/release/melodic/rosflight_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "52d7c9becbc24bb69b7cda495f0d7b85ca368607ab545a90f28248773e343a48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosflight"; + repo = "rosflight-release"; + rev = "release/melodic/rosflight_msgs/1.3.1-1"; + sha256 = "sha256-vJGirsY3dBlrBV3rvEL6gqCInJlu+iy+yH4ahFAwgMw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rosflight-pkgs/default.nix b/distros/melodic/rosflight-pkgs/default.nix index 947399fad3..8b613a6685 100644 --- a/distros/melodic/rosflight-pkgs/default.nix +++ b/distros/melodic/rosflight-pkgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosflight-pkgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/rosflight/rosflight-release/archive/release/melodic/rosflight_pkgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "d35450427eefe3c64eb5c88a514f4462e73f75ef53cf9a66bf80521380ef309b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosflight"; + repo = "rosflight-release"; + rev = "release/melodic/rosflight_pkgs/1.3.1-1"; + sha256 = "sha256-ikNnsgxClDSpU0G4fwvuB2/aimFX/JRZibMyvhjaOEs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosflight-sim/default.nix b/distros/melodic/rosflight-sim/default.nix index a2c2fb34e8..2d2a0db1bc 100644 --- a/distros/melodic/rosflight-sim/default.nix +++ b/distros/melodic/rosflight-sim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosflight-sim"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/rosflight/rosflight-release/archive/release/melodic/rosflight_sim/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "231909a454064b5b3d1d7a37839d4b35238e308318ae9f04857a7f0b45691283"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosflight"; + repo = "rosflight-release"; + rev = "release/melodic/rosflight_sim/1.3.1-1"; + sha256 = "sha256-NYktbMe48QwQ56879Ukgy11JOHFGeB/es3O2v5gRjs0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosflight-utils/default.nix b/distros/melodic/rosflight-utils/default.nix index f533772581..97f8525863 100644 --- a/distros/melodic/rosflight-utils/default.nix +++ b/distros/melodic/rosflight-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosflight-utils"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/rosflight/rosflight-release/archive/release/melodic/rosflight_utils/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "5a9ff019490687c98ed678a9b1074534a44e3c3d07c3cedc79d91688d4607e35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosflight"; + repo = "rosflight-release"; + rev = "release/melodic/rosflight_utils/1.3.1-1"; + sha256 = "sha256-18n4x/Sx44od25W3jFtziwQKYrSdtcHCKvY/ykAkDW8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosflight/default.nix b/distros/melodic/rosflight/default.nix index e1e71d6e3a..9fa32eef8f 100644 --- a/distros/melodic/rosflight/default.nix +++ b/distros/melodic/rosflight/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosflight"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/rosflight/rosflight-release/archive/release/melodic/rosflight/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "39677cf16d92770db360bc6aada7d212a62d80aa96c40b1027b34c327cd488d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosflight"; + repo = "rosflight-release"; + rev = "release/melodic/rosflight/1.3.1-1"; + sha256 = "sha256-wHL0wqklrW+x4hZ5HgT0gGvnF/W0nwlGuk7H7KQHxhg="; + }; buildType = "catkin"; buildInputs = [ catkin git pkg-config ]; diff --git a/distros/melodic/rosfmt/default.nix b/distros/melodic/rosfmt/default.nix index 36bdf30695..ab6ed6d760 100644 --- a/distros/melodic/rosfmt/default.nix +++ b/distros/melodic/rosfmt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosfmt"; version = "7.0.0-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosfmt-release/archive/release/melodic/rosfmt/7.0.0-1.tar.gz"; - name = "7.0.0-1.tar.gz"; - sha256 = "9b377b866f2d9d6fc807b982f0893cf58a95fbce0af4a7cc92b88507db5c037b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosfmt-release"; + rev = "release/melodic/rosfmt/7.0.0-1"; + sha256 = "sha256-32W7hu//XsloTL1Yx5yZX05+13QL4sPbKni7WtRyQJo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosgraph-msgs/default.nix b/distros/melodic/rosgraph-msgs/default.nix index 711e92510b..2f5001c175 100644 --- a/distros/melodic/rosgraph-msgs/default.nix +++ b/distros/melodic/rosgraph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosgraph-msgs"; version = "1.11.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm_msgs-release/archive/release/melodic/rosgraph_msgs/1.11.2-0.tar.gz"; - name = "1.11.2-0.tar.gz"; - sha256 = "5aa9e1b1adbf5e86931e771b1a154384485803a73e50804e0c739f83767270c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm_msgs-release"; + rev = "release/melodic/rosgraph_msgs/1.11.2-0"; + sha256 = "sha256-6ufZzyutE+irt/QY8lnA0G5p1d1KZ/GGmDDlqananqk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rosgraph/default.nix b/distros/melodic/rosgraph/default.nix index bffce8b28a..70d1f3356a 100644 --- a/distros/melodic/rosgraph/default.nix +++ b/distros/melodic/rosgraph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosgraph"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosgraph/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "af6a29e59ad7e16e5feda1446e671c1de54a2744516f106fd2938363336ef09b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosgraph/1.14.13-1"; + sha256 = "sha256-lAV3tP4ZqDhkCPoAwwZU4pg5AUmZ2UBm636qgjFPQs4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roslang/default.nix b/distros/melodic/roslang/default.nix index 54a2dc6a95..a51563e2a8 100644 --- a/distros/melodic/roslang/default.nix +++ b/distros/melodic/roslang/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslang"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/roslang/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "320b5d85852833da8a3aa3bcd48125aed8e9354cb4785ce760084a0cab84b48f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/roslang/1.14.9-1"; + sha256 = "sha256-7JKOxQBI3Cz7rw4tWkzPzrn0U/fpmYnlV5aD59aSxRc="; + }; buildType = "catkin"; propagatedBuildInputs = [ catkin genmsg ]; diff --git a/distros/melodic/roslaunch/default.nix b/distros/melodic/roslaunch/default.nix index 7fae53bd03..333b07998e 100644 --- a/distros/melodic/roslaunch/default.nix +++ b/distros/melodic/roslaunch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslaunch"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roslaunch/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "847286eaf75f11f6b23c04b29c4de58d6499e4312eb79670b1dc98358875bb54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/roslaunch/1.14.13-1"; + sha256 = "sha256-bjwrjxsyTh6wGMq7oUz1GVX8I0Fc+QpnXrwKd1QOn0g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roslib/default.nix b/distros/melodic/roslib/default.nix index 6d954acb1b..5b545e336a 100644 --- a/distros/melodic/roslib/default.nix +++ b/distros/melodic/roslib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslib"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/roslib/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "5d88106ad4dc7cf82a698e7a7ff86afa17c87ba2d994ea6caf5248cca727d6eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/roslib/1.14.9-1"; + sha256 = "sha256-GS6IKaEXGJzZ2HU9YdGq3V602aIsn+SwrqiZJK//irQ="; + }; buildType = "catkin"; buildInputs = [ boost pythonPackages.setuptools ]; diff --git a/distros/melodic/roslint/default.nix b/distros/melodic/roslint/default.nix index e491662412..3bd2249244 100644 --- a/distros/melodic/roslint/default.nix +++ b/distros/melodic/roslint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslint"; version = "0.11.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslint-release/archive/release/melodic/roslint/0.11.2-0.tar.gz"; - name = "0.11.2-0.tar.gz"; - sha256 = "85588e28bc32d5359340c5524437aa447aadbd15f25c30d9e6cb4030f49232a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslint-release"; + rev = "release/melodic/roslint/0.11.2-0"; + sha256 = "sha256-I0deHAP9G8QEyxmE0FUNVuOzNw2ieRZVAKiD5fYO8O8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roslisp-common/default.nix b/distros/melodic/roslisp-common/default.nix index 92a73b1e76..d112917679 100644 --- a/distros/melodic/roslisp-common/default.nix +++ b/distros/melodic/roslisp-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslisp-common"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/roslisp_common/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "7fbfd8b1d0dc002023ed13524091df870f94315258f7db00c994c0ab6ce7e309"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/roslisp_common/0.2.13-1"; + sha256 = "sha256-8cySZNIbAOJmWhkrxC8aPHXqQnmslzWh6qRch+h/6hs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roslisp-repl/default.nix b/distros/melodic/roslisp-repl/default.nix index bb137e9539..e218d4fc17 100644 --- a/distros/melodic/roslisp-repl/default.nix +++ b/distros/melodic/roslisp-repl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslisp-repl"; version = "0.4.16-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/melodic/roslisp_repl/0.4.16-1.tar.gz"; - name = "0.4.16-1.tar.gz"; - sha256 = "e61ec7c039072709e4635378db091237d9d7eaa4d961557237497e006aa7152b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/melodic/roslisp_repl/0.4.16-1"; + sha256 = "sha256-8sjVcWIp97peXmu9Twqt+cU6k10a+HU7yX2V9GFhVy8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roslisp-utilities/default.nix b/distros/melodic/roslisp-utilities/default.nix index 7907ce0d22..025beaf898 100644 --- a/distros/melodic/roslisp-utilities/default.nix +++ b/distros/melodic/roslisp-utilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslisp-utilities"; version = "0.2.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/melodic/roslisp_utilities/0.2.13-1.tar.gz"; - name = "0.2.13-1.tar.gz"; - sha256 = "d00d8ac04df0def12d8ff4a78bf4266bf0cc3b8c9259686f4d66a6368422e7cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/melodic/roslisp_utilities/0.2.13-1"; + sha256 = "sha256-5JaS4sVdayR6ZWh2HKa5lCQGomzJKVWUI07bhU98nZQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roslisp/default.nix b/distros/melodic/roslisp/default.nix index f733e32a50..00d53067c9 100644 --- a/distros/melodic/roslisp/default.nix +++ b/distros/melodic/roslisp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslisp"; version = "1.9.24-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp-release/archive/release/melodic/roslisp/1.9.24-1.tar.gz"; - name = "1.9.24-1.tar.gz"; - sha256 = "86906499473238efd1de66d1cb4749973e1b5fc2965b3d6b6096fabc0bc601b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp-release"; + rev = "release/melodic/roslisp/1.9.24-1"; + sha256 = "sha256-IDP0xaGdzWf3vimDdWw6utA3oVzIH/AmuVH+boFX+NE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roslz4/default.nix b/distros/melodic/roslz4/default.nix index fad482c323..60950d3a96 100644 --- a/distros/melodic/roslz4/default.nix +++ b/distros/melodic/roslz4/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roslz4"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roslz4/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "9c771184872ca9f50fc94046bcabbf3735cc733b9bffebf80e7678f791d26904"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/roslz4/1.14.13-1"; + sha256 = "sha256-fTv5mngt+UfY2+w7U/7KKzkVwcSr5E4X4Q2NO0Zjp8Q="; + }; buildType = "catkin"; buildInputs = [ catkin cpp-common ]; diff --git a/distros/melodic/rosmake/default.nix b/distros/melodic/rosmake/default.nix index 9a2dc02238..1f2ee3cd99 100644 --- a/distros/melodic/rosmake/default.nix +++ b/distros/melodic/rosmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosmake"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/rosmake/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "a67c86505fa7edb380511dfb3e9021f6bbab44a11835af67117aa980af88e35a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/rosmake/1.14.9-1"; + sha256 = "sha256-PxD7GIPJ954/wCCykY4NfAQUstJ1Im6agRC1QL8Fifo="; + }; buildType = "catkin"; buildInputs = [ pythonPackages.setuptools ]; diff --git a/distros/melodic/rosmaster/default.nix b/distros/melodic/rosmaster/default.nix index c1cd120af0..ef415ce7a0 100644 --- a/distros/melodic/rosmaster/default.nix +++ b/distros/melodic/rosmaster/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosmaster"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosmaster/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "9fb28a867e636062516f0dc377c24383d181a06a0297d84acabd7253202112ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosmaster/1.14.13-1"; + sha256 = "sha256-Hm8YhwhDIh8yL5uxVtZ+w9jpJNF07D54TqcwHF7EnNU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosmon-core/default.nix b/distros/melodic/rosmon-core/default.nix index 07e27a2228..0a45b392f2 100644 --- a/distros/melodic/rosmon-core/default.nix +++ b/distros/melodic/rosmon-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosmon-core"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosmon-release/archive/release/melodic/rosmon_core/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "9e919083967cc7d7859ede0342cb2a26d19ce8c01504b047f6688bff640835c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosmon-release"; + rev = "release/melodic/rosmon_core/2.3.2-1"; + sha256 = "sha256-D77/dqa7YuhXmR5lUH4efs3vgTqtaNTYMtMP4UVngdc="; + }; buildType = "catkin"; buildInputs = [ catkin python ]; diff --git a/distros/melodic/rosmon-msgs/default.nix b/distros/melodic/rosmon-msgs/default.nix index defe05b208..a541af9fe8 100644 --- a/distros/melodic/rosmon-msgs/default.nix +++ b/distros/melodic/rosmon-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosmon-msgs"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosmon-release/archive/release/melodic/rosmon_msgs/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "2ae3bb5ebf044c4c74720afb8df5c6fd04070d1477b4e12e13fb10dfea84ac47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosmon-release"; + rev = "release/melodic/rosmon_msgs/2.3.2-1"; + sha256 = "sha256-hClJKyAYcZu1skSLDbHPgZUt/i5txQI6ay2f90b4VWE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosmon/default.nix b/distros/melodic/rosmon/default.nix index 616f48d182..b7aebbb3f3 100644 --- a/distros/melodic/rosmon/default.nix +++ b/distros/melodic/rosmon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosmon"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosmon-release/archive/release/melodic/rosmon/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "a27ecc9867d2130a7fedc83d531bc182cae7ad0e88b6fe34a2a2fc5bb05fa39d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosmon-release"; + rev = "release/melodic/rosmon/2.3.2-1"; + sha256 = "sha256-94/KUGh9QR8/bii6CE9eyqmuhAtlDzmbhp0+pReFI+o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosmsg-cpp/default.nix b/distros/melodic/rosmsg-cpp/default.nix index 2972385b20..1f3c54c282 100644 --- a/distros/melodic/rosmsg-cpp/default.nix +++ b/distros/melodic/rosmsg-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosmsg-cpp"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ctu-vras/rosmsg_cpp-release/archive/release/melodic/rosmsg_cpp/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "0e6da8054fc8e85204a8c0a58a68e516a18d994bfe94ae19748a791586a5d834"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ctu-vras"; + repo = "rosmsg_cpp-release"; + rev = "release/melodic/rosmsg_cpp/1.0.2-1"; + sha256 = "sha256-78DbURdOPEKrEXwGtg/MUxsbNesIKpCn1DjqSh4q8No="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.python ros-environment ]; diff --git a/distros/melodic/rosmsg/default.nix b/distros/melodic/rosmsg/default.nix index af8d4e06b7..1884437a99 100644 --- a/distros/melodic/rosmsg/default.nix +++ b/distros/melodic/rosmsg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosmsg"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosmsg/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "12ea63e00d4d35c223229eadddab04a147c44475aa4cf4288b72daf4a4637a5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosmsg/1.14.13-1"; + sha256 = "sha256-xSY21cE/RuCxF+eZiOgVTSPpgUHgIRKGDP9JY82qZl4="; + }; buildType = "catkin"; checkInputs = [ diagnostic-msgs rostest std-msgs std-srvs ]; diff --git a/distros/melodic/rosnode-rtc/default.nix b/distros/melodic/rosnode-rtc/default.nix index d4e1827022..c27c629c0f 100644 --- a/distros/melodic/rosnode-rtc/default.nix +++ b/distros/melodic/rosnode-rtc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosnode-rtc"; version = "1.4.3-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_common-release/archive/release/melodic/rosnode_rtc/1.4.3-1.tar.gz"; - name = "1.4.3-1.tar.gz"; - sha256 = "67abf6f423674d1ae9d0f5e41197ee68ae00697f676338b98ec345fd7af8eee8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_common-release"; + rev = "release/melodic/rosnode_rtc/1.4.3-1"; + sha256 = "sha256-qQl4lh84pcVQH6TJ7pqIq1GT/1f1znN7U+fQSbGcgAw="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp-tutorials rospy rostopic ]; diff --git a/distros/melodic/rosnode/default.nix b/distros/melodic/rosnode/default.nix index d27b171def..b7a76f7aa4 100644 --- a/distros/melodic/rosnode/default.nix +++ b/distros/melodic/rosnode/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosnode"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosnode/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "3b0fc3810617683ce9209792c4ca2b3e2e57ad56638da13e0a88ddd86f4aa2d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosnode/1.14.13-1"; + sha256 = "sha256-k8F1uRKFKqf3GxvSVRnwvLGv1j1+pSLXYRNWUTonoUE="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/rosout/default.nix b/distros/melodic/rosout/default.nix index df3f600560..920b2c6157 100644 --- a/distros/melodic/rosout/default.nix +++ b/distros/melodic/rosout/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosout"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosout/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "44b692ed3292419961cf7a78d8df3bd8b5e0958e620bebd778e0249d0a9a230f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosout/1.14.13-1"; + sha256 = "sha256-bfSBP1CcTXN2WD5eJ9V5aNU1eN1m5BQI+iEgrqOGEAA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rospack/default.nix b/distros/melodic/rospack/default.nix index bf2f3d84b2..e606cd4f7e 100644 --- a/distros/melodic/rospack/default.nix +++ b/distros/melodic/rospack/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rospack"; version = "2.5.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rospack-release/archive/release/melodic/rospack/2.5.6-1.tar.gz"; - name = "2.5.6-1.tar.gz"; - sha256 = "5d348a4428f344ecbde8d0ceed9d38b4326d45538d5875ead0b5498804d8f30e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rospack-release"; + rev = "release/melodic/rospack/2.5.6-1"; + sha256 = "sha256-Ij+5dpmFxgLhtUWZffhEHNmnyzHJOdCjrp4T6tYB8xI="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules gtest ]; diff --git a/distros/melodic/rosparam-handler/default.nix b/distros/melodic/rosparam-handler/default.nix index 7aefd31af9..3097295c85 100644 --- a/distros/melodic/rosparam-handler/default.nix +++ b/distros/melodic/rosparam-handler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosparam-handler"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/cbandera/rosparam_handler-release/archive/release/melodic/rosparam_handler/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "b11ba2d257e5c7fc2c50f3e9eea117867178ed67a74906e21ebfad9f222f3fba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cbandera"; + repo = "rosparam_handler-release"; + rev = "release/melodic/rosparam_handler/0.1.4-1"; + sha256 = "sha256-DNpRsk38hZoPSCa8YLGYJcEakWVUIsmzOgBY6w6qxnw="; + }; buildType = "catkin"; buildInputs = [ rostest ]; diff --git a/distros/melodic/rosparam-shortcuts/default.nix b/distros/melodic/rosparam-shortcuts/default.nix index 31bb6b326a..d96d5e97a9 100644 --- a/distros/melodic/rosparam-shortcuts/default.nix +++ b/distros/melodic/rosparam-shortcuts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosparam-shortcuts"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/rosparam_shortcuts-release/archive/release/melodic/rosparam_shortcuts/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "e98b3641823b5ebc202bf41a8c62202f8c26fd7d898c9c9a32fb1812771b9554"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "rosparam_shortcuts-release"; + rev = "release/melodic/rosparam_shortcuts/0.3.3-1"; + sha256 = "sha256-5XLWPuIIWqE+BqmEtwWcdtAiNlsiGb93STaUMg4KQsc="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen roslint ]; diff --git a/distros/melodic/rosparam/default.nix b/distros/melodic/rosparam/default.nix index c76a970bbb..266e59b166 100644 --- a/distros/melodic/rosparam/default.nix +++ b/distros/melodic/rosparam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosparam"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosparam/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "10861fbca6603cd0a4ee97d16940cbd777cfd8fb9c4fb66ac93b53802c2ac5ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosparam/1.14.13-1"; + sha256 = "sha256-plw+cSMEN0s5TlLqgMfU2pttUBDAflg4hIgH1GeqLUQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rospatlite/default.nix b/distros/melodic/rospatlite/default.nix index 4f2ce35202..c6872283d5 100644 --- a/distros/melodic/rospatlite/default.nix +++ b/distros/melodic/rospatlite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rospatlite"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/rospatlite/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "9f38ca446c4aaaaa6fc430c796304b3040ad049416e28857e2622bbafbfeffb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/rospatlite/2.1.24-2"; + sha256 = "sha256-N8w8vDlwaGP/jJRn5FzU9PkWMyap/6RCSz/B8VxNuZI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosping/default.nix b/distros/melodic/rosping/default.nix index 277e82f038..ce9f3965fc 100644 --- a/distros/melodic/rosping/default.nix +++ b/distros/melodic/rosping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosping"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/rosping/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "d0a34e3eb3d8bd83f9c2adbf15c35b2a9c476969bbdf6653fc139e0c8b25de84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/rosping/2.1.24-2"; + sha256 = "sha256-cmm07WR5zznQUc3jvFieloEquNCsmNBYBmyPrV9dlbE="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosboost-cfg rosbuild rostest ]; diff --git a/distros/melodic/rospy-message-converter/default.nix b/distros/melodic/rospy-message-converter/default.nix index 988cb77f8c..8273889f8a 100644 --- a/distros/melodic/rospy-message-converter/default.nix +++ b/distros/melodic/rospy-message-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rospy-message-converter"; version = "0.5.9-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/rospy_message_converter-release/archive/release/melodic/rospy_message_converter/0.5.9-1.tar.gz"; - name = "0.5.9-1.tar.gz"; - sha256 = "87f060cdd07e2216fbda60ba3f5c3a55b8e4d202a4faeedb6dc9ea71caf546c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "rospy_message_converter-release"; + rev = "release/melodic/rospy_message_converter/0.5.9-1"; + sha256 = "sha256-/QmKoz7Y/DE3g/dz535r6vkFH/k92V6DebqapX0gqeU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rospy-tutorials/default.nix b/distros/melodic/rospy-tutorials/default.nix index f1d85b7a92..4a74848090 100644 --- a/distros/melodic/rospy-tutorials/default.nix +++ b/distros/melodic/rospy-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rospy-tutorials"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_tutorials-release/archive/release/melodic/rospy_tutorials/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "ed656ddf3487d1b362676d72b5aa00c09699a33c013d1f0f2fa2d5c33942d27b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_tutorials-release"; + rev = "release/melodic/rospy_tutorials/0.9.3-1"; + sha256 = "sha256-htjBSKqPP/XtVRDMGL17jWug4USv8Noc/Ez7/9w0Q4M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/melodic/rospy/default.nix b/distros/melodic/rospy/default.nix index 7d2ffc01cc..7b45ef2710 100644 --- a/distros/melodic/rospy/default.nix +++ b/distros/melodic/rospy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rospy"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rospy/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "b4a5bf60412932d0ebe959b4958112cac22af9ec3174ae1c1825b7568a727299"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rospy/1.14.13-1"; + sha256 = "sha256-9oxUjY1JLw0uXjm5XjiIuFJeXe3vHs04N+8fqOw3sIo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosrt/default.nix b/distros/melodic/rosrt/default.nix index 945bdbc95f..29a99d7c66 100644 --- a/distros/melodic/rosrt/default.nix +++ b/distros/melodic/rosrt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosrt"; version = "1.0.25"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/melodic/rosrt/1.0.25-0.tar.gz"; - name = "1.0.25-0.tar.gz"; - sha256 = "ab1cb91949e270a78898a6d03547538b9c4da40d82d9da354cda672ba8585f11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/melodic/rosrt/1.0.25-0"; + sha256 = "sha256-sa4sVy7EGPoChDqb9dHWoKXn8ioisLi/5c77xvpTtbQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosserial-arduino/default.nix b/distros/melodic/rosserial-arduino/default.nix index 34fa804ea9..5770ab11f5 100644 --- a/distros/melodic/rosserial-arduino/default.nix +++ b/distros/melodic/rosserial-arduino/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-arduino"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_arduino/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "dd4574a7017d7e81ffdf3d68f443017a16946a2788c02daa2ba21cf9ca351da6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_arduino/0.8.0-0"; + sha256 = "sha256-fyeVk8JguyiKQfRfyGHCK8pzRTbtIBMGM1ZzUewm0hw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rosserial-client/default.nix b/distros/melodic/rosserial-client/default.nix index b437e36013..db03e13b05 100644 --- a/distros/melodic/rosserial-client/default.nix +++ b/distros/melodic/rosserial-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-client"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_client/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "13062a7278b9eefc10406a7aaa3b18cf9ab2cad7b24485d9ed4e8699e86af22b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_client/0.8.0-0"; + sha256 = "sha256-yfeBkGHJwhKXzSMViD6ENJ17zGfBB2HnVf2+MityQGE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosserial-embeddedlinux/default.nix b/distros/melodic/rosserial-embeddedlinux/default.nix index f0fea13194..74e991164d 100644 --- a/distros/melodic/rosserial-embeddedlinux/default.nix +++ b/distros/melodic/rosserial-embeddedlinux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-embeddedlinux"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_embeddedlinux/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "3834be581ac1ed6d71d9481ec8fdb9818be429b348ebcbfa1dd2311faf4bab1b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_embeddedlinux/0.8.0-0"; + sha256 = "sha256-x2rjc9V9NDk4ft9M1E0ACyHZW1/xnzeNk+YKTZ6fnD4="; + }; buildType = "catkin"; buildInputs = [ catkin rosserial-client ]; diff --git a/distros/melodic/rosserial-mbed/default.nix b/distros/melodic/rosserial-mbed/default.nix index 22bbb2b30e..de2c93d04a 100644 --- a/distros/melodic/rosserial-mbed/default.nix +++ b/distros/melodic/rosserial-mbed/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-mbed"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_mbed/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "b77ce76f551bf7df86c3c333738d6d0778b12de2e7bc656069de475e04345999"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_mbed/0.8.0-0"; + sha256 = "sha256-GpWGNoogdQGYGnMZxMIH1GkoAjeJX6fH251v/IFuPlM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rosserial-msgs/default.nix b/distros/melodic/rosserial-msgs/default.nix index 84f787320c..cc735d0027 100644 --- a/distros/melodic/rosserial-msgs/default.nix +++ b/distros/melodic/rosserial-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-msgs"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_msgs/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "8e7997385cc06168097b0d5e56c91155f5a3fea6a28cecbc9ba0d9dc48cad6af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_msgs/0.8.0-0"; + sha256 = "sha256-D5D+PWVFnQXU5vrLmoc97g3jSIubszLOvWWOD2VJebw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rosserial-python/default.nix b/distros/melodic/rosserial-python/default.nix index 87d25e177b..ff868df431 100644 --- a/distros/melodic/rosserial-python/default.nix +++ b/distros/melodic/rosserial-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-python"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_python/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "dc7ee1151a0b5b2dea4b0987e98c0296b67bfc4addb31ae70e14f33e18dd02c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_python/0.8.0-0"; + sha256 = "sha256-eIw+IZ0hUx6QHU0gHBz9OCmgO7QgZ+VfCEa6C6GWfg0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosserial-server/default.nix b/distros/melodic/rosserial-server/default.nix index 831e26e049..5b32dc93c6 100644 --- a/distros/melodic/rosserial-server/default.nix +++ b/distros/melodic/rosserial-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-server"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_server/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "fc7304dc2df2134f5d35a9e6ec22cf082a3742139f41b1ac1feb3156114a87b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_server/0.8.0-0"; + sha256 = "sha256-yV1cvBmynO8n7TLMMWSlq0zugpo24ppgbxyAQ6O/uz0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosserial-tivac/default.nix b/distros/melodic/rosserial-tivac/default.nix index 4e18e91410..741ef1b262 100644 --- a/distros/melodic/rosserial-tivac/default.nix +++ b/distros/melodic/rosserial-tivac/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-tivac"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_tivac/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "3d4ce56cd9d2dd5e1d51afa86467890aa0d06c97b7342f7d469640eaa09c1372"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_tivac/0.8.0-0"; + sha256 = "sha256-LT++YPb99HzGWrvjMO9b1iLL6NT9iEY/RNR2YFn8dWM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosserial-vex-cortex/default.nix b/distros/melodic/rosserial-vex-cortex/default.nix index 6bd21dc15f..de9e59aee1 100644 --- a/distros/melodic/rosserial-vex-cortex/default.nix +++ b/distros/melodic/rosserial-vex-cortex/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-vex-cortex"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_vex_cortex/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "d043417c13c7692d528e3382813c00bdd9a6da7a5dc7ea0e5da6e68e44c395c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_vex_cortex/0.8.0-0"; + sha256 = "sha256-Ao4pV/bCPyqzURorOw7W8IbCtkk3tyAB/O3ttB/PMd8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosserial-vex-v5/default.nix b/distros/melodic/rosserial-vex-v5/default.nix index dd051c30e0..6bef6618da 100644 --- a/distros/melodic/rosserial-vex-v5/default.nix +++ b/distros/melodic/rosserial-vex-v5/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-vex-v5"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_vex_v5/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "4f28ad67afe3ee95fc74913159fcf5c1121049490b7ab7cb95721ccd04122c80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_vex_v5/0.8.0-0"; + sha256 = "sha256-bZhVaHmZIwxC3Q6XNnnZI2eWZ9cWSYFXRH6c0hz2R8g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosserial-windows/default.nix b/distros/melodic/rosserial-windows/default.nix index 8815e8ec6c..203a03af83 100644 --- a/distros/melodic/rosserial-windows/default.nix +++ b/distros/melodic/rosserial-windows/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-windows"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_windows/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "620b3a46eb5abe13e626c55510ee6175e35b0548be995208f0b062cbb02c7089"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_windows/0.8.0-0"; + sha256 = "sha256-gp+H7MAJnKrsWQ6+6SNH6Yib7lZIBK4E4AfR7GJWY5s="; + }; buildType = "catkin"; buildInputs = [ catkin geometry-msgs nav-msgs sensor-msgs std-msgs ]; diff --git a/distros/melodic/rosserial-xbee/default.nix b/distros/melodic/rosserial-xbee/default.nix index 74be49eb94..151ab48001 100644 --- a/distros/melodic/rosserial-xbee/default.nix +++ b/distros/melodic/rosserial-xbee/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial-xbee"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial_xbee/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "6efbc90d56bf2d6caad0e830fe206c9c7cb3c1edfe08507caf2721589f5d7a5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial_xbee/0.8.0-0"; + sha256 = "sha256-6UlS9mzch3cB9Jsb0gxQC2ETGdvuv09KCxSWYUfXjOA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosserial/default.nix b/distros/melodic/rosserial/default.nix index e6f6d8ce96..c6dab832aa 100644 --- a/distros/melodic/rosserial/default.nix +++ b/distros/melodic/rosserial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosserial"; version = "0.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/melodic/rosserial/0.8.0-0.tar.gz"; - name = "0.8.0-0.tar.gz"; - sha256 = "76cb860f1a6ba8a8bf9f13a2a878e91bc6cd33578e2bfadc0769449c6e9dc379"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/melodic/rosserial/0.8.0-0"; + sha256 = "sha256-1Q0nlytKgVmP14wzVNI4mClU5QcJuVC9j+As/JPcWmQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosservice/default.nix b/distros/melodic/rosservice/default.nix index f2c4dcb800..d88f94c362 100644 --- a/distros/melodic/rosservice/default.nix +++ b/distros/melodic/rosservice/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosservice"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rosservice/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "47639ab9a30a872ddfd521b6af2b9766b49963ec646956667224088ff302d62b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rosservice/1.14.13-1"; + sha256 = "sha256-gXLjR6g4125PJQSfVB+ee4mzQ87+vu7qzAOUDJ6rpFI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rostate-machine/default.nix b/distros/melodic/rostate-machine/default.nix index f331662b7c..ed2d418366 100644 --- a/distros/melodic/rostate-machine/default.nix +++ b/distros/melodic/rostate-machine/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rostate-machine"; version = "0.0.2-r3"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/rostate_machine-release/archive/release/melodic/rostate_machine/0.0.2-3.tar.gz"; - name = "0.0.2-3.tar.gz"; - sha256 = "a7eae9ee6371319fc4b598f00322101431141a52b07ed6ef2c0ee5588a050253"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "rostate_machine-release"; + rev = "release/melodic/rostate_machine/0.0.2-3"; + sha256 = "sha256-KN9F+u0MnkKKZreZNT7KaFkTrDi8f3NhLbmd5wMVrd4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rostest-node-interface-validation/default.nix b/distros/melodic/rostest-node-interface-validation/default.nix index 2fd06c5d26..ad700b9523 100644 --- a/distros/melodic/rostest-node-interface-validation/default.nix +++ b/distros/melodic/rostest-node-interface-validation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rostest-node-interface-validation"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/tecnalia-advancedmanufacturing-robotics/rostest_node_interface_validation-release/archive/release/melodic/rostest_node_interface_validation/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "04d36f1346f96b88c4bcbece65fa1917697ffc129132adf4a307e8bd44dc18dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tecnalia-advancedmanufacturing-robotics"; + repo = "rostest_node_interface_validation-release"; + rev = "release/melodic/rostest_node_interface_validation/0.2.0-1"; + sha256 = "sha256-K//RBrzpGit3JvXAwc8M8VfkoE6t1ssb6B4KR09clCg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rostest/default.nix b/distros/melodic/rostest/default.nix index fc31335fc0..2aaa8d23cc 100644 --- a/distros/melodic/rostest/default.nix +++ b/distros/melodic/rostest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rostest"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rostest/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "ebcec8f57379b442df3c1f876b410b8efc0f8d37f7282e93adeb5af435cd3ee3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rostest/1.14.13-1"; + sha256 = "sha256-rKv8d/TGsJ9IvWL6qAJB0ku3KAHmVFPluGBpUCHzCaM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rosthrottle/default.nix b/distros/melodic/rosthrottle/default.nix index 13dc82ad74..f336efd552 100644 --- a/distros/melodic/rosthrottle/default.nix +++ b/distros/melodic/rosthrottle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosthrottle"; version = "1.2.0-r3"; - src = fetchurl { - url = "https://github.com/UTNuclearRoboticsPublic/rosthrottle-release/archive/release/melodic/rosthrottle/1.2.0-3.tar.gz"; - name = "1.2.0-3.tar.gz"; - sha256 = "b4f4384cb8098eb9adc8e27e784f30df9059b7cb9709fa6fe75cb17ddc65011c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UTNuclearRoboticsPublic"; + repo = "rosthrottle-release"; + rev = "release/melodic/rosthrottle/1.2.0-3"; + sha256 = "sha256-qwfsUzASoxgCF4v1DF0cLpOWQ3MskZlUyxYoV3Ay9Rs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rostime/default.nix b/distros/melodic/rostime/default.nix index 3ca2087ad9..8cf23436fd 100644 --- a/distros/melodic/rostime/default.nix +++ b/distros/melodic/rostime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rostime"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/rostime/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "f6f308e9a4fdd5823498141e265bbe03b46f5a2233eab8ede343c3dc6eb2aee8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/melodic/rostime/0.6.14-1"; + sha256 = "sha256-qeH828b+c4uuHXk/roIoqkUzVBVt3j3BAbfT5gfXYS4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rostopic/default.nix b/distros/melodic/rostopic/default.nix index 4c1feb6689..75467b3f8a 100644 --- a/distros/melodic/rostopic/default.nix +++ b/distros/melodic/rostopic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rostopic"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/rostopic/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "b6000cb95b3a415e1429b20797524f7c74dbed2ce25d17b47ad9737bc5149a64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/rostopic/1.14.13-1"; + sha256 = "sha256-HZizpRgQveSrgj/iB9TMyyvNcIvsXJ2zgwE+03fg1T8="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/rosunit/default.nix b/distros/melodic/rosunit/default.nix index 045f0f78c4..fc8781de8a 100644 --- a/distros/melodic/rosunit/default.nix +++ b/distros/melodic/rosunit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rosunit"; version = "1.14.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/melodic/rosunit/1.14.9-1.tar.gz"; - name = "1.14.9-1.tar.gz"; - sha256 = "4d2b0afb40e4967f16c1c7f1dd37938f0ea8a3e00c0e2bcc58b23e8ec63de772"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/melodic/rosunit/1.14.9-1"; + sha256 = "sha256-c+utnt3hsyyN656Owkun1fmJHalO2IADFtI+MVO13Js="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/roswtf/default.nix b/distros/melodic/roswtf/default.nix index bdc8f3e4d8..06315b5019 100644 --- a/distros/melodic/roswtf/default.nix +++ b/distros/melodic/roswtf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roswtf"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roswtf/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "5c6ff528c7c6a8dcff6d24603e208c9f9223cdafe33741a0e46569fe4f05965f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/roswtf/1.14.13-1"; + sha256 = "sha256-+2PPiNQrqS5NVf4+QyuxKXqdDUq6GjmmY8pqPA8LHvI="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/roswww-static/default.nix b/distros/melodic/roswww-static/default.nix index f369e3c9ff..b3b68401d7 100644 --- a/distros/melodic/roswww-static/default.nix +++ b/distros/melodic/roswww-static/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roswww-static"; version = "0.21.2-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/clover-release/archive/release/melodic/roswww_static/0.21.2-1.tar.gz"; - name = "0.21.2-1.tar.gz"; - sha256 = "d15218175c9d6ccaac2489434e083d4cac54ff6403af7b69e76560f3a9712cbd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "clover-release"; + rev = "release/melodic/roswww_static/0.21.2-1"; + sha256 = "sha256-uzdO4Yz6u/9yX+LUKfTA3g5l0zj1igy52adYo4b1YEE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/roswww/default.nix b/distros/melodic/roswww/default.nix index 31e4bd5a5c..ae6b2521df 100644 --- a/distros/melodic/roswww/default.nix +++ b/distros/melodic/roswww/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-roswww"; version = "0.1.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roswww-release/archive/release/melodic/roswww/0.1.13-1.tar.gz"; - name = "0.1.13-1.tar.gz"; - sha256 = "eb82a974660ca3170ed06eebb74536569c53d935861cb6d44fc791f0657f8245"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roswww-release"; + rev = "release/melodic/roswww/0.1.13-1"; + sha256 = "sha256-/es7Z0mr7Rhsj4ZaOk8lBfQQvO/Stc4cc4Ros3Or/Rs="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg ]; diff --git a/distros/melodic/rotate-recovery/default.nix b/distros/melodic/rotate-recovery/default.nix index 3aae99f579..10b4407ae2 100644 --- a/distros/melodic/rotate-recovery/default.nix +++ b/distros/melodic/rotate-recovery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotate-recovery"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/rotate_recovery/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "c5dd88b6687c235f1a7764d44adc91465bd0117da2afc12151b6d8798866041a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/rotate_recovery/1.16.7-1"; + sha256 = "sha256-wWsK87QZPbZTjsdp9dO9dS524F6aMAALzkyt+sBdUfw="; + }; buildType = "catkin"; buildInputs = [ angles base-local-planner catkin cmake-modules ]; diff --git a/distros/melodic/rotors-comm/default.nix b/distros/melodic/rotors-comm/default.nix index efab79b8db..0b2c549e6b 100644 --- a/distros/melodic/rotors-comm/default.nix +++ b/distros/melodic/rotors-comm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-comm"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_comm/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "6f5fc3033ab80590b10c00fc416c36221be5abd5756b389577e5f3e13dbb346c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_comm/2.2.3-0"; + sha256 = "sha256-gprw83t7KQy/XTyHa1FCzzVjjqip1QWkX4E/djlCoeA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rotors-control/default.nix b/distros/melodic/rotors-control/default.nix index 7437c3a773..3f68360cde 100644 --- a/distros/melodic/rotors-control/default.nix +++ b/distros/melodic/rotors-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-control"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_control/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "360134fe15fab3cd01a1869458c0d767006f445a2124532ac6b0c2484e4cc38f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_control/2.2.3-0"; + sha256 = "sha256-8O8Ndnv440Ck7CnRukyJPKgzfgb3GOYLHrJ1hYhbGkc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rotors-description/default.nix b/distros/melodic/rotors-description/default.nix index 0ba19f81a5..a4e3c3ec55 100644 --- a/distros/melodic/rotors-description/default.nix +++ b/distros/melodic/rotors-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-description"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_description/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "414a6facf153f956359a4bb6faffc2b01b3615b25f5b9b8a0f5141e268a982f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_description/2.2.3-0"; + sha256 = "sha256-hvpnxyoZq+dMko8094bzogoBJq+JHjaXmKdEu+vHxnA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rotors-evaluation/default.nix b/distros/melodic/rotors-evaluation/default.nix index 2b46874aad..7a4ddba14f 100644 --- a/distros/melodic/rotors-evaluation/default.nix +++ b/distros/melodic/rotors-evaluation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-evaluation"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_evaluation/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "01b472150f0c2e6250cfb8db3a04a66d23c16c987d3f95900be335c64b9886e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_evaluation/2.2.3-0"; + sha256 = "sha256-TEnPegVONoJ2/Sdfs/kF77vlGeIXiqDu2KR+gA4rbcg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rotors-gazebo-plugins/default.nix b/distros/melodic/rotors-gazebo-plugins/default.nix index b71b1ab55e..826d98d22a 100644 --- a/distros/melodic/rotors-gazebo-plugins/default.nix +++ b/distros/melodic/rotors-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-gazebo-plugins"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_gazebo_plugins/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "9a4fc0b6f45d9fe43292fa7b4656ea3190c32928c36b33aee9adfaa0c3fafcd2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_gazebo_plugins/2.2.3-0"; + sha256 = "sha256-eAN5O445B4sffZiSYMHswGy6xuR3QxA5tPH2qgj54fY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rotors-gazebo/default.nix b/distros/melodic/rotors-gazebo/default.nix index caa5281958..5bf040ac79 100644 --- a/distros/melodic/rotors-gazebo/default.nix +++ b/distros/melodic/rotors-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-gazebo"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_gazebo/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "98425c45ee4f84bc43c033c786ad18ea897efda6616cca43f24ad38b3cc5083b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_gazebo/2.2.3-0"; + sha256 = "sha256-EZav/Vphyxm4tgp5kBjNbpA5f/B6/BQ4Qnn9BxYWiUM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rotors-hil-interface/default.nix b/distros/melodic/rotors-hil-interface/default.nix index 38fe6055c3..1b1104085b 100644 --- a/distros/melodic/rotors-hil-interface/default.nix +++ b/distros/melodic/rotors-hil-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-hil-interface"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_hil_interface/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "ee4f035b44afcf982354c3740f05087f5dc9c8f2fffee6816a5e9dc435d46fc5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_hil_interface/2.2.3-0"; + sha256 = "sha256-dEYclVn4DtkWi48EcsQl2Kdm5NswREjN/Qm6JhJdxw8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/rotors-joy-interface/default.nix b/distros/melodic/rotors-joy-interface/default.nix index 59e1d603af..526afc380c 100644 --- a/distros/melodic/rotors-joy-interface/default.nix +++ b/distros/melodic/rotors-joy-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-joy-interface"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_joy_interface/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "ee68f6dbc4f3d3b8b1377de6ceca6113c1d528d5a898c8766c62c0394bfd4db1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_joy_interface/2.2.3-0"; + sha256 = "sha256-hMBwJfmCL9x5LFRn0Qq/tN3wJ90iw4rA9lxIMTwW+VE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rotors-simulator/default.nix b/distros/melodic/rotors-simulator/default.nix index d1288ed907..6118491212 100644 --- a/distros/melodic/rotors-simulator/default.nix +++ b/distros/melodic/rotors-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rotors-simulator"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rotors_simulator/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "9d38b7e1ce765500cf43571b367e9c04d2bfe3bcb599ba3de81ac5690b855f58"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rotors_simulator/2.2.3-0"; + sha256 = "sha256-LQlkPY1xqe6OJe1mXJP44CoLrVGoBdhQvz6oytMy0kg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/route-network/default.nix b/distros/melodic/route-network/default.nix index 053d94f421..ce782ea6f0 100644 --- a/distros/melodic/route-network/default.nix +++ b/distros/melodic/route-network/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-route-network"; version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/open_street_map-release/archive/release/melodic/route_network/0.2.5-1.tar.gz"; - name = "0.2.5-1.tar.gz"; - sha256 = "4100ef3d698459819f6f5ce27ece00c7f361daa3a7fe69e64ad6d2725e173ec0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "open_street_map-release"; + rev = "release/melodic/route_network/0.2.5-1"; + sha256 = "sha256-FHPpVgDf+lM/l8bcH1hUpjieW5UKqXkEPd4YL0kqar0="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/rplidar-ros/default.nix b/distros/melodic/rplidar-ros/default.nix index 4ad9fa0d1d..58022860f8 100644 --- a/distros/melodic/rplidar-ros/default.nix +++ b/distros/melodic/rplidar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rplidar-ros"; version = "1.7.0"; - src = fetchurl { - url = "https://github.com/Slamtec/rplidar_ros-release/archive/release/melodic/rplidar_ros/1.7.0-0.tar.gz"; - name = "1.7.0-0.tar.gz"; - sha256 = "548d65fb0fba265d22e0ad2e2fdb4d522f97a751b62bf01fb7dfbac36e9899d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Slamtec"; + repo = "rplidar_ros-release"; + rev = "release/melodic/rplidar_ros/1.7.0-0"; + sha256 = "sha256-e0knDCrcluTcwjne/xebbhNeVmVFGkQu+Q99hRD+4Ms="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-action/default.nix b/distros/melodic/rqt-action/default.nix index b0623972b8..e07ffbf2ca 100644 --- a/distros/melodic/rqt-action/default.nix +++ b/distros/melodic/rqt-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-action"; version = "0.4.9"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_action-release/archive/release/melodic/rqt_action/0.4.9-0.tar.gz"; - name = "0.4.9-0.tar.gz"; - sha256 = "5ac33f2d857d43c2c79f82f73070f6dec9bf326ea6bc0b3bce4e49c3d5b8c7d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_action-release"; + rev = "release/melodic/rqt_action/0.4.9-0"; + sha256 = "sha256-N5GFkG2yNzCE4tWc23uFMGwFk8D7TEUoLddfyC3UxmQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-bag-plugins/default.nix b/distros/melodic/rqt-bag-plugins/default.nix index 726ccd9ca6..2e5bb90444 100644 --- a/distros/melodic/rqt-bag-plugins/default.nix +++ b/distros/melodic/rqt-bag-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-bag-plugins"; version = "0.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_bag-release/archive/release/melodic/rqt_bag_plugins/0.5.1-1.tar.gz"; - name = "0.5.1-1.tar.gz"; - sha256 = "ec47dd8d2efc2accd606964cb40a5531a46d57551a49b35558bedbd2a08f9d9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_bag-release"; + rev = "release/melodic/rqt_bag_plugins/0.5.1-1"; + sha256 = "sha256-v95eh3z05gE+OVHH88XufYgfN8ZaTDDbXbxRLGeebrg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-bag/default.nix b/distros/melodic/rqt-bag/default.nix index d3e23c3664..04e8288269 100644 --- a/distros/melodic/rqt-bag/default.nix +++ b/distros/melodic/rqt-bag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-bag"; version = "0.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_bag-release/archive/release/melodic/rqt_bag/0.5.1-1.tar.gz"; - name = "0.5.1-1.tar.gz"; - sha256 = "182a0246366034f55abc0285d2f018819c1b455ce54cbf526d4880395be4396e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_bag-release"; + rev = "release/melodic/rqt_bag/0.5.1-1"; + sha256 = "sha256-UZBQhAxdSV6nqNrefZSu8ESMB7yXUqmLxEhfN+O2II0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-common-plugins/default.nix b/distros/melodic/rqt-common-plugins/default.nix index 8eb2a0b726..f94f99f4f7 100644 --- a/distros/melodic/rqt-common-plugins/default.nix +++ b/distros/melodic/rqt-common-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-common-plugins"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_common_plugins-release/archive/release/melodic/rqt_common_plugins/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "f0c64a0ec07274960b5e4eb9c032c6c439e67a82b0ae25c4cc9d27be2ecacc83"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_common_plugins-release"; + rev = "release/melodic/rqt_common_plugins/0.4.8-0"; + sha256 = "sha256-gMkSASqqkjeK9lt9LaSsP90Ud3n5MJUTBiI87//8gJo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-console/default.nix b/distros/melodic/rqt-console/default.nix index 9434bcef5c..7900052a53 100644 --- a/distros/melodic/rqt-console/default.nix +++ b/distros/melodic/rqt-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-console"; version = "0.4.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_console-release/archive/release/melodic/rqt_console/0.4.9-1.tar.gz"; - name = "0.4.9-1.tar.gz"; - sha256 = "e01cb923bec977383fddbb9ee64baf50ceb167645989b018c4fa47acf43db003"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_console-release"; + rev = "release/melodic/rqt_console/0.4.9-1"; + sha256 = "sha256-h3aLcZE7BF1rMntSaFjDvz5z9p/O6j1cjqBwjy8h+9E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-controller-manager/default.nix b/distros/melodic/rqt-controller-manager/default.nix index 4aa9f6e4e7..d69d9f0c1a 100644 --- a/distros/melodic/rqt-controller-manager/default.nix +++ b/distros/melodic/rqt-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-controller-manager"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/rqt_controller_manager/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "a0b95b62508520a28777ce405681283895487126fc06f6985230de6b5e59c546"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/rqt_controller_manager/0.18.4-1"; + sha256 = "sha256-7eLCeDFxrz15BLH1N9mySOBv0XNHJYie88QZl1zJJBo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-dep/default.nix b/distros/melodic/rqt-dep/default.nix index b4235de680..eca4bfd8e9 100644 --- a/distros/melodic/rqt-dep/default.nix +++ b/distros/melodic/rqt-dep/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-dep"; version = "0.4.9"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_dep-release/archive/release/melodic/rqt_dep/0.4.9-0.tar.gz"; - name = "0.4.9-0.tar.gz"; - sha256 = "7fa60310716f75eb444c3f45578111826f1e2bcdc092a1a5b530bfef04b8fb7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_dep-release"; + rev = "release/melodic/rqt_dep/0.4.9-0"; + sha256 = "sha256-KASqCpZ0CfTB3k4XyL7b52fKUhhPYJP5LhA9B/nYeHE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-drone-teleop/default.nix b/distros/melodic/rqt-drone-teleop/default.nix index e39cac90d4..cac1af7ef9 100644 --- a/distros/melodic/rqt-drone-teleop/default.nix +++ b/distros/melodic/rqt-drone-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-drone-teleop"; version = "1.3.10-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/melodic/rqt_drone_teleop/1.3.10-1.tar.gz"; - name = "1.3.10-1.tar.gz"; - sha256 = "000740452eca47b8a6adc8b41ed7ccddd59b8f5572a2a8ee84cc0d906ad10a70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/melodic/rqt_drone_teleop/1.3.10-1"; + sha256 = "sha256-XL7a000o++IYGW/bFKPxCLZnMP/lGXwoGq/hlGzJyWc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-ez-publisher/default.nix b/distros/melodic/rqt-ez-publisher/default.nix index db1b945199..a49e757af2 100644 --- a/distros/melodic/rqt-ez-publisher/default.nix +++ b/distros/melodic/rqt-ez-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-ez-publisher"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/OTL/rqt_ez_publisher-release/archive/release/melodic/rqt_ez_publisher/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "0ddd9a4715365473360ac5443887e7da747eb8280c7c9f90894f304131582f7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OTL"; + repo = "rqt_ez_publisher-release"; + rev = "release/melodic/rqt_ez_publisher/0.5.0-1"; + sha256 = "sha256-3z+SiisueQ5IEJ+ztpeUtEbKTKDzupqxTLpIBgEgHmw="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.catkin-pkg rostest ]; diff --git a/distros/melodic/rqt-graph/default.nix b/distros/melodic/rqt-graph/default.nix index 720351f95c..03890701fe 100644 --- a/distros/melodic/rqt-graph/default.nix +++ b/distros/melodic/rqt-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-graph"; version = "0.4.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_graph-release/archive/release/melodic/rqt_graph/0.4.11-1.tar.gz"; - name = "0.4.11-1.tar.gz"; - sha256 = "a7a56af64f801c609b96cffa380f0571800c2f7f1a759f95bd68e0afb03816f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_graph-release"; + rev = "release/melodic/rqt_graph/0.4.11-1"; + sha256 = "sha256-xMa30f2ftTlfFZXkDbGU+Sum/0+5ulWTtbRKDGgAwUM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-ground-robot-teleop/default.nix b/distros/melodic/rqt-ground-robot-teleop/default.nix index a468d5a826..3106c20570 100644 --- a/distros/melodic/rqt-ground-robot-teleop/default.nix +++ b/distros/melodic/rqt-ground-robot-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-ground-robot-teleop"; version = "1.3.10-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/melodic/rqt_ground_robot_teleop/1.3.10-1.tar.gz"; - name = "1.3.10-1.tar.gz"; - sha256 = "a49430e2166e4845a9137466c78f82964e3c6f8032cb1bc8b9db0533323d39f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/melodic/rqt_ground_robot_teleop/1.3.10-1"; + sha256 = "sha256-gC7f0CLVD7G7Ac5E4V86VEOcTMXivKiyLZXbkdA08bg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-gui-cpp/default.nix b/distros/melodic/rqt-gui-cpp/default.nix index b8513879c1..474e823468 100644 --- a/distros/melodic/rqt-gui-cpp/default.nix +++ b/distros/melodic/rqt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-gui-cpp"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/melodic/rqt_gui_cpp/0.5.3-1"; + sha256 = "sha256-Hl+GO6Vq4ftYGSyn94lV1KawBuiGB64zHZrLLScicZU="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/melodic/rqt-gui-py/default.nix b/distros/melodic/rqt-gui-py/default.nix index b1fbb661f2..70617c8815 100644 --- a/distros/melodic/rqt-gui-py/default.nix +++ b/distros/melodic/rqt-gui-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-gui-py"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/melodic/rqt_gui_py/0.5.3-1"; + sha256 = "sha256-Ksq1yik3Jt0JLGM80wZl24uw4J3wbQP22KFbBZtdHKU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-gui/default.nix b/distros/melodic/rqt-gui/default.nix index 4de2acf659..398779ed25 100644 --- a/distros/melodic/rqt-gui/default.nix +++ b/distros/melodic/rqt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-gui"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/melodic/rqt_gui/0.5.3-1"; + sha256 = "sha256-8LWZVobGPDEMsp45yFGHB6JfoYe57ROlArBVzSk4oa4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-image-view/default.nix b/distros/melodic/rqt-image-view/default.nix index 89ac2a4e5d..ddeab37068 100644 --- a/distros/melodic/rqt-image-view/default.nix +++ b/distros/melodic/rqt-image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-image-view"; version = "0.4.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_image_view-release/archive/release/melodic/rqt_image_view/0.4.16-1.tar.gz"; - name = "0.4.16-1.tar.gz"; - sha256 = "3825a7503e15ac9907c8bc36aadacca1c83f47dfe999a30b2fa45b957719ab2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_image_view-release"; + rev = "release/melodic/rqt_image_view/0.4.16-1"; + sha256 = "sha256-FKgLVFXZvlgp1PGBEGqCdSD3scc7Re70ViuSVMNBfbA="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/melodic/rqt-joint-trajectory-controller/default.nix b/distros/melodic/rqt-joint-trajectory-controller/default.nix index 7ce94105ea..60b51bdf72 100644 --- a/distros/melodic/rqt-joint-trajectory-controller/default.nix +++ b/distros/melodic/rqt-joint-trajectory-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-joint-trajectory-controller"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/rqt_joint_trajectory_controller/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "68cbcd1d5be02ae72c77a890debca340b587a338e72afe4a26f966605724d2bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/rqt_joint_trajectory_controller/0.17.2-1"; + sha256 = "sha256-A+/bWODLQcMvt0Iu77p10Hhw5wAbx9BbW2H+ZzUZhU4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-joint-trajectory-plot/default.nix b/distros/melodic/rqt-joint-trajectory-plot/default.nix index 44c2e3199f..3f7a6726d9 100644 --- a/distros/melodic/rqt-joint-trajectory-plot/default.nix +++ b/distros/melodic/rqt-joint-trajectory-plot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-joint-trajectory-plot"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rqt_joint_trajectory_plot-release/archive/release/melodic/rqt_joint_trajectory_plot/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "8ed2a8dd2ebbbaf91dceb82134c324f5efb676ddc2767175967f96361357c77e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rqt_joint_trajectory_plot-release"; + rev = "release/melodic/rqt_joint_trajectory_plot/0.0.5-1"; + sha256 = "sha256-1xK5N1zbHJu8kG3TdTAJarNHkDSGrDF8W8ij1PLz6uE="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch roslint rostest ]; diff --git a/distros/melodic/rqt-launch/default.nix b/distros/melodic/rqt-launch/default.nix index 69603edcb6..170c17cbba 100644 --- a/distros/melodic/rqt-launch/default.nix +++ b/distros/melodic/rqt-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-launch"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_launch-release/archive/release/melodic/rqt_launch/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "7aab0c6b78ad90736d40ae6b7ce54048936ef38c0f032858b65a8347b4cbccc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_launch-release"; + rev = "release/melodic/rqt_launch/0.4.8-0"; + sha256 = "sha256-9Xw2HDDV6B3ZDbhcADwUUT5yCEUZStU4GZeQo9tUE+E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-launchtree/default.nix b/distros/melodic/rqt-launchtree/default.nix index 0f57b6e428..f2224cfda7 100644 --- a/distros/melodic/rqt-launchtree/default.nix +++ b/distros/melodic/rqt-launchtree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-launchtree"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pschillinger/rqt_launchtree-release/archive/release/melodic/rqt_launchtree/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "0eb679a1667c49340b2cd90602a653377d5b5582cc782d9fc8b2a58d9b9dc79e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pschillinger"; + repo = "rqt_launchtree-release"; + rev = "release/melodic/rqt_launchtree/0.2.0-1"; + sha256 = "sha256-HvQE8diWcHfSKIlmd1BI0I6mWbA+pRhSbfgIBXuJO6o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-logger-level/default.nix b/distros/melodic/rqt-logger-level/default.nix index 4b7a75b17a..b35cce0040 100644 --- a/distros/melodic/rqt-logger-level/default.nix +++ b/distros/melodic/rqt-logger-level/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-logger-level"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_logger_level-release/archive/release/melodic/rqt_logger_level/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "c2fcc66a3b20e836aba40218bc745f0112986d329804f3929c275534d907a4b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_logger_level-release"; + rev = "release/melodic/rqt_logger_level/0.4.8-0"; + sha256 = "sha256-9RAJf3jbP0n8+hi0osPo41ewu86V5ZlFXgxmcpl++kE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-moveit/default.nix b/distros/melodic/rqt-moveit/default.nix index 78e330c5d3..bd0953f3c9 100644 --- a/distros/melodic/rqt-moveit/default.nix +++ b/distros/melodic/rqt-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-moveit"; version = "0.5.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_moveit-release/archive/release/melodic/rqt_moveit/0.5.10-1.tar.gz"; - name = "0.5.10-1.tar.gz"; - sha256 = "06495252cf3f0a50d89f1e79000067fc0d50feac5c2104065adabbcf52c26aa3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_moveit-release"; + rev = "release/melodic/rqt_moveit/0.5.10-1"; + sha256 = "sha256-zv684ywE1qfK6bcCDcHiNNkC1u18EpLfbC+LxBp2T8Q="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/rqt-msg/default.nix b/distros/melodic/rqt-msg/default.nix index ac7e281afe..01a3a0157a 100644 --- a/distros/melodic/rqt-msg/default.nix +++ b/distros/melodic/rqt-msg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-msg"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_msg-release/archive/release/melodic/rqt_msg/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "ec3e88d3c822856ace98a11ab03950fb0e9390829122b7abfabc863180611630"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_msg-release"; + rev = "release/melodic/rqt_msg/0.4.8-0"; + sha256 = "sha256-dCkrkaDMlD7UxQFDKOXmlr7CjBqsh0ii1u/nra5+XoI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-multiplot/default.nix b/distros/melodic/rqt-multiplot/default.nix index da3d179759..79020237ac 100644 --- a/distros/melodic/rqt-multiplot/default.nix +++ b/distros/melodic/rqt-multiplot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-multiplot"; version = "0.0.10"; - src = fetchurl { - url = "https://github.com/anybotics/rqt_multiplot_plugin-release/archive/release/melodic/rqt_multiplot/0.0.10-0.tar.gz"; - name = "0.0.10-0.tar.gz"; - sha256 = "92e975517c6726dcd8a9c73c658d524126d48716bd4db032cec61f641ce27ae8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "rqt_multiplot_plugin-release"; + rev = "release/melodic/rqt_multiplot/0.0.10-0"; + sha256 = "sha256-CnQEVSfDrT3vzAEozmck7WmNXCd0F1f++uDJ6sDQAWk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-nav-view/default.nix b/distros/melodic/rqt-nav-view/default.nix index 1a28b7a506..084a356a66 100644 --- a/distros/melodic/rqt-nav-view/default.nix +++ b/distros/melodic/rqt-nav-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-nav-view"; version = "0.5.7"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_nav_view-release/archive/release/melodic/rqt_nav_view/0.5.7-0.tar.gz"; - name = "0.5.7-0.tar.gz"; - sha256 = "a531ad91a1753f9dd2b74d56b519c52aebeac013373f76c6e4e6b19c66ca46a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_nav_view-release"; + rev = "release/melodic/rqt_nav_view/0.5.7-0"; + sha256 = "sha256-EP33l2lVCEe3AF/jxTwus9WHpxFk1R3awJ02+OEjINo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-paramedit/default.nix b/distros/melodic/rqt-paramedit/default.nix index d082d934bb..c1ec6246e0 100644 --- a/distros/melodic/rqt-paramedit/default.nix +++ b/distros/melodic/rqt-paramedit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-paramedit"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/dornhege/rqt_paramedit-release/archive/release/melodic/rqt_paramedit/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "41ea3a8828c47d3be448920e3255e9340447a44c84f63b7f4df615d197807f7f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dornhege"; + repo = "rqt_paramedit-release"; + rev = "release/melodic/rqt_paramedit/1.0.1-1"; + sha256 = "sha256-7ylX8byVohqvSZ1fGgMWWkhYCv+sBKjiKasx85Ku1Jo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-play-motion-builder/default.nix b/distros/melodic/rqt-play-motion-builder/default.nix index ae4e9191e4..3ee0f015d2 100644 --- a/distros/melodic/rqt-play-motion-builder/default.nix +++ b/distros/melodic/rqt-play-motion-builder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-play-motion-builder"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/pal-robotics/play_motion_builder-release/archive/release/melodic/rqt_play_motion_builder/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "36b45498a7420ef0806a1bf10d23e5b76b401e2486b33e5f6d504050999066f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-robotics"; + repo = "play_motion_builder-release"; + rev = "release/melodic/rqt_play_motion_builder/1.0.2-1"; + sha256 = "sha256-4hjKfNzI6s/5Dm5zTJL8MIN+e4tWq3M4J8Uq2X8b4DA="; + }; buildType = "catkin"; buildInputs = [ catkin class-loader qt5.qtbase ]; diff --git a/distros/melodic/rqt-plot/default.nix b/distros/melodic/rqt-plot/default.nix index 4aaf1a42da..099755a782 100644 --- a/distros/melodic/rqt-plot/default.nix +++ b/distros/melodic/rqt-plot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-plot"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_plot-release/archive/release/melodic/rqt_plot/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "8ad543629315c87c8694d9efe79df4026582cea73d9183774b523e6fcb8a089a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_plot-release"; + rev = "release/melodic/rqt_plot/0.4.13-1"; + sha256 = "sha256-xIn09V9PwNShI6KR00H6ZDx7hdH+sXys0gzs1Y4WSnc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-pose-view/default.nix b/distros/melodic/rqt-pose-view/default.nix index bfcfcccb95..e0e6a1c5f6 100644 --- a/distros/melodic/rqt-pose-view/default.nix +++ b/distros/melodic/rqt-pose-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-pose-view"; version = "0.5.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_pose_view-release/archive/release/melodic/rqt_pose_view/0.5.8-0.tar.gz"; - name = "0.5.8-0.tar.gz"; - sha256 = "00e9962e4a7132dcb9082692fb49563d309b9e446b5eb17e65354dd7e1e24e4d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_pose_view-release"; + rev = "release/melodic/rqt_pose_view/0.5.8-0"; + sha256 = "sha256-2qYlpDEsyRK2RbRVJ0FSrQ/AVr7+BuZHMjUaQrcZBno="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-publisher/default.nix b/distros/melodic/rqt-publisher/default.nix index bc9a2e102f..6dd92fc6c7 100644 --- a/distros/melodic/rqt-publisher/default.nix +++ b/distros/melodic/rqt-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-publisher"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_publisher-release/archive/release/melodic/rqt_publisher/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "9411fa1eb8fefee5ab7653c83dc2baa44cf352797759436fdfaa48de29e098e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_publisher-release"; + rev = "release/melodic/rqt_publisher/0.4.8-0"; + sha256 = "sha256-NZz4St5vi9V/RtW9JB9fWdBdKLvQ8yQJZUe1Aenh8uc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-py-common/default.nix b/distros/melodic/rqt-py-common/default.nix index 27f36e119c..d79ebbac74 100644 --- a/distros/melodic/rqt-py-common/default.nix +++ b/distros/melodic/rqt-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-py-common"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/melodic/rqt_py_common/0.5.3-1"; + sha256 = "sha256-8VsM0C1qh8bIekBZ2gF0gKD3CEHSbvKN31JXUPoRnqo="; + }; buildType = "catkin"; buildInputs = [ catkin genmsg std-msgs ]; diff --git a/distros/melodic/rqt-py-console/default.nix b/distros/melodic/rqt-py-console/default.nix index 3735b1b9ac..e70c5d534c 100644 --- a/distros/melodic/rqt-py-console/default.nix +++ b/distros/melodic/rqt-py-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-py-console"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_py_console-release/archive/release/melodic/rqt_py_console/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "0c5714fce4f464fa175e42a7c8fc0ced483fdcfbd90cf4c8584f40b3cf208242"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_py_console-release"; + rev = "release/melodic/rqt_py_console/0.4.8-0"; + sha256 = "sha256-H9nwjD085SFDhxTM37Vhusf7uc508NmolONVmJbq7hM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-py-trees/default.nix b/distros/melodic/rqt-py-trees/default.nix index 8ab2d3867a..fcf90279b2 100644 --- a/distros/melodic/rqt-py-trees/default.nix +++ b/distros/melodic/rqt-py-trees/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-py-trees"; version = "0.3.1"; - src = fetchurl { - url = "https://github.com/stonier/rqt_py_trees-release/archive/release/melodic/rqt_py_trees/0.3.1-0.tar.gz"; - name = "0.3.1-0.tar.gz"; - sha256 = "f01bb9ccb08d23b79f515c9fe65342463911d1af5c2cffec32c33845817b934f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "rqt_py_trees-release"; + rev = "release/melodic/rqt_py_trees/0.3.1-0"; + sha256 = "sha256-/wNWtcaqa75ru27P1Wb/RAEeugk5M0Ayg40bqt+DEMU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-reconfigure/default.nix b/distros/melodic/rqt-reconfigure/default.nix index 8a39d3f6c4..fbace4b87f 100644 --- a/distros/melodic/rqt-reconfigure/default.nix +++ b/distros/melodic/rqt-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-reconfigure"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_reconfigure-release/archive/release/melodic/rqt_reconfigure/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "2df7a0cf5fbaa895845208b22828c01dd85b6a749624b9f320e61f4133690544"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_reconfigure-release"; + rev = "release/melodic/rqt_reconfigure/0.5.4-1"; + sha256 = "sha256-OP6+bqt1lLlqgT+/VHMnXZmBRLoJctg+ksDGiVeQ2YE="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools roslint ]; diff --git a/distros/melodic/rqt-robot-dashboard/default.nix b/distros/melodic/rqt-robot-dashboard/default.nix index b9ab93dc8b..28bd18b35d 100644 --- a/distros/melodic/rqt-robot-dashboard/default.nix +++ b/distros/melodic/rqt-robot-dashboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-robot-dashboard"; version = "0.5.7"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_dashboard-release/archive/release/melodic/rqt_robot_dashboard/0.5.7-0.tar.gz"; - name = "0.5.7-0.tar.gz"; - sha256 = "19eb8bffb5697ef7e7d7bc23cf7cda4e3446e6415a40e53987095b85bb9b8568"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_dashboard-release"; + rev = "release/melodic/rqt_robot_dashboard/0.5.7-0"; + sha256 = "sha256-K7snpxSWSzpE7y/UdF80x0dctTTyuhJY/MyNMeBTmEQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-robot-monitor/default.nix b/distros/melodic/rqt-robot-monitor/default.nix index 79bfb47cd1..fab2b2bfbe 100644 --- a/distros/melodic/rqt-robot-monitor/default.nix +++ b/distros/melodic/rqt-robot-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-robot-monitor"; 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.14-1.tar.gz"; - name = "0.5.14-1.tar.gz"; - sha256 = "914de4f23e33719f90164020750d84e1445f37c7abfef9b477927235eae3b527"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_monitor-release"; + rev = "release/melodic/rqt_robot_monitor/0.5.14-1"; + sha256 = "sha256-o8UcpdECMCBChTb200sHsZlrF6SZPkZOZPyqcllFVq4="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/rqt-robot-plugins/default.nix b/distros/melodic/rqt-robot-plugins/default.nix index 74c282eb6a..15935918d9 100644 --- a/distros/melodic/rqt-robot-plugins/default.nix +++ b/distros/melodic/rqt-robot-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-robot-plugins"; version = "0.5.7"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_plugins-release/archive/release/melodic/rqt_robot_plugins/0.5.7-0.tar.gz"; - name = "0.5.7-0.tar.gz"; - sha256 = "2fa30a70d1eed9ff4724c1b9d1ef8303066b373bae9abcbf2b8a715a89e515ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_plugins-release"; + rev = "release/melodic/rqt_robot_plugins/0.5.7-0"; + sha256 = "sha256-GFbhbrQp2W1Deg8osppxkRND3v1mBxFy5Eudsxbyfbk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-robot-steering/default.nix b/distros/melodic/rqt-robot-steering/default.nix index bf29438d38..78ec33c130 100644 --- a/distros/melodic/rqt-robot-steering/default.nix +++ b/distros/melodic/rqt-robot-steering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-robot-steering"; version = "0.5.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_steering-release/archive/release/melodic/rqt_robot_steering/0.5.10-1.tar.gz"; - name = "0.5.10-1.tar.gz"; - sha256 = "a66bedc6c4ed106b7528912f4b911b5b33279df3029caeb5379ef2230bf4881c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_steering-release"; + rev = "release/melodic/rqt_robot_steering/0.5.10-1"; + sha256 = "sha256-iq4Gb75FFNimmJbvjJcbo3mdwsvGrUcJjUk6lX6K2YE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-rosmon/default.nix b/distros/melodic/rqt-rosmon/default.nix index 08101971b3..b5e033630e 100644 --- a/distros/melodic/rqt-rosmon/default.nix +++ b/distros/melodic/rqt-rosmon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-rosmon"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosmon-release/archive/release/melodic/rqt_rosmon/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "9769d8e7d864db419856c498157f0bb6d41913049802afbc22f7bc229f173ec5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosmon-release"; + rev = "release/melodic/rqt_rosmon/2.3.2-1"; + sha256 = "sha256-Je81db7u5bhu3C3HC0kQyMzeBPb+iD4qq+pcTHSILcU="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/melodic/rqt-rotors/default.nix b/distros/melodic/rqt-rotors/default.nix index 3c10eb295c..5d70d3e962 100644 --- a/distros/melodic/rqt-rotors/default.nix +++ b/distros/melodic/rqt-rotors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-rotors"; version = "2.2.3"; - src = fetchurl { - url = "https://github.com/ethz-asl/rotors_simulator-release/archive/release/melodic/rqt_rotors/2.2.3-0.tar.gz"; - name = "2.2.3-0.tar.gz"; - sha256 = "fd26afa06f8f7acd5dcc50aeab04521d73b266f1b921150cdd675cdf62a9c840"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "rotors_simulator-release"; + rev = "release/melodic/rqt_rotors/2.2.3-0"; + sha256 = "sha256-eTHhHTIHRjkwnmSJd73i8Nlbf2hP0uK1XkfQ8WnsneU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-runtime-monitor/default.nix b/distros/melodic/rqt-runtime-monitor/default.nix index a2179ab1b5..64ccf3d79f 100644 --- a/distros/melodic/rqt-runtime-monitor/default.nix +++ b/distros/melodic/rqt-runtime-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-runtime-monitor"; version = "0.5.7"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_runtime_monitor-release/archive/release/melodic/rqt_runtime_monitor/0.5.7-0.tar.gz"; - name = "0.5.7-0.tar.gz"; - sha256 = "f58958b5649d59fca3022a1771e6a457382744c616835cc65980213ab742fd5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_runtime_monitor-release"; + rev = "release/melodic/rqt_runtime_monitor/0.5.7-0"; + sha256 = "sha256-JZw3GyHEK3J6Ektad2v2wx4d4YI6TmCTAxflsb5y/nc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-rviz/default.nix b/distros/melodic/rqt-rviz/default.nix index 6cd68b2d30..320bbd127b 100644 --- a/distros/melodic/rqt-rviz/default.nix +++ b/distros/melodic/rqt-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-rviz"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_rviz-release/archive/release/melodic/rqt_rviz/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "b9fcb50156f163d73e52c3128524dfac04c4bfecfe76562926aa7780e9adf6b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_rviz-release"; + rev = "release/melodic/rqt_rviz/0.7.0-1"; + sha256 = "sha256-cLQ60gEfaxRNz4XGfHoKBMRaEmfD13y6zMBL7bUv84c="; + }; buildType = "catkin"; buildInputs = [ catkin class-loader qt5.qtbase ]; diff --git a/distros/melodic/rqt-service-caller/default.nix b/distros/melodic/rqt-service-caller/default.nix index 298fbbc81e..e43d64ed41 100644 --- a/distros/melodic/rqt-service-caller/default.nix +++ b/distros/melodic/rqt-service-caller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-service-caller"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_service_caller-release/archive/release/melodic/rqt_service_caller/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "574aa580c11737fc800b058f7cac63a7a7b75d144525d04e89c538716418c1b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_service_caller-release"; + rev = "release/melodic/rqt_service_caller/0.4.8-0"; + sha256 = "sha256-Q8E9VrENKB69o6hV0LpAN3lu7jhyMJqpVBL9ELnDt80="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-shell/default.nix b/distros/melodic/rqt-shell/default.nix index 66f8c5db59..122cb58d70 100644 --- a/distros/melodic/rqt-shell/default.nix +++ b/distros/melodic/rqt-shell/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-shell"; version = "0.4.9"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_shell-release/archive/release/melodic/rqt_shell/0.4.9-0.tar.gz"; - name = "0.4.9-0.tar.gz"; - sha256 = "522e34ae2cf5e4af2d14805e70767f394ec88043033a1c6e44324ae58a139001"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_shell-release"; + rev = "release/melodic/rqt_shell/0.4.9-0"; + sha256 = "sha256-NTuyf2AGAxKsTy2Ntz6fCk/M8L4oRcaR9aH14lb1WGY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-srv/default.nix b/distros/melodic/rqt-srv/default.nix index 98813449ca..3b8bb413bf 100644 --- a/distros/melodic/rqt-srv/default.nix +++ b/distros/melodic/rqt-srv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-srv"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_srv-release/archive/release/melodic/rqt_srv/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "601cd2f2679ebf45e306a1b9e6ddaca9dcbb2c614c26cdedc87e2e65c1c2571f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_srv-release"; + rev = "release/melodic/rqt_srv/0.4.8-0"; + sha256 = "sha256-1ur5/fkjhZ7H77sJ1Ws15k//PW2fQU7fk0TbPf7tVIk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-tf-tree/default.nix b/distros/melodic/rqt-tf-tree/default.nix index 48e5950019..ee98527ab3 100644 --- a/distros/melodic/rqt-tf-tree/default.nix +++ b/distros/melodic/rqt-tf-tree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-tf-tree"; version = "0.6.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_tf_tree-release/archive/release/melodic/rqt_tf_tree/0.6.0-0.tar.gz"; - name = "0.6.0-0.tar.gz"; - sha256 = "c52046ad978eb9ae418a866706d9b909646dee0f8b76deed4fa501e0894c3ee4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_tf_tree-release"; + rev = "release/melodic/rqt_tf_tree/0.6.0-0"; + sha256 = "sha256-jd6rCCqHIt2BU9tygcvV/SkrvS5b4bRgYkTKzEQb0k8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-top/default.nix b/distros/melodic/rqt-top/default.nix index 9507e733ff..3be7f6546c 100644 --- a/distros/melodic/rqt-top/default.nix +++ b/distros/melodic/rqt-top/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-top"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_top-release/archive/release/melodic/rqt_top/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "06a64dcb66e010ec7fa6e474dcd0b50efac71516ecb6a247c38652d309ee7c8a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_top-release"; + rev = "release/melodic/rqt_top/0.4.8-0"; + sha256 = "sha256-LYt2qbLJfJst0SrpEpKfpXgpbkWkiOnb10GZj14X6vo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-topic/default.nix b/distros/melodic/rqt-topic/default.nix index b1d1f5f03a..471bb3232c 100644 --- a/distros/melodic/rqt-topic/default.nix +++ b/distros/melodic/rqt-topic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-topic"; version = "0.4.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_topic-release/archive/release/melodic/rqt_topic/0.4.11-1.tar.gz"; - name = "0.4.11-1.tar.gz"; - sha256 = "ae0107ece513376fbeac8547a8d74f539e7c754132302bec282cbf3d4a1c1f8d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_topic-release"; + rev = "release/melodic/rqt_topic/0.4.11-1"; + sha256 = "sha256-3v0nZsBT2E8tnt12KeYT6ZsEcW3MilSw/nIl6jO2GTo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-virtual-joy/default.nix b/distros/melodic/rqt-virtual-joy/default.nix index 37f77e3709..0eff5edb7b 100644 --- a/distros/melodic/rqt-virtual-joy/default.nix +++ b/distros/melodic/rqt-virtual-joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-virtual-joy"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/aquahika/rqt_virtual_joystick-release/archive/release/melodic/rqt_virtual_joy/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "493513036a5a34f777bce227efa92908ea7e93392d784f7e427a0950f2a3c4d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aquahika"; + repo = "rqt_virtual_joystick-release"; + rev = "release/melodic/rqt_virtual_joy/0.1.2-1"; + sha256 = "sha256-oZ+qprSY4weP4utYHXHqzdF9NMHLwatZfx+85jWBwaE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt-web/default.nix b/distros/melodic/rqt-web/default.nix index c7554ed05a..c11a47b64d 100644 --- a/distros/melodic/rqt-web/default.nix +++ b/distros/melodic/rqt-web/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt-web"; version = "0.4.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_web-release/archive/release/melodic/rqt_web/0.4.8-0.tar.gz"; - name = "0.4.8-0.tar.gz"; - sha256 = "3192e2e64f268d79b93d505bc475aa1f39009e75f645d294934d55c2b0b27303"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_web-release"; + rev = "release/melodic/rqt_web/0.4.8-0"; + sha256 = "sha256-Cg0Qwsb2JfzJiTpt2hijreVJpldKr4hKp3eG3ec6ay8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rqt/default.nix b/distros/melodic/rqt/default.nix index 0877275736..f868f5f1f3 100644 --- a/distros/melodic/rqt/default.nix +++ b/distros/melodic/rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rqt"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/melodic/rqt/0.5.3-1"; + sha256 = "sha256-Upv5EmuQw6GsKPsr7camVEb/mzP1vbLGQnYCULJTNu4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rr-control-input-manager/default.nix b/distros/melodic/rr-control-input-manager/default.nix index 2d5880b4e4..ac53d35ee3 100644 --- a/distros/melodic/rr-control-input-manager/default.nix +++ b/distros/melodic/rr-control-input-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rr-control-input-manager"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/rr_openrover_stack-release/archive/release/melodic/rr_control_input_manager/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "db25b07273b106b589148f80502cb9e31e015c44c1038da30701e59c05665366"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "rr_openrover_stack-release"; + rev = "release/melodic/rr_control_input_manager/1.1.1-1"; + sha256 = "sha256-N1eAXLT8McUKwIshcogkg1MPGmhOqo27zUgLXGZsR4M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rr-openrover-description/default.nix b/distros/melodic/rr-openrover-description/default.nix index 5de03e2065..3bcef6e042 100644 --- a/distros/melodic/rr-openrover-description/default.nix +++ b/distros/melodic/rr-openrover-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rr-openrover-description"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/rr_openrover_stack-release/archive/release/melodic/rr_openrover_description/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "0274774ac629b0db1ae649644177d38fc7c6a08d4b51bf448f45a25044a23adb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "rr_openrover_stack-release"; + rev = "release/melodic/rr_openrover_description/1.1.1-1"; + sha256 = "sha256-t2xcEvOxViqXtmZY4DgzCAFZbb5t3hjTXOXcohL5iso="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rr-openrover-driver-msgs/default.nix b/distros/melodic/rr-openrover-driver-msgs/default.nix index e420833585..d720a63425 100644 --- a/distros/melodic/rr-openrover-driver-msgs/default.nix +++ b/distros/melodic/rr-openrover-driver-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rr-openrover-driver-msgs"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/rr_openrover_stack-release/archive/release/melodic/rr_openrover_driver_msgs/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "809fd2071d04f447b256c6aa0cf07e1b9f83ee90b03e77a881e4388250891526"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "rr_openrover_stack-release"; + rev = "release/melodic/rr_openrover_driver_msgs/1.1.1-1"; + sha256 = "sha256-AFJ2FE19gxF6elpeg3mAnbE5NU13vTxqJnOx5ArZvvQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rr-openrover-driver/default.nix b/distros/melodic/rr-openrover-driver/default.nix index 926be2307f..1a210529c0 100644 --- a/distros/melodic/rr-openrover-driver/default.nix +++ b/distros/melodic/rr-openrover-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rr-openrover-driver"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/rr_openrover_stack-release/archive/release/melodic/rr_openrover_driver/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "d44e90740c1301be2451d7a739f42711563236f17e04e027363ed2c8140e4be8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "rr_openrover_stack-release"; + rev = "release/melodic/rr_openrover_driver/1.1.1-1"; + sha256 = "sha256-N8bVuJSBivrnWlEJTOjp+9vLY7PbkElgUpK2WD2IE4I="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation tf2-geometry-msgs ]; diff --git a/distros/melodic/rr-openrover-simulation/default.nix b/distros/melodic/rr-openrover-simulation/default.nix index f29c4799e8..0b75282eb6 100644 --- a/distros/melodic/rr-openrover-simulation/default.nix +++ b/distros/melodic/rr-openrover-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rr-openrover-simulation"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/rr_openrover_stack-release/archive/release/melodic/rr_openrover_simulation/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "b08f5b97f14c600060f59a48f66c22f5b5233b6d11c130fea1a073184871eadf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "rr_openrover_stack-release"; + rev = "release/melodic/rr_openrover_simulation/1.1.1-1"; + sha256 = "sha256-4GEQ8Npq7a1dNnz7d8uUO4ogzk6UDiQtE5CxROxliYY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rr-openrover-stack/default.nix b/distros/melodic/rr-openrover-stack/default.nix index 53299a66b2..e55e00c2f2 100644 --- a/distros/melodic/rr-openrover-stack/default.nix +++ b/distros/melodic/rr-openrover-stack/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rr-openrover-stack"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/rr_openrover_stack-release/archive/release/melodic/rr_openrover_stack/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "b8c6b289d8b66c77cd4d55ce405038ea9ee68c772aca5d35d1f90eae916b5b38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "rr_openrover_stack-release"; + rev = "release/melodic/rr_openrover_stack/1.1.1-1"; + sha256 = "sha256-n5TVxSbBX3K415By96nXHStFhCPbOE2c6XEtzOZ76lE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rr-rover-zero-driver/default.nix b/distros/melodic/rr-rover-zero-driver/default.nix index 8899cb2a63..fbc0e0920a 100644 --- a/distros/melodic/rr-rover-zero-driver/default.nix +++ b/distros/melodic/rr-rover-zero-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rr-rover-zero-driver"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/RoverRobotics-release/rr_openrover_stack-release/archive/release/melodic/rr_rover_zero_driver/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "50d742a89bea79ea48fdf795a04d2ce825d3fa2f01efa92dc1dcd6b175c4ebed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RoverRobotics-release"; + repo = "rr_openrover_stack-release"; + rev = "release/melodic/rr_rover_zero_driver/1.1.1-1"; + sha256 = "sha256-c0MbK23u32blWiF6vBkCKLX151fQ0ZPFyhFOrOowpns="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rslidar-driver/default.nix b/distros/melodic/rslidar-driver/default.nix index cfb86d0afe..d275ab5f40 100644 --- a/distros/melodic/rslidar-driver/default.nix +++ b/distros/melodic/rslidar-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rslidar-driver"; version = "1.0.2"; - src = fetchurl { - url = "https://github.com/CPFL/robosense-release/archive/release/melodic/rslidar_driver/1.0.2-0.tar.gz"; - name = "1.0.2-0.tar.gz"; - sha256 = "7f1ae8931ebeb64b13cf0b1976fb269a63257de51d8de79c6cebbd716a307661"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CPFL"; + repo = "robosense-release"; + rev = "release/melodic/rslidar_driver/1.0.2-0"; + sha256 = "sha256-R1q9PNbKUkteIRQYm8ECqufqsNNYEyNJnyuAI8IaKVw="; + }; buildType = "catkin"; buildInputs = [ catkin libpcap message-generation roslaunch rostest tf2-ros ]; diff --git a/distros/melodic/rslidar-msgs/default.nix b/distros/melodic/rslidar-msgs/default.nix index f6cd6c25a8..35642675c7 100644 --- a/distros/melodic/rslidar-msgs/default.nix +++ b/distros/melodic/rslidar-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rslidar-msgs"; version = "1.0.2"; - src = fetchurl { - url = "https://github.com/CPFL/robosense-release/archive/release/melodic/rslidar_msgs/1.0.2-0.tar.gz"; - name = "1.0.2-0.tar.gz"; - sha256 = "5e648cc16e6b3f0db83e8ce00c9609f6f2da14f0d29951c2cb63e2e2716f953d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CPFL"; + repo = "robosense-release"; + rev = "release/melodic/rslidar_msgs/1.0.2-0"; + sha256 = "sha256-bjeWQx5kkLPggbD3pm06aG/fm6jLhjUy/nhQiL23a1E="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rslidar-pointcloud/default.nix b/distros/melodic/rslidar-pointcloud/default.nix index 72495ecc6a..91a13bd293 100644 --- a/distros/melodic/rslidar-pointcloud/default.nix +++ b/distros/melodic/rslidar-pointcloud/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rslidar-pointcloud"; version = "1.0.2"; - src = fetchurl { - url = "https://github.com/CPFL/robosense-release/archive/release/melodic/rslidar_pointcloud/1.0.2-0.tar.gz"; - name = "1.0.2-0.tar.gz"; - sha256 = "a6c848ebbe5c69d8458345fbb9c5fd54012a1a96130c1587ccf0b251de64aa75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CPFL"; + repo = "robosense-release"; + rev = "release/melodic/rslidar_pointcloud/1.0.2-0"; + sha256 = "sha256-9on+vcFAiCyYgYHRSthq63y73GUDaxERmq/if+PM4lA="; + }; buildType = "catkin"; buildInputs = [ catkin pcl-conversions roslaunch rostest tf2-ros ]; diff --git a/distros/melodic/rslidar-sdk/default.nix b/distros/melodic/rslidar-sdk/default.nix index 48a82a40b7..269c153983 100644 --- a/distros/melodic/rslidar-sdk/default.nix +++ b/distros/melodic/rslidar-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rslidar-sdk"; version = "1.3.2-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rslidar_sdk-release"; + rev = "release/melodic/rslidar_sdk/1.3.2-1"; + sha256 = "sha256-yGHvc+4i7wsj0xeGZogVgtx8WabkvbAba8FP36REx4s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rslidar/default.nix b/distros/melodic/rslidar/default.nix index fe16075790..dbe5265b7f 100644 --- a/distros/melodic/rslidar/default.nix +++ b/distros/melodic/rslidar/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rslidar"; version = "1.0.2"; - src = fetchurl { - url = "https://github.com/CPFL/robosense-release/archive/release/melodic/rslidar/1.0.2-0.tar.gz"; - name = "1.0.2-0.tar.gz"; - sha256 = "afc1683d73695c2460bccb0db0b1ecf4907ddff91506e6c4c33ac34ecf91a5f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CPFL"; + repo = "robosense-release"; + rev = "release/melodic/rslidar/1.0.2-0"; + sha256 = "sha256-RYxAMRkGX8Ddf6Ymik1nAKy08Cy3N1f4iQW0nCYRoRI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rsm-additions/default.nix b/distros/melodic/rsm-additions/default.nix index 1b6db46569..37dc57a175 100644 --- a/distros/melodic/rsm-additions/default.nix +++ b/distros/melodic/rsm-additions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rsm-additions"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/MarcoStb1993/robot_statemachine-release/archive/release/melodic/rsm_additions/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "d0ab381d12932e014c6a1a9f698193eaf89e502b8ebd6bad0b8da54e3d45d327"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarcoStb1993"; + repo = "robot_statemachine-release"; + rev = "release/melodic/rsm_additions/1.2.1-1"; + sha256 = "sha256-IaaPYwJ6+NH5G/igW/ckWf0ODAZjy35TVphkX+XCtwE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rsm-core/default.nix b/distros/melodic/rsm-core/default.nix index 7c9c519e49..7a7d46a4d5 100644 --- a/distros/melodic/rsm-core/default.nix +++ b/distros/melodic/rsm-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rsm-core"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/MarcoStb1993/robot_statemachine-release/archive/release/melodic/rsm_core/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "2617e8e7b3b17b92394685b886898922bfcd72bcbf1b3208c1818900e6b319e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarcoStb1993"; + repo = "robot_statemachine-release"; + rev = "release/melodic/rsm_core/1.2.1-1"; + sha256 = "sha256-niMSSJ/zblpPu0w0yEVRMbHIbCV9Vutwd1mzCTiLjso="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rsm-msgs/default.nix b/distros/melodic/rsm-msgs/default.nix index 661368ecba..582920239a 100644 --- a/distros/melodic/rsm-msgs/default.nix +++ b/distros/melodic/rsm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rsm-msgs"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/MarcoStb1993/robot_statemachine-release/archive/release/melodic/rsm_msgs/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "309853640e80fb363b51b510b1638527021b6e961199f639eee8494c8650dd21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarcoStb1993"; + repo = "robot_statemachine-release"; + rev = "release/melodic/rsm_msgs/1.2.1-1"; + sha256 = "sha256-Q7qyM9yy8vq8CkddDlQCzL4hhmuqtDuRu50eYs+ksAQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rsm-rqt-plugins/default.nix b/distros/melodic/rsm-rqt-plugins/default.nix index e665c1652b..0df5f187b1 100644 --- a/distros/melodic/rsm-rqt-plugins/default.nix +++ b/distros/melodic/rsm-rqt-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rsm-rqt-plugins"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/MarcoStb1993/robot_statemachine-release/archive/release/melodic/rsm_rqt_plugins/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "c4fc756e54002afb4f750d42869ea09b11207c61c20bdfc17b0c107379ff66d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarcoStb1993"; + repo = "robot_statemachine-release"; + rev = "release/melodic/rsm_rqt_plugins/1.2.1-1"; + sha256 = "sha256-7riSEPckluVRSDaGBivKtvZ7SNbHoJFx+pbkzkJ1w5g="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/melodic/rsm-rviz-plugins/default.nix b/distros/melodic/rsm-rviz-plugins/default.nix index 5a3aeca56e..01eecc2090 100644 --- a/distros/melodic/rsm-rviz-plugins/default.nix +++ b/distros/melodic/rsm-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rsm-rviz-plugins"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/MarcoStb1993/robot_statemachine-release/archive/release/melodic/rsm_rviz_plugins/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "d3f94448ec9038c8da1be7d2290237e1db02cb482d5765abfb32fc687b338e05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarcoStb1993"; + repo = "robot_statemachine-release"; + rev = "release/melodic/rsm_rviz_plugins/1.2.1-1"; + sha256 = "sha256-ylO5ox3yuIDhQ0QJRk6DlWnkZtjuct7BNPUb20rw74A="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/melodic/rt-usb-9axisimu-driver/default.nix b/distros/melodic/rt-usb-9axisimu-driver/default.nix index 47c167679a..b24fa7b6b3 100644 --- a/distros/melodic/rt-usb-9axisimu-driver/default.nix +++ b/distros/melodic/rt-usb-9axisimu-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rt-usb-9axisimu-driver"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_usb_9axisimu_driver-release/archive/release/melodic/rt_usb_9axisimu_driver/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "d5601c729db3cede96fa28086a40d6bc7ec8346d5dc88ebabc7e856ec68f7989"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_usb_9axisimu_driver-release"; + rev = "release/melodic/rt_usb_9axisimu_driver/1.0.1-1"; + sha256 = "sha256-Mq8KbH32cTlyZtFtTyi+RLSQXhupXHtrsjeItyRVA+8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rtabmap-ros/default.nix b/distros/melodic/rtabmap-ros/default.nix index 6ea91fd954..288ce4930f 100644 --- a/distros/melodic/rtabmap-ros/default.nix +++ b/distros/melodic/rtabmap-ros/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, apriltag-ros, catkin, class-loader, compressed-depth-image-transport, compressed-image-transport, costmap-2d, cv-bridge, dynamic-reconfigure, eigen-conversions, find-object-2d, genmsg, geometry-msgs, image-geometry, image-transport, laser-geometry, message-filters, message-generation, message-runtime, move-base-msgs, nav-msgs, nodelet, octomap-msgs, pcl, pcl-conversions, pcl-ros, pluginlib, roscpp, rosgraph-msgs, rospy, rtabmap, rviz, sensor-msgs, std-msgs, std-srvs, stereo-msgs, tf, tf-conversions, tf2-ros, theora-image-transport, visualization-msgs }: buildRosPackage { pname = "ros-melodic-rtabmap-ros"; - version = "0.20.22-r1"; + version = "0.20.23-r1"; - src = fetchurl { - url = "https://github.com/introlab/rtabmap_ros-release/archive/release/melodic/rtabmap_ros/0.20.22-1.tar.gz"; - name = "0.20.22-1.tar.gz"; - sha256 = "7b38d0cf63f57c6e08c12dc01439f1f2e28a95564c67cec9419bcb5fe2bc9f15"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "rtabmap_ros-release"; + rev = "release/melodic/rtabmap_ros/0.20.23-1"; + sha256 = "sha256-skW9aDVspz9Qh/TpYw82zCOOhwDHLZdjvnjfTdL40xk="; + }; buildType = "catkin"; buildInputs = [ catkin genmsg message-generation pcl ]; diff --git a/distros/melodic/rtcm-msgs/default.nix b/distros/melodic/rtcm-msgs/default.nix index 788fee13fc..64c5aa001d 100644 --- a/distros/melodic/rtcm-msgs/default.nix +++ b/distros/melodic/rtcm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rtcm-msgs"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rtcm_msgs-release/archive/release/melodic/rtcm_msgs/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "19fc3432ee5e525194ebbb7fac86afabcc2565e492980fd342cf42b44c49bd13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rtcm_msgs-release"; + rev = "release/melodic/rtcm_msgs/1.1.6-1"; + sha256 = "sha256-5yTtIdGostlOwChSlKKL4JivCyK284g0KYZxB6GBtBY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/melodic/rtmbuild/default.nix b/distros/melodic/rtmbuild/default.nix index 2c43897ff8..74ae498420 100644 --- a/distros/melodic/rtmbuild/default.nix +++ b/distros/melodic/rtmbuild/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rtmbuild"; version = "1.4.3-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_common-release/archive/release/melodic/rtmbuild/1.4.3-1.tar.gz"; - name = "1.4.3-1.tar.gz"; - sha256 = "d2b853594a8ee7bb2672d6b2e8f15a2c78e564e3197468a8fd8dc77f686b108a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_common-release"; + rev = "release/melodic/rtmbuild/1.4.3-1"; + sha256 = "sha256-8hHVu4LzN3Xd9NFNFDFPM64I+leMBgCpWMiMQNVTcdg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rtmros-common/default.nix b/distros/melodic/rtmros-common/default.nix index 0c1d74c58f..05dec502ce 100644 --- a/distros/melodic/rtmros-common/default.nix +++ b/distros/melodic/rtmros-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rtmros-common"; version = "1.4.3-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_common-release/archive/release/melodic/rtmros_common/1.4.3-1.tar.gz"; - name = "1.4.3-1.tar.gz"; - sha256 = "0af1052d8862dc6e92b5ea1c656d311b32b1a55ad6127972c6c7be977f324cbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_common-release"; + rev = "release/melodic/rtmros_common/1.4.3-1"; + sha256 = "sha256-FlSHKHIw1YYNTrz+0Mz5fyeFV/FtMhrBq4VKudMHX48="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rtmros-hironx/default.nix b/distros/melodic/rtmros-hironx/default.nix index a74e6b149a..42ca484505 100644 --- a/distros/melodic/rtmros-hironx/default.nix +++ b/distros/melodic/rtmros-hironx/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rtmros-hironx"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_hironx-release/archive/release/melodic/rtmros_hironx/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "51824e75419c9acc1c538fc32ee9e387bd0e90a2519ddfe59680665b3146f149"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_hironx-release"; + rev = "release/melodic/rtmros_hironx/2.2.0-1"; + sha256 = "sha256-ixA1EUT35aNEg5mCWmxYFGdJ8VjGsRP9E35kRB2zts4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rtmros-nextage/default.nix b/distros/melodic/rtmros-nextage/default.nix index ad0ce114c9..b5be579941 100644 --- a/distros/melodic/rtmros-nextage/default.nix +++ b/distros/melodic/rtmros-nextage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rtmros-nextage"; version = "0.8.6-r3"; - src = fetchurl { - url = "https://github.com/tork-a/rtmros_nextage-release/archive/release/melodic/rtmros_nextage/0.8.6-3.tar.gz"; - name = "0.8.6-3.tar.gz"; - sha256 = "f2c142f406e576dcf8820ec267d0dfb4c3dec98e32d87dc15e9901bd17451660"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "rtmros_nextage-release"; + rev = "release/melodic/rtmros_nextage/0.8.6-3"; + sha256 = "sha256-A95jqAFhCA5Uq45SL07yLZFAcNilgh+oWzp+O1eg6ZQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ruckig/default.nix b/distros/melodic/ruckig/default.nix index f752f70e68..9e355043e8 100644 --- a/distros/melodic/ruckig/default.nix +++ b/distros/melodic/ruckig/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, cmake }: buildRosPackage { pname = "ros-melodic-ruckig"; - version = "0.6.3-r1"; + version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/pantor/ruckig-release/archive/release/melodic/ruckig/0.6.3-1.tar.gz"; - name = "0.6.3-1.tar.gz"; - sha256 = "2d91a730efc4c1c7452b085d98caadfabedd9da926c75b3f8a1cb8f3d430f268"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pantor"; + repo = "ruckig-release"; + rev = "release/melodic/ruckig/0.9.1-1"; + sha256 = "sha256-IEDNR/6JMFG5xGwIQb+/cLOvSW1F7+iDvvSU4dsWkUM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/rviz-animated-view-controller/default.nix b/distros/melodic/rviz-animated-view-controller/default.nix index b4bfeb6691..21ce68a862 100644 --- a/distros/melodic/rviz-animated-view-controller/default.nix +++ b/distros/melodic/rviz-animated-view-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rviz-animated-view-controller"; version = "0.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/rviz_animated_view_controller-release/archive/release/melodic/rviz_animated_view_controller/0.2.0-2.tar.gz"; - name = "0.2.0-2.tar.gz"; - sha256 = "2528e6708151c41f229ca409f625c143ad8ee2db43fc65ba12e4216df54e0a59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rviz_animated_view_controller-release"; + rev = "release/melodic/rviz_animated_view_controller/0.2.0-2"; + sha256 = "sha256-oqcLyN8xVxsRPPHmsFMY8KPUdI/mhY1Fkf4/VJXbcok="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rviz-imu-plugin/default.nix b/distros/melodic/rviz-imu-plugin/default.nix index 6c68677d32..611f0e802f 100644 --- a/distros/melodic/rviz-imu-plugin/default.nix +++ b/distros/melodic/rviz-imu-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rviz-imu-plugin"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/imu_tools-release/archive/release/melodic/rviz_imu_plugin/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "5f05c06594a77f466543b305c493267af7366f3ac2c3f6b6aaf46eeb44ead605"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "imu_tools-release"; + rev = "release/melodic/rviz_imu_plugin/1.2.5-1"; + sha256 = "sha256-x3MyWvIgNSMw0++PQ3gxYa5ZNrzi/Om/5D9vJxtckR4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rviz-plugin-tutorials/default.nix b/distros/melodic/rviz-plugin-tutorials/default.nix index c4212c6b6c..019af5c4d3 100644 --- a/distros/melodic/rviz-plugin-tutorials/default.nix +++ b/distros/melodic/rviz-plugin-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rviz-plugin-tutorials"; version = "0.10.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/melodic/rviz_plugin_tutorials/0.10.5-1.tar.gz"; - name = "0.10.5-1.tar.gz"; - sha256 = "56b0a158213319f1580c03cb98af5450debd18f7ed1d4888c0a4868d67ecdc3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/melodic/rviz_plugin_tutorials/0.10.5-1"; + sha256 = "sha256-Yr65TePACQ3d2GvVpzOLnXlbXcDCloFvKD9zbCNTpW8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rviz-python-tutorial/default.nix b/distros/melodic/rviz-python-tutorial/default.nix index 8c44099f6b..0154bc3247 100644 --- a/distros/melodic/rviz-python-tutorial/default.nix +++ b/distros/melodic/rviz-python-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rviz-python-tutorial"; version = "0.10.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/melodic/rviz_python_tutorial/0.10.5-1.tar.gz"; - name = "0.10.5-1.tar.gz"; - sha256 = "e4cc2466079f2b9ead23a1584a2c2fc808b106d7aa49fcc3c2e0c3520aae2599"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/melodic/rviz_python_tutorial/0.10.5-1"; + sha256 = "sha256-WxoXa0d6kYBgl1qZ5XanGosE3AV1nfHUDjqgRHtp6Cc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rviz-satellite/default.nix b/distros/melodic/rviz-satellite/default.nix index 9c86e7601d..be4cc09b6f 100644 --- a/distros/melodic/rviz-satellite/default.nix +++ b/distros/melodic/rviz-satellite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rviz-satellite"; version = "3.0.3-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rviz_satellite-release/archive/release/melodic/rviz_satellite/3.0.3-1.tar.gz"; - name = "3.0.3-1.tar.gz"; - sha256 = "4fd1277f66deb468cddf432aef90edc9d53e65ee2e2a9eacd5a29ea4414db215"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rviz_satellite-release"; + rev = "release/melodic/rviz_satellite/3.0.3-1"; + sha256 = "sha256-AbKv0N1s6yyvavo96nAiT0AwSX84iN8hU8hg9/2DsIM="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/melodic/rviz-visual-tools/default.nix b/distros/melodic/rviz-visual-tools/default.nix index b6852cf75f..06762023bd 100644 --- a/distros/melodic/rviz-visual-tools/default.nix +++ b/distros/melodic/rviz-visual-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rviz-visual-tools"; version = "3.8.0-r4"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/rviz_visual_tools-release/archive/release/melodic/rviz_visual_tools/3.8.0-4.tar.gz"; - name = "3.8.0-4.tar.gz"; - sha256 = "4b4eb5dcac945413442686e3c37cb0f383c40fd7cb491044ca7e0505fffb2976"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "rviz_visual_tools-release"; + rev = "release/melodic/rviz_visual_tools/3.8.0-4"; + sha256 = "sha256-JUAImO9LR4eNZtlODe/HeOIusD8caQw6Q0LEp+CpA00="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rviz/default.nix b/distros/melodic/rviz/default.nix index f4eab7f9c2..800bab2968 100644 --- a/distros/melodic/rviz/default.nix +++ b/distros/melodic/rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rviz"; version = "1.13.29-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rviz-release/archive/release/melodic/rviz/1.13.29-1.tar.gz"; - name = "1.13.29-1.tar.gz"; - sha256 = "355e851ad2bcf6e28e189c56e312b38039e7929a77ba33f007c412765b9e14f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rviz-release"; + rev = "release/melodic/rviz/1.13.29-1"; + sha256 = "sha256-+AIOGuOovqqb+xw8HM5FmSJrgD+RCYKiEsRVfti3t40="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen message-generation urdfdom urdfdom-headers ]; diff --git a/distros/melodic/rwt-app-chooser/default.nix b/distros/melodic/rwt-app-chooser/default.nix index cc504cb28e..fb0e1b2057 100644 --- a/distros/melodic/rwt-app-chooser/default.nix +++ b/distros/melodic/rwt-app-chooser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-app-chooser"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_app_chooser/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "d895ce642f710dec08e1dbebe7de978bcc9977b03bf135dbbf53b17a4afcf69e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_app_chooser/0.1.1-1"; + sha256 = "sha256-vgoTeghGf3cgyV0IHHPYRZL9ydYTTxcnQBeinBsxnCg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rwt-image-view/default.nix b/distros/melodic/rwt-image-view/default.nix index dd0368d521..1185baa8dc 100644 --- a/distros/melodic/rwt-image-view/default.nix +++ b/distros/melodic/rwt-image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-image-view"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_image_view/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "4636e54ee0c17a57480aeb4114e5c0686504da5eec5b8ffb1c44f237f1c8241a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_image_view/0.1.1-1"; + sha256 = "sha256-Acfcnlp8FhvFUgoTH3qeYFvDWi0kpPNoUSkZo7Gbrts="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rwt-moveit/default.nix b/distros/melodic/rwt-moveit/default.nix index 5d0884a346..e80aa07ef8 100644 --- a/distros/melodic/rwt-moveit/default.nix +++ b/distros/melodic/rwt-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-moveit"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_moveit/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "4cc126eb4bb0bd7be316e06cc2a2421ae8aa3d17089f5dbc759b8d2d3cd57204"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_moveit/0.1.1-1"; + sha256 = "sha256-Y+U2pDOCVC0WD30S/VHpkcrvx/7VW7dxzLSyweZOudM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/rwt-nav/default.nix b/distros/melodic/rwt-nav/default.nix index 482e6382e2..ab0a5804da 100644 --- a/distros/melodic/rwt-nav/default.nix +++ b/distros/melodic/rwt-nav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-nav"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_nav/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "b923c3c3f2e4c7a35710d91171ec49aa8ca4046ca24969fcac3b35169f389bd0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_nav/0.1.1-1"; + sha256 = "sha256-k9qDFDmF82YPdc12pyl6h/38aiqrpnfSkVAKCprsZGk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rwt-plot/default.nix b/distros/melodic/rwt-plot/default.nix index ee41cca88c..b56e15366e 100644 --- a/distros/melodic/rwt-plot/default.nix +++ b/distros/melodic/rwt-plot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-plot"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_plot/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "442f7110a879b5d107aa19b676910acf811ebe1d030568cc86e476244222b249"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_plot/0.1.1-1"; + sha256 = "sha256-Y/zpc6zAB/LdMAzXeTGZocRIipdrybqeWHmmE++gxaA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rwt-robot-monitor/default.nix b/distros/melodic/rwt-robot-monitor/default.nix index a9a47bf560..4b1b830ef3 100644 --- a/distros/melodic/rwt-robot-monitor/default.nix +++ b/distros/melodic/rwt-robot-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-robot-monitor"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_robot_monitor/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "b78fe02256cf1b24be648221fa89df0e81e61f19a2e37d34ee608650be8be79d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_robot_monitor/0.1.1-1"; + sha256 = "sha256-xl0AxSjKUZXMad+NyE67gjp1XScSYoorn826yWpGBds="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rwt-speech-recognition/default.nix b/distros/melodic/rwt-speech-recognition/default.nix index 39ec686b91..075ca6584e 100644 --- a/distros/melodic/rwt-speech-recognition/default.nix +++ b/distros/melodic/rwt-speech-recognition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-speech-recognition"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_speech_recognition/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "3777c5129e7fea8791bfdbcf97400e38f57064ffc3e0c12fe75b78e6ffbfc24e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_speech_recognition/0.1.1-1"; + sha256 = "sha256-1AJnTg63O6+0ZwC6Ulw02490i1FYqBbs8aKv1zGO5cs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rwt-steer/default.nix b/distros/melodic/rwt-steer/default.nix index fa401131ce..83d785d8cb 100644 --- a/distros/melodic/rwt-steer/default.nix +++ b/distros/melodic/rwt-steer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-steer"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_steer/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "db2abd4a820bfb28b5bfa98bfaee23a0ac800040288ccd66049e21b75fd38871"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_steer/0.1.1-1"; + sha256 = "sha256-ZBqPWxC1EzA1fHOJQwAn5/WWVxjVHYWqeuIiAul0iKg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rwt-utils-3rdparty/default.nix b/distros/melodic/rwt-utils-3rdparty/default.nix index 869f745295..caac86a301 100644 --- a/distros/melodic/rwt-utils-3rdparty/default.nix +++ b/distros/melodic/rwt-utils-3rdparty/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rwt-utils-3rdparty"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/rwt_utils_3rdparty/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "3a6f48ed988311ffcab9a6bbdef0c4f5cc1be08e3c35470e2b3f57bc1076d870"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/rwt_utils_3rdparty/0.1.1-1"; + sha256 = "sha256-PlVplDJ/EAKAUxhoxQRs3L8sbc+XIB3zLS14qk6DZzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rx-service-tools/default.nix b/distros/melodic/rx-service-tools/default.nix index 0f2d73c353..f217a4ece4 100644 --- a/distros/melodic/rx-service-tools/default.nix +++ b/distros/melodic/rx-service-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rx-service-tools"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rx_service_tools-release/archive/release/melodic/rx_service_tools/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "68d0c57e7a8de53a6bfd718d6bbfef0871720a3b62113eda08506b6c7db6539b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rx_service_tools-release"; + rev = "release/melodic/rx_service_tools/1.0.1-1"; + sha256 = "sha256-lWHlCm5e8l2tsFp1Fooeov8ZPG6YzZGfIvgjPEOKwDE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rxcpp-vendor/default.nix b/distros/melodic/rxcpp-vendor/default.nix index 2eac5d1845..c375116036 100644 --- a/distros/melodic/rxcpp-vendor/default.nix +++ b/distros/melodic/rxcpp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rxcpp-vendor"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/rosin-project/rxcpp_vendor-release/archive/release/melodic/rxcpp_vendor/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "a9489ead897a2615307dc749869cef1d17caddde0eda42a362f9d811cc34980b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosin-project"; + repo = "rxcpp_vendor-release"; + rev = "release/melodic/rxcpp_vendor/4.1.0-1"; + sha256 = "sha256-4ZiYFFuAkvXXE989SuJVKdnJP6oeD2yuORvWNX4ym6U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rxros-tf/default.nix b/distros/melodic/rxros-tf/default.nix index 6abf6794e9..c787cded34 100644 --- a/distros/melodic/rxros-tf/default.nix +++ b/distros/melodic/rxros-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rxros-tf"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/rosin-project/rxros-release/archive/release/melodic/rxros_tf/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "dc14d6a0fb3706f25cbad9696e1b39a5e9b16f44be6f8f827a13aa5833bbe355"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosin-project"; + repo = "rxros-release"; + rev = "release/melodic/rxros_tf/0.1.0-1"; + sha256 = "sha256-caRGb8SG4275JoHjVUPzvNuxihP4wYWupSffOT7MTs0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/rxros/default.nix b/distros/melodic/rxros/default.nix index 994dd9ac37..5aafbae4f6 100644 --- a/distros/melodic/rxros/default.nix +++ b/distros/melodic/rxros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-rxros"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/rosin-project/rxros-release/archive/release/melodic/rxros/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "ac6bf266d3f1bfbe7be43f5870ba29469fffb094fe4c4bdc8241a128187c6dde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rosin-project"; + repo = "rxros-release"; + rev = "release/melodic/rxros/0.1.0-1"; + sha256 = "sha256-45Fy0qhcLdjAHW6g2FoeU6YS2VtB2VyOt2wCctfFj18="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/s3-common/default.nix b/distros/melodic/s3-common/default.nix index 77e0f9f270..95c6c5895d 100644 --- a/distros/melodic/s3-common/default.nix +++ b/distros/melodic/s3-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-s3-common"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/rosbag_uploader-release/archive/release/melodic/s3_common/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "020e7dcb88eb4b7c3efc63814fd190051ca4769345fc180807b576ee018e9bbb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "rosbag_uploader-release"; + rev = "release/melodic/s3_common/1.0.1-1"; + sha256 = "sha256-gXFna7MZ2Hy5i15mlFnYZTE1oysVww2hdHWm3KwYi5I="; + }; buildType = "cmake"; buildInputs = [ catkin cmake ]; diff --git a/distros/melodic/s3-file-uploader/default.nix b/distros/melodic/s3-file-uploader/default.nix index 31dfbfc838..60d871e705 100644 --- a/distros/melodic/s3-file-uploader/default.nix +++ b/distros/melodic/s3-file-uploader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-s3-file-uploader"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/rosbag_uploader-release/archive/release/melodic/s3_file_uploader/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "c0dcc4dbd3ec1ee24590acc7b770caef82b6b4a4434517b277754f5738d6836a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "rosbag_uploader-release"; + rev = "release/melodic/s3_file_uploader/1.0.1-1"; + sha256 = "sha256-iztGqlNyI8jbUNEEgyBo/wlaiAvV/aRTwgL5oSyzBWc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/safe-teleop-base/default.nix b/distros/melodic/safe-teleop-base/default.nix index c1118caef0..3f5c2ea1ff 100644 --- a/distros/melodic/safe-teleop-base/default.nix +++ b/distros/melodic/safe-teleop-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-safe-teleop-base"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/shared_autonomy_manipulation-release/archive/release/melodic/safe_teleop_base/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "5ac007d2e99c8152a67a16dcfaea3ec11535b8e94ec591bf5fd2cbdd87f46450"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "shared_autonomy_manipulation-release"; + rev = "release/melodic/safe_teleop_base/0.0.3-1"; + sha256 = "sha256-PWojSi99sdRQ3VRURPU2A14cMUNO/wIhx5IWGtDd5Fc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/safe-teleop-pr2/default.nix b/distros/melodic/safe-teleop-pr2/default.nix index 1a77261420..bafe1f5ad3 100644 --- a/distros/melodic/safe-teleop-pr2/default.nix +++ b/distros/melodic/safe-teleop-pr2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-safe-teleop-pr2"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/shared_autonomy_manipulation-release/archive/release/melodic/safe_teleop_pr2/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "6cdde56548b70fcc58b87f41d60de6b1266c65c9851944e1b913bcadf0fe36cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "shared_autonomy_manipulation-release"; + rev = "release/melodic/safe_teleop_pr2/0.0.3-1"; + sha256 = "sha256-wRLdRtVQdFs0nxlVLcsRQDTIAaQE+BEZ9/Za3CXmgU0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/safe-teleop-stage/default.nix b/distros/melodic/safe-teleop-stage/default.nix index e257e3b770..fd820919d8 100644 --- a/distros/melodic/safe-teleop-stage/default.nix +++ b/distros/melodic/safe-teleop-stage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-safe-teleop-stage"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/shared_autonomy_manipulation-release/archive/release/melodic/safe_teleop_stage/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "ff18ef24923e712f4647f4e03481d7efeb8cb06910599525e6acb1821a71f374"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "shared_autonomy_manipulation-release"; + rev = "release/melodic/safe_teleop_stage/0.0.3-1"; + sha256 = "sha256-01/SZ+qAjoSYWM4cBHK+LtYwNiIgpj/m/gt/f2/QtK4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/safety-limiter-msgs/default.nix b/distros/melodic/safety-limiter-msgs/default.nix index be8e5d85c3..f4da79ddce 100644 --- a/distros/melodic/safety-limiter-msgs/default.nix +++ b/distros/melodic/safety-limiter-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-melodic-safety-limiter-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/melodic/safety_limiter_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "2766e5617f0e92762fc7f259b384ee3145499157e836804e26a8c2a952958afe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/melodic/safety_limiter_msgs/0.12.0-1"; + sha256 = "sha256-g35ZIz6QoDjeH6DFPBITZqO4xSuxyVSb1+pcu4o1LHc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/safety-limiter/default.nix b/distros/melodic/safety-limiter/default.nix index e7e75f0f93..ad2d7bce2d 100644 --- a/distros/melodic/safety-limiter/default.nix +++ b/distros/melodic/safety-limiter/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, diagnostic-updater, dynamic-reconfigure, eigen, geometry-msgs, nav-msgs, neonavigation-common, pcl, pcl-conversions, pcl-ros, roscpp, roslint, rostest, safety-limiter-msgs, sensor-msgs, std-msgs, tf2-geometry-msgs, tf2-ros, tf2-sensor-msgs, xmlrpcpp }: buildRosPackage { pname = "ros-melodic-safety-limiter"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/safety_limiter/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "ed7d2dabb807d1554ee33c2f70d693d2ee6ff629daf997c8f3179b78bc0a06b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/safety_limiter/0.12.0-1"; + sha256 = "sha256-i9WvYayzwrPfLkvojqlvs1gAY3ilZNIjzmVJtF03ABI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sainsmart-relay-usb/default.nix b/distros/melodic/sainsmart-relay-usb/default.nix index d9bb5999e7..5c6355cb29 100644 --- a/distros/melodic/sainsmart-relay-usb/default.nix +++ b/distros/melodic/sainsmart-relay-usb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sainsmart-relay-usb"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/sainsmart_relay_usb-release/archive/release/melodic/sainsmart_relay_usb/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "d9a7f0576cdd1b259381f941e661e87e5695a87cde643d2b07aa141e0f04138c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "sainsmart_relay_usb-release"; + rev = "release/melodic/sainsmart_relay_usb/0.0.4-1"; + sha256 = "sha256-Fzb/XLmZfDK4mzsj7j2KjD62n6l4kVABp14CzMML4Xo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sand-island/default.nix b/distros/melodic/sand-island/default.nix index 0f96d3529f..624980940b 100644 --- a/distros/melodic/sand-island/default.nix +++ b/distros/melodic/sand-island/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sand-island"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/uav_testing-release/archive/release/melodic/sand_island/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "fa4a4a3f74588458997cdc7eefa1be98c9dbc08d98f53ab426b40cea4530fa90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "uav_testing-release"; + rev = "release/melodic/sand_island/0.0.1-1"; + sha256 = "sha256-Qu8ZUw4cADXNCp+RFZh57OKzS23gyQ9oiXEZ8z0LNCg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sbg-driver/default.nix b/distros/melodic/sbg-driver/default.nix index eb40aa2bf2..f025c4957c 100644 --- a/distros/melodic/sbg-driver/default.nix +++ b/distros/melodic/sbg-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sbg-driver"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/SBG-Systems/sbg_ros_driver-release/archive/release/melodic/sbg_driver/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "d9eacffb9bd5b9b0807ad482598c36932f04ca9b8313bc1714c140a6c5a02d7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SBG-Systems"; + repo = "sbg_ros_driver-release"; + rev = "release/melodic/sbg_driver/3.0.0-1"; + sha256 = "sha256-iayaBLqAoj/a0bPwxX5uEh0HedVbggjlCNTgrYFY4Ps="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/sbpl-lattice-planner/default.nix b/distros/melodic/sbpl-lattice-planner/default.nix index 41fa13dc3f..4b3b377fdb 100644 --- a/distros/melodic/sbpl-lattice-planner/default.nix +++ b/distros/melodic/sbpl-lattice-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sbpl-lattice-planner"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/melodic/sbpl_lattice_planner/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "3e0c9722b80b6dabbe65028a6d9396b526294c540b59e7f4a5c49c29e3ec09d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/melodic/sbpl_lattice_planner/0.3.6-1"; + sha256 = "sha256-OYkkH8A7tXx3uaChL1h03MdCtaGvdQlmxbMsT1EHC+M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/sbpl-recovery/default.nix b/distros/melodic/sbpl-recovery/default.nix index 0a3bb855c6..79bfd655f8 100644 --- a/distros/melodic/sbpl-recovery/default.nix +++ b/distros/melodic/sbpl-recovery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sbpl-recovery"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/melodic/sbpl_recovery/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "2d38cd509a685ec31df2517ca2c45c79a424fb45ae76a29736f86168a4137ed6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/melodic/sbpl_recovery/0.3.6-1"; + sha256 = "sha256-dx97MaDv5cWqDaPBd18pDrM1sWg/32CJB09bqdcvuDM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sbpl/default.nix b/distros/melodic/sbpl/default.nix index 8a98951504..c451a0b26e 100644 --- a/distros/melodic/sbpl/default.nix +++ b/distros/melodic/sbpl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sbpl"; version = "1.3.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/sbpl-release/archive/release/melodic/sbpl/1.3.1-0.tar.gz"; - name = "1.3.1-0.tar.gz"; - sha256 = "9f24887428cc4e548e8cb297b225d952a1085e3c1f555a847350016c21c7cef2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "sbpl-release"; + rev = "release/melodic/sbpl/1.3.1-0"; + sha256 = "sha256-cgcPFOXOMnw5oAxDkyMNOhxfemMesoM4xzpW+ZQlqAc="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/scaled-controllers/default.nix b/distros/melodic/scaled-controllers/default.nix index c9301fc754..0aa002b141 100644 --- a/distros/melodic/scaled-controllers/default.nix +++ b/distros/melodic/scaled-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-scaled-controllers"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_scaled_controllers-release/archive/release/melodic/scaled_controllers/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "326bb647af2998e8552761864179e37433d7b8902b36fbbb3232d1e7e452ac8d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_scaled_controllers-release"; + rev = "release/melodic/scaled_controllers/0.1.0-1"; + sha256 = "sha256-aMcK8c5WS85vYboHV04KmtAEM3bx0yExlt73qAmWd38="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/scaled-joint-trajectory-controller/default.nix b/distros/melodic/scaled-joint-trajectory-controller/default.nix index fd98cb4975..ec1693ef96 100644 --- a/distros/melodic/scaled-joint-trajectory-controller/default.nix +++ b/distros/melodic/scaled-joint-trajectory-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-scaled-joint-trajectory-controller"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_scaled_controllers-release/archive/release/melodic/scaled_joint_trajectory_controller/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "6dea8314c90b48ccb9e02a3877059d765b053bb285c9b4ef64b6601c3bf92439"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_scaled_controllers-release"; + rev = "release/melodic/scaled_joint_trajectory_controller/0.1.0-1"; + sha256 = "sha256-YnCM6WrVoaKXHEQeg4iorgy5G+NPAFzOSIiUXPFZbvM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/scan-to-cloud-converter/default.nix b/distros/melodic/scan-to-cloud-converter/default.nix index be29d2356e..ffad58c021 100644 --- a/distros/melodic/scan-to-cloud-converter/default.nix +++ b/distros/melodic/scan-to-cloud-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-scan-to-cloud-converter"; version = "0.3.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/melodic/scan_to_cloud_converter/0.3.3-2.tar.gz"; - name = "0.3.3-2.tar.gz"; - sha256 = "3ec240f339589c404db018ccf98fda92f2dc33e740678a6246ffa248f2dab533"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/melodic/scan_to_cloud_converter/0.3.3-2"; + sha256 = "sha256-PbqPH8KR7i6Einlcettf0P73PN7E67K96puohcJPUn4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/scan-tools/default.nix b/distros/melodic/scan-tools/default.nix index b7bba12e04..e0504e1b9e 100644 --- a/distros/melodic/scan-tools/default.nix +++ b/distros/melodic/scan-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-scan-tools"; version = "0.3.3-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/melodic/scan_tools/0.3.3-2.tar.gz"; - name = "0.3.3-2.tar.gz"; - sha256 = "b2848d7623a75866185fa47d415fbcb05bbabcfdbfc7bc11f40fdfd704c698f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/melodic/scan_tools/0.3.3-2"; + sha256 = "sha256-srfyjN+cxm9kXrXUE7QtjRqaF7Ehi8SQ0rmaa04TDZg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/scenario-test-tools/default.nix b/distros/melodic/scenario-test-tools/default.nix index 9c5efd2cb7..ef0ec3b567 100644 --- a/distros/melodic/scenario-test-tools/default.nix +++ b/distros/melodic/scenario-test-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-scenario-test-tools"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/scenario_test_tools/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "14e3f791241da2ccad0f94359f33eb914ad3ec26e8427639f370c85760ac39cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/scenario_test_tools/0.6.19-1"; + sha256 = "sha256-1fAu8yoNw53SdVHcypbNZWMsqEhI6Z78J8V0m1qvDaU="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/scheduler-msgs/default.nix b/distros/melodic/scheduler-msgs/default.nix index cf2cf5975e..b1aea086bd 100644 --- a/distros/melodic/scheduler-msgs/default.nix +++ b/distros/melodic/scheduler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-scheduler-msgs"; version = "0.9.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/rocon_msgs-release/archive/release/melodic/scheduler_msgs/0.9.0-0.tar.gz"; - name = "0.9.0-0.tar.gz"; - sha256 = "1b4d4544455c6a6b0cd9dfa8388e3f497ada0125fd906b544ccdb0d23a491a71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "rocon_msgs-release"; + rev = "release/melodic/scheduler_msgs/0.9.0-0"; + sha256 = "sha256-d6PkSXculGsa08XSRC+nKk3dWV1ANnD6hRpHjqNJbF4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/schunk-description/default.nix b/distros/melodic/schunk-description/default.nix index 00e978a17f..b4022fc6ab 100644 --- a/distros/melodic/schunk-description/default.nix +++ b/distros/melodic/schunk-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-schunk-description"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/melodic/schunk_description/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "ab32680fd438533e45433cf9a39abc77ab6950e44621e72b395fcd62d1f0c25c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/melodic/schunk_description/0.6.14-1"; + sha256 = "sha256-MPm9rEUUfG8qh+5ypZoBVfwFsPxdjq1cCcga2Pvc9Ds="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-libm5api/default.nix b/distros/melodic/schunk-libm5api/default.nix index 5b8f02dd10..3e90541fa4 100644 --- a/distros/melodic/schunk-libm5api/default.nix +++ b/distros/melodic/schunk-libm5api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-schunk-libm5api"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/melodic/schunk_libm5api/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "b5ff483ea55dee762a82ae1a43b607a331ac9c40b7c88e3c5d8e24552c95052a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/melodic/schunk_libm5api/0.6.14-1"; + sha256 = "sha256-eQ+DYSbflkN+8LXihVVjqF9boMNqKhB8p1T69P5R7Do="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-modular-robotics/default.nix b/distros/melodic/schunk-modular-robotics/default.nix index abcec2c0e5..ee7e9c0b38 100644 --- a/distros/melodic/schunk-modular-robotics/default.nix +++ b/distros/melodic/schunk-modular-robotics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-schunk-modular-robotics"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/melodic/schunk_modular_robotics/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "5ff696b3e27fafc12fd26ae1f0f013306d65382a9b463a6b7c4c6d9ad9755f03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/melodic/schunk_modular_robotics/0.6.14-1"; + sha256 = "sha256-Z+6LdOA56MdhIkPLmMNsNbeiQ3LYvICqOiwFj7fQdn4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-powercube-chain/default.nix b/distros/melodic/schunk-powercube-chain/default.nix index c9b1d0c70f..3f2e5b2f3a 100644 --- a/distros/melodic/schunk-powercube-chain/default.nix +++ b/distros/melodic/schunk-powercube-chain/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-schunk-powercube-chain"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/melodic/schunk_powercube_chain/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "3e7774dfbaa500ebffd5a4c7cb63ea881e6941d0a5635e787e1707418bcf94db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/melodic/schunk_powercube_chain/0.6.14-1"; + sha256 = "sha256-Bqgv2EXXzyTj4bgp8Pyf6AeyfOJABpGhtH/ln7pomEg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-sdh/default.nix b/distros/melodic/schunk-sdh/default.nix index ab2c278a7c..537d15fae0 100644 --- a/distros/melodic/schunk-sdh/default.nix +++ b/distros/melodic/schunk-sdh/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-schunk-sdh"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/melodic/schunk_sdh/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "1e69dfad7195f759af1ad8b8a8774fcbf49950ad9c7d14c8025f7756c6b483b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/melodic/schunk_sdh/0.6.14-1"; + sha256 = "sha256-8nQDbkqJKaA7ggj7AOw/fUX/uxHwbwve34BoP5yyZdc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/melodic/schunk-simulated-tactile-sensors/default.nix b/distros/melodic/schunk-simulated-tactile-sensors/default.nix index d6cff822c3..e01babbdba 100644 --- a/distros/melodic/schunk-simulated-tactile-sensors/default.nix +++ b/distros/melodic/schunk-simulated-tactile-sensors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-schunk-simulated-tactile-sensors"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/melodic/schunk_simulated_tactile_sensors/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "9f51c59099e957bbeb3cf7dac8267d3940787b6c6db8d5cb1ef0fbbba1fbdbb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/melodic/schunk_simulated_tactile_sensors/0.6.14-1"; + sha256 = "sha256-P3bjg82EBGfPHnC31BV6ZxuoS42QWa2Fo10SNMCOjAE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-svh-description/default.nix b/distros/melodic/schunk-svh-description/default.nix index 1440dc73d4..f05eabd46a 100644 --- a/distros/melodic/schunk-svh-description/default.nix +++ b/distros/melodic/schunk-svh-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-melodic-schunk-svh-description"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/melodic/schunk_svh_description/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "90d06d2240e267e72a988c2499d0c25a67a1e7c039ecff4a2c5a893fa0f4bd26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/melodic/schunk_svh_description/0.1.2-1"; + sha256 = "sha256-B66wDcyoS7o/aA8DvF7nLWMxMpRegtzLTZMSkCBrg0I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-svh-driver/default.nix b/distros/melodic/schunk-svh-driver/default.nix index cefb3bfddf..870b747222 100644 --- a/distros/melodic/schunk-svh-driver/default.nix +++ b/distros/melodic/schunk-svh-driver/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, combined-robot-hw, controller-manager, dynamic-reconfigure, hardware-interface, joint-limits-interface, joint-state-controller, joint-state-publisher, joint-trajectory-controller, pluginlib, python-qt-binding, pythonPackages, qt-gui, robot-state-publisher, roscpp, rospy, rqt-gui, rqt-gui-py, schunk-svh-description, schunk-svh-library, schunk-svh-msgs, sensor-msgs, std-msgs, urdf, xacro }: buildRosPackage { pname = "ros-melodic-schunk-svh-driver"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/melodic/schunk_svh_driver/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "be2b5d3df09d0ecee66aa0f0f031c94466b71ce6cb631a00da572792a7c17ae9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/melodic/schunk_svh_driver/0.1.2-1"; + sha256 = "sha256-qosALExQVYdRQaj657KTX38ilU2FjoEqG6JN9ODh+EA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-svh-library/default.nix b/distros/melodic/schunk-svh-library/default.nix index 1cef0d1d7b..dfa131160e 100644 --- a/distros/melodic/schunk-svh-library/default.nix +++ b/distros/melodic/schunk-svh-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-schunk-svh-library"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_library-release/archive/release/melodic/schunk_svh_library/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "ac6f8612c04ac2ce32a8e55ed52f236a05305b5c414d2153ff8204a4b8dd879b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_library-release"; + rev = "release/melodic/schunk_svh_library/1.0.1-2"; + sha256 = "sha256-n1ECtIIlm0bPzlzsul/AH8CHSn5tXYbNJqbiCC9AuSs="; + }; buildType = "cmake"; buildInputs = [ boost cmake ]; diff --git a/distros/melodic/schunk-svh-msgs/default.nix b/distros/melodic/schunk-svh-msgs/default.nix index 03cd412bae..80eac4e23d 100644 --- a/distros/melodic/schunk-svh-msgs/default.nix +++ b/distros/melodic/schunk-svh-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, message-generation, message-runtime, std-msgs, std-srvs }: buildRosPackage { pname = "ros-melodic-schunk-svh-msgs"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/melodic/schunk_svh_msgs/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "e43698c7600d93e5f481ea22df0bac518277e80d6f33a93e4be0a9e2d87b5fc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/melodic/schunk_svh_msgs/0.1.2-1"; + sha256 = "sha256-DpPiWtr6MuTdY80T5I46q+rFwrBd9Ga9fQTQcBUw5H8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-svh-simulation/default.nix b/distros/melodic/schunk-svh-simulation/default.nix index 62d3823b2f..f9583cc166 100644 --- a/distros/melodic/schunk-svh-simulation/default.nix +++ b/distros/melodic/schunk-svh-simulation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, schunk-svh-description }: buildRosPackage { pname = "ros-melodic-schunk-svh-simulation"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/melodic/schunk_svh_simulation/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "4b6ef368ee0629ee9bc7ef74455fb9a9f1c12d85cc3c0540ff6e2ad2f7858665"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/melodic/schunk_svh_simulation/0.1.2-1"; + sha256 = "sha256-hTd7wkmrf1v4iU79uwDDTVV/tFKJOWzOSDkbsBa6Sow="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/schunk-svh/default.nix b/distros/melodic/schunk-svh/default.nix index e12d6bb2f1..83b814b3f0 100644 --- a/distros/melodic/schunk-svh/default.nix +++ b/distros/melodic/schunk-svh/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, schunk-svh-description, schunk-svh-driver, schunk-svh-msgs }: buildRosPackage { pname = "ros-melodic-schunk-svh"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/melodic/schunk_svh/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "1f48270d59bcfefbbc65d3d51a766c744e322a93ef4a03086cebb7966518837d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/melodic/schunk_svh/0.1.2-1"; + sha256 = "sha256-vE7M/QBiVMbPyF8B4P0jVnmVOn7JTumZFaFxc52HacU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sdc21x0/default.nix b/distros/melodic/sdc21x0/default.nix index 232ec2015d..3a05f535e3 100644 --- a/distros/melodic/sdc21x0/default.nix +++ b/distros/melodic/sdc21x0/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sdc21x0"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/melodic/sdc21x0/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "ba36cc5570fc9c1e86170c6d6b25c913ff595d792d65b709ea6458be53554c94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/melodic/sdc21x0/1.0.8-1"; + sha256 = "sha256-yWG2OYjoyIm3k9RfVLqXaVSGWzBLrmm8qGyYgG60vnU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/sdhlibrary-cpp/default.nix b/distros/melodic/sdhlibrary-cpp/default.nix index 7a8e7ae308..81f2c9ff86 100644 --- a/distros/melodic/sdhlibrary-cpp/default.nix +++ b/distros/melodic/sdhlibrary-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sdhlibrary-cpp"; version = "0.2.10-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/SDHLibrary-CPP-release/archive/release/melodic/sdhlibrary_cpp/0.2.10-1.tar.gz"; - name = "0.2.10-1.tar.gz"; - sha256 = "cdc88eafafbe1def8674349fac30f504bd9d354416ec2a2daa58e47d3d138db3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "SDHLibrary-CPP-release"; + rev = "release/melodic/sdhlibrary_cpp/0.2.10-1"; + sha256 = "sha256-4Fg1zDkpoUwidBGO5S2wWcxswKYv0F01dLW2eu9LdAY="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/seed-r7-bringup/default.nix b/distros/melodic/seed-r7-bringup/default.nix index 379ddc2426..aa924ee283 100644 --- a/distros/melodic/seed-r7-bringup/default.nix +++ b/distros/melodic/seed-r7-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-bringup"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_bringup/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "72c404e7e5759b24d61a7468cac8f8aecb59a70a399da74788599608db5b49dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_bringup/0.3.3-1"; + sha256 = "sha256-OZL7jmUgLkQr9TN02kPuyEN7F9shBIiSEU9lmcXMwNo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-r7-description/default.nix b/distros/melodic/seed-r7-description/default.nix index 0c864e26f6..e1e9049bec 100644 --- a/distros/melodic/seed-r7-description/default.nix +++ b/distros/melodic/seed-r7-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-description"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_description/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "1c67f02e68a82358e6aeb0f323bfae89e35322b0a92ce40f082ac9e0b37a9cb5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_description/0.3.3-1"; + sha256 = "sha256-kYPw52dm4oyH1FD/RPutVKQdItBt3HcLWYI/uaFPCxQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-r7-moveit-config/default.nix b/distros/melodic/seed-r7-moveit-config/default.nix index 2c6db6c189..6b7696e4e8 100644 --- a/distros/melodic/seed-r7-moveit-config/default.nix +++ b/distros/melodic/seed-r7-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-moveit-config"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_moveit_config/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "fe05d8eb712ff6eccd2f079fbecf10e3b9defec16d0d7bdc6c214d577c6a65cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_moveit_config/0.3.3-1"; + sha256 = "sha256-xBGGLuqhNBW2Tovr3MTmyRr7EThEuLhirDglA61Rz3E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-r7-navigation/default.nix b/distros/melodic/seed-r7-navigation/default.nix index b6bd0c5d3e..64e5ec6276 100644 --- a/distros/melodic/seed-r7-navigation/default.nix +++ b/distros/melodic/seed-r7-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-navigation"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_navigation/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "4cd0a99daf7b2b78efbeffa4e986d97c6880666eafd3f2d38daf38ce56604e44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_navigation/0.3.3-1"; + sha256 = "sha256-IxaslCNF2wkKGsmixO3cB88huP5PncFce+03g0qi6eA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-r7-robot-interface/default.nix b/distros/melodic/seed-r7-robot-interface/default.nix index b4c9290060..d92a99a4ae 100644 --- a/distros/melodic/seed-r7-robot-interface/default.nix +++ b/distros/melodic/seed-r7-robot-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-robot-interface"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_robot_interface/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "f9a852559d704824b420e67f085064b434b29fe9c7bb9d7a24be71d97f2dfafb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_robot_interface/0.3.3-1"; + sha256 = "sha256-qYm2F+/VypdLCkmhs9TlIiitasv+ehN6G9ARQbTgN7Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-r7-ros-controller/default.nix b/distros/melodic/seed-r7-ros-controller/default.nix index 628061cc22..85d58e57a8 100644 --- a/distros/melodic/seed-r7-ros-controller/default.nix +++ b/distros/melodic/seed-r7-ros-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-ros-controller"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_ros_controller/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "0e3674741373be00a5b4182f1d0f89d4efb84a61dadc306e769337ab72cc41b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_ros_controller/0.3.3-1"; + sha256 = "sha256-yT+D/0n7zfkYg0IQz7W0+5OVw+/j2mMTCvHbgx4G3GY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-r7-ros-pkg/default.nix b/distros/melodic/seed-r7-ros-pkg/default.nix index 216997afd8..e3c9bcbd70 100644 --- a/distros/melodic/seed-r7-ros-pkg/default.nix +++ b/distros/melodic/seed-r7-ros-pkg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-ros-pkg"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_ros_pkg/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "853aceab8b2fc4aabfff5d1e0461f46ecc314afc5686b4e9cf900b7baa8344ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_ros_pkg/0.3.3-1"; + sha256 = "sha256-5Y9beeoSDeONO4ausfYbnWQURsBO60rW4u+NwS8Ki70="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-r7-samples/default.nix b/distros/melodic/seed-r7-samples/default.nix index 811a532cb9..2b9e2da515 100644 --- a/distros/melodic/seed-r7-samples/default.nix +++ b/distros/melodic/seed-r7-samples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-samples"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_samples/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "054de0026cd190bc6e6cb30597a51208f3ff6013b1cd9e9186ad4bc405c8dbcc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_samples/0.3.3-1"; + sha256 = "sha256-j4xGrG+QyFu/L3AZYhwoRMMkOrfsqKvdD/iO5NrD+8I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-r7-typef-moveit-config/default.nix b/distros/melodic/seed-r7-typef-moveit-config/default.nix index 97c6eb7db0..1ea0427a35 100644 --- a/distros/melodic/seed-r7-typef-moveit-config/default.nix +++ b/distros/melodic/seed-r7-typef-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-r7-typef-moveit-config"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_r7_ros_pkg-release/archive/release/melodic/seed_r7_typef_moveit_config/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "7611edec284fa3e653b623c38a1f3369bf34059ae65d3624254415f2dc12e827"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_r7_ros_pkg-release"; + rev = "release/melodic/seed_r7_typef_moveit_config/0.3.3-1"; + sha256 = "sha256-qZa43l4HjWXzgBFgPwogiIgtZblOgh0tUqOivwlK1LM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/seed-smartactuator-sdk/default.nix b/distros/melodic/seed-smartactuator-sdk/default.nix index d73b5845a7..51c5bd0f58 100644 --- a/distros/melodic/seed-smartactuator-sdk/default.nix +++ b/distros/melodic/seed-smartactuator-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-seed-smartactuator-sdk"; version = "0.0.5-r3"; - src = fetchurl { - url = "https://github.com/seed-solutions/seed_smartactuator_sdk-release/archive/release/melodic/seed_smartactuator_sdk/0.0.5-3.tar.gz"; - name = "0.0.5-3.tar.gz"; - sha256 = "445ac23ff8cd18327f9575b9b033f17af9202233ac66fd0139f019e560aceb95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seed-solutions"; + repo = "seed_smartactuator_sdk-release"; + rev = "release/melodic/seed_smartactuator_sdk/0.0.5-3"; + sha256 = "sha256-NI/5dFfTvHW9irF4uBMeVAPi6MYu93eY447rNuxFN8o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/self-test/default.nix b/distros/melodic/self-test/default.nix index 81e65db2f0..bd829932e3 100644 --- a/distros/melodic/self-test/default.nix +++ b/distros/melodic/self-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-self-test"; version = "1.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/self_test/1.9.7-1.tar.gz"; - name = "1.9.7-1.tar.gz"; - sha256 = "8003bc9a5dcc8daae483cced14c86f3a413161871cd48d7d5e9e1277148c8f56"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/melodic/self_test/1.9.7-1"; + sha256 = "sha256-CEqYDW+B1IlUSc9N2SVnkJsZg0rUOtgu8Ix+4qc6w2Y="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/semantic-point-annotator/default.nix b/distros/melodic/semantic-point-annotator/default.nix index e11b126307..7fe6d24a4a 100644 --- a/distros/melodic/semantic-point-annotator/default.nix +++ b/distros/melodic/semantic-point-annotator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-semantic-point-annotator"; version = "0.1.28-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/melodic/semantic_point_annotator/0.1.28-1.tar.gz"; - name = "0.1.28-1.tar.gz"; - sha256 = "283e91edafb9350032916638065c04e42bebbc22cd49e9b5caaf60c4a1f56522"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/melodic/semantic_point_annotator/0.1.28-1"; + sha256 = "sha256-5BjG0wRzSK3lkWyQUrA1Xfs3A6w2SzVlRX8f+D9kNuU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sensor-filters/default.nix b/distros/melodic/sensor-filters/default.nix index 53d2445f84..f44eea16c4 100644 --- a/distros/melodic/sensor-filters/default.nix +++ b/distros/melodic/sensor-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sensor-filters"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ctu-vras/sensor_filters-release/archive/release/melodic/sensor_filters/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "d1f055827741d614e075119e14faf90db3e4974e2d04f1dec6c6c1e968b5a334"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ctu-vras"; + repo = "sensor_filters-release"; + rev = "release/melodic/sensor_filters/1.0.3-1"; + sha256 = "sha256-7zG/cp/Skv0mGkPQfp/ZwSEfOe7pWa8mfIKmXBdmBTs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sensor-msgs/default.nix b/distros/melodic/sensor-msgs/default.nix index c33c93ae49..b0f0feb6ef 100644 --- a/distros/melodic/sensor-msgs/default.nix +++ b/distros/melodic/sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sensor-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/sensor_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "b5f8b54c44bdabb59caf4d67240eace2f50c0278a191558122893cb7322d8d81"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/sensor_msgs/1.12.8-1"; + sha256 = "sha256-BqeHou1Rffh4doC/5JDTc3ZIy3B0XbbD2SKU+94THgg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pythonPackages.setuptools ]; diff --git a/distros/melodic/septentrio-gnss-driver/default.nix b/distros/melodic/septentrio-gnss-driver/default.nix index 0ff317974c..e584dca280 100644 --- a/distros/melodic/septentrio-gnss-driver/default.nix +++ b/distros/melodic/septentrio-gnss-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-septentrio-gnss-driver"; version = "1.2.3-r2"; - src = fetchurl { - url = "https://github.com/septentrio-users/septentrio_gnss_driver-release/archive/release/melodic/septentrio_gnss_driver/1.2.3-2.tar.gz"; - name = "1.2.3-2.tar.gz"; - sha256 = "06bad4f5068960ec8c7adb2133dd0fc7eff960e6fdae3c2401c577d80f09b701"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "septentrio-users"; + repo = "septentrio_gnss_driver-release"; + rev = "release/melodic/septentrio_gnss_driver/1.2.3-2"; + sha256 = "sha256-l8gWw/6QWUgcxGhCFwHKBpRwASdfyI5E+lHNGAUvPNY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/serial/default.nix b/distros/melodic/serial/default.nix index 809abc9e5d..d6b60d06f7 100644 --- a/distros/melodic/serial/default.nix +++ b/distros/melodic/serial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-serial"; version = "1.2.1"; - src = fetchurl { - url = "https://github.com/wjwwood/serial-release/archive/release/melodic/serial/1.2.1-0.tar.gz"; - name = "1.2.1-0.tar.gz"; - sha256 = "2509a47393feef491a0876997beb0fd9af9ecc4e6ed6ceb533f3b8840471f1c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wjwwood"; + repo = "serial-release"; + rev = "release/melodic/serial/1.2.1-0"; + sha256 = "sha256-/FAxK2r1ZPZM1fLmXmpgiYBEX+n8be3bqKfNxHtXmEE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/service-tools/default.nix b/distros/melodic/service-tools/default.nix index 390483c545..22e8633632 100644 --- a/distros/melodic/service-tools/default.nix +++ b/distros/melodic/service-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-service-tools"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/melodic/service_tools/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "3fa381f92d6e447262a0daaed32c670d6e301329bd0f7ad88432bc526c8a6d5a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/melodic/service_tools/0.6.19-1"; + sha256 = "sha256-+6u2caEVRKHHsMh7gmku5iQZRuDXYo8/lKW4j3bxE58="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sesame-ros/default.nix b/distros/melodic/sesame-ros/default.nix index 30dd237473..d9158859d3 100644 --- a/distros/melodic/sesame-ros/default.nix +++ b/distros/melodic/sesame-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sesame-ros"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/sesame_ros/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "50245aa61649961bd2fd9ebd7b9c8a71548b362ad1d35a9e80cec7641b9b298b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/sesame_ros/2.1.24-2"; + sha256 = "sha256-x/FgElH7i2DD5V7CvTGpY1BUZd0Yw+pkg9NgnuAETh4="; + }; buildType = "catkin"; buildInputs = [ catkin catkin-virtualenv libffi message-generation openssl ]; diff --git a/distros/melodic/settlerlib/default.nix b/distros/melodic/settlerlib/default.nix index b0613b0aa5..02b720f20e 100644 --- a/distros/melodic/settlerlib/default.nix +++ b/distros/melodic/settlerlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-settlerlib"; version = "0.10.14"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/melodic/settlerlib/0.10.14-0.tar.gz"; - name = "0.10.14-0.tar.gz"; - sha256 = "795d9982aacaca98ad5750e40e707596f6a88b7f7f703ee664ebd98464d861b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/melodic/settlerlib/0.10.14-0"; + sha256 = "sha256-QC+unnWPvccOT7yX2x7c/stwQ/CEabx7SLqoZsSaXwM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/shape-msgs/default.nix b/distros/melodic/shape-msgs/default.nix index 68cd0d438f..7f3b0145db 100644 --- a/distros/melodic/shape-msgs/default.nix +++ b/distros/melodic/shape-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-shape-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/shape_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "6976133b7282f8d56d0b97419174fb9dce5b41c8ac1d3ca708b7616ce138ffe3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/shape_msgs/1.12.8-1"; + sha256 = "sha256-aYeCqGcnBQNF9lVudC08hzTd01mXZiP/PWsl3HX7dCU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/sick-safetyscanners/default.nix b/distros/melodic/sick-safetyscanners/default.nix index 5c3f563b1e..224b5bd53f 100644 --- a/distros/melodic/sick-safetyscanners/default.nix +++ b/distros/melodic/sick-safetyscanners/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sick-safetyscanners"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_safetyscanners-release/archive/release/melodic/sick_safetyscanners/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "ef1fa5f288d15b522ba62e41e5b6bb8d5f8f4d6618df50ed889016f9bff2fc3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_safetyscanners-release"; + rev = "release/melodic/sick_safetyscanners/1.0.8-1"; + sha256 = "sha256-PTS57R5b3reGqfNwKbRXVGH8m5lygAwU9eTkdKtH3Y0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/sick-scan/default.nix b/distros/melodic/sick-scan/default.nix index 6d74498fd7..2188887ac3 100644 --- a/distros/melodic/sick-scan/default.nix +++ b/distros/melodic/sick-scan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sick-scan"; version = "1.10.1-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_scan-release/archive/release/melodic/sick_scan/1.10.1-1.tar.gz"; - name = "1.10.1-1.tar.gz"; - sha256 = "4fb58055785390aae3e9cdbf0dbb77e4f371865c63b6845ace206136ac85957f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_scan-release"; + rev = "release/melodic/sick_scan/1.10.1-1"; + sha256 = "sha256-P3F9nPsS/g2r9i3AtygCdNt+DZAxjjVPeOk33yMyRTg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/sick-tim/default.nix b/distros/melodic/sick-tim/default.nix index 2ce5aa4801..8305c9cc3d 100644 --- a/distros/melodic/sick-tim/default.nix +++ b/distros/melodic/sick-tim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sick-tim"; version = "0.0.17-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/sick_tim-release/archive/release/melodic/sick_tim/0.0.17-1.tar.gz"; - name = "0.0.17-1.tar.gz"; - sha256 = "876226df215f9fc5731e719a33b70dae58a197dfd11b48dbb2830dbdc23cc5b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "sick_tim-release"; + rev = "release/melodic/sick_tim/0.0.17-1"; + sha256 = "sha256-BpL2J53RqWWL3YAhZxl99C0rj4RP5bRGbxp+RAPIoLA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/simple-grasping/default.nix b/distros/melodic/simple-grasping/default.nix index 7d68d983cb..f788b10e96 100644 --- a/distros/melodic/simple-grasping/default.nix +++ b/distros/melodic/simple-grasping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-simple-grasping"; version = "0.3.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/simple_grasping-release/archive/release/melodic/simple_grasping/0.3.1-0.tar.gz"; - name = "0.3.1-0.tar.gz"; - sha256 = "1dada4bbf81347bac9d7fee738e20246ec4f6f25a8983a7edda10894bd896a54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "simple_grasping-release"; + rev = "release/melodic/simple_grasping/0.3.1-0"; + sha256 = "sha256-VdAej5oMWugDpx9ywZMvatIrwaEPQpPEFvu09pLpb7o="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/melodic/simple-message/default.nix b/distros/melodic/simple-message/default.nix index ff9acac187..d5aade0e13 100644 --- a/distros/melodic/simple-message/default.nix +++ b/distros/melodic/simple-message/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-simple-message"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/melodic/simple_message/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "e3dcc3297fef3c238c0f9e63c80aa7be89329cc927c414de96bfca435db50075"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/melodic/simple_message/0.7.3-1"; + sha256 = "sha256-e3VzIL53EqPr6HAracyGAzAxkhG4qoQDU15xOYAE/64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/simple-navigation-goals-tutorial/default.nix b/distros/melodic/simple-navigation-goals-tutorial/default.nix index 1b5e2ed62f..cf05d75f2d 100644 --- a/distros/melodic/simple-navigation-goals-tutorial/default.nix +++ b/distros/melodic/simple-navigation-goals-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-simple-navigation-goals-tutorial"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_tutorials-release/archive/release/melodic/simple_navigation_goals_tutorial/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "463089eeedbdf2ae763fd9459fc309d5fa85bae49f8f6d7129587b36b067a622"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_tutorials-release"; + rev = "release/melodic/simple_navigation_goals_tutorial/0.2.4-1"; + sha256 = "sha256-lg0Mx+lVBunrBajKgpUEVIMwCPmrFQxbg1SPtMwtRqQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/simulators/default.nix b/distros/melodic/simulators/default.nix index aa033554bc..30582a44b3 100644 --- a/distros/melodic/simulators/default.nix +++ b/distros/melodic/simulators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-simulators"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/melodic/simulators/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "5a6ddc7bfbe78170db5541bdab3f2ab031abcd787b4d087e41d010acb6de2455"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/melodic/simulators/1.4.1-0"; + sha256 = "sha256-E3InUeOtmFrmdIK7VnAkf6mPq9esMIWKWQAo8vovNx8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/single-joint-position-action/default.nix b/distros/melodic/single-joint-position-action/default.nix index edfc93427e..44c50f7019 100644 --- a/distros/melodic/single-joint-position-action/default.nix +++ b/distros/melodic/single-joint-position-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-single-joint-position-action"; version = "1.10.17-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/melodic/single_joint_position_action/1.10.17-1.tar.gz"; - name = "1.10.17-1.tar.gz"; - sha256 = "f7761a78b2539d7cc7f01ad00d85cb426c9b57b8b696cf41d8a98e00192fb1bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/melodic/single_joint_position_action/1.10.17-1"; + sha256 = "sha256-6Fq+JbW5CRRduXsiPwNVI3F37QWLphjiaJSOVFFee+Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/slam-gmapping/default.nix b/distros/melodic/slam-gmapping/default.nix index 8df49e3204..d6809ac287 100644 --- a/distros/melodic/slam-gmapping/default.nix +++ b/distros/melodic/slam-gmapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-slam-gmapping"; version = "1.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/slam_gmapping-release/archive/release/melodic/slam_gmapping/1.4.1-1.tar.gz"; - name = "1.4.1-1.tar.gz"; - sha256 = "8ed5a534e68076a909ce36d5ba2f351e362738ab42d433e00a4ac8ffc1aaadb6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "slam_gmapping-release"; + rev = "release/melodic/slam_gmapping/1.4.1-1"; + sha256 = "sha256-XjxyNn+U/PDnKtCsJLqil9Zz6cBWRNYUD0BKD355u50="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/slam-karto/default.nix b/distros/melodic/slam-karto/default.nix index b4f7c5c57c..42cda456e2 100644 --- a/distros/melodic/slam-karto/default.nix +++ b/distros/melodic/slam-karto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-slam-karto"; version = "0.8.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/slam_karto-release/archive/release/melodic/slam_karto/0.8.1-0.tar.gz"; - name = "0.8.1-0.tar.gz"; - sha256 = "5a602df47e9778bf47a4e51c2e263c27188f949686e525bb8a446c2eb6637eea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "slam_karto-release"; + rev = "release/melodic/slam_karto/0.8.1-0"; + sha256 = "sha256-fbQW4B9N+XFFFGgd7nOSL5K1j7WZmvf95ame1KdBmuQ="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/slam-toolbox-msgs/default.nix b/distros/melodic/slam-toolbox-msgs/default.nix index c75a103f12..63e0470753 100644 --- a/distros/melodic/slam-toolbox-msgs/default.nix +++ b/distros/melodic/slam-toolbox-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-slam-toolbox-msgs"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/slam_toolbox-release/archive/release/melodic/slam_toolbox_msgs/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "9b72a259b2d29b84c80cbedfd01faab555414e19c1d861f2b950e64176428b44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "slam_toolbox-release"; + rev = "release/melodic/slam_toolbox_msgs/1.1.6-1"; + sha256 = "sha256-272UutPDbLxv5WpZFU3Lld3z8vj4LyyWu8gnN/S5Xn0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/slam-toolbox/default.nix b/distros/melodic/slam-toolbox/default.nix index 5f528e9b23..55340557a9 100644 --- a/distros/melodic/slam-toolbox/default.nix +++ b/distros/melodic/slam-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-slam-toolbox"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/slam_toolbox-release/archive/release/melodic/slam_toolbox/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "73c76ea13e65f47d6a6a3e5d2beb39130cd8a1d8f769517e44c52e5f2578ee65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "slam_toolbox-release"; + rev = "release/melodic/slam_toolbox/1.1.6-1"; + sha256 = "sha256-iSoTo1FWLPpNNfqrmTEZCMt4bpF+p+l6kXPpGA39LHQ="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/slic/default.nix b/distros/melodic/slic/default.nix index 70db31c053..0bf342b3b4 100644 --- a/distros/melodic/slic/default.nix +++ b/distros/melodic/slic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-slic"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/slic/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "9520a466a57433c5f8f949ecd9337e2f30038b298d793af438747f22d9d22ab1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/slic/2.1.24-2"; + sha256 = "sha256-AwQWguq1qdhXDq3ss+skRt85EK60lzGLQnOMjirQ4l4="; + }; buildType = "cmake"; buildInputs = [ cacert cmake cmake-modules git openssl ]; diff --git a/distros/melodic/slime-ros/default.nix b/distros/melodic/slime-ros/default.nix index f9c835a232..e043d00ac1 100644 --- a/distros/melodic/slime-ros/default.nix +++ b/distros/melodic/slime-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-slime-ros"; version = "0.4.16-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/melodic/slime_ros/0.4.16-1.tar.gz"; - name = "0.4.16-1.tar.gz"; - sha256 = "626705c68ddf409fb0990f686038f71cef98a8742cc1118cb0cc186fc7949f43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/melodic/slime_ros/0.4.16-1"; + sha256 = "sha256-x/XiYUjq/0XF3nMVMpv2NZ56tfAXbqs4qswU9cLxlFQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/slime-wrapper/default.nix b/distros/melodic/slime-wrapper/default.nix index 2bf7000b50..5877f4a32d 100644 --- a/distros/melodic/slime-wrapper/default.nix +++ b/distros/melodic/slime-wrapper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-slime-wrapper"; version = "0.4.16-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/melodic/slime_wrapper/0.4.16-1.tar.gz"; - name = "0.4.16-1.tar.gz"; - sha256 = "e7e2a818ac01d6b941f20940051f9656a0be07afac18f76adf66ff761569575b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/melodic/slime_wrapper/0.4.16-1"; + sha256 = "sha256-7O9ReKaQ2FNpX4XtyjPGDKtDq98D4Rf89AAu8L4jzik="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/smacc-msgs/default.nix b/distros/melodic/smacc-msgs/default.nix index 65c184c85a..b696e2d08d 100644 --- a/distros/melodic/smacc-msgs/default.nix +++ b/distros/melodic/smacc-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-smacc-msgs"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/robosoft-ai/smacc-release/archive/release/melodic/smacc_msgs/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "47e7989725595f9700fe4ca26f004ddfb1874f6cf2c281d665751343179a4ea6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robosoft-ai"; + repo = "smacc-release"; + rev = "release/melodic/smacc_msgs/1.3.2-1"; + sha256 = "sha256-2UJS3aNv94Mn/F9Hc/JqKkqzBe89qBGg2ADUj+YDeks="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/smacc/default.nix b/distros/melodic/smacc/default.nix index 90fce14b21..fe844d2f0b 100644 --- a/distros/melodic/smacc/default.nix +++ b/distros/melodic/smacc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-smacc"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/robosoft-ai/smacc-release/archive/release/melodic/smacc/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "082945c5f579e5fca9e49aabe32b966fa5d8e9b53a0e94b384a8f302d217dcee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robosoft-ai"; + repo = "smacc-release"; + rev = "release/melodic/smacc/1.3.2-1"; + sha256 = "sha256-b7vz8ibak9pBXwm67l+t+gBxtGPQps0HHnQQN+5DphY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/smach-msgs/default.nix b/distros/melodic/smach-msgs/default.nix index 701288bbbd..b117bdfecf 100644 --- a/distros/melodic/smach-msgs/default.nix +++ b/distros/melodic/smach-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-smach-msgs"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/executive_smach-release/archive/release/melodic/smach_msgs/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "b42e7a31e5e9ee3fcec7388566ca1a78d2af773c2e0bc7428d4f2d62ed732bcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "executive_smach-release"; + rev = "release/melodic/smach_msgs/2.0.1-0"; + sha256 = "sha256-LneIBPdeEBqt6aniWFy5Mhk5ao27VBfFWXGhQ/5r5kM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/smach-ros/default.nix b/distros/melodic/smach-ros/default.nix index f64dae8cfa..26684b27d0 100644 --- a/distros/melodic/smach-ros/default.nix +++ b/distros/melodic/smach-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-smach-ros"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/executive_smach-release/archive/release/melodic/smach_ros/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "2a6062c9bb60b5cea300784b67e7c977b1cd42bc7117c0d5bea7122eb04d37ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "executive_smach-release"; + rev = "release/melodic/smach_ros/2.0.1-0"; + sha256 = "sha256-588b+LDB9pJYnVAkzP/9FpWohEja+HTzMIiScQNIaJY="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/smach-viewer/default.nix b/distros/melodic/smach-viewer/default.nix index 5740361da3..24318dd1bf 100644 --- a/distros/melodic/smach-viewer/default.nix +++ b/distros/melodic/smach-viewer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-smach-viewer"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/jbohren/executive_smach_visualization-release/archive/release/melodic/smach_viewer/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "9a5187a9b246fe0c1ecdf782fdd31c78902c28d5d041f84424b12eea8c954d26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "jbohren"; + repo = "executive_smach_visualization-release"; + rev = "release/melodic/smach_viewer/4.0.1-1"; + sha256 = "sha256-m5J2XvHQJtRmsIpME/SdYR4YrVQ+xpd2o9gbLmUx2TI="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/smach/default.nix b/distros/melodic/smach/default.nix index 479ac8e939..b17660e5fb 100644 --- a/distros/melodic/smach/default.nix +++ b/distros/melodic/smach/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-smach"; version = "2.0.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/executive_smach-release/archive/release/melodic/smach/2.0.1-0.tar.gz"; - name = "2.0.1-0.tar.gz"; - sha256 = "37de5727c98e7aa222670ad40229cfe239e2907f25ec0d7133b4ec2c29eb6c7c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "executive_smach-release"; + rev = "release/melodic/smach/2.0.1-0"; + sha256 = "sha256-UlcJEfWez74lJKboyFcN4CrONfR/RELrgt5EpypP4iU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/smclib/default.nix b/distros/melodic/smclib/default.nix index dd6b5484c6..9723a9582b 100644 --- a/distros/melodic/smclib/default.nix +++ b/distros/melodic/smclib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-smclib"; version = "1.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/melodic/smclib/1.8.5-1.tar.gz"; - name = "1.8.5-1.tar.gz"; - sha256 = "7048853d548eef1c934bf174c172b5afa93bdbe089a55667d045863feb40919f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/melodic/smclib/1.8.5-1"; + sha256 = "sha256-e3SGip9Gr6EYIqYbZB3DjHN7br0wyzvoBhq1CtIt504="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/snowbot-operating-system/default.nix b/distros/melodic/snowbot-operating-system/default.nix index 4cf1246055..3519abc24a 100644 --- a/distros/melodic/snowbot-operating-system/default.nix +++ b/distros/melodic/snowbot-operating-system/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-snowbot-operating-system"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/snowbot_release/archive/release/melodic/snowbot_operating_system/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "8a31650a6043bba368d396b6d70c776e373b47e6897e9294efad3621f9788baa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "snowbot_release"; + rev = "release/melodic/snowbot_operating_system/0.0.2-1"; + sha256 = "sha256-KwksEPSljZYY5GKDjh4wtoNfFJv38wksdimlzNd+RU0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/social-navigation-layers/default.nix b/distros/melodic/social-navigation-layers/default.nix index 079fdd8e96..f8f2b2fb64 100644 --- a/distros/melodic/social-navigation-layers/default.nix +++ b/distros/melodic/social-navigation-layers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-social-navigation-layers"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/wu-robotics/navigation_layers_release/archive/release/melodic/social_navigation_layers/0.5.0-0.tar.gz"; - name = "0.5.0-0.tar.gz"; - sha256 = "106139809be8e491881b20b8510ca74eb2b73109bef94c30f1c58be452e2e4cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "navigation_layers_release"; + rev = "release/melodic/social_navigation_layers/0.5.0-0"; + sha256 = "sha256-cPw/WJlilXxs2p/H8soPv/RAnTAzWoOt9k0nOnSQzaA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/socketcan-bridge/default.nix b/distros/melodic/socketcan-bridge/default.nix index 5e8916681b..f611204d56 100644 --- a/distros/melodic/socketcan-bridge/default.nix +++ b/distros/melodic/socketcan-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-socketcan-bridge"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/melodic/socketcan_bridge/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "d195820d08a60070e886fe46899e4d967b40838d1fe41b57ef11b70cc6ececad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/melodic/socketcan_bridge/0.8.5-1"; + sha256 = "sha256-TROokf77eTUmXExRuRlqkfntVP7pHuGrmI6hqVLosnc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/socketcan-interface/default.nix b/distros/melodic/socketcan-interface/default.nix index d420456f34..18d98e2b3e 100644 --- a/distros/melodic/socketcan-interface/default.nix +++ b/distros/melodic/socketcan-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-socketcan-interface"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/melodic/socketcan_interface/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "c6081461a8225963a3d576e9e5d6abbbb1518406786d3cda971206883ee5e917"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/melodic/socketcan_interface/0.8.5-1"; + sha256 = "sha256-U9+/4Xc3B/6kk6iMvN9fcMp6Dra0p7kJibdjmoUZjg4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/soem/default.nix b/distros/melodic/soem/default.nix index 6230d61a93..b9586f269d 100644 --- a/distros/melodic/soem/default.nix +++ b/distros/melodic/soem/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-soem"; version = "1.4.1003-r1"; - src = fetchurl { - url = "https://github.com/mgruhler/soem-gbp/archive/release/melodic/soem/1.4.1003-1.tar.gz"; - name = "1.4.1003-1.tar.gz"; - sha256 = "e8935f21d07691ccd7340b353426a7d438e52643d81717093aab2064ea9778e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mgruhler"; + repo = "soem-gbp"; + rev = "release/melodic/soem/1.4.1003-1"; + sha256 = "sha256-kz+EHVji3/7AgG21sBsyFBuZ/fh+avgpi+LVvIDpJjs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sophus/default.nix b/distros/melodic/sophus/default.nix index 2f5f6dfd0d..f8efe87041 100644 --- a/distros/melodic/sophus/default.nix +++ b/distros/melodic/sophus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sophus"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/sophus-release/archive/release/melodic/sophus/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "9e42bd34716ace8e9d2ac385a63bb85ce3c3eb6df98e1fa76d8b1dc14f6aade2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "sophus-release"; + rev = "release/melodic/sophus/1.0.1-1"; + sha256 = "sha256-tcXe2h1cP4Viw3WZJ1EnUx2FxRrCzMUUyuoLr3QYE/0="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/sot-core/default.nix b/distros/melodic/sot-core/default.nix index 71953a30dc..7de97860b2 100644 --- a/distros/melodic/sot-core/default.nix +++ b/distros/melodic/sot-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sot-core"; version = "4.11.8-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/sot-core-ros-release/archive/release/melodic/sot-core/4.11.8-1.tar.gz"; - name = "4.11.8-1.tar.gz"; - sha256 = "72bcd76b77f5ddb4dba9aabf97967f637e0055b9f9e73e3dfe586727ecc53383"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "sot-core-ros-release"; + rev = "release/melodic/sot-core/4.11.8-1"; + sha256 = "sha256-RoSn5VvD331uV4bz3XkozgcfkIBtLhrzwvvCueyL/Fo="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen ]; diff --git a/distros/melodic/sot-dynamic-pinocchio/default.nix b/distros/melodic/sot-dynamic-pinocchio/default.nix index c65f80b5f1..e95f6444f0 100644 --- a/distros/melodic/sot-dynamic-pinocchio/default.nix +++ b/distros/melodic/sot-dynamic-pinocchio/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sot-dynamic-pinocchio"; version = "3.6.5-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/sot-dynamic-pinocchio-ros-release/archive/release/melodic/sot-dynamic-pinocchio/3.6.5-1.tar.gz"; - name = "3.6.5-1.tar.gz"; - sha256 = "70feb89ab90ebda7d34a1505aaabe1118a988a9e46619736046125bb904988c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "sot-dynamic-pinocchio-ros-release"; + rev = "release/melodic/sot-dynamic-pinocchio/3.6.5-1"; + sha256 = "sha256-MT1NNwbg/1OuCt42vG1XWKTgox+CCMhmh8plMB1f/lY="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/melodic/sot-tools/default.nix b/distros/melodic/sot-tools/default.nix index ab934c3db9..3eb7fcef39 100644 --- a/distros/melodic/sot-tools/default.nix +++ b/distros/melodic/sot-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sot-tools"; version = "2.3.5-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/sot-tools-ros-release/archive/release/melodic/sot-tools/2.3.5-1.tar.gz"; - name = "2.3.5-1.tar.gz"; - sha256 = "fb18de16f9d6de4ac41e43509b1058c5f78553a1bcd5e13b2e35d6ca672b6880"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "sot-tools-ros-release"; + rev = "release/melodic/sot-tools/2.3.5-1"; + sha256 = "sha256-N/8HZvhmtQfqtXs82gGjbH5pfnr6+ODZCqcCL0aVVm0="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/melodic/spacenav-node/default.nix b/distros/melodic/spacenav-node/default.nix index 392f4b5e86..5f48d7b6d3 100644 --- a/distros/melodic/spacenav-node/default.nix +++ b/distros/melodic/spacenav-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-spacenav-node"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joystick_drivers-release/archive/release/melodic/spacenav_node/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "976cd504287d9e94e4bc514765dd351e1b46b9042d490c7f530993a673375315"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joystick_drivers-release"; + rev = "release/melodic/spacenav_node/1.14.0-1"; + sha256 = "sha256-HujxkzCVr6HCoNGtZNd9xBXnAJ01xvHZ9bA60EAUMfI="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/sparse-bundle-adjustment/default.nix b/distros/melodic/sparse-bundle-adjustment/default.nix index 058ea69dd5..67d1b8e0bf 100644 --- a/distros/melodic/sparse-bundle-adjustment/default.nix +++ b/distros/melodic/sparse-bundle-adjustment/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sparse-bundle-adjustment"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/sparse_bundle_adjustment-release/archive/release/melodic/sparse_bundle_adjustment/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "e6425dad1b8dff51a83846a5e7ae5fd70477183c6acfd5c952fb39f006168837"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "sparse_bundle_adjustment-release"; + rev = "release/melodic/sparse_bundle_adjustment/0.4.4-1"; + sha256 = "sha256-875J1dmacTFSy9Vsc5exd/cQL747NpnDqFiz+zdnezI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/spatio-temporal-voxel-layer/default.nix b/distros/melodic/spatio-temporal-voxel-layer/default.nix index 004e491932..67fef9fcd4 100644 --- a/distros/melodic/spatio-temporal-voxel-layer/default.nix +++ b/distros/melodic/spatio-temporal-voxel-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-spatio-temporal-voxel-layer"; version = "1.3.5-r2"; - src = fetchurl { - url = "https://github.com/SteveMacenski/spatio_temporal_voxel_layer-release/archive/release/melodic/spatio_temporal_voxel_layer/1.3.5-2.tar.gz"; - name = "1.3.5-2.tar.gz"; - sha256 = "c4f1a275ab85e04a11a2a5a3a300ec41375da9877b087036ddc5f50b381546fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "spatio_temporal_voxel_layer-release"; + rev = "release/melodic/spatio_temporal_voxel_layer/1.3.5-2"; + sha256 = "sha256-OVS6L/lwFv8hVPoonk+ruWFYk0hHa61ERfTBxtuiVys="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/speech-recognition-msgs/default.nix b/distros/melodic/speech-recognition-msgs/default.nix index bd37ec4873..d237aa2761 100644 --- a/distros/melodic/speech-recognition-msgs/default.nix +++ b/distros/melodic/speech-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-speech-recognition-msgs"; version = "4.3.1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/melodic/speech_recognition_msgs/4.3.1-0.tar.gz"; - name = "4.3.1-0.tar.gz"; - sha256 = "f6b39c252c011e5572aa0a1fed50b3ecdefa2abe7c96da0259fd1e578cac6541"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/melodic/speech_recognition_msgs/4.3.1-0"; + sha256 = "sha256-3SGqTTh3l8nmffe8CZYyzTlOrubjtrYMiZP30H8R1Ps="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/speed-scaling-interface/default.nix b/distros/melodic/speed-scaling-interface/default.nix index 6444655a10..64bc164ebe 100644 --- a/distros/melodic/speed-scaling-interface/default.nix +++ b/distros/melodic/speed-scaling-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-speed-scaling-interface"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_scaled_controllers-release/archive/release/melodic/speed_scaling_interface/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "c862c92b1d5c2d4a118c4868a9bd6bf48ff79c4947233770c99a91da3662148f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_scaled_controllers-release"; + rev = "release/melodic/speed_scaling_interface/0.1.0-1"; + sha256 = "sha256-OfoHqjr37QumzWq8tBJgBPqbaA4yXDN/kI6JBfVCoS8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/speed-scaling-state-controller/default.nix b/distros/melodic/speed-scaling-state-controller/default.nix index 9c192b5190..e0cfae3032 100644 --- a/distros/melodic/speed-scaling-state-controller/default.nix +++ b/distros/melodic/speed-scaling-state-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-speed-scaling-state-controller"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_scaled_controllers-release/archive/release/melodic/speed_scaling_state_controller/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "22689826e020b2ad87e2e312836e84c175d291b97d6f782eafdba5c166de4690"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_scaled_controllers-release"; + rev = "release/melodic/speed_scaling_state_controller/0.1.0-1"; + sha256 = "sha256-LQzmbPK2YP+cx6MepxteuUjH1xBKImkgbuWvZVWOG5g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/sr-hand-detector/default.nix b/distros/melodic/sr-hand-detector/default.nix index be5b61b552..ebc134d895 100644 --- a/distros/melodic/sr-hand-detector/default.nix +++ b/distros/melodic/sr-hand-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-sr-hand-detector"; version = "0.0.3-r2"; - src = fetchurl { - url = "https://github.com/shadow-robot/sr_hand_detector-release/archive/release/melodic/sr_hand_detector/0.0.3-2.tar.gz"; - name = "0.0.3-2.tar.gz"; - sha256 = "542a25bb3b2df53eb8477962b57471d8d1fb080e74d0d182c58a5f86b05037b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "shadow-robot"; + repo = "sr_hand_detector-release"; + rev = "release/melodic/sr_hand_detector/0.0.3-2"; + sha256 = "sha256-MseTsSlRiRX4vL7s59AtkbPsC+GCGxYc96o+K7nZWCA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/srdfdom/default.nix b/distros/melodic/srdfdom/default.nix index 822e30f550..1f9b020b28 100644 --- a/distros/melodic/srdfdom/default.nix +++ b/distros/melodic/srdfdom/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-srdfdom"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/srdfdom-release/archive/release/melodic/srdfdom/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "0388b8682093d1a7e1f8a13fe291253db5792b04e22e5df48fb725697a3239f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "srdfdom-release"; + rev = "release/melodic/srdfdom/0.5.2-1"; + sha256 = "sha256-FBTSP7R9i+cR/crV3DVK4uuxd7Nw3+QjA5N9SJk3Xdk="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules console-bridge ]; diff --git a/distros/melodic/stag-ros/default.nix b/distros/melodic/stag-ros/default.nix index 24f6711fff..1e04260822 100644 --- a/distros/melodic/stag-ros/default.nix +++ b/distros/melodic/stag-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-stag-ros"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/usrl-uofsc/stag_ros-release/archive/release/melodic/stag_ros/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "e0ad126a2ffbeacc996a39f3dc98b53401462a21d0aa46ba4873233f8c9b90ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "usrl-uofsc"; + repo = "stag_ros-release"; + rev = "release/melodic/stag_ros/0.2.2-1"; + sha256 = "sha256-XLxLVAYt5ltURELiZuUAb9CMnKhwnraU1A/5nzObqtA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/stage-ros/default.nix b/distros/melodic/stage-ros/default.nix index 88df93b1c7..5ca13fc986 100644 --- a/distros/melodic/stage-ros/default.nix +++ b/distros/melodic/stage-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-stage-ros"; version = "1.8.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/stage_ros-release/archive/release/melodic/stage_ros/1.8.0-0.tar.gz"; - name = "1.8.0-0.tar.gz"; - sha256 = "5762c477b0401c12f43573895f7a94ec3bdfddc4aa9fe3a127d3acc1ce2960d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "stage_ros-release"; + rev = "release/melodic/stage_ros/1.8.0-0"; + sha256 = "sha256-8N+wPzN7yC0rVdaTnq/17aCyQfsbCgLafRrgfPjgous="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/stage/default.nix b/distros/melodic/stage/default.nix index 5ece1a6cfc..8ba2f2bb4a 100644 --- a/distros/melodic/stage/default.nix +++ b/distros/melodic/stage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-stage"; version = "4.3.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/stage-release/archive/release/melodic/stage/4.3.0-0.tar.gz"; - name = "4.3.0-0.tar.gz"; - sha256 = "3c72bba7242ecd98b26f177e4227aef06ec85915f196ee88ec6103be4dfb492d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "stage-release"; + rev = "release/melodic/stage/4.3.0-0"; + sha256 = "sha256-I4psU8+xrEh2p3KAHkSjbhAYz+hzq7GOzqJ2/D6qwEE="; + }; buildType = "cmake"; buildInputs = [ cmake libtool pkg-config ]; diff --git a/distros/melodic/static-tf/default.nix b/distros/melodic/static-tf/default.nix index 0aa79f7ff2..13f60b50f1 100644 --- a/distros/melodic/static-tf/default.nix +++ b/distros/melodic/static-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-static-tf"; version = "0.0.2"; - src = fetchurl { - url = "https://github.com/wu-robotics/static_tf_release/archive/release/melodic/static_tf/0.0.2-0.tar.gz"; - name = "0.0.2-0.tar.gz"; - sha256 = "0c372214894f09c32cf9f0e8364ee57db00a1a906ba997b8767c027bf835e1f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "static_tf_release"; + rev = "release/melodic/static_tf/0.0.2-0"; + sha256 = "sha256-f5W54xK/nY2dSjkQWeTOKOD7km8ZKja9H1sLnJKdIR0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/static-transform-mux/default.nix b/distros/melodic/static-transform-mux/default.nix index 8f1151e271..99c75a0449 100644 --- a/distros/melodic/static-transform-mux/default.nix +++ b/distros/melodic/static-transform-mux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-static-transform-mux"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/peci1/static_transform_mux-release/archive/release/melodic/static_transform_mux/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "9b5bce13459bb33c3bcf4eb03f3c72e10e4b9b118f16a5a352ca9d42937e8343"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "static_transform_mux-release"; + rev = "release/melodic/static_transform_mux/1.1.0-0"; + sha256 = "sha256-ExTQbRpJhwknQMuBV4fSvNU0epTxEVZ/Z+RG9aqDWF4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/statistics-msgs/default.nix b/distros/melodic/statistics-msgs/default.nix index d657c8f1c3..a5e280f164 100644 --- a/distros/melodic/statistics-msgs/default.nix +++ b/distros/melodic/statistics-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-statistics-msgs"; version = "0.14.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/melodic/statistics_msgs/0.14.2-1.tar.gz"; - name = "0.14.2-1.tar.gz"; - sha256 = "eca1d76ca10b012c1a9590ebb55996bd73ad8223246637f2603b83350db0add7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/melodic/statistics_msgs/0.14.2-1"; + sha256 = "sha256-y80mX9vbUCCI4p6cuExsCSYkB8HxDirf81WQGGVXp0I="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/std-capabilities/default.nix b/distros/melodic/std-capabilities/default.nix index a746140654..563318c236 100644 --- a/distros/melodic/std-capabilities/default.nix +++ b/distros/melodic/std-capabilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-std-capabilities"; version = "0.1.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/std_capabilities-release/archive/release/melodic/std_capabilities/0.1.0-0.tar.gz"; - name = "0.1.0-0.tar.gz"; - sha256 = "56846414a12f4f667aec42eaef1c602c355854fdaa729692117961e54d94a9b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "std_capabilities-release"; + rev = "release/melodic/std_capabilities/0.1.0-0"; + sha256 = "sha256-B5MCD1Q5n4GbXIIzgcAgzEbPuCIBdSB+BLsRwGx8v40="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/std-msgs/default.nix b/distros/melodic/std-msgs/default.nix index 3ab0665053..3e5ea79afa 100644 --- a/distros/melodic/std-msgs/default.nix +++ b/distros/melodic/std-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-std-msgs"; version = "0.5.12"; - src = fetchurl { - url = "https://github.com/ros-gbp/std_msgs-release/archive/release/melodic/std_msgs/0.5.12-0.tar.gz"; - name = "0.5.12-0.tar.gz"; - sha256 = "4e8b6a65ca70e92bbc9044c99cde67b5859392f6489e3e2fd7fc74844cedce1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "std_msgs-release"; + rev = "release/melodic/std_msgs/0.5.12-0"; + sha256 = "sha256-iSMHCWm/b/Wb48JnT++MdB1Uxk5cZjmj+DR3wEJgI34="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/std-srvs/default.nix b/distros/melodic/std-srvs/default.nix index e79fcd26af..33a4b8a311 100644 --- a/distros/melodic/std-srvs/default.nix +++ b/distros/melodic/std-srvs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-std-srvs"; version = "1.11.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm_msgs-release/archive/release/melodic/std_srvs/1.11.2-0.tar.gz"; - name = "1.11.2-0.tar.gz"; - sha256 = "ecc565aebf13d5afbfaf42a1fb8a31de29af19331ca76239ced87c10f14fc363"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm_msgs-release"; + rev = "release/melodic/std_srvs/1.11.2-0"; + sha256 = "sha256-Rxvgnd+wVrrWDeABFUnr5bIN96c7qK4ky4pA2lcALNM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/steering-functions/default.nix b/distros/melodic/steering-functions/default.nix index 48022f81ce..6c6757fae4 100644 --- a/distros/melodic/steering-functions/default.nix +++ b/distros/melodic/steering-functions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-steering-functions"; version = "0.1.1-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "steering_functions-release"; + rev = "release/melodic/steering_functions/0.1.1-1"; + sha256 = "sha256-+w+22INXNz8L6kUVuda9BjzfpQrOFbmEUCtQWKiyCso="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/stereo-image-proc/default.nix b/distros/melodic/stereo-image-proc/default.nix index d2a1b2daa8..92b04ab660 100644 --- a/distros/melodic/stereo-image-proc/default.nix +++ b/distros/melodic/stereo-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-stereo-image-proc"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/melodic/stereo_image_proc/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "0eb1ce0600f114d0ba5e2e145c05c4cc0b76c8fcd92186100851b0ddaf56c0e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/melodic/stereo_image_proc/1.15.2-1"; + sha256 = "sha256-nYWMUTM885h81NrcjevdBDoDjhBfwx4yLNQc7IqR3hE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/stereo-msgs/default.nix b/distros/melodic/stereo-msgs/default.nix index df667440b7..806b86d16a 100644 --- a/distros/melodic/stereo-msgs/default.nix +++ b/distros/melodic/stereo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-stereo-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/stereo_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "2b4e582d515c307c9416f19881898bcc23c45b356f55bfae0d51d112f04aa1c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/stereo_msgs/1.12.8-1"; + sha256 = "sha256-xGMwx0RFfWIK8+4abKcU3wYkWf51EKywLVGzDxWJkHs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/switchbot-ros/default.nix b/distros/melodic/switchbot-ros/default.nix index 3b3a6be4a1..73b7e3ff6b 100644 --- a/distros/melodic/switchbot-ros/default.nix +++ b/distros/melodic/switchbot-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-switchbot-ros"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/switchbot_ros/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "4395f8e6fa9575450e9fbdae009e49c674c1cf7d4c1420129b256b4031f73dd9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/switchbot_ros/2.1.24-2"; + sha256 = "sha256-VCGEu8uuMAbyV8sqgSUEeqlzjbm4+sGkANPqYZBqsIw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-cli-tools/default.nix b/distros/melodic/swri-cli-tools/default.nix index 91416b3450..d2270f0a9a 100644 --- a/distros/melodic/swri-cli-tools/default.nix +++ b/distros/melodic/swri-cli-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-cli-tools"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_cli_tools/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "2ee4fd3897dceda29bb436710511d29e8ab2e72290b45efb62b209d29fe427ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_cli_tools/2.15.2-1"; + sha256 = "sha256-3asCd86nJsg2n4zW4jIF7TqSG5Uu4Ux2FB6QZBUz35I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-console-util/default.nix b/distros/melodic/swri-console-util/default.nix index c072b60202..3415006eaa 100644 --- a/distros/melodic/swri-console-util/default.nix +++ b/distros/melodic/swri-console-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-console-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_console_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "e2892f1a73322c575fcc2f54bbfa875c94859f9b052e20e56c9c6bac6800bf13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_console_util/2.15.2-1"; + sha256 = "sha256-gGsi0JXxItBxE9WrEBpaI6r54Azf2RsyVNtzohyqb5I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-console/default.nix b/distros/melodic/swri-console/default.nix index edaf55517e..ab842bb411 100644 --- a/distros/melodic/swri-console/default.nix +++ b/distros/melodic/swri-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-console"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/swri_console-release/archive/release/melodic/swri_console/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "3b316832e42c12ebf733b8f9f299ad56326bdeea281c36e1323dfe6c195a4cfe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "swri_console-release"; + rev = "release/melodic/swri_console/1.1.0-0"; + sha256 = "sha256-oF/7iUjp8cjtvWmnqqqXSRNn636RlQM7unl7lVMNVC4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-dbw-interface/default.nix b/distros/melodic/swri-dbw-interface/default.nix index 9312699efc..715792d40c 100644 --- a/distros/melodic/swri-dbw-interface/default.nix +++ b/distros/melodic/swri-dbw-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-dbw-interface"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_dbw_interface/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "89ee023cd77c3844485b98c05ee7b7f7bafd64737de6c84e12e776077100e776"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_dbw_interface/2.15.2-1"; + sha256 = "sha256-GY2AZ5E2A+EBPNMbIXo5X57FEqqNDnJd7uFDH0hsIBg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-geometry-util/default.nix b/distros/melodic/swri-geometry-util/default.nix index 71c7beb490..44e3487f96 100644 --- a/distros/melodic/swri-geometry-util/default.nix +++ b/distros/melodic/swri-geometry-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-geometry-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_geometry_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "597ad7151017fe1361d37eb5db999d87e77870f864708cc1fa698c9afe944871"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_geometry_util/2.15.2-1"; + sha256 = "sha256-ulx0FAyLOffwXUd7UwL2ZdQ/l2H8YzZbDAo2YTYduso="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/melodic/swri-image-util/default.nix b/distros/melodic/swri-image-util/default.nix index 5327d2b6cc..bec1c8c2a9 100644 --- a/distros/melodic/swri-image-util/default.nix +++ b/distros/melodic/swri-image-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-image-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_image_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "c06fa346ff49d1d38af68c3bed8ff0a38cb4a96798c68985c69016f8a4df6d3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_image_util/2.15.2-1"; + sha256 = "sha256-DqneoCYHs4y5VhYcpSEpWx76hugZZL3N+EzTSu4GSqs="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config swri-nodelet ]; diff --git a/distros/melodic/swri-math-util/default.nix b/distros/melodic/swri-math-util/default.nix index e496cb5d34..1aef66db4e 100644 --- a/distros/melodic/swri-math-util/default.nix +++ b/distros/melodic/swri-math-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-math-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_math_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "ea43a9d90e91fa64205a78903c4e40d0ccd8b2a356caa7c3013a1a0a95ac2534"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_math_util/2.15.2-1"; + sha256 = "sha256-Vz20syGZfrKA+Ib0b8BJM/nTaOfN6CxtEVArXkT8dwE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-nodelet/default.nix b/distros/melodic/swri-nodelet/default.nix index 333cc369f0..3d1248ee81 100644 --- a/distros/melodic/swri-nodelet/default.nix +++ b/distros/melodic/swri-nodelet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-nodelet"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_nodelet/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "78927d5e6057dc60de10bdff45f4d454a026528ab9ced40af2c6e20687930aad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_nodelet/2.15.2-1"; + sha256 = "sha256-42wkVD2H/SaGulcMEROawfekpN0/oMKtb9AXq+nYV8s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-opencv-util/default.nix b/distros/melodic/swri-opencv-util/default.nix index 489981a3a9..d3f63a30aa 100644 --- a/distros/melodic/swri-opencv-util/default.nix +++ b/distros/melodic/swri-opencv-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-opencv-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_opencv_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "b7da72b8e33fead7ca82dc04db4145a7b8351d9a8e49660cd5b7f10235165e56"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_opencv_util/2.15.2-1"; + sha256 = "sha256-M2CNQviWLd4XNqcjlH9HhDDKf2wfAdDqr9vuU13Fy1U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-prefix-tools/default.nix b/distros/melodic/swri-prefix-tools/default.nix index 56771fda49..f9e915124c 100644 --- a/distros/melodic/swri-prefix-tools/default.nix +++ b/distros/melodic/swri-prefix-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-prefix-tools"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_prefix_tools/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "0c8ad3a2b2bc72de71aab602d56fdbeebfd31e960c2e02692a4ee4ff75123d26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_prefix_tools/2.15.2-1"; + sha256 = "sha256-ECnNCSdWXUqA2/lfsR/Y9wKpWyK9AjwLi00GNnwpufc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-profiler-msgs/default.nix b/distros/melodic/swri-profiler-msgs/default.nix index 6870363a8d..49f3c096f3 100644 --- a/distros/melodic/swri-profiler-msgs/default.nix +++ b/distros/melodic/swri-profiler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-profiler-msgs"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/swri_profiler-release/archive/release/melodic/swri_profiler_msgs/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "d1f7c0da94cd60aee2e36ea5967f09635e78fb931129a04b4bbbff7747df90d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "swri_profiler-release"; + rev = "release/melodic/swri_profiler_msgs/0.2.2-1"; + sha256 = "sha256-Z/lTDATfvF26DGIF+IYW6N54P1NYKD1MdxEMT95muqI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation std-msgs ]; diff --git a/distros/melodic/swri-profiler-tools/default.nix b/distros/melodic/swri-profiler-tools/default.nix index 1a4e473509..fd4470effe 100644 --- a/distros/melodic/swri-profiler-tools/default.nix +++ b/distros/melodic/swri-profiler-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-profiler-tools"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/swri_profiler-release/archive/release/melodic/swri_profiler_tools/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "e3a2a60bb840c74380dbed0c880033551237c4440ef2768d825bf983e41ea6e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "swri_profiler-release"; + rev = "release/melodic/swri_profiler_tools/0.2.2-1"; + sha256 = "sha256-sz4KZc9NYkFu55vuBmgV0ee6zqCb6Tu1X1iqT+FLNOw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-profiler/default.nix b/distros/melodic/swri-profiler/default.nix index 9f4d95c2ea..7ece88b3b7 100644 --- a/distros/melodic/swri-profiler/default.nix +++ b/distros/melodic/swri-profiler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-profiler"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/swri_profiler-release/archive/release/melodic/swri_profiler/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "5fc011fc3d5f908f7e6e3accbf3dd2e73634416dfefa2d412495d18f0efbea67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "swri_profiler-release"; + rev = "release/melodic/swri_profiler/0.2.2-1"; + sha256 = "sha256-qOoJ03sjU2FSyX6zdrg6vEvMcnN0mZvpcf32l4w02PQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-roscpp/default.nix b/distros/melodic/swri-roscpp/default.nix index e9fcdac094..d007c31c9b 100644 --- a/distros/melodic/swri-roscpp/default.nix +++ b/distros/melodic/swri-roscpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-roscpp"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_roscpp/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "8cd64485b1da019c1600856af0caa8831decd98cc2f8eeca2ae8c55a2ec76566"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_roscpp/2.15.2-1"; + sha256 = "sha256-iYDok1TQuOKAmykFkMTedTrobmTiHAbtj+N12OeYUO4="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/melodic/swri-rospy/default.nix b/distros/melodic/swri-rospy/default.nix index c0dd91c1dd..a25bbcc14e 100644 --- a/distros/melodic/swri-rospy/default.nix +++ b/distros/melodic/swri-rospy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-rospy"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_rospy/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "10011f7fd4f01422051fb0ccc2479f08e7298bdddb5f6477104c4b92aed3df4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_rospy/2.15.2-1"; + sha256 = "sha256-hKaYVmqoLehCXumz+nQeu3Nz0BfOrNoo66viKbSYEVU="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/swri-route-util/default.nix b/distros/melodic/swri-route-util/default.nix index b0b0ea9064..d6ee10c623 100644 --- a/distros/melodic/swri-route-util/default.nix +++ b/distros/melodic/swri-route-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-route-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_route_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "2e8c0d95a5170682c60c68bb1d1e266df680a01f42d88a0e53b2d9661a083543"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_route_util/2.15.2-1"; + sha256 = "sha256-lrQIIIUIuVjLP6gk1VxgIA8xBP5Js+mP4aBo0ibaSxo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-serial-util/default.nix b/distros/melodic/swri-serial-util/default.nix index 17c89d8cd0..bd42370e71 100644 --- a/distros/melodic/swri-serial-util/default.nix +++ b/distros/melodic/swri-serial-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-serial-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_serial_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "3827339995c14e34990f4e550fc978d0323e9a0996fa3294dd981b3725d7b352"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_serial_util/2.15.2-1"; + sha256 = "sha256-W2FJeVbiBdrXM4VEOzQ+h/c44E/8Gf2UDMPMdDh5of4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-string-util/default.nix b/distros/melodic/swri-string-util/default.nix index d0b94d230e..5ac30802ce 100644 --- a/distros/melodic/swri-string-util/default.nix +++ b/distros/melodic/swri-string-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-string-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_string_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "ea34be12aa11141705af1896728a59decfc1f4886b76b38af405f9c9c7d13345"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_string_util/2.15.2-1"; + sha256 = "sha256-sN8iZWwiqUE8TuvICjQ5xN89AEaml2Vhg7s/Igd1NQ4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-system-util/default.nix b/distros/melodic/swri-system-util/default.nix index 6adecb512f..507c8fb215 100644 --- a/distros/melodic/swri-system-util/default.nix +++ b/distros/melodic/swri-system-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-system-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_system_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "7ff8cdc3bf6831e6ed4988ca42b12e0578661504f53f4a49f4b4df3fb875879a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_system_util/2.15.2-1"; + sha256 = "sha256-v5BrSgBtdAueJdUcyFQBMubVeED0xYd3kYvjqTlNexo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/swri-transform-util/default.nix b/distros/melodic/swri-transform-util/default.nix index adff62722d..4eef71f17a 100644 --- a/distros/melodic/swri-transform-util/default.nix +++ b/distros/melodic/swri-transform-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-transform-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_transform_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "724cd554abb5f178cfdd32914eef4453c163aa01229a83b43e61e2c174cda006"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_transform_util/2.15.2-1"; + sha256 = "sha256-2p3MOalmCs2ZG8zRynSO91R1iscd+UTfXl3D3yMGJdM="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config pythonPackages.setuptools ]; diff --git a/distros/melodic/swri-yaml-util/default.nix b/distros/melodic/swri-yaml-util/default.nix index fc218371ab..949655f09f 100644 --- a/distros/melodic/swri-yaml-util/default.nix +++ b/distros/melodic/swri-yaml-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-swri-yaml-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/melodic/swri_yaml_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "3c959e8d2d3fbab727fe55b10e3aa174a2ebffc79bce7e60e4df92dfa5460e8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/melodic/swri_yaml_util/2.15.2-1"; + sha256 = "sha256-3pfyGTUKsQ/+qxn6ekxKD007itkeaUMFKF25MfMpGjA="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/melodic/tablet-socket-msgs/default.nix b/distros/melodic/tablet-socket-msgs/default.nix index 723752e219..df8dc98966 100644 --- a/distros/melodic/tablet-socket-msgs/default.nix +++ b/distros/melodic/tablet-socket-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tablet-socket-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/tablet_socket_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "46866d3f0916a650ea03de6f93ad4f7488b1c2d79c48bd87112d8c6b04573e1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/tablet_socket_msgs/1.14.0-1"; + sha256 = "sha256-K81PQWc5f4ipaEOUnZgJcmABZiUzdI1Jg96O6a9fVkA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/talos-description-calibration/default.nix b/distros/melodic/talos-description-calibration/default.nix index db0dc0137f..5781fcc7e0 100644 --- a/distros/melodic/talos-description-calibration/default.nix +++ b/distros/melodic/talos-description-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-talos-description-calibration"; version = "1.0.45"; - src = fetchurl { - url = "https://github.com/pal-gbp/talos_robot-release/archive/release/melodic/talos_description_calibration/1.0.45-0.tar.gz"; - name = "1.0.45-0.tar.gz"; - sha256 = "d5e6dc7ae7fcb932718a916c9be6c892b135ff83c5be3795c87cd4b9412f72e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "talos_robot-release"; + rev = "release/melodic/talos_description_calibration/1.0.45-0"; + sha256 = "sha256-AQ/Z/UMtUc/PTlG4+Y6rV2QITqJ7w1dJpeZyyfqHtaU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/talos-description-inertial/default.nix b/distros/melodic/talos-description-inertial/default.nix index 4090078e63..72588639b7 100644 --- a/distros/melodic/talos-description-inertial/default.nix +++ b/distros/melodic/talos-description-inertial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-talos-description-inertial"; version = "1.0.45"; - src = fetchurl { - url = "https://github.com/pal-gbp/talos_robot-release/archive/release/melodic/talos_description_inertial/1.0.45-0.tar.gz"; - name = "1.0.45-0.tar.gz"; - sha256 = "03af558efe948f9f6e0babd3a08d1f83819ad86011e25edca8402a9e2bcd8a3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "talos_robot-release"; + rev = "release/melodic/talos_description_inertial/1.0.45-0"; + sha256 = "sha256-jxGRbqqCGU33XF5r/0J7tnXLsvaX9J3k6afA3Gkcur8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/talos-description/default.nix b/distros/melodic/talos-description/default.nix index cd00674f92..5a1261bcd7 100644 --- a/distros/melodic/talos-description/default.nix +++ b/distros/melodic/talos-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-talos-description"; version = "1.0.45"; - src = fetchurl { - url = "https://github.com/pal-gbp/talos_robot-release/archive/release/melodic/talos_description/1.0.45-0.tar.gz"; - name = "1.0.45-0.tar.gz"; - sha256 = "a50d729ebe08f18e3cf29dc44d284453434e04c9dc2b41be74bf5e7ec79832c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "talos_robot-release"; + rev = "release/melodic/talos_description/1.0.45-0"; + sha256 = "sha256-8f2UUM5XZKb4du8Zso8+gOHEdCXDx0a2kGPdUHUkHFU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/task-compiler/default.nix b/distros/melodic/task-compiler/default.nix index c01675d2d8..48e823e809 100644 --- a/distros/melodic/task-compiler/default.nix +++ b/distros/melodic/task-compiler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-task-compiler"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_planning-release/archive/release/melodic/task_compiler/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "0d42aa893bab08122853cd293c293b1b3099bbf0dde19872b5d0d21d4d205aba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_planning-release"; + rev = "release/melodic/task_compiler/0.1.12-1"; + sha256 = "sha256-MmG0p9lAqbDuTuNQ9TIRoLZnADIn5onAbUyDkFs4yV4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/teb-local-planner-tutorials/default.nix b/distros/melodic/teb-local-planner-tutorials/default.nix index 6cdf2057bd..73c9eaedb4 100644 --- a/distros/melodic/teb-local-planner-tutorials/default.nix +++ b/distros/melodic/teb-local-planner-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teb-local-planner-tutorials"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/teb_local_planner_tutorials-release/archive/release/melodic/teb_local_planner_tutorials/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "844e431b24ee4635946618da536b22f2571196f298e74b7715ee6a4f4cd42d1a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "teb_local_planner_tutorials-release"; + rev = "release/melodic/teb_local_planner_tutorials/0.2.4-1"; + sha256 = "sha256-YT/10QNfUpXEzpyOqioa1CQ2IhIyesO+M2kh5gYDct8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/teb-local-planner/default.nix b/distros/melodic/teb-local-planner/default.nix index 9fd14eaabc..7abe16b558 100644 --- a/distros/melodic/teb-local-planner/default.nix +++ b/distros/melodic/teb-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teb-local-planner"; version = "0.8.4-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/teb_local_planner-release/archive/release/melodic/teb_local_planner/0.8.4-1.tar.gz"; - name = "0.8.4-1.tar.gz"; - sha256 = "a1052cfa296cd74da059953a01bf0d5cfea8c24f7ef910117ba998fa12f44ff8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "teb_local_planner-release"; + rev = "release/melodic/teb_local_planner/0.8.4-1"; + sha256 = "sha256-1jmnZEVmUwsAYvFINyhVLGTiCiqh7t7i6Dt9SPNs1N4="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation tf2-eigen tf2-geometry-msgs ]; diff --git a/distros/melodic/teleop-legged-robots/default.nix b/distros/melodic/teleop-legged-robots/default.nix index 8030f02714..0455f6cbb2 100644 --- a/distros/melodic/teleop-legged-robots/default.nix +++ b/distros/melodic/teleop-legged-robots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teleop-legged-robots"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/SoftServeSAG/teleop_legged_robots-release/archive/release/melodic/teleop_legged_robots/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "a6f0d0e043ddf4d8b8f93bc394b341780c3439ddf09da38555b1c9a4acb62662"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SoftServeSAG"; + repo = "teleop_legged_robots-release"; + rev = "release/melodic/teleop_legged_robots/1.1.2-1"; + sha256 = "sha256-TTdOolQrx0eIplFQXi3BHPo56lOYXCVYFKWuThYggJY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/teleop-tools-msgs/default.nix b/distros/melodic/teleop-tools-msgs/default.nix index d2446363fa..1bef327ed4 100644 --- a/distros/melodic/teleop-tools-msgs/default.nix +++ b/distros/melodic/teleop-tools-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teleop-tools-msgs"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/melodic/teleop_tools_msgs/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "8e09cf4ead3f0f1f98917472c6c2286a6fc33b2b707978d8919132a70cb3244c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/melodic/teleop_tools_msgs/0.3.1-1"; + sha256 = "sha256-R+1LEVlkEw8CwAm6gqS/etycEZLK4WgZneQHFBgBfbs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/teleop-tools/default.nix b/distros/melodic/teleop-tools/default.nix index 796e22e105..c820af109f 100644 --- a/distros/melodic/teleop-tools/default.nix +++ b/distros/melodic/teleop-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teleop-tools"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/melodic/teleop_tools/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "d45ea282f8d899d5213a3f616d5c09e37779e81bc5f8b5a9a2fa53896a039ff8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/melodic/teleop_tools/0.3.1-1"; + sha256 = "sha256-B8DoHSu+6ahNiZgfDC9mchwr+sjYOGCASVzsH+zjBzI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/teleop-twist-joy/default.nix b/distros/melodic/teleop-twist-joy/default.nix index 13eb1568ff..227f8c19e2 100644 --- a/distros/melodic/teleop-twist-joy/default.nix +++ b/distros/melodic/teleop-twist-joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teleop-twist-joy"; version = "0.1.3"; - src = fetchurl { - url = "https://github.com/ros-teleop/teleop_twist_joy-release/archive/release/melodic/teleop_twist_joy/0.1.3-0.tar.gz"; - name = "0.1.3-0.tar.gz"; - sha256 = "3e9186dd642c84cc2776994b6afa7a97a9a4759d53170c1e1f9fddd9fbc789e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-teleop"; + repo = "teleop_twist_joy-release"; + rev = "release/melodic/teleop_twist_joy/0.1.3-0"; + sha256 = "sha256-7hNsyJOqpGjAJufLvI+K2teBHZfVDfeKBX5eOTYoJY0="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch roslint rostest ]; diff --git a/distros/melodic/teleop-twist-keyboard/default.nix b/distros/melodic/teleop-twist-keyboard/default.nix index 77c31b1e3d..b4075c6dde 100644 --- a/distros/melodic/teleop-twist-keyboard/default.nix +++ b/distros/melodic/teleop-twist-keyboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teleop-twist-keyboard"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_twist_keyboard-release/archive/release/melodic/teleop_twist_keyboard/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "bc9aa97ea8811e7dda293d3abeb9824fb0efb18236ef647fdf393cfc05c65181"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_twist_keyboard-release"; + rev = "release/melodic/teleop_twist_keyboard/1.0.0-1"; + sha256 = "sha256-HWSbDb6AaeUM+9e6kvAiT2Uh1NxEcd/2cEQjkseYn10="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tello-driver/default.nix b/distros/melodic/tello-driver/default.nix index 6962254b31..269d93754b 100644 --- a/distros/melodic/tello-driver/default.nix +++ b/distros/melodic/tello-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tello-driver"; version = "1.3.10-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/melodic/tello_driver/1.3.10-1.tar.gz"; - name = "1.3.10-1.tar.gz"; - sha256 = "50b3b304d69506b2c50e52ce670354c013abd89bd5668f5f508fb8221a173d15"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/melodic/tello_driver/1.3.10-1"; + sha256 = "sha256-DAj7Ke8+bmz03Kgh9eTKyZhkwHMouKmPscHa+KGydPE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/teraranger-array/default.nix b/distros/melodic/teraranger-array/default.nix index 0ef1b527c7..418455090a 100644 --- a/distros/melodic/teraranger-array/default.nix +++ b/distros/melodic/teraranger-array/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teraranger-array"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/Terabee/teraranger_array-release/archive/release/melodic/teraranger_array/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "7d5ebf525e7be16d78cbeb170579970889386e503e84f571b4187450e3784233"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Terabee"; + repo = "teraranger_array-release"; + rev = "release/melodic/teraranger_array/2.0.0-1"; + sha256 = "sha256-tEdVeg6oA71hYVfle/agiCDQrDUga8sjSpiPJD/nR3w="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/teraranger/default.nix b/distros/melodic/teraranger/default.nix index 1124515042..8d587ed1bb 100644 --- a/distros/melodic/teraranger/default.nix +++ b/distros/melodic/teraranger/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-teraranger"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/Terabee/teraranger-release/archive/release/melodic/teraranger/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "7a46f25a882f135c1261b889e11462660d26f4b6e6d288d8b2026dfda5f4bc0a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Terabee"; + repo = "teraranger-release"; + rev = "release/melodic/teraranger/2.1.0-1"; + sha256 = "sha256-2XehN9YWYY+jDfbj7EWiu7ZnnzxjJ2PiJ7aHq/Wsc3Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/test-diagnostic-aggregator/default.nix b/distros/melodic/test-diagnostic-aggregator/default.nix index f739682c15..bae03601b1 100644 --- a/distros/melodic/test-diagnostic-aggregator/default.nix +++ b/distros/melodic/test-diagnostic-aggregator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-test-diagnostic-aggregator"; version = "1.9.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/test_diagnostic_aggregator/1.9.7-1.tar.gz"; - name = "1.9.7-1.tar.gz"; - sha256 = "201eab0e2c91bc2bd05f59b91f9a21d4e9076f361d980c56fec5c5fca4634109"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/melodic/test_diagnostic_aggregator/1.9.7-1"; + sha256 = "sha256-SGgKtgOXi5R4Dz07qKTDjJYyQNKRAlbj6SJzHJ0W2QA="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/test-mavros/default.nix b/distros/melodic/test-mavros/default.nix index 24a70a0385..e00a749b9d 100644 --- a/distros/melodic/test-mavros/default.nix +++ b/distros/melodic/test-mavros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-test-mavros"; version = "1.15.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/melodic/test_mavros/1.15.0-1.tar.gz"; - name = "1.15.0-1.tar.gz"; - sha256 = "fc382a0a6ad8eca5933e63e1c553ee1de226ad39aa2f7bfc5c41d4bf6d404943"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/melodic/test_mavros/1.15.0-1"; + sha256 = "sha256-SLJvU/TPVXD77MF+r2MOJWMFr78zX4+NHRa7kIOzt0w="; + }; buildType = "catkin"; buildInputs = [ angles catkin cmake-modules ]; diff --git a/distros/melodic/test-osm/default.nix b/distros/melodic/test-osm/default.nix index 2e6a2334d4..0a0b3a9c02 100644 --- a/distros/melodic/test-osm/default.nix +++ b/distros/melodic/test-osm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-test-osm"; version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/open_street_map-release/archive/release/melodic/test_osm/0.2.5-1.tar.gz"; - name = "0.2.5-1.tar.gz"; - sha256 = "b03e821df33ef8a22f1ca6b22cdc84711879e74e55df49077beb761e72caffd4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "open_street_map-release"; + rev = "release/melodic/test_osm/0.2.5-1"; + sha256 = "sha256-ZQ31cczUFSFyDHJuqdvijBAEgggHnuwIRHPwBxXkw4U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf-conversions/default.nix b/distros/melodic/tf-conversions/default.nix index 850e7b275a..403661488e 100644 --- a/distros/melodic/tf-conversions/default.nix +++ b/distros/melodic/tf-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf-conversions"; version = "1.12.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/melodic/tf_conversions/1.12.1-1.tar.gz"; - name = "1.12.1-1.tar.gz"; - sha256 = "e2e457c4d59951b3ed07f72d6e013905184e5de1458c3a57b9e3b35ee4355580"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/melodic/tf_conversions/1.12.1-1"; + sha256 = "sha256-vLIhSf92VZK9ee1Bt/2kRpvs/d/Ot20QGj2dZcxHhO8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf-remapper-cpp/default.nix b/distros/melodic/tf-remapper-cpp/default.nix index c8c87c4a6f..5d43e78124 100644 --- a/distros/melodic/tf-remapper-cpp/default.nix +++ b/distros/melodic/tf-remapper-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf-remapper-cpp"; version = "1.1.1"; - src = fetchurl { - url = "https://github.com/peci1/tf_remapper_cpp-release/archive/release/melodic/tf_remapper_cpp/1.1.1-0.tar.gz"; - name = "1.1.1-0.tar.gz"; - sha256 = "e212a7354d6e6f6eb42f9f8a90551b26cc4ffd427324bfe6f82ccbcd4603f77a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "tf_remapper_cpp-release"; + rev = "release/melodic/tf_remapper_cpp/1.1.1-0"; + sha256 = "sha256-gPTx/WRgemtvKvNrCviawV3/lxdKSGSZADICFHMss9k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf/default.nix b/distros/melodic/tf/default.nix index e67d6f2a6d..74d4a6e1fd 100644 --- a/distros/melodic/tf/default.nix +++ b/distros/melodic/tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf"; version = "1.12.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/melodic/tf/1.12.1-1.tar.gz"; - name = "1.12.1-1.tar.gz"; - sha256 = "49b7cc26908b03a7d035a88b238b11a86d31648559e488fbfae09d3a0696efbe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/melodic/tf/1.12.1-1"; + sha256 = "sha256-zzjQqwlZnGfgDP9WfXfwpVlI1M/uyrxCCpuo5rhmDxM="; + }; buildType = "catkin"; buildInputs = [ angles catkin message-generation rostime ]; diff --git a/distros/melodic/tf2-2d/default.nix b/distros/melodic/tf2-2d/default.nix index fc0c725df0..44aa82b4b0 100644 --- a/distros/melodic/tf2-2d/default.nix +++ b/distros/melodic/tf2-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-2d"; version = "0.6.4-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/tf2_2d-release/archive/release/melodic/tf2_2d/0.6.4-1.tar.gz"; - name = "0.6.4-1.tar.gz"; - sha256 = "1d4a60de80ea7adfb5894381d0b16e8d7257230a93caa3eaa9411e248a154847"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "tf2_2d-release"; + rev = "release/melodic/tf2_2d/0.6.4-1"; + sha256 = "sha256-fzb/KTasnwpnYHrHv+LYFIZ+HiS+a+zTiZ6t1CBuUMk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf2-bullet/default.nix b/distros/melodic/tf2-bullet/default.nix index 624bf3a433..bed5d50765 100644 --- a/distros/melodic/tf2-bullet/default.nix +++ b/distros/melodic/tf2-bullet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-bullet"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_bullet/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "2cb1d1e6d4ba180010c3f53ac138ba147ef4fb2c037d1b76be5cfb7d60ecd8e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_bullet/0.6.5-0"; + sha256 = "sha256-aITQnFz9/4H80uaffidkNE1F3yvAIgIoCtECpawNOGw="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/melodic/tf2-eigen/default.nix b/distros/melodic/tf2-eigen/default.nix index 0c4985f15f..e57f7fca2c 100644 --- a/distros/melodic/tf2-eigen/default.nix +++ b/distros/melodic/tf2-eigen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-eigen"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_eigen/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "0097c690bd551d83154cc551b7d50439d86e8acda2bc4ebc307d1157cdf8c24d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_eigen/0.6.5-0"; + sha256 = "sha256-2prM7fcAHXpt0B1pzBaPQsUGu3T23ATrJzMDQCycbNY="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/tf2-geometry-msgs/default.nix b/distros/melodic/tf2-geometry-msgs/default.nix index 00ca9ee6ce..552a95331c 100644 --- a/distros/melodic/tf2-geometry-msgs/default.nix +++ b/distros/melodic/tf2-geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-geometry-msgs"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_geometry_msgs/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "f1516df538999a5fb7cb8eeaf71636c9572bba758adac8cdafbf5446918b7bbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_geometry_msgs/0.6.5-0"; + sha256 = "sha256-eyJSm8NOjxlXJlxaVWvYfZ6ubzTJDVmHCWLmPq5AbAw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf2-kdl/default.nix b/distros/melodic/tf2-kdl/default.nix index 32a50e7f05..87c8bdd732 100644 --- a/distros/melodic/tf2-kdl/default.nix +++ b/distros/melodic/tf2-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-kdl"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_kdl/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "af0a21267f7ff0d435f5b54a3b55575e399daaf75ed8e01f09906e1b9af018cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_kdl/0.6.5-0"; + sha256 = "sha256-ym2F2xDtQaAQvkFv4wBDrmXtXZ3Kcz0ENNb+cL8qQBg="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/tf2-msgs/default.nix b/distros/melodic/tf2-msgs/default.nix index 2d2114d38b..0d7944f8d2 100644 --- a/distros/melodic/tf2-msgs/default.nix +++ b/distros/melodic/tf2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-msgs"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_msgs/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "27ecf00eef462615bab0dd0ff5232f6aaad8712e79bbf5912c008705f27c1d5d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_msgs/0.6.5-0"; + sha256 = "sha256-1MweJJXLUR9H8Uu0WxSfjRVFv6QqpVr+I9id67lzb+0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf2-py/default.nix b/distros/melodic/tf2-py/default.nix index f5f7440c68..46e7f2a95d 100644 --- a/distros/melodic/tf2-py/default.nix +++ b/distros/melodic/tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-py"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_py/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "24fc32a89eb1f6714d2f05c138c5d85741aabe819fc18475e63564aa0e2c388b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_py/0.6.5-0"; + sha256 = "sha256-L31ZQ8mFws0nmSgIAicOp+uzEcyf0Amcc6llSEruTDQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf2-relay/default.nix b/distros/melodic/tf2-relay/default.nix index e8eae27cf2..7273018627 100644 --- a/distros/melodic/tf2-relay/default.nix +++ b/distros/melodic/tf2-relay/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-relay"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/cpr_multimaster_tools-release/archive/release/melodic/tf2_relay/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "6052668a6f51ee065e7833b033ade709311193d3b62f662e38dd617eab05dc31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "cpr_multimaster_tools-release"; + rev = "release/melodic/tf2_relay/0.0.2-1"; + sha256 = "sha256-2dW7qeIgKV94Evu95Q6kQYTI+4UxzA7v+Y8PdvjPggA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf2-ros/default.nix b/distros/melodic/tf2-ros/default.nix index 70719ebc8e..e4b84e36e4 100644 --- a/distros/melodic/tf2-ros/default.nix +++ b/distros/melodic/tf2-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-ros"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_ros/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "f5ea730b28e1668228c151fec493a768164843aa867770570c93ba3dcbda2d0f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_ros/0.6.5-0"; + sha256 = "sha256-ZsYWk45SfdF5xwHfUwubAi4aBTpKDRKLC2j9xzjuUg8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf2-sensor-msgs/default.nix b/distros/melodic/tf2-sensor-msgs/default.nix index f0f0af76f0..d813573710 100644 --- a/distros/melodic/tf2-sensor-msgs/default.nix +++ b/distros/melodic/tf2-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-sensor-msgs"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_sensor_msgs/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "1a5247c2cfec650cb26758f587e6af12e90b0a99749eb861813ab39f83c7b2e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_sensor_msgs/0.6.5-0"; + sha256 = "sha256-YMJHiQzYlN+G+nvl7HoD5BP0tjexKy8LX3A6HM3oMEc="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/tf2-server/default.nix b/distros/melodic/tf2-server/default.nix index 264e29bd64..b4e08e3d00 100644 --- a/distros/melodic/tf2-server/default.nix +++ b/distros/melodic/tf2-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-server"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/peci1/tf2_server-release/archive/release/melodic/tf2_server/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "c67256a38cfb77de988fe3a67334caf05eaab0b13108cf526d109c65e94dd63a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "tf2_server-release"; + rev = "release/melodic/tf2_server/1.0.6-1"; + sha256 = "sha256-x/pWPJM9Etkzz1+wCI0ebN4a7FErlEC0EaGbYwMwABE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tf2-tools/default.nix b/distros/melodic/tf2-tools/default.nix index 9a397e712d..e60220f4de 100644 --- a/distros/melodic/tf2-tools/default.nix +++ b/distros/melodic/tf2-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-tools"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_tools/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "c474f792ecac52bec866f11bb705444141ea38f2e9f23fc1513307a4681ef724"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2_tools/0.6.5-0"; + sha256 = "sha256-zNaw7pnDRgCRqpO4zr5E5cOFyQ5Eque2Gf1zKilmPSg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tf2-urdf/default.nix b/distros/melodic/tf2-urdf/default.nix index 293f6a45ea..bd9d3a6af4 100644 --- a/distros/melodic/tf2-urdf/default.nix +++ b/distros/melodic/tf2-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-urdf"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/standmit/tf2_urdf-release/archive/release/melodic/tf2_urdf/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "f397b372dd5c56a93f4dd6f42187929d66c3cb92103899f95a61734d2d466277"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "standmit"; + repo = "tf2_urdf-release"; + rev = "release/melodic/tf2_urdf/0.1.1-1"; + sha256 = "sha256-CTvgw7cgd6H2vKpW+Q1qFqul14LgAerFUsWEWODsPqI="; + }; buildType = "catkin"; buildInputs = [ catkin geometry-msgs urdfdom-headers ]; diff --git a/distros/melodic/tf2-web-republisher/default.nix b/distros/melodic/tf2-web-republisher/default.nix index f680c4cacf..e91d927dac 100644 --- a/distros/melodic/tf2-web-republisher/default.nix +++ b/distros/melodic/tf2-web-republisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2-web-republisher"; version = "0.3.2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/tf2_web_republisher-release/archive/release/melodic/tf2_web_republisher/0.3.2-0.tar.gz"; - name = "0.3.2-0.tar.gz"; - sha256 = "401fcc79bf11e5071e8304b1053bf8afed6f3e91d3df30c0823c87c82b741420"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "tf2_web_republisher-release"; + rev = "release/melodic/tf2_web_republisher/0.3.2-0"; + sha256 = "sha256-SWlALJIr/iyDp2Qh1Vw6fk7oq1AHzE3I3b2ysTWrbWU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tf2/default.nix b/distros/melodic/tf2/default.nix index 2cfde73a77..9dac2ff56a 100644 --- a/distros/melodic/tf2/default.nix +++ b/distros/melodic/tf2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tf2"; version = "0.6.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2/0.6.5-0.tar.gz"; - name = "0.6.5-0.tar.gz"; - sha256 = "f6776b600f397998cef387bfa57b6ad3e1e396f7a0015521ba7389ce2ca211c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/melodic/tf2/0.6.5-0"; + sha256 = "sha256-wArIoY2MArwMSmKQ0QLHJ6MmiUamOq6r5YG6QdoQypM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/theora-image-transport/default.nix b/distros/melodic/theora-image-transport/default.nix index 3c1bb64aa6..bdc44d12e2 100644 --- a/distros/melodic/theora-image-transport/default.nix +++ b/distros/melodic/theora-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-theora-image-transport"; version = "1.9.5"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_transport_plugins-release/archive/release/melodic/theora_image_transport/1.9.5-0.tar.gz"; - name = "1.9.5-0.tar.gz"; - sha256 = "03701fa45f64b4642eb8b7720662363bb10c4f20e32da2783c595258fc3eaced"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/melodic/theora_image_transport/1.9.5-0"; + sha256 = "sha256-NRn5uF86fC3K9ld3QhqpIg810rvbYVQCs0TCuBSA7g0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tile-map/default.nix b/distros/melodic/tile-map/default.nix index ddc9b5e5df..a1683793f7 100644 --- a/distros/melodic/tile-map/default.nix +++ b/distros/melodic/tile-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tile-map"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/melodic/tile_map/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "b8dff88df9fe3838b14c477a6d9ac3ae00085e8deb0b7d58ddd37130e32582f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/melodic/tile_map/1.4.2-1"; + sha256 = "sha256-avDvm2BvpzVJJJ88DPTJesFdIznBLyQRyZ12ycmBt7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/timed-roslaunch/default.nix b/distros/melodic/timed-roslaunch/default.nix index cca9fe3afb..6f754dbb44 100644 --- a/distros/melodic/timed-roslaunch/default.nix +++ b/distros/melodic/timed-roslaunch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-timed-roslaunch"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/MoriKen254/timed_roslaunch-release/archive/release/melodic/timed_roslaunch/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "bc837c15627dd4cbf4eef4543e75d3240948dcc6d0671941723ecece6ff3bdfd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MoriKen254"; + repo = "timed_roslaunch-release"; + rev = "release/melodic/timed_roslaunch/0.1.4-1"; + sha256 = "sha256-Htx5vTSxlnRyzkV6KJ8IOalIBPeNpG+F19gydUEWUqU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/timestamp-tools/default.nix b/distros/melodic/timestamp-tools/default.nix index d82d0e59ef..48b0b1642c 100644 --- a/distros/melodic/timestamp-tools/default.nix +++ b/distros/melodic/timestamp-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-timestamp-tools"; version = "1.6.8"; - src = fetchurl { - url = "https://github.com/ros-gbp/driver_common-release/archive/release/melodic/timestamp_tools/1.6.8-0.tar.gz"; - name = "1.6.8-0.tar.gz"; - sha256 = "dabb75248bb8528c603d556f7533df6bf701870db84b5d5c5983e2d7f08464b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "driver_common-release"; + rev = "release/melodic/timestamp_tools/1.6.8-0"; + sha256 = "sha256-ReswhsaA1UeIac0A9zIxWkFvdzt7gsrpZqSPNrkn+G4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/topic-tools/default.nix b/distros/melodic/topic-tools/default.nix index d45a7bf8c0..2a32b649c2 100644 --- a/distros/melodic/topic-tools/default.nix +++ b/distros/melodic/topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-topic-tools"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/topic_tools/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "4679a32027c15a54e496519128489c63c277342563387f96f260daefb655c07c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/topic_tools/1.14.13-1"; + sha256 = "sha256-yNiedx64ZoDr9BGEg/pHiau4eIRNnaVuKlOEeeo1b2I="; + }; buildType = "catkin"; buildInputs = [ catkin cpp-common message-generation rostest rosunit ]; diff --git a/distros/melodic/tork-moveit-tutorial/default.nix b/distros/melodic/tork-moveit-tutorial/default.nix index 1f51699843..8e3cdab42f 100644 --- a/distros/melodic/tork-moveit-tutorial/default.nix +++ b/distros/melodic/tork-moveit-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tork-moveit-tutorial"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/tork_moveit_tutorial-release/archive/release/melodic/tork_moveit_tutorial/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "b559d39011e7c16f709e376dc1892eb9d2bfc489388218ce37d77eadfce596d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "tork_moveit_tutorial-release"; + rev = "release/melodic/tork_moveit_tutorial/0.1.1-1"; + sha256 = "sha256-VuK7H8hRe6l7w5M5eOhuN2OD6P652pEkyrkhQSAJsZs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/towr-ros/default.nix b/distros/melodic/towr-ros/default.nix index d248db2a0e..f4807f2bb5 100644 --- a/distros/melodic/towr-ros/default.nix +++ b/distros/melodic/towr-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-towr-ros"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ethz-adrl/towr-release/archive/release/melodic/towr_ros/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "fd30887f7c1a5dcd841ed043da22a724bc30cc47f3db12593a0da5d7a99ae854"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-adrl"; + repo = "towr-release"; + rev = "release/melodic/towr_ros/1.4.1-0"; + sha256 = "sha256-Iv9lpP9rDSkWURdw+VMSTj0uCRY3JD3LlgpA9Pp5YaY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/towr/default.nix b/distros/melodic/towr/default.nix index c864a6530f..a30c911dd2 100644 --- a/distros/melodic/towr/default.nix +++ b/distros/melodic/towr/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-towr"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ethz-adrl/towr-release/archive/release/melodic/towr/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "62df4c4444a14ce7bfb5bef8fbcd602942cb97a36b24ed7a7413575568b9a50f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-adrl"; + repo = "towr-release"; + rev = "release/melodic/towr/1.4.1-0"; + sha256 = "sha256-35o/tjNwKi7irLCOFb6opc1XwRdVILWDcXE8lmr9ED8="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/tra1-bringup/default.nix b/distros/melodic/tra1-bringup/default.nix index d45deec46e..222adbb514 100644 --- a/distros/melodic/tra1-bringup/default.nix +++ b/distros/melodic/tra1-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tra1-bringup"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/tork-a/minas-release/archive/release/melodic/tra1_bringup/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "b26072a45edf374187cbf24fc53bdaa12840abfcd32a5e5a3e78e6d76609f721"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "minas-release"; + rev = "release/melodic/tra1_bringup/1.0.10-1"; + sha256 = "sha256-t6ay/ufQCW6G8gpN+5Y975gRossCpClwz/PuKVKCy04="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tra1-description/default.nix b/distros/melodic/tra1-description/default.nix index 6d7bd9a2e7..17b5cc38c7 100644 --- a/distros/melodic/tra1-description/default.nix +++ b/distros/melodic/tra1-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tra1-description"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/tork-a/minas-release/archive/release/melodic/tra1_description/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "cecc2bf7664b6d24ccf9783e0955499ca1a7e21b38f7a0ea38b718fe10bf6f1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "minas-release"; + rev = "release/melodic/tra1_description/1.0.10-1"; + sha256 = "sha256-nzu//p4QJ8jdi6VNavImGxeTM4A5exJHuGpm3nXHyhw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tra1-moveit-config/default.nix b/distros/melodic/tra1-moveit-config/default.nix index cf794ebda1..2b298ae1e5 100644 --- a/distros/melodic/tra1-moveit-config/default.nix +++ b/distros/melodic/tra1-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tra1-moveit-config"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/tork-a/minas-release/archive/release/melodic/tra1_moveit_config/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "aae9958445d523413c744f069ca4e973b137a0c3f1c4f8472902c3e6a2467572"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "minas-release"; + rev = "release/melodic/tra1_moveit_config/1.0.10-1"; + sha256 = "sha256-MtrQqMdCgAW5NxedmSGXIq4eOg9RGYpcqzlhjPKebAI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/trac-ik-examples/default.nix b/distros/melodic/trac-ik-examples/default.nix index 488dfb3c5e..bb209f3788 100644 --- a/distros/melodic/trac-ik-examples/default.nix +++ b/distros/melodic/trac-ik-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-trac-ik-examples"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/melodic/trac_ik_examples/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "c04e9f5a860f562ce0d1e044723198ffa560d2f3ac815bdc4da79a7da8a4e40f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/melodic/trac_ik_examples/1.5.1-1"; + sha256 = "sha256-EWR8rgCYY8h3qZ8DT7hcy9cDb8mbiTwrdUMPU1d3V1M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/trac-ik-kinematics-plugin/default.nix b/distros/melodic/trac-ik-kinematics-plugin/default.nix index 9db42acfac..672e911328 100644 --- a/distros/melodic/trac-ik-kinematics-plugin/default.nix +++ b/distros/melodic/trac-ik-kinematics-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-trac-ik-kinematics-plugin"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/melodic/trac_ik_kinematics_plugin/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "f6758d2cd5aa2247de6d995d31051d844a993288e69abb94e13a05f3eb0b0a29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/melodic/trac_ik_kinematics_plugin/1.5.1-1"; + sha256 = "sha256-Oa3H87jzNBw7730phbboRzNWdPuArYPrVb6+xJEtDNc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/trac-ik-lib/default.nix b/distros/melodic/trac-ik-lib/default.nix index 25cb5c6b55..d9f958ef11 100644 --- a/distros/melodic/trac-ik-lib/default.nix +++ b/distros/melodic/trac-ik-lib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-trac-ik-lib"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/melodic/trac_ik_lib/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "09489c4aef503272d85513f815ffa9244284aaa093f19c6f5a43a1185cb6645a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/melodic/trac_ik_lib/1.5.1-1"; + sha256 = "sha256-c4kwS6nDgNda4+ktmVfzUTKeKzEuxavO5rEvrmlSOfk="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen pkg-config ]; diff --git a/distros/melodic/trac-ik-python/default.nix b/distros/melodic/trac-ik-python/default.nix index 121ed15420..6074b20271 100644 --- a/distros/melodic/trac-ik-python/default.nix +++ b/distros/melodic/trac-ik-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-trac-ik-python"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/melodic/trac_ik_python/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "9c51f2b23b3874f3dafc2240d9e590a0305fd52256a011f34023b62b32258e02"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/melodic/trac_ik_python/1.5.1-1"; + sha256 = "sha256-2NuygJuEibf/BZE0uCtnXiqVBJz0fjhfbD6OfEiKVpc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/trac-ik/default.nix b/distros/melodic/trac-ik/default.nix index 14a33cc40f..031482cb26 100644 --- a/distros/melodic/trac-ik/default.nix +++ b/distros/melodic/trac-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-trac-ik"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/melodic/trac_ik/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "5100591cc6fe9a21062cbd806709226bc0b9bc95ec1aa9f2688af6058b2c3f30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/melodic/trac_ik/1.5.1-1"; + sha256 = "sha256-wA0H20bO4T+VePFTrqgtcutRRE3grupYd3Xjt/G7PjQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tracetools/default.nix b/distros/melodic/tracetools/default.nix index c6401f1a9d..7d10481b8d 100644 --- a/distros/melodic/tracetools/default.nix +++ b/distros/melodic/tracetools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tracetools"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/boschresearch/ros1-tracetools-release/archive/release/melodic/tracetools/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "1432003c36ab6c12cd03dc132dba1e8dd87986ae2fbf3bb4537001369bd47fc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "boschresearch"; + repo = "ros1-tracetools-release"; + rev = "release/melodic/tracetools/0.2.1-1"; + sha256 = "sha256-rZV5DIFIOeySsNeb5rbsceSjFicuTMpXAmigknhiT7M="; + }; buildType = "catkin"; buildInputs = [ boost catkin pkg-config ]; diff --git a/distros/melodic/track-odometry/default.nix b/distros/melodic/track-odometry/default.nix index 548a925d68..752f171c6e 100644 --- a/distros/melodic/track-odometry/default.nix +++ b/distros/melodic/track-odometry/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, eigen, geometry-msgs, message-filters, nav-msgs, neonavigation-common, roscpp, roslint, rostest, sensor-msgs, std-msgs, tf2, tf2-geometry-msgs, tf2-ros, trajectory-msgs }: buildRosPackage { pname = "ros-melodic-track-odometry"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/track_odometry/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "76ef5d19cd6f6a48073d3e091df23b61801208f36bc810e74eeff49da77b92ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/track_odometry/0.12.0-1"; + sha256 = "sha256-H21kc3o0Bb4XxCkeAWmtpw+KEmjR0LyjVT/zYYChys0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/trajectory-msgs/default.nix b/distros/melodic/trajectory-msgs/default.nix index f978da2ed3..5a8c8de01e 100644 --- a/distros/melodic/trajectory-msgs/default.nix +++ b/distros/melodic/trajectory-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-trajectory-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/trajectory_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "8aebff2d175c8079754d4739b14947bc5b0391158ddb047d71567b4e5b0882c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/trajectory_msgs/1.12.8-1"; + sha256 = "sha256-xjsHut39Ol1XqV40vF6iWKPpjONuaNinoH5TxW0tS9g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/trajectory-tracker-msgs/default.nix b/distros/melodic/trajectory-tracker-msgs/default.nix index 3356061935..84106a98e5 100644 --- a/distros/melodic/trajectory-tracker-msgs/default.nix +++ b/distros/melodic/trajectory-tracker-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, nav-msgs, roscpp, roslint, rosunit, std-msgs }: buildRosPackage { pname = "ros-melodic-trajectory-tracker-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/melodic/trajectory_tracker_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "2086e554a50e2b029b0c610edfdbd0d88ce9cb00fb283309acfc501e60b02ac5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/melodic/trajectory_tracker_msgs/0.12.0-1"; + sha256 = "sha256-CSySzmjxiIBKd3AmpwkHd2xHu5eURVuUnXSwHm95taY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/trajectory-tracker-rviz-plugins/default.nix b/distros/melodic/trajectory-tracker-rviz-plugins/default.nix index 35655c8b26..f977dce486 100644 --- a/distros/melodic/trajectory-tracker-rviz-plugins/default.nix +++ b/distros/melodic/trajectory-tracker-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-trajectory-tracker-rviz-plugins"; version = "0.11.6-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_rviz_plugins-release/archive/release/melodic/trajectory_tracker_rviz_plugins/0.11.6-1.tar.gz"; - name = "0.11.6-1.tar.gz"; - sha256 = "644e1c112888474dc2bee1a80c94dfa76798cfeca77fad982e691b88088d220d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_rviz_plugins-release"; + rev = "release/melodic/trajectory_tracker_rviz_plugins/0.11.6-1"; + sha256 = "sha256-B82uDHEztq8cpGy2+hlPDaV++lB0T2p2BJZwgVI70q8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/trajectory-tracker/default.nix b/distros/melodic/trajectory-tracker/default.nix index 4b9fc511d1..7f754800f2 100644 --- a/distros/melodic/trajectory-tracker/default.nix +++ b/distros/melodic/trajectory-tracker/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, eigen, geometry-msgs, interactive-markers, nav-msgs, neonavigation-common, roscpp, roslint, rostest, std-srvs, tf2, tf2-geometry-msgs, tf2-ros, trajectory-tracker-msgs }: buildRosPackage { pname = "ros-melodic-trajectory-tracker"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/melodic/trajectory_tracker/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "b45fc77880950760b87365dd18a00bebcb59d6276f5f91c8470a4cc4faff43c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/melodic/trajectory_tracker/0.12.0-1"; + sha256 = "sha256-UBO1/K5nFuiwjKolZI1jlUGgdNDUwPktF+vykeLJG8A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/transmission-interface/default.nix b/distros/melodic/transmission-interface/default.nix index 885c735cff..b0eb1f3a90 100644 --- a/distros/melodic/transmission-interface/default.nix +++ b/distros/melodic/transmission-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-transmission-interface"; version = "0.18.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/melodic/transmission_interface/0.18.4-1.tar.gz"; - name = "0.18.4-1.tar.gz"; - sha256 = "29a214b71892ff82b0e71f07b2d8fa98487ac97e2936dc3ad82d0801792f405c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/melodic/transmission_interface/0.18.4-1"; + sha256 = "sha256-tYGGVL/OjY2A0rjn7Ob/bzqnW/E+IAI9Gu0j1jl2i5o="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/melodic/tsid/default.nix b/distros/melodic/tsid/default.nix index 3132c4bc4e..f37880185b 100644 --- a/distros/melodic/tsid/default.nix +++ b/distros/melodic/tsid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tsid"; version = "1.6.2-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/tsid-ros-release/archive/release/melodic/tsid/1.6.2-1.tar.gz"; - name = "1.6.2-1.tar.gz"; - sha256 = "8f8b3c24e70436228693c32976bab700a2876676c12c3b661237f379d723b138"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "tsid-ros-release"; + rev = "release/melodic/tsid/1.6.2-1"; + sha256 = "sha256-OItC0M0+JnOACPGfrmYGjsEUu6OI+J/5tZGReB0sNmo="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/melodic/tts/default.nix b/distros/melodic/tts/default.nix index d571600da1..5d0840da1b 100644 --- a/distros/melodic/tts/default.nix +++ b/distros/melodic/tts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tts"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/aws-gbp/tts-release/archive/release/melodic/tts/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "ff9513ecc2e040bc38e882badee1407e351c9c1abb6cd8c75ec1ac81dcfe5cd1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aws-gbp"; + repo = "tts-release"; + rev = "release/melodic/tts/1.0.2-1"; + sha256 = "sha256-oQY/oPRXNEc+n26XiKt9skrskbBFj6kpQrtsm1M6Q/Q="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest rosunit ]; diff --git a/distros/melodic/turtle-actionlib/default.nix b/distros/melodic/turtle-actionlib/default.nix index 7d415336f9..2051b27dc6 100644 --- a/distros/melodic/turtle-actionlib/default.nix +++ b/distros/melodic/turtle-actionlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtle-actionlib"; version = "0.1.11"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/melodic/turtle_actionlib/0.1.11-0.tar.gz"; - name = "0.1.11-0.tar.gz"; - sha256 = "692d2a6946d45017346aa4165b4331314b1fde5f0067717ce33bf7ebbce1bc94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/melodic/turtle_actionlib/0.1.11-0"; + sha256 = "sha256-F0DuxqGMCMOVNcjMezQUCivMsuBywpAETRHsMmGbVvY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/turtle-teleop-multi-key/default.nix b/distros/melodic/turtle-teleop-multi-key/default.nix index 057ba5869a..79f181e48d 100644 --- a/distros/melodic/turtle-teleop-multi-key/default.nix +++ b/distros/melodic/turtle-teleop-multi-key/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtle-teleop-multi-key"; version = "0.0.4-r3"; - src = fetchurl { - url = "https://github.com/EngHyu/turtle_teleop_multi_key-release/archive/release/melodic/turtle_teleop_multi_key/0.0.4-3.tar.gz"; - name = "0.0.4-3.tar.gz"; - sha256 = "fbb81a963e9695912038087e72a8bc3323f67022afb17184213fd38d4556b1bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "EngHyu"; + repo = "turtle_teleop_multi_key-release"; + rev = "release/melodic/turtle_teleop_multi_key/0.0.4-3"; + sha256 = "sha256-fsA78UrGVwMnzuIjwBTa38XgNoRAw3HrNV9SJnoFyFA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtle-tf/default.nix b/distros/melodic/turtle-tf/default.nix index a63ee9c40e..f507f0a56d 100644 --- a/distros/melodic/turtle-tf/default.nix +++ b/distros/melodic/turtle-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtle-tf"; version = "0.2.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry_tutorials-release/archive/release/melodic/turtle_tf/0.2.2-0.tar.gz"; - name = "0.2.2-0.tar.gz"; - sha256 = "182947fcfff5ec44a27e343306a78fd488fbcaff6d8ca894ed0646846293f02d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/melodic/turtle_tf/0.2.2-0"; + sha256 = "sha256-vfvp15LZBgpZ8ghp/P4gAnxEYfMveNG0c30+bQJWtwc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtle-tf2/default.nix b/distros/melodic/turtle-tf2/default.nix index 35eafb1956..025378e5b2 100644 --- a/distros/melodic/turtle-tf2/default.nix +++ b/distros/melodic/turtle-tf2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtle-tf2"; version = "0.2.2"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry_tutorials-release/archive/release/melodic/turtle_tf2/0.2.2-0.tar.gz"; - name = "0.2.2-0.tar.gz"; - sha256 = "898be65b26bacc4c8ec117c9696b0506f18c33cce83c507442c3b4b239c64ada"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/melodic/turtle_tf2/0.2.2-0"; + sha256 = "sha256-E4f/84fKrurMNKMbbIWEY3wWM76DmrJ6/dPRuMeBKcI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-applications-msgs/default.nix b/distros/melodic/turtlebot3-applications-msgs/default.nix index fdf85027c7..de120108b1 100644 --- a/distros/melodic/turtlebot3-applications-msgs/default.nix +++ b/distros/melodic/turtlebot3-applications-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-applications-msgs"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_applications_msgs-release/archive/release/melodic/turtlebot3_applications_msgs/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "1dc86e6606109d67a3f28c9bb18934265196c0d3b1338722bc8bc4f9454112cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_applications_msgs-release"; + rev = "release/melodic/turtlebot3_applications_msgs/1.0.0-1"; + sha256 = "sha256-ySfkXnUDVO8iWYDy2YaAk2TFidpSKZOiPBBtER9cszU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/turtlebot3-applications/default.nix b/distros/melodic/turtlebot3-applications/default.nix index e9df491f67..21282747b2 100644 --- a/distros/melodic/turtlebot3-applications/default.nix +++ b/distros/melodic/turtlebot3-applications/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-applications"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_applications-release/archive/release/melodic/turtlebot3_applications/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "6a187830b2a3b3dc070e2ad870e5e17a471fa63318a305b188b13e35b9c5bd69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_applications-release"; + rev = "release/melodic/turtlebot3_applications/1.1.0-0"; + sha256 = "sha256-ntZondLOMQNUAEtU/tjDXJH5Z25icSLQFoc+Om6MxbY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-automatic-parking-vision/default.nix b/distros/melodic/turtlebot3-automatic-parking-vision/default.nix index 74f9ec063e..34065ab051 100644 --- a/distros/melodic/turtlebot3-automatic-parking-vision/default.nix +++ b/distros/melodic/turtlebot3-automatic-parking-vision/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-automatic-parking-vision"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_applications-release/archive/release/melodic/turtlebot3_automatic_parking_vision/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "6e10d535cf4f41ac732ed8cc54edc197c35c8cf6969c2bf9b0649e37c97809ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_applications-release"; + rev = "release/melodic/turtlebot3_automatic_parking_vision/1.1.0-0"; + sha256 = "sha256-ysLE57I2Wn3wpdzlboI/+UT6LHyCEzl7lMou39SyxbE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-automatic-parking/default.nix b/distros/melodic/turtlebot3-automatic-parking/default.nix index 43fc5714dc..29ddf4496b 100644 --- a/distros/melodic/turtlebot3-automatic-parking/default.nix +++ b/distros/melodic/turtlebot3-automatic-parking/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-automatic-parking"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_applications-release/archive/release/melodic/turtlebot3_automatic_parking/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "5ab127fe3a3ff9c1eb767058c423d2e7625925a482c808ddf35047daaa4852be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_applications-release"; + rev = "release/melodic/turtlebot3_automatic_parking/1.1.0-0"; + sha256 = "sha256-BUjJ/zuSMuI1m7DKWnA9gsN9DrdecdzWEg5m/Sms1uo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-autorace-camera/default.nix b/distros/melodic/turtlebot3-autorace-camera/default.nix index 536e7b7ae7..e1f87af1c4 100644 --- a/distros/melodic/turtlebot3-autorace-camera/default.nix +++ b/distros/melodic/turtlebot3-autorace-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-autorace-camera"; version = "1.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace-release/archive/release/melodic/turtlebot3_autorace_camera/1.2.0-0.tar.gz"; - name = "1.2.0-0.tar.gz"; - sha256 = "fe6adfc679b7e08c054367e89c6a94da5cbecbd7f51411298fd4d795c61138de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace-release"; + rev = "release/melodic/turtlebot3_autorace_camera/1.2.0-0"; + sha256 = "sha256-868c2pFq8Qh/sBgiLKQnufeglYJjC8nm0HUbKnhdOh8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-autorace-control/default.nix b/distros/melodic/turtlebot3-autorace-control/default.nix index 941cc7be2e..a4814d6b7a 100644 --- a/distros/melodic/turtlebot3-autorace-control/default.nix +++ b/distros/melodic/turtlebot3-autorace-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-autorace-control"; version = "1.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace-release/archive/release/melodic/turtlebot3_autorace_control/1.2.0-0.tar.gz"; - name = "1.2.0-0.tar.gz"; - sha256 = "b56c3c0c52ea3cffbbca2e86a6236f6a8a0520edc2c8178682c1e0dda35dfd94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace-release"; + rev = "release/melodic/turtlebot3_autorace_control/1.2.0-0"; + sha256 = "sha256-x5eZDsBUyBR2Y5+iUg25CdHLRwUaFR3MXYlhDNxhhnY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-autorace-core/default.nix b/distros/melodic/turtlebot3-autorace-core/default.nix index 56a963f98e..f8c8f0be40 100644 --- a/distros/melodic/turtlebot3-autorace-core/default.nix +++ b/distros/melodic/turtlebot3-autorace-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-autorace-core"; version = "1.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace-release/archive/release/melodic/turtlebot3_autorace_core/1.2.0-0.tar.gz"; - name = "1.2.0-0.tar.gz"; - sha256 = "cd350672e9b7912409d33cd0e9f7f0deccddc9eac9999778f9fe08f0ea81912d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace-release"; + rev = "release/melodic/turtlebot3_autorace_core/1.2.0-0"; + sha256 = "sha256-kEb8+S1RTdIyGaDBrZrQl8bQSt/wu+XeFTD9RFnGtJI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-autorace-detect/default.nix b/distros/melodic/turtlebot3-autorace-detect/default.nix index 92a5d78707..27eaed9347 100644 --- a/distros/melodic/turtlebot3-autorace-detect/default.nix +++ b/distros/melodic/turtlebot3-autorace-detect/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-autorace-detect"; version = "1.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace-release/archive/release/melodic/turtlebot3_autorace_detect/1.2.0-0.tar.gz"; - name = "1.2.0-0.tar.gz"; - sha256 = "51d9465e570d60f2d1fe2500d9c9f285a801800c131f38fba376b0034eff3288"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace-release"; + rev = "release/melodic/turtlebot3_autorace_detect/1.2.0-0"; + sha256 = "sha256-97/3GqrLmdynA5gZuT/ZnkM9kZCNdLeZZtWBSH7hon0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-autorace/default.nix b/distros/melodic/turtlebot3-autorace/default.nix index 4ab7ddbb99..ca6af6c08b 100644 --- a/distros/melodic/turtlebot3-autorace/default.nix +++ b/distros/melodic/turtlebot3-autorace/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-autorace"; version = "1.2.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace-release/archive/release/melodic/turtlebot3_autorace/1.2.0-0.tar.gz"; - name = "1.2.0-0.tar.gz"; - sha256 = "1e9063e4da91e347177fe176cdcdea7510bd47e555bada4446679354de1b53ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace-release"; + rev = "release/melodic/turtlebot3_autorace/1.2.0-0"; + sha256 = "sha256-YhCPwXVjUAz5o8zlgSRwZ169j+mqgbWk4bCPm2o4xlo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-bringup/default.nix b/distros/melodic/turtlebot3-bringup/default.nix index 656084abcc..b4f4e01141 100644 --- a/distros/melodic/turtlebot3-bringup/default.nix +++ b/distros/melodic/turtlebot3-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-bringup"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/melodic/turtlebot3_bringup/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "6ea29c518a9182b0d3135c63be07b5c5d28af1230db1b8ba1e656fab5eb9042a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/melodic/turtlebot3_bringup/1.2.5-1"; + sha256 = "sha256-JUAzSvBDO5X4y1IglkIhT8RpbGjIjvkOv1Hv0KOaRT8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-description/default.nix b/distros/melodic/turtlebot3-description/default.nix index bf0139876f..0184e70acb 100644 --- a/distros/melodic/turtlebot3-description/default.nix +++ b/distros/melodic/turtlebot3-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-description"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/melodic/turtlebot3_description/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "ea95db46d10146b4d3725ea1b08fe5ce49eb298fc76bfce097047ac93e0267f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/melodic/turtlebot3_description/1.2.5-1"; + sha256 = "sha256-aYpo45uD6TsqM3/ItbjfhRABXraZMZfLcxpgAwfC/NM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-example/default.nix b/distros/melodic/turtlebot3-example/default.nix index 782b44e852..efb9cb9e6a 100644 --- a/distros/melodic/turtlebot3-example/default.nix +++ b/distros/melodic/turtlebot3-example/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-example"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/melodic/turtlebot3_example/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "fe2c517697cd5f64936641dfd194134d56de30dade5e46c621473451115438fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/melodic/turtlebot3_example/1.2.5-1"; + sha256 = "sha256-s+01xzaIyoB+ZYqvDup3zPc64trqrP7YVEwwQfBEpgE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/turtlebot3-fake/default.nix b/distros/melodic/turtlebot3-fake/default.nix index be54332856..c747af4d73 100644 --- a/distros/melodic/turtlebot3-fake/default.nix +++ b/distros/melodic/turtlebot3-fake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-fake"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_simulations-release/archive/release/melodic/turtlebot3_fake/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "f7974e0d8015e3a089be733f06c7155d83ec20dd103c54330d6a65cebc352de9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/melodic/turtlebot3_fake/1.3.2-1"; + sha256 = "sha256-k2Oo4SH8RFCFB+EJq5pu/h5ADYDLii9RzVkj47Zoep8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-follow-filter/default.nix b/distros/melodic/turtlebot3-follow-filter/default.nix index 3e49e1a25a..c542151728 100644 --- a/distros/melodic/turtlebot3-follow-filter/default.nix +++ b/distros/melodic/turtlebot3-follow-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-follow-filter"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_applications-release/archive/release/melodic/turtlebot3_follow_filter/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "a97a63ec2370bbc67e7270c6aa1d5efca85134228642ac263e9a6d2ccef39f45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_applications-release"; + rev = "release/melodic/turtlebot3_follow_filter/1.1.0-0"; + sha256 = "sha256-KiXrZZYTZ6nXosxiPUkn0CCBNJI5/1KQUwMkwwJmQS0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-follower/default.nix b/distros/melodic/turtlebot3-follower/default.nix index e8a67bb389..ca9c39ff5b 100644 --- a/distros/melodic/turtlebot3-follower/default.nix +++ b/distros/melodic/turtlebot3-follower/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-follower"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_applications-release/archive/release/melodic/turtlebot3_follower/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "f2059a2728165ba5974739c04cabd2e782f3c06bff35299c149836c98bc6a429"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_applications-release"; + rev = "release/melodic/turtlebot3_follower/1.1.0-0"; + sha256 = "sha256-SyB+Z4JwR1xAIgNR59Tq2pAWnznQIwbB22BL1OT3ZLc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-gazebo/default.nix b/distros/melodic/turtlebot3-gazebo/default.nix index d959f69948..20fe3a1646 100644 --- a/distros/melodic/turtlebot3-gazebo/default.nix +++ b/distros/melodic/turtlebot3-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-gazebo"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_simulations-release/archive/release/melodic/turtlebot3_gazebo/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "6c2fcf64534c1bf2c45e1525b6ace892fecb354cc998985f969a55755b6e7857"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/melodic/turtlebot3_gazebo/1.3.2-1"; + sha256 = "sha256-eyDNkPH3zZEUUCqFCy0/hQW/ufKcgF7C8rVTyMNMWuY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-msgs/default.nix b/distros/melodic/turtlebot3-msgs/default.nix index 39725a832c..b1eda54231 100644 --- a/distros/melodic/turtlebot3-msgs/default.nix +++ b/distros/melodic/turtlebot3-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_msgs-release/archive/release/melodic/turtlebot3_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "c5c91c55fd028b5e07dde17b1e0c380618ce4dcffddb0a315c267106181c5697"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_msgs-release"; + rev = "release/melodic/turtlebot3_msgs/1.0.1-1"; + sha256 = "sha256-TuKkhqY+h2teOgQsMu4wZ+onxN+V+kMDigJAUNrLiiw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/turtlebot3-navigation/default.nix b/distros/melodic/turtlebot3-navigation/default.nix index 183df53621..376bb9ba02 100644 --- a/distros/melodic/turtlebot3-navigation/default.nix +++ b/distros/melodic/turtlebot3-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-navigation"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/melodic/turtlebot3_navigation/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "0f1c3dab84decee26908d5c5c150ee8db3681caa7cdd4c0d67f34c1d0ab25aa3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/melodic/turtlebot3_navigation/1.2.5-1"; + sha256 = "sha256-CdHx+SA0zxRVGqbt5ZBOrh/gFc5Y11kM1jTu6q0vAMU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-panorama/default.nix b/distros/melodic/turtlebot3-panorama/default.nix index b0adc57b73..5fd815b201 100644 --- a/distros/melodic/turtlebot3-panorama/default.nix +++ b/distros/melodic/turtlebot3-panorama/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-panorama"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_applications-release/archive/release/melodic/turtlebot3_panorama/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "1ea012a9fb7e79c68cb54f5e608739f79f378ab6867bad8d1aeee3d7e5039c3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_applications-release"; + rev = "release/melodic/turtlebot3_panorama/1.1.0-0"; + sha256 = "sha256-w2cbDSS9R4jMnxbOFPuNfHLGrKkSosQ+6m1e/vzk7Xg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-simulations/default.nix b/distros/melodic/turtlebot3-simulations/default.nix index 37f179fc11..b917703081 100644 --- a/distros/melodic/turtlebot3-simulations/default.nix +++ b/distros/melodic/turtlebot3-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-simulations"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_simulations-release/archive/release/melodic/turtlebot3_simulations/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "cd6e3fdbe9a6e53715475eee65bf1a0aff709ac94b41567e7c1cb198f7300e96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/melodic/turtlebot3_simulations/1.3.2-1"; + sha256 = "sha256-3whDHJxK9b6qeoSdk7sdQroNBwRbo+QdLg1Zt2GOyU4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-slam/default.nix b/distros/melodic/turtlebot3-slam/default.nix index db83dd8eb8..3d1051dbb0 100644 --- a/distros/melodic/turtlebot3-slam/default.nix +++ b/distros/melodic/turtlebot3-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-slam"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/melodic/turtlebot3_slam/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "4b81004b14a65def505bfa532335233542da0b2b669733dc5128da3f992db603"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/melodic/turtlebot3_slam/1.2.5-1"; + sha256 = "sha256-KaUBzMvaTytc+uhLSg5u7jdW7re6DmbBPiO8vlwgRcA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3-teleop/default.nix b/distros/melodic/turtlebot3-teleop/default.nix index 61802f2039..ed363abf6e 100644 --- a/distros/melodic/turtlebot3-teleop/default.nix +++ b/distros/melodic/turtlebot3-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3-teleop"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/melodic/turtlebot3_teleop/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "7eaab5159344f9de40e735bd4fbec6c287dba5e90848b5e9eaf7a65bd5696901"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/melodic/turtlebot3_teleop/1.2.5-1"; + sha256 = "sha256-B8g7xfr12HA8mza+W03grdMy2vAg9zAyjQ3f5B4rcLo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlebot3/default.nix b/distros/melodic/turtlebot3/default.nix index 362c786a72..0b54472f36 100644 --- a/distros/melodic/turtlebot3/default.nix +++ b/distros/melodic/turtlebot3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlebot3"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/melodic/turtlebot3/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "e394c49a47c91bb821f4c037d47671e7150d6efc7e1eac31fa8688566abd56fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/melodic/turtlebot3/1.2.5-1"; + sha256 = "sha256-SU4ybJCdTW15hpQ0GnGfnmgggYfL4fQna7krrMH3kYc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlesim-dash-tutorial/default.nix b/distros/melodic/turtlesim-dash-tutorial/default.nix index 3d728188f6..6173f30d04 100644 --- a/distros/melodic/turtlesim-dash-tutorial/default.nix +++ b/distros/melodic/turtlesim-dash-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlesim-dash-tutorial"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/banerjs-ros-release/turtlesim_dash_tutorial-release/archive/release/melodic/turtlesim_dash_tutorial/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "60883c74f5ef621c347210e58ab60991c86a138305e0abf18d9f1f40f8fedb3c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "banerjs-ros-release"; + repo = "turtlesim_dash_tutorial-release"; + rev = "release/melodic/turtlesim_dash_tutorial/1.0.0-2"; + sha256 = "sha256-2sG46VbSBhyWbd2yiSJQXH+OXkHH6vjDjs5wU1n+KKo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/turtlesim/default.nix b/distros/melodic/turtlesim/default.nix index 55b29f2ffc..9ecc719fcf 100644 --- a/distros/melodic/turtlesim/default.nix +++ b/distros/melodic/turtlesim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-turtlesim"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_tutorials-release/archive/release/melodic/turtlesim/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "4e997ce7969937add7184053b6b82ee104696edd0918c69ad477ce2170fdb6a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_tutorials-release"; + rev = "release/melodic/turtlesim/0.9.3-1"; + sha256 = "sha256-H3gRNCiEFQnfwboM9I/ROH338EEHm6XydFQBghbY9m8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tuw-airskin-msgs/default.nix b/distros/melodic/tuw-airskin-msgs/default.nix index 8fc4d542cb..4a5ce79e60 100644 --- a/distros/melodic/tuw-airskin-msgs/default.nix +++ b/distros/melodic/tuw-airskin-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-airskin-msgs"; version = "0.0.13"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_msgs-release/archive/release/melodic/tuw_airskin_msgs/0.0.13-0.tar.gz"; - name = "0.0.13-0.tar.gz"; - sha256 = "86882acd5c73168422e7ed6be2d10f89d9c5f1bd07951be9479eaf10fa9a082d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_msgs-release"; + rev = "release/melodic/tuw_airskin_msgs/0.0.13-0"; + sha256 = "sha256-DQsdPLEkserEpEc67wUGQGHtvIjGgaqoMLe5swh4StA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tuw-aruco/default.nix b/distros/melodic/tuw-aruco/default.nix index 122af9bb8e..03a4a2a13b 100644 --- a/distros/melodic/tuw-aruco/default.nix +++ b/distros/melodic/tuw-aruco/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-aruco"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_marker_detection-release/archive/release/melodic/tuw_aruco/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "98fd74948391d0642bc7d6c8f4b679bdbe748da0b17856ddcb782c1e797fbf1a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_marker_detection-release"; + rev = "release/melodic/tuw_aruco/0.1.1-1"; + sha256 = "sha256-52XtLhGoUboykIN8E/Z4w9zwAB93wh2TT4MUZywOGIw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tuw-checkerboard/default.nix b/distros/melodic/tuw-checkerboard/default.nix index cf387159d9..d9d89964c3 100644 --- a/distros/melodic/tuw-checkerboard/default.nix +++ b/distros/melodic/tuw-checkerboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-checkerboard"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_marker_detection-release/archive/release/melodic/tuw_checkerboard/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "e7d76c6bb8a14e31094674fc33504b7cca4335d4d0c2362ceda6811633fc483c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_marker_detection-release"; + rev = "release/melodic/tuw_checkerboard/0.1.1-1"; + sha256 = "sha256-HPz21moK3O9n3ixudFErqZC5mkP/kniy4fi728qtZbw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tuw-ellipses/default.nix b/distros/melodic/tuw-ellipses/default.nix index 391ca3d374..cf81e847c2 100644 --- a/distros/melodic/tuw-ellipses/default.nix +++ b/distros/melodic/tuw-ellipses/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-ellipses"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_marker_detection-release/archive/release/melodic/tuw_ellipses/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "6f40eb7c0d83f05f8dac8ce03ca8fd2c6a30876e06174e16d80d8909b84d8749"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_marker_detection-release"; + rev = "release/melodic/tuw_ellipses/0.1.1-1"; + sha256 = "sha256-ZhJXJoaT4bG7f0MKMsqhNIVIAXwiyzggRmLqxij867c="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen ]; diff --git a/distros/melodic/tuw-gazebo-msgs/default.nix b/distros/melodic/tuw-gazebo-msgs/default.nix index a75d4b3d55..19d1b04a33 100644 --- a/distros/melodic/tuw-gazebo-msgs/default.nix +++ b/distros/melodic/tuw-gazebo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-gazebo-msgs"; version = "0.0.13"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_msgs-release/archive/release/melodic/tuw_gazebo_msgs/0.0.13-0.tar.gz"; - name = "0.0.13-0.tar.gz"; - sha256 = "126d0a9d1083f1d6e1c05b617f46f4c00e72dbd5a26a4dfa16490465d7dcc181"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_msgs-release"; + rev = "release/melodic/tuw_gazebo_msgs/0.0.13-0"; + sha256 = "sha256-RgMBIO5Uiik4rI4laYRo1m+ZwQ456CG56Fh/1jFNCpE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tuw-geometry-msgs/default.nix b/distros/melodic/tuw-geometry-msgs/default.nix index 1ad78d7a0a..1736c08b7a 100644 --- a/distros/melodic/tuw-geometry-msgs/default.nix +++ b/distros/melodic/tuw-geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-geometry-msgs"; version = "0.0.13"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_msgs-release/archive/release/melodic/tuw_geometry_msgs/0.0.13-0.tar.gz"; - name = "0.0.13-0.tar.gz"; - sha256 = "423e031652dcf0357d6e857d9a40e120bd249816739ca42785c2961006ddfbce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_msgs-release"; + rev = "release/melodic/tuw_geometry_msgs/0.0.13-0"; + sha256 = "sha256-A9EpZfnYteQuVe6SeoJP/uqwmEsvvedypSRzSrmBvuQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tuw-geometry/default.nix b/distros/melodic/tuw-geometry/default.nix index deaa0e0994..05af472755 100644 --- a/distros/melodic/tuw-geometry/default.nix +++ b/distros/melodic/tuw-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-geometry"; version = "0.0.3"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_geometry-release/archive/release/melodic/tuw_geometry/0.0.3-0.tar.gz"; - name = "0.0.3-0.tar.gz"; - sha256 = "96df80626ab8ecd101acb1f972c815be0d105e9e5539e73d691ea3b2ef5d3e84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_geometry-release"; + rev = "release/melodic/tuw_geometry/0.0.3-0"; + sha256 = "sha256-1VyEdZJbBU90yTHVYzBuK41YB+MHIZ92xkui7EykPTE="; + }; buildType = "catkin"; buildInputs = [ boost catkin eigen ]; diff --git a/distros/melodic/tuw-marker-detection/default.nix b/distros/melodic/tuw-marker-detection/default.nix index 06c0a367e5..1f98986f3d 100644 --- a/distros/melodic/tuw-marker-detection/default.nix +++ b/distros/melodic/tuw-marker-detection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-marker-detection"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_marker_detection-release/archive/release/melodic/tuw_marker_detection/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "4b831ec3d6f8678dad02b5e96201e7944af7210da72b19a90d72d48ed4628ec9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_marker_detection-release"; + rev = "release/melodic/tuw_marker_detection/0.1.1-1"; + sha256 = "sha256-nTdbRMybKoHGWdmluoH+dgaLyy/3InE7c3sb1icb0WU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tuw-marker-pose-estimation/default.nix b/distros/melodic/tuw-marker-pose-estimation/default.nix index ead9d6ca16..4a54b9b366 100644 --- a/distros/melodic/tuw-marker-pose-estimation/default.nix +++ b/distros/melodic/tuw-marker-pose-estimation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-marker-pose-estimation"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_marker_detection-release/archive/release/melodic/tuw_marker_pose_estimation/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "58ea5472112e231d213667c8977c5910de7398b71471b12a8a9e55dab48defd2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_marker_detection-release"; + rev = "release/melodic/tuw_marker_pose_estimation/0.1.1-1"; + sha256 = "sha256-VZ6SJ6+8Y96vq9YsEucfLiU6IBq0tQyqRCo9eY/00do="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tuw-msgs/default.nix b/distros/melodic/tuw-msgs/default.nix index 6c1112c108..c6ae4417b4 100644 --- a/distros/melodic/tuw-msgs/default.nix +++ b/distros/melodic/tuw-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-msgs"; version = "0.0.13"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_msgs-release/archive/release/melodic/tuw_msgs/0.0.13-0.tar.gz"; - name = "0.0.13-0.tar.gz"; - sha256 = "d220a642fe9b13209de81e68572102fffe34285934865e2ed9b8ebe9afe9baf4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_msgs-release"; + rev = "release/melodic/tuw_msgs/0.0.13-0"; + sha256 = "sha256-5SGieh9loDG2QLEjIrcg/0UnjKo9BqMteikkzujXS2E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/tuw-multi-robot-msgs/default.nix b/distros/melodic/tuw-multi-robot-msgs/default.nix index 1232d41cc0..99efbc8a5f 100644 --- a/distros/melodic/tuw-multi-robot-msgs/default.nix +++ b/distros/melodic/tuw-multi-robot-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-multi-robot-msgs"; version = "0.0.13"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_msgs-release/archive/release/melodic/tuw_multi_robot_msgs/0.0.13-0.tar.gz"; - name = "0.0.13-0.tar.gz"; - sha256 = "c46ab49af256d3f580c7eade0281686d12dfa70472080d9c6b4a6c9c3e153f43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_msgs-release"; + rev = "release/melodic/tuw_multi_robot_msgs/0.0.13-0"; + sha256 = "sha256-Fc+ZurE1HnGJ6L1ZOg/JLH4vHZ4DKtFKXwMPqdt8IM8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tuw-nav-msgs/default.nix b/distros/melodic/tuw-nav-msgs/default.nix index 99bcabf5a5..8d9665891f 100644 --- a/distros/melodic/tuw-nav-msgs/default.nix +++ b/distros/melodic/tuw-nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-nav-msgs"; version = "0.0.13"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_msgs-release/archive/release/melodic/tuw_nav_msgs/0.0.13-0.tar.gz"; - name = "0.0.13-0.tar.gz"; - sha256 = "6dd62f9b473be78c32bafb0b1f9c9410d2ed6f2b87586ce77f51e84f49132c39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_msgs-release"; + rev = "release/melodic/tuw_nav_msgs/0.0.13-0"; + sha256 = "sha256-9KR3r4CW5MbqfZCqpXM+SVylhCIzGUNEEYeub1Jrw+c="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tuw-object-msgs/default.nix b/distros/melodic/tuw-object-msgs/default.nix index d666dfda5b..42a82ca779 100644 --- a/distros/melodic/tuw-object-msgs/default.nix +++ b/distros/melodic/tuw-object-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-object-msgs"; version = "0.0.13"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_msgs-release/archive/release/melodic/tuw_object_msgs/0.0.13-0.tar.gz"; - name = "0.0.13-0.tar.gz"; - sha256 = "cd872b1996ab016b75719c00f199bef95322fabf5efc964a169a6dd362fdec8f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_msgs-release"; + rev = "release/melodic/tuw_object_msgs/0.0.13-0"; + sha256 = "sha256-c6XJfuFxbqSIf0egUIUIysRdmtZL/v9F0dG5E/EZXqc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tuw-vehicle-msgs/default.nix b/distros/melodic/tuw-vehicle-msgs/default.nix index 5a82753ff9..07eaa6fdd1 100644 --- a/distros/melodic/tuw-vehicle-msgs/default.nix +++ b/distros/melodic/tuw-vehicle-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tuw-vehicle-msgs"; version = "0.0.13"; - src = fetchurl { - url = "https://github.com/tuw-robotics/tuw_msgs-release/archive/release/melodic/tuw_vehicle_msgs/0.0.13-0.tar.gz"; - name = "0.0.13-0.tar.gz"; - sha256 = "47c7c12836c59f936116f877d105cdf3399455996e434fdb75c72fe958b94c4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "tuw_msgs-release"; + rev = "release/melodic/tuw_vehicle_msgs/0.0.13-0"; + sha256 = "sha256-D9u2z/LTu49b9D2JFY/SJY1fzk7YC5agcbBGXf4GFvY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/tvm-vendor/default.nix b/distros/melodic/tvm-vendor/default.nix index c75742b6ba..c017f14306 100644 --- a/distros/melodic/tvm-vendor/default.nix +++ b/distros/melodic/tvm-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-tvm-vendor"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/autowarefoundation/tvm_vendor-release/archive/release/melodic/tvm_vendor/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "511a053350273ffa7480269d5730915ca32972142ae9894be91b1690cfadd378"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autowarefoundation"; + repo = "tvm_vendor-release"; + rev = "release/melodic/tvm_vendor/0.7.2-1"; + sha256 = "sha256-j4nYJoBch1w/tq7IR1V0lQqjz/cj6+GPsgox3dKNtEU="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/melodic/twist-controller/default.nix b/distros/melodic/twist-controller/default.nix index bc66b9dc33..a07ee125eb 100644 --- a/distros/melodic/twist-controller/default.nix +++ b/distros/melodic/twist-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-twist-controller"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/melodic/twist_controller/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "29963ca38d385ca8d2ee9e79ca9aab624a347d42bb38e5193b98238820ed30c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/melodic/twist_controller/0.1.5-1"; + sha256 = "sha256-9ZeNKdV61DwK8A4FzIF2BhS/N6mso+lQk0SA+KP4xcQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/twist-mux-msgs/default.nix b/distros/melodic/twist-mux-msgs/default.nix index fce2cb9464..cc3de91b03 100644 --- a/distros/melodic/twist-mux-msgs/default.nix +++ b/distros/melodic/twist-mux-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-twist-mux-msgs"; version = "2.1.0-r6"; - src = fetchurl { - url = "https://github.com/ros-gbp/twist_mux_msgs-release/archive/release/melodic/twist_mux_msgs/2.1.0-6.tar.gz"; - name = "2.1.0-6.tar.gz"; - sha256 = "521a28a3dcc722a2eac2208e66f7f511a2010c3fda6e0b81fe45548c3ead692a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "twist_mux_msgs-release"; + rev = "release/melodic/twist_mux_msgs/2.1.0-6"; + sha256 = "sha256-nFTjNHn8Nj72WiOy79WlpfEU1l66Ra/e7n67sfL4Dn0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/twist-mux/default.nix b/distros/melodic/twist-mux/default.nix index b05931b686..aa8aae5a53 100644 --- a/distros/melodic/twist-mux/default.nix +++ b/distros/melodic/twist-mux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-twist-mux"; version = "3.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/twist_mux-release/archive/release/melodic/twist_mux/3.1.2-1.tar.gz"; - name = "3.1.2-1.tar.gz"; - sha256 = "f789b4f46623508b3c7e8071a4e2960788930e04a5795fc8d6bc323994a272cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "twist_mux-release"; + rev = "release/melodic/twist_mux/3.1.2-1"; + sha256 = "sha256-CCIS9YXTYqoQyvK4VNkMOwAI4anz2NfTeVJtom7YmWA="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/melodic/twist-recovery/default.nix b/distros/melodic/twist-recovery/default.nix index 96f5edae21..59cef4df05 100644 --- a/distros/melodic/twist-recovery/default.nix +++ b/distros/melodic/twist-recovery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-twist-recovery"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/melodic/twist_recovery/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "490d8eb344c2c9d14ece49b3993f764cb8a659738ecc72c25697b94c9f50d401"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/melodic/twist_recovery/0.3.6-1"; + sha256 = "sha256-90x+KOunqYn3LUuKgrnLc1phNsBseJd1k34qR8qidCw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ubiquity-motor/default.nix b/distros/melodic/ubiquity-motor/default.nix index 0542c58804..5dc4b86b5a 100644 --- a/distros/melodic/ubiquity-motor/default.nix +++ b/distros/melodic/ubiquity-motor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ubiquity-motor"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/ubiquity_motor-release/archive/release/melodic/ubiquity_motor/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "fc7f93bc91f0b0839504df0bcec459794df081b9dfb9fe6bad99c747bb55f0bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "ubiquity_motor-release"; + rev = "release/melodic/ubiquity_motor/0.10.0-1"; + sha256 = "sha256-qmjXLV46sVDYH2z0fsUTfwmF1hHpUFSI0BaaL+UBpuc="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp ]; diff --git a/distros/melodic/ublox-gps/default.nix b/distros/melodic/ublox-gps/default.nix index 06e245385f..631695d87f 100644 --- a/distros/melodic/ublox-gps/default.nix +++ b/distros/melodic/ublox-gps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ublox-gps"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/KumarRobotics/ublox-release/archive/release/melodic/ublox_gps/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "ac19d9ba729337ae2b8bc7c3466c2042c3e26d960f4ea6862b6a362d7a5cec4d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KumarRobotics"; + repo = "ublox-release"; + rev = "release/melodic/ublox_gps/1.5.0-1"; + sha256 = "sha256-cOV6LUh53kzyrwCUI63aDm9zqHfMlGgG8Fo4NIqWEHk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ublox-msgs/default.nix b/distros/melodic/ublox-msgs/default.nix index 6650b537ed..480b910c59 100644 --- a/distros/melodic/ublox-msgs/default.nix +++ b/distros/melodic/ublox-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ublox-msgs"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/KumarRobotics/ublox-release/archive/release/melodic/ublox_msgs/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "59386408efdc588104e4e2a02cd698f428b3ae7bfc27e5d1918f15101e60cd9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KumarRobotics"; + repo = "ublox-release"; + rev = "release/melodic/ublox_msgs/1.5.0-1"; + sha256 = "sha256-Pti1Oh0+JtLsCL2TvUdFUTE1KrqThw6cBTkUqTpP6V8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ublox-serialization/default.nix b/distros/melodic/ublox-serialization/default.nix index 1569c9fe3a..e1f8cf6bc4 100644 --- a/distros/melodic/ublox-serialization/default.nix +++ b/distros/melodic/ublox-serialization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ublox-serialization"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/KumarRobotics/ublox-release/archive/release/melodic/ublox_serialization/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "8da0916388a541cc8fd9508af13950edc16fb6da5517390f23cd1332d10dc069"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KumarRobotics"; + repo = "ublox-release"; + rev = "release/melodic/ublox_serialization/1.5.0-1"; + sha256 = "sha256-5+/6oF8J4m3RAg7K0wKJoWtSuSmTqTejU22h4+n/hTM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ublox/default.nix b/distros/melodic/ublox/default.nix index 1598d30936..8d0d293440 100644 --- a/distros/melodic/ublox/default.nix +++ b/distros/melodic/ublox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ublox"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/KumarRobotics/ublox-release/archive/release/melodic/ublox/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "e7ae5c8870070c6229a4a3ff637088e3e8060220889dfed4a9a6a3f563a94d6d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KumarRobotics"; + repo = "ublox-release"; + rev = "release/melodic/ublox/1.5.0-1"; + sha256 = "sha256-HS8LAMK2ydxUm81nYipqV8xMyLFyie20IEByw7bTKC4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ubnt-airos-tools/default.nix b/distros/melodic/ubnt-airos-tools/default.nix index aeb6e031ec..5c2e6ea072 100644 --- a/distros/melodic/ubnt-airos-tools/default.nix +++ b/distros/melodic/ubnt-airos-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ubnt-airos-tools"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/peci1/ubnt_airos_tools-release/archive/release/melodic/ubnt_airos_tools/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "93160bad92af03db3438a1e00b4d3bd41305408b221400eb3c2193690c249369"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "ubnt_airos_tools-release"; + rev = "release/melodic/ubnt_airos_tools/1.0.1-1"; + sha256 = "sha256-01X2oIbDT7wd40s/FWGSF98A9a+t/evhxasiw6Dytvo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/udp-com/default.nix b/distros/melodic/udp-com/default.nix index 358eb58c83..75c996f8c8 100644 --- a/distros/melodic/udp-com/default.nix +++ b/distros/melodic/udp-com/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-udp-com"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/flynneva/udp_com-release/archive/release/melodic/udp_com/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "2a27e17103618c78691b9d353174c16fb4565148e8be0825fc629dc55ebbb068"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "udp_com-release"; + rev = "release/melodic/udp_com/1.1.2-1"; + sha256 = "sha256-/+NB3JgSv1jewDwinkKvkUoa/+BT6++94bgZcIpyYk8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ueye-cam/default.nix b/distros/melodic/ueye-cam/default.nix index 584e53e8a4..66f1a79477 100644 --- a/distros/melodic/ueye-cam/default.nix +++ b/distros/melodic/ueye-cam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ueye-cam"; version = "1.0.17-r1"; - src = fetchurl { - url = "https://github.com/anqixu/ueye_cam-release/archive/release/melodic/ueye_cam/1.0.17-1.tar.gz"; - name = "1.0.17-1.tar.gz"; - sha256 = "03d172816684251094ab052bb7b8d6c9be51d752e47f5bea0153f24ccc2932f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anqixu"; + repo = "ueye_cam-release"; + rev = "release/melodic/ueye_cam/1.0.17-1"; + sha256 = "sha256-um+1HYcVMN2jTLeQJJPtuJ2IZAhsnpuXYjjGoU5Qu24="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/um6/default.nix b/distros/melodic/um6/default.nix index 1c0e4dfe68..876d0b8fa9 100644 --- a/distros/melodic/um6/default.nix +++ b/distros/melodic/um6/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-um6"; version = "1.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/um6-release/archive/release/melodic/um6/1.1.3-1.tar.gz"; - name = "1.1.3-1.tar.gz"; - sha256 = "2dab6e1c445eb2ac9fb634a8df474aec4e9f269f5a19832109ba8ba324ffcadd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "um6-release"; + rev = "release/melodic/um6/1.1.3-1"; + sha256 = "sha256-Jq7xl6e/7pAf8wyE+Ykf3vGDB2nDYEyc3Z2zV8tYeBE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/melodic/um7/default.nix b/distros/melodic/um7/default.nix index c426c64521..c69671ea3d 100644 --- a/distros/melodic/um7/default.nix +++ b/distros/melodic/um7/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-um7"; version = "0.0.7-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/um7-release/archive/release/melodic/um7/0.0.7-1.tar.gz"; - name = "0.0.7-1.tar.gz"; - sha256 = "2c3e906d3ea464379b5d44ae8834da5e8136d03b7ac108bc50d2f0116318a914"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "um7-release"; + rev = "release/melodic/um7/0.0.7-1"; + sha256 = "sha256-YWxUBWOI1Vn2U184XPqCVLb0y4wDmZD1bqxjIKouXbE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/underwater-sensor-msgs/default.nix b/distros/melodic/underwater-sensor-msgs/default.nix index 7e9ea9da00..1d6e4fd1e2 100644 --- a/distros/melodic/underwater-sensor-msgs/default.nix +++ b/distros/melodic/underwater-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-underwater-sensor-msgs"; version = "1.4.2-r3"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/underwater_simulation-release/archive/release/melodic/underwater_sensor_msgs/1.4.2-3.tar.gz"; - name = "1.4.2-3.tar.gz"; - sha256 = "744d8c7ecf3b8262a69c7366f3263a6e2cb74b1277407de7a804862e4b34d033"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "underwater_simulation-release"; + rev = "release/melodic/underwater_sensor_msgs/1.4.2-3"; + sha256 = "sha256-6Hy/87ZPdAVSfrPIerkVVerC0PPd2+HMJ6Q/e/ViyGI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/underwater-vehicle-dynamics/default.nix b/distros/melodic/underwater-vehicle-dynamics/default.nix index 619b8e7faa..16bcc0f0e5 100644 --- a/distros/melodic/underwater-vehicle-dynamics/default.nix +++ b/distros/melodic/underwater-vehicle-dynamics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-underwater-vehicle-dynamics"; version = "1.4.2-r3"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/underwater_simulation-release/archive/release/melodic/underwater_vehicle_dynamics/1.4.2-3.tar.gz"; - name = "1.4.2-3.tar.gz"; - sha256 = "614c6318a07c0fb3a1db67f93c96e24feb3cadeabe2f5d77a31954d88926e57d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "underwater_simulation-release"; + rev = "release/melodic/underwater_vehicle_dynamics/1.4.2-3"; + sha256 = "sha256-n9eIj2/lZMNvqrp9pJcQceeS0m1rkM5sindXZHrFEEY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/unique-id/default.nix b/distros/melodic/unique-id/default.nix index 7d0785a495..7a6f80fc67 100644 --- a/distros/melodic/unique-id/default.nix +++ b/distros/melodic/unique-id/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-unique-id"; version = "1.0.6"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/unique_identifier-release/archive/release/melodic/unique_id/1.0.6-0.tar.gz"; - name = "1.0.6-0.tar.gz"; - sha256 = "8f995d23c4bdefadf40cd213fead2b4f4be1285f536a3578823fdaa46cc9019c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "unique_identifier-release"; + rev = "release/melodic/unique_id/1.0.6-0"; + sha256 = "sha256-Utf63NtbxEw1gmgIlpLsrswjQvw973ZfBGJ2cbCPYd8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/unique-identifier/default.nix b/distros/melodic/unique-identifier/default.nix index 42319e1e27..fe410b9cf1 100644 --- a/distros/melodic/unique-identifier/default.nix +++ b/distros/melodic/unique-identifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-unique-identifier"; version = "1.0.6"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/unique_identifier-release/archive/release/melodic/unique_identifier/1.0.6-0.tar.gz"; - name = "1.0.6-0.tar.gz"; - sha256 = "d1e54e7f1f8f2d9a6e7d481ee0c300dc7440f3033915afba621257aac6ff7d8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "unique_identifier-release"; + rev = "release/melodic/unique_identifier/1.0.6-0"; + sha256 = "sha256-PxqzwB/Ek35RtgN1JvHsoYwcdlCUsfSpayNNJEjqqtk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/universal-robots/default.nix b/distros/melodic/universal-robots/default.nix index 0196a561e0..4b0b5467d9 100644 --- a/distros/melodic/universal-robots/default.nix +++ b/distros/melodic/universal-robots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-universal-robots"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/universal_robots/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "ecdcc84965d34016d04bf4d40060287066ad2b95c82c4dd7b73e3689dcb14bf8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/universal_robots/1.3.1-1"; + sha256 = "sha256-IpROXEJ8yu4Nv8+ARV6bxFwZMcfwK+8bxsMdebHa9DI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uos-common-urdf/default.nix b/distros/melodic/uos-common-urdf/default.nix index 8177dec789..cd6b552e2d 100644 --- a/distros/melodic/uos-common-urdf/default.nix +++ b/distros/melodic/uos-common-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uos-common-urdf"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/uos-tools/archive/release/melodic/uos_common_urdf/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "649e62977084896ee211f71a8dfe3771d6a1e20846242c172a190539a27d25c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "uos-tools"; + rev = "release/melodic/uos_common_urdf/1.0.1-1"; + sha256 = "sha256-gbshN8ogiDLAyUJN7zMjms+ZJrLsVMoBTGQQwPoUmMU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uos-diffdrive-teleop/default.nix b/distros/melodic/uos-diffdrive-teleop/default.nix index 7c0dffc683..a299046d01 100644 --- a/distros/melodic/uos-diffdrive-teleop/default.nix +++ b/distros/melodic/uos-diffdrive-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uos-diffdrive-teleop"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/uos-tools/archive/release/melodic/uos_diffdrive_teleop/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "97046be610e69043ee9998448c35c4427b8acfab629215481681f528de564b75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "uos-tools"; + rev = "release/melodic/uos_diffdrive_teleop/1.0.1-1"; + sha256 = "sha256-AAqcaABGMJxmizt9vR7HhYEbBlzRCcOACiXMA45FatM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uos-freespace/default.nix b/distros/melodic/uos-freespace/default.nix index 1ec86f1c55..596d709800 100644 --- a/distros/melodic/uos-freespace/default.nix +++ b/distros/melodic/uos-freespace/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uos-freespace"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/uos-tools/archive/release/melodic/uos_freespace/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "3564c0d97b94ca9fba2a23a4f35d699d491bbd796883f11fa14cc07607f9933b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "uos-tools"; + rev = "release/melodic/uos_freespace/1.0.1-1"; + sha256 = "sha256-nv5OxGe04nrd2Cad+cAd30p+kRi89d/QZcS7MajMl5s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uos-gazebo-worlds/default.nix b/distros/melodic/uos-gazebo-worlds/default.nix index 6580beab25..7970b2ff1e 100644 --- a/distros/melodic/uos-gazebo-worlds/default.nix +++ b/distros/melodic/uos-gazebo-worlds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uos-gazebo-worlds"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/uos-tools/archive/release/melodic/uos_gazebo_worlds/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "944340682e6216565bf271134cbcdad800f6689f86818a50a92e29f717008833"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "uos-tools"; + rev = "release/melodic/uos_gazebo_worlds/1.0.1-1"; + sha256 = "sha256-qbRkGncHGgF38t+Co32c6ius/n9HUmpu6+koHWKBYOg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uos-maps/default.nix b/distros/melodic/uos-maps/default.nix index 2e6c0eaccf..2e668bdf3e 100644 --- a/distros/melodic/uos-maps/default.nix +++ b/distros/melodic/uos-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uos-maps"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/uos-tools/archive/release/melodic/uos_maps/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "2ab21963ff350773c0f0f8bc4b3db7a038aaa614e8655d5a24c85f0f052d6441"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "uos-tools"; + rev = "release/melodic/uos_maps/1.0.1-1"; + sha256 = "sha256-fOpXXZEQLeKmaFGK0dK39NNlS5w5k20CX3pjKd0kCig="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uos-tools/default.nix b/distros/melodic/uos-tools/default.nix index 1a6fff3d5d..32b68f3e8c 100644 --- a/distros/melodic/uos-tools/default.nix +++ b/distros/melodic/uos-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uos-tools"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/uos-tools/archive/release/melodic/uos_tools/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "ab16981ee26882e551d9587b934b63e5eb7f255f726013d5b5f6bf3c6a3b0c0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "uos-tools"; + rev = "release/melodic/uos_tools/1.0.1-1"; + sha256 = "sha256-JdU4UlOGCzbj8F2VQi8pWQfDsbeuVP+ou3lMmU4cYZM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur-calibration/default.nix b/distros/melodic/ur-calibration/default.nix new file mode 100644 index 0000000000..c53a6310b0 --- /dev/null +++ b/distros/melodic/ur-calibration/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, eigen, libyamlcpp, roscpp, rosunit, ur-client-library, ur-robot-driver }: +buildRosPackage { + pname = "ros-melodic-ur-calibration"; + version = "2.1.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_Driver-release"; + rev = "release/melodic/ur_calibration/2.1.2-1"; + sha256 = "sha256-Zp6pj1kBgPWeOk59VARXax7RwKKItJZXSMX9c7VdO3A="; + }; + + buildType = "catkin"; + buildInputs = [ catkin ]; + checkInputs = [ rosunit ]; + propagatedBuildInputs = [ eigen libyamlcpp roscpp ur-client-library ur-robot-driver ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Package for extracting the factory calibration from a UR robot and change it such that it can be used by ur_description to gain a correct URDF''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/melodic/ur-client-library/default.nix b/distros/melodic/ur-client-library/default.nix index 31b4a67499..09b5571833 100644 --- a/distros/melodic/ur-client-library/default.nix +++ b/distros/melodic/ur-client-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur-client-library"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_Client_Library-release/archive/release/melodic/ur_client_library/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "73215038c71a1ce226d161a57e14e02b4ceedda416a8f4811a5d859d44d6a5f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_Client_Library-release"; + rev = "release/melodic/ur_client_library/1.3.1-1"; + sha256 = "sha256-AYfd94IM+Etv+B7ZUeZWVMNr98mHHmGlCi5CUh8hhWo="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/ur-dashboard-msgs/default.nix b/distros/melodic/ur-dashboard-msgs/default.nix new file mode 100644 index 0000000000..1c8d0b91ac --- /dev/null +++ b/distros/melodic/ur-dashboard-msgs/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, message-generation, message-runtime, std-msgs }: +buildRosPackage { + pname = "ros-melodic-ur-dashboard-msgs"; + version = "2.1.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_Driver-release"; + rev = "release/melodic/ur_dashboard_msgs/2.1.2-1"; + sha256 = "sha256-Fi3SqrgCS/j3gEVgRGKf6JRyPfu66O+xaPCNLFZo7Ak="; + }; + + buildType = "catkin"; + buildInputs = [ catkin message-generation ]; + propagatedBuildInputs = [ actionlib-msgs message-runtime std-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Messages around the UR Dashboard server.''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/melodic/ur-description/default.nix b/distros/melodic/ur-description/default.nix index cd8debab49..fee30ac55d 100644 --- a/distros/melodic/ur-description/default.nix +++ b/distros/melodic/ur-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur-description"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur_description/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "54424cf0c2c6bcb0bb46c36b30f2a639bdcd6202feacd3b578bc3c1fd198a2b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur_description/1.3.1-1"; + sha256 = "sha256-oBfwM4xdLzEP2wgCWkIfMCPQDILmVaxIayQJOLucr5I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur-gazebo/default.nix b/distros/melodic/ur-gazebo/default.nix index 560c509368..96ef924754 100644 --- a/distros/melodic/ur-gazebo/default.nix +++ b/distros/melodic/ur-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur-gazebo"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur_gazebo/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "3928c72b9df055ed5445b4d0ff0118fd9cdc99feb0eb9b472dbe7a348817cf19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur_gazebo/1.3.1-1"; + sha256 = "sha256-Vu37y39DoI9TCxE0DAIUkgZBSShKb+uw3glc/7TKZlw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur-msgs/default.nix b/distros/melodic/ur-msgs/default.nix index 00c2f37787..8a91cab0ee 100644 --- a/distros/melodic/ur-msgs/default.nix +++ b/distros/melodic/ur-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur-msgs"; version = "1.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ur_msgs-release/archive/release/melodic/ur_msgs/1.3.4-1.tar.gz"; - name = "1.3.4-1.tar.gz"; - sha256 = "a532eae48580e45bb3a1493d46aeeed4ec80e53a21e7887c859e93be455f9262"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ur_msgs-release"; + rev = "release/melodic/ur_msgs/1.3.4-1"; + sha256 = "sha256-pO62WDlSmq6jTyravoCaS4ZXGrP+9blXSh3buP4yT/g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ur-robot-driver/default.nix b/distros/melodic/ur-robot-driver/default.nix new file mode 100644 index 0000000000..835f807039 --- /dev/null +++ b/distros/melodic/ur-robot-driver/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, actionlib, boost, cartesian-trajectory-controller, catkin, control-msgs, controller-manager, controller-manager-msgs, force-torque-sensor-controller, geometry-msgs, hardware-interface, industrial-robot-status-controller, industrial-robot-status-interface, joint-state-controller, joint-trajectory-controller, kdl-parser, pass-through-controllers, pluginlib, robot-state-publisher, roscpp, rostest, scaled-joint-trajectory-controller, sensor-msgs, socat, speed-scaling-interface, speed-scaling-state-controller, std-srvs, tf, tf2-geometry-msgs, tf2-msgs, trajectory-msgs, twist-controller, ur-client-library, ur-dashboard-msgs, ur-description, ur-msgs, velocity-controllers }: +buildRosPackage { + pname = "ros-melodic-ur-robot-driver"; + version = "2.1.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_Driver-release"; + rev = "release/melodic/ur_robot_driver/2.1.2-1"; + sha256 = "sha256-FuyNLO/SFkuG8Njqn6tJxljYcHvJJvEFsMivKBrwB4Q="; + }; + + buildType = "catkin"; + buildInputs = [ boost catkin industrial-robot-status-interface ]; + checkInputs = [ rostest ]; + propagatedBuildInputs = [ actionlib cartesian-trajectory-controller control-msgs controller-manager controller-manager-msgs force-torque-sensor-controller geometry-msgs hardware-interface industrial-robot-status-controller joint-state-controller joint-trajectory-controller kdl-parser pass-through-controllers pluginlib robot-state-publisher roscpp scaled-joint-trajectory-controller sensor-msgs socat speed-scaling-interface speed-scaling-state-controller std-srvs tf tf2-geometry-msgs tf2-msgs trajectory-msgs twist-controller ur-client-library ur-dashboard-msgs ur-description ur-msgs velocity-controllers ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''The new driver for Universal Robots UR3, UR5 and UR10 robots with CB3 controllers and the e-series.''; + license = with lib.licenses; [ asl20 "BSD-2-Clause" "Zlib" ]; + }; +} diff --git a/distros/melodic/ur10-moveit-config/default.nix b/distros/melodic/ur10-moveit-config/default.nix index e9a4f5a870..e0d6d98453 100644 --- a/distros/melodic/ur10-moveit-config/default.nix +++ b/distros/melodic/ur10-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur10-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur10_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "3eed64307b656770fa34ad475ce4cdda4a6e76356449782e77026ce235d27f80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur10_moveit_config/1.3.1-1"; + sha256 = "sha256-31mRsM0p44A/uTtBd62BSaq1qRk67vBcSYsznBaZKYM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur10e-moveit-config/default.nix b/distros/melodic/ur10e-moveit-config/default.nix index 4703d56359..8295cb03eb 100644 --- a/distros/melodic/ur10e-moveit-config/default.nix +++ b/distros/melodic/ur10e-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur10e-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur10e_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "288b8248a510f0a5c702baa1e829e4a6a7f0629b3b0345e4ab38fe785935a6ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur10e_moveit_config/1.3.1-1"; + sha256 = "sha256-fotsAd1d3BkdGh2exf0RMd6dpz+gWz4+3jopJ9ncWaY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur16e-moveit-config/default.nix b/distros/melodic/ur16e-moveit-config/default.nix index 58e9f1bd60..1b8e1a9759 100644 --- a/distros/melodic/ur16e-moveit-config/default.nix +++ b/distros/melodic/ur16e-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur16e-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur16e_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "92edb5da8cff18a2d1222c66f0a98ca231ece680547f9f9543994ccc6b8a9561"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur16e_moveit_config/1.3.1-1"; + sha256 = "sha256-Y776LP9vxgAXu8XirAfMlk6GhJ6rgslxj+mwttl4llo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur3-moveit-config/default.nix b/distros/melodic/ur3-moveit-config/default.nix index 17ee7c6808..fef10c35f8 100644 --- a/distros/melodic/ur3-moveit-config/default.nix +++ b/distros/melodic/ur3-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur3-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur3_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "e8f4f7797f623cc32be3d2e855ede27afde4f501ac0d7b57b65fd38742d27ed4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur3_moveit_config/1.3.1-1"; + sha256 = "sha256-dKboWdVHZC8TgG3dunucIICDNcZE5AoIbtiwBoiot+k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur3e-moveit-config/default.nix b/distros/melodic/ur3e-moveit-config/default.nix index bb6deda45c..f2210d04da 100644 --- a/distros/melodic/ur3e-moveit-config/default.nix +++ b/distros/melodic/ur3e-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur3e-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur3e_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "889565f3ee71b62e26fe48c5f77c6a735c6cad4abe1411ae29113891031c2401"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur3e_moveit_config/1.3.1-1"; + sha256 = "sha256-6HTWo5SUP9sC0loTDwC8yaIvaqy9JDtuK1Yd+uwJyCI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur5-moveit-config/default.nix b/distros/melodic/ur5-moveit-config/default.nix index b1a8c32733..3d8c2b95c5 100644 --- a/distros/melodic/ur5-moveit-config/default.nix +++ b/distros/melodic/ur5-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur5-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur5_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "dccc4c71c637e1644e867106c66c6fe9865552c5313f89ab781bebcb8ce8350f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur5_moveit_config/1.3.1-1"; + sha256 = "sha256-bWM9jAE0cjwfFEgOkiG2ibkd/ThaSI1fE3Fr37cUOXI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ur5e-moveit-config/default.nix b/distros/melodic/ur5e-moveit-config/default.nix index 566b88fe12..f2c83fe127 100644 --- a/distros/melodic/ur5e-moveit-config/default.nix +++ b/distros/melodic/ur5e-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ur5e-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/melodic/ur5e_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "de05c63b4d2b51ee4a835805a122721296e521c7364831fc70b5557f2d0226fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/melodic/ur5e_moveit_config/1.3.1-1"; + sha256 = "sha256-LfhgoS0LUs/f806LCqGBzxP4B00ZvLhTtwEbuiy1AQ8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/urdf-geometry-parser/default.nix b/distros/melodic/urdf-geometry-parser/default.nix index e4ef55001a..833f4d1e8e 100644 --- a/distros/melodic/urdf-geometry-parser/default.nix +++ b/distros/melodic/urdf-geometry-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urdf-geometry-parser"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf_geometry_parser-release/archive/release/melodic/urdf_geometry_parser/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "9b68c05013b435ece6b738f89fc436fea59ec3895b15af4e13f9986d89351569"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf_geometry_parser-release"; + rev = "release/melodic/urdf_geometry_parser/0.1.0-1"; + sha256 = "sha256-l2eoHl6UawX0I4fffoKC1lmzTpiArHETSfqpwcaYBgs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/urdf-parser-plugin/default.nix b/distros/melodic/urdf-parser-plugin/default.nix index 476cd767c6..cfd66b62b6 100644 --- a/distros/melodic/urdf-parser-plugin/default.nix +++ b/distros/melodic/urdf-parser-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urdf-parser-plugin"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf-release/archive/release/melodic/urdf_parser_plugin/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "292e3a8dd2aa7672ef77ca49f1ef9ebc753f521c524f5fa6b4cfea324a2be13f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf-release"; + rev = "release/melodic/urdf_parser_plugin/1.13.2-1"; + sha256 = "sha256-DShxAFWFuiNgRTPwyuqtwkAAXIR75aD+kWQX7VUVJWc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/urdf-sim-tutorial/default.nix b/distros/melodic/urdf-sim-tutorial/default.nix index 299b11b958..463bfa8192 100644 --- a/distros/melodic/urdf-sim-tutorial/default.nix +++ b/distros/melodic/urdf-sim-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urdf-sim-tutorial"; version = "0.4.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf_sim_tutorial-release/archive/release/melodic/urdf_sim_tutorial/0.4.0-0.tar.gz"; - name = "0.4.0-0.tar.gz"; - sha256 = "520f94f7fe52250069283fc7bdd40b734e9153bdcc11b76309fe9522972d8f77"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf_sim_tutorial-release"; + rev = "release/melodic/urdf_sim_tutorial/0.4.0-0"; + sha256 = "sha256-gf4cZeErT+2tyH6OBFLPialZH1DnXEIalqhjG/tjErw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/urdf-test/default.nix b/distros/melodic/urdf-test/default.nix index 32e5eb35d9..720d769f25 100644 --- a/distros/melodic/urdf-test/default.nix +++ b/distros/melodic/urdf-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urdf-test"; version = "1.0.4"; - src = fetchurl { - url = "https://github.com/pal-gbp/urdf_test-release/archive/release/melodic/urdf_test/1.0.4-0.tar.gz"; - name = "1.0.4-0.tar.gz"; - sha256 = "0c218b7644479fe4c625fd32883d1e45d945f3662f73152e60e45bbf3cabc8b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "urdf_test-release"; + rev = "release/melodic/urdf_test/1.0.4-0"; + sha256 = "sha256-ylxLRwWS+kAio+elyt4ZAqXS4pZ3oUsl5rp5+h7pns8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/urdf-tutorial/default.nix b/distros/melodic/urdf-tutorial/default.nix index 4f15d0eb5b..b789839b85 100644 --- a/distros/melodic/urdf-tutorial/default.nix +++ b/distros/melodic/urdf-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urdf-tutorial"; version = "0.4.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf_tutorial-release/archive/release/melodic/urdf_tutorial/0.4.0-0.tar.gz"; - name = "0.4.0-0.tar.gz"; - sha256 = "92605e8f00f4f6ca12ef65eceb536dc41ba222e9881eaa733a28afc784f7bbbf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf_tutorial-release"; + rev = "release/melodic/urdf_tutorial/0.4.0-0"; + sha256 = "sha256-wAGWsI4l/bJh817VGuqHPGZJnGD6IBOl6I2/d6eW8/o="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/urdf/default.nix b/distros/melodic/urdf/default.nix index d22c92c5bb..5785db10dc 100644 --- a/distros/melodic/urdf/default.nix +++ b/distros/melodic/urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urdf"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf-release/archive/release/melodic/urdf/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "476b4598a2a6d84da0a60fe3436d7f0b7fc8270c977b70eca24201f37529dbc3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf-release"; + rev = "release/melodic/urdf/1.13.2-1"; + sha256 = "sha256-IWaVoJMDw+51StqYwMxLLFa+l1d/X1CbQoHPi5crAso="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules urdf-parser-plugin ]; diff --git a/distros/melodic/urdfdom-py/default.nix b/distros/melodic/urdfdom-py/default.nix index b156eccb43..e342193a0d 100644 --- a/distros/melodic/urdfdom-py/default.nix +++ b/distros/melodic/urdfdom-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urdfdom-py"; version = "0.4.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdfdom_py-release/archive/release/melodic/urdfdom_py/0.4.6-1.tar.gz"; - name = "0.4.6-1.tar.gz"; - sha256 = "4422ae385618443c9dd7c0e834cf457d73ddeffedc14c44f682fbd769ab913f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdfdom_py-release"; + rev = "release/melodic/urdfdom_py/0.4.6-1"; + sha256 = "sha256-Q8wZfX5ll7vzWYT5TXEhnxu6RGf1//b6ZmUeOgapEKM="; + }; buildType = "catkin"; buildInputs = [ catkin pythonPackages.setuptools ]; diff --git a/distros/melodic/urg-c/default.nix b/distros/melodic/urg-c/default.nix index 14c4657deb..d4280ae2ce 100644 --- a/distros/melodic/urg-c/default.nix +++ b/distros/melodic/urg-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urg-c"; version = "1.0.405"; - src = fetchurl { - url = "https://github.com/ros-gbp/urg_c-release/archive/release/melodic/urg_c/1.0.405-0.tar.gz"; - name = "1.0.405-0.tar.gz"; - sha256 = "f747da6d3ab437c8a455194bbd9cf64f84798700d7458584c77916f9c479691a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urg_c-release"; + rev = "release/melodic/urg_c/1.0.405-0"; + sha256 = "sha256-wEtV8auslEcnhmACa0SvoVopTV4FKwss35VKw95wxP0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/urg-node/default.nix b/distros/melodic/urg-node/default.nix index 612e3272da..7f52a6c6d8 100644 --- a/distros/melodic/urg-node/default.nix +++ b/distros/melodic/urg-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-urg-node"; version = "0.1.18-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urg_node-release/archive/release/melodic/urg_node/0.1.18-1.tar.gz"; - name = "0.1.18-1.tar.gz"; - sha256 = "8006441873ecfa6f2da638d0c569fabaf39213fb54703615b8ea7f685fd7d09a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urg_node-release"; + rev = "release/melodic/urg_node/0.1.18-1"; + sha256 = "sha256-sGUjNvOfcAt2vDn73QWWnr97ccvyARR7PUAyl25Gty8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/urg-stamped/default.nix b/distros/melodic/urg-stamped/default.nix index 96c8eac4ff..7af4658f0b 100644 --- a/distros/melodic/urg-stamped/default.nix +++ b/distros/melodic/urg-stamped/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, roscpp, roslint, rostest, rosunit, sensor-msgs }: buildRosPackage { pname = "ros-melodic-urg-stamped"; - version = "0.0.15-r1"; + version = "0.0.16-r1"; - src = fetchurl { - url = "https://github.com/seqsense/urg_stamped-release/archive/release/melodic/urg_stamped/0.0.15-1.tar.gz"; - name = "0.0.15-1.tar.gz"; - sha256 = "93fdbbc6a096ba0db350336204ec1d05017b5f865c1f5e62e8ec62c3a35b9bbe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seqsense"; + repo = "urg_stamped-release"; + rev = "release/melodic/urg_stamped/0.0.16-1"; + sha256 = "sha256-74V11Qe+5NQd9N55zWdrpHRNPPTUmskQ5CMnjC3vlCM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/usb-cam-controllers/default.nix b/distros/melodic/usb-cam-controllers/default.nix index bdee2e1c63..44314f0330 100644 --- a/distros/melodic/usb-cam-controllers/default.nix +++ b/distros/melodic/usb-cam-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-usb-cam-controllers"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/usb_cam_hardware-release/archive/release/melodic/usb_cam_controllers/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "1f3b3500161706be6f2420612ecfff387942aa71cd1cc755da4c40267c707891"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "usb_cam_hardware-release"; + rev = "release/melodic/usb_cam_controllers/0.1.1-1"; + sha256 = "sha256-uszQgBOk7T8I+2/fBNac/VAiUPOn0179I8GE5kchOkE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/usb-cam-hardware-interface/default.nix b/distros/melodic/usb-cam-hardware-interface/default.nix index 316a929c9e..c3cb60c8e6 100644 --- a/distros/melodic/usb-cam-hardware-interface/default.nix +++ b/distros/melodic/usb-cam-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-usb-cam-hardware-interface"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/usb_cam_hardware-release/archive/release/melodic/usb_cam_hardware_interface/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "96288caef7a5aed8832e30d5a874e820179435133deacf8159186cd2d7ab2c33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "usb_cam_hardware-release"; + rev = "release/melodic/usb_cam_hardware_interface/0.1.1-1"; + sha256 = "sha256-OrV0hUa9ExsdUVMJNW0NSvchWGPwew4CDe9ZFsoEKBI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/usb-cam-hardware/default.nix b/distros/melodic/usb-cam-hardware/default.nix index e54fb99781..69e366b70f 100644 --- a/distros/melodic/usb-cam-hardware/default.nix +++ b/distros/melodic/usb-cam-hardware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-usb-cam-hardware"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/usb_cam_hardware-release/archive/release/melodic/usb_cam_hardware/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "d2548637f0638d86eb84a650f0db22fe13cefda2a17ee16acd913061df7440fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "usb_cam_hardware-release"; + rev = "release/melodic/usb_cam_hardware/0.1.1-1"; + sha256 = "sha256-4QSMayExZp0wgu83/MAPjPA6JfpvT0D9ED5hg5wb9gw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/usb-cam/default.nix b/distros/melodic/usb-cam/default.nix index 7e751c9cdd..d8bc7950d3 100644 --- a/distros/melodic/usb-cam/default.nix +++ b/distros/melodic/usb-cam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-usb-cam"; version = "0.3.6"; - src = fetchurl { - url = "https://github.com/ros-gbp/usb_cam-release/archive/release/melodic/usb_cam/0.3.6-0.tar.gz"; - name = "0.3.6-0.tar.gz"; - sha256 = "21a2fa956af929b771c989bdb53a572443481b101cea0ba0b66547e0440a9bd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "usb_cam-release"; + rev = "release/melodic/usb_cam/0.3.6-0"; + sha256 = "sha256-f9BE3cZ4E5uz9WjHVPTiw8Cnt/80lDBjgYU1e/hdI6U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/usv-gazebo-plugins/default.nix b/distros/melodic/usv-gazebo-plugins/default.nix index d57f9d9396..0a40b662d9 100644 --- a/distros/melodic/usv-gazebo-plugins/default.nix +++ b/distros/melodic/usv-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-usv-gazebo-plugins"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vrx-release/archive/release/melodic/usv_gazebo_plugins/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "54ddedf4fbf19bd6d0fd6586cfdf233133f8768a88eb0b1720a9db433946027e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vrx-release"; + rev = "release/melodic/usv_gazebo_plugins/1.3.0-1"; + sha256 = "sha256-7PfaDCQ+WcL2lXFdp6zw8SQM2xnROwMF97D/oDBegL0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuid-msgs/default.nix b/distros/melodic/uuid-msgs/default.nix index 92c79cc577..00c481399c 100644 --- a/distros/melodic/uuid-msgs/default.nix +++ b/distros/melodic/uuid-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuid-msgs"; version = "1.0.6"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/unique_identifier-release/archive/release/melodic/uuid_msgs/1.0.6-0.tar.gz"; - name = "1.0.6-0.tar.gz"; - sha256 = "c00cacdbfc12e1cc2715a8531eae1fc69700362b2abab974d03d70de5de6d2b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "unique_identifier-release"; + rev = "release/melodic/uuid_msgs/1.0.6-0"; + sha256 = "sha256-I2wvd92JL9cbXsWyCd2Vnm0TXQQbqeTXJrTopF6F0rk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/uuv-assistants/default.nix b/distros/melodic/uuv-assistants/default.nix index 82da0bdd83..bf8ed29d71 100644 --- a/distros/melodic/uuv-assistants/default.nix +++ b/distros/melodic/uuv-assistants/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-assistants"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_assistants/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "3f82b560d43b9d371d23bc2b9a6d8b1ea61b674d6578653c4b96df897f8e88f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_assistants/0.6.13-0"; + sha256 = "sha256-zklufFpz1RaTXMAWBGHTOdZh9RTRhvTY8Rgj0lUOcaM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-auv-control-allocator/default.nix b/distros/melodic/uuv-auv-control-allocator/default.nix index d354779e27..e00351662c 100644 --- a/distros/melodic/uuv-auv-control-allocator/default.nix +++ b/distros/melodic/uuv-auv-control-allocator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-auv-control-allocator"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_auv_control_allocator/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "4db21178544a59cd19888ae887ff0bd17b75737fd0972673c4314a6db1cf3482"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_auv_control_allocator/0.6.13-0"; + sha256 = "sha256-ZjBkhgi9KUKc8XP5yuxAL83USSPLocjUBP03GSFHxX4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/uuv-control-cascaded-pid/default.nix b/distros/melodic/uuv-control-cascaded-pid/default.nix index 64726b09c7..41ad9fe7e8 100644 --- a/distros/melodic/uuv-control-cascaded-pid/default.nix +++ b/distros/melodic/uuv-control-cascaded-pid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-control-cascaded-pid"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_control_cascaded_pid/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "dbf283b84f3ab21206873ec6a4423873ae696cd5e00d9ced11568cef4d0930be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_control_cascaded_pid/0.6.13-0"; + sha256 = "sha256-2vottzrptT1d96JdKu5qsCwQrUD+acRvF8T31a6gdKY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-control-msgs/default.nix b/distros/melodic/uuv-control-msgs/default.nix index 785ff9e931..96addf378c 100644 --- a/distros/melodic/uuv-control-msgs/default.nix +++ b/distros/melodic/uuv-control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-control-msgs"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_control_msgs/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "eb58f7a2416af641a4668c72ee16804e77f3a84e4e3250c701e6395fa97a2e47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_control_msgs/0.6.13-0"; + sha256 = "sha256-clqv1AprEYowj+FYsczKSrcna0u2Ag49RzPPTlop360="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-control-utils/default.nix b/distros/melodic/uuv-control-utils/default.nix index bd4215b54e..d247c3b559 100644 --- a/distros/melodic/uuv-control-utils/default.nix +++ b/distros/melodic/uuv-control-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-control-utils"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_control_utils/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "7b4acaefcbd1899b5a4d5c3b9e4a24617317b65a86ca79322bdf871fadf69e74"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_control_utils/0.6.13-0"; + sha256 = "sha256-r7Ia+Du5nQrEtLF9D89K7LhbarorvcLd7d3vgAsgQTU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-descriptions/default.nix b/distros/melodic/uuv-descriptions/default.nix index 366c159027..a1dd8a02bc 100644 --- a/distros/melodic/uuv-descriptions/default.nix +++ b/distros/melodic/uuv-descriptions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-descriptions"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_descriptions/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "b502f0791f2a6185ec41cd24b0a7bc29d2edb5c219ba6e21e6112017e071eff1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_descriptions/0.6.13-0"; + sha256 = "sha256-ofTg2eidzAkzG1cQACPTBMjRW/F8DESrnP+93ZEW82Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-gazebo-plugins/default.nix b/distros/melodic/uuv-gazebo-plugins/default.nix index 5d952ac2b7..9a73cc202b 100644 --- a/distros/melodic/uuv-gazebo-plugins/default.nix +++ b/distros/melodic/uuv-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-gazebo-plugins"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_gazebo_plugins/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "ba78a31401069832ef24a64776753b3e510db70e7c95761f2556f8ac3e9b6d93"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_gazebo_plugins/0.6.13-0"; + sha256 = "sha256-l1d9YHDPm2m9VC2jxFi9kRe6b/UJWptEv/rNAqaiJXs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-gazebo-ros-plugins-msgs/default.nix b/distros/melodic/uuv-gazebo-ros-plugins-msgs/default.nix index 45b8e37632..463d5abc5c 100644 --- a/distros/melodic/uuv-gazebo-ros-plugins-msgs/default.nix +++ b/distros/melodic/uuv-gazebo-ros-plugins-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-gazebo-ros-plugins-msgs"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_gazebo_ros_plugins_msgs/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "b48e850ae31997516e36049b592f26939a20a278600d8b3f8168b8048a3b6a83"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_gazebo_ros_plugins_msgs/0.6.13-0"; + sha256 = "sha256-n1QczTZhmEnwxXAg823BPpj9jnJMTYNcH2QjssoePOo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/uuv-gazebo-ros-plugins/default.nix b/distros/melodic/uuv-gazebo-ros-plugins/default.nix index 797d61e689..1918f3ae52 100644 --- a/distros/melodic/uuv-gazebo-ros-plugins/default.nix +++ b/distros/melodic/uuv-gazebo-ros-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-gazebo-ros-plugins"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_gazebo_ros_plugins/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "061cc787ee014cb7729eed0a28bdbb52967c821a3fb8bd7ead255b38909a2a3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_gazebo_ros_plugins/0.6.13-0"; + sha256 = "sha256-zjDY5gS7Cgmze7bGRUlpywyPO98QRfyA7o4VzWAkI4E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-gazebo-worlds/default.nix b/distros/melodic/uuv-gazebo-worlds/default.nix index 38b3a3b703..95678d6ec1 100644 --- a/distros/melodic/uuv-gazebo-worlds/default.nix +++ b/distros/melodic/uuv-gazebo-worlds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-gazebo-worlds"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_gazebo_worlds/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "c1b93c1bb6574a54a18765928e6d640b4484fb3cd982698ff97936083af57166"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_gazebo_worlds/0.6.13-0"; + sha256 = "sha256-52+094dAtxg/qic0bmX7yvMqOzWcKra+DXmnlDAEyEE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-gazebo/default.nix b/distros/melodic/uuv-gazebo/default.nix index 1a35e1b284..bb195f3a83 100644 --- a/distros/melodic/uuv-gazebo/default.nix +++ b/distros/melodic/uuv-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-gazebo"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_gazebo/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "18f98a1d4bb9b97520dc86abd517810d51596f1c71d135ad4c8b7e157a24ad5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_gazebo/0.6.13-0"; + sha256 = "sha256-iBcmvjCciL9J556ovDaaKXpPNidfcMlhPBZCazIcRls="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-sensor-ros-plugins-msgs/default.nix b/distros/melodic/uuv-sensor-ros-plugins-msgs/default.nix index dca0c67b07..e65243298c 100644 --- a/distros/melodic/uuv-sensor-ros-plugins-msgs/default.nix +++ b/distros/melodic/uuv-sensor-ros-plugins-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-sensor-ros-plugins-msgs"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_sensor_ros_plugins_msgs/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "224d60b31ea5e63efae3ca2fc78b501d208c77a873751a45a64475a3ae4cafd7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_sensor_ros_plugins_msgs/0.6.13-0"; + sha256 = "sha256-PZqAOCu1lY2YMtm8mhz1eiZbe+FIfb02hjCf/I5F0LE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/uuv-sensor-ros-plugins/default.nix b/distros/melodic/uuv-sensor-ros-plugins/default.nix index d2d5b7873b..ab4128feee 100644 --- a/distros/melodic/uuv-sensor-ros-plugins/default.nix +++ b/distros/melodic/uuv-sensor-ros-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-sensor-ros-plugins"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_sensor_ros_plugins/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "403319ab9a425f0ace52c7ca845a359b67d5a0ea1fb8737a172608d9f41e4eb0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_sensor_ros_plugins/0.6.13-0"; + sha256 = "sha256-LZt706D/FPyHqu61qCnA+ZDyNuKubLUvI8S9Bu8rKOw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-simulator/default.nix b/distros/melodic/uuv-simulator/default.nix index daf28e8e7b..b0c58c18f9 100644 --- a/distros/melodic/uuv-simulator/default.nix +++ b/distros/melodic/uuv-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-simulator"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_simulator/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "9dd981efd3c5ceb4f4d7d731f41fdc26eb321a02bf3ab8b8e40b866e5c56e457"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_simulator/0.6.13-0"; + sha256 = "sha256-CfXEVhCAhNlpJPBpAQA0o6DTIS3LU5C8mWVInaDsMcY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-teleop/default.nix b/distros/melodic/uuv-teleop/default.nix index b9840cf0f1..b513abbe82 100644 --- a/distros/melodic/uuv-teleop/default.nix +++ b/distros/melodic/uuv-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-teleop"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_teleop/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "f3bae248754ff04b19bfb6f9575218cc77f9a682426fd3716082098ea055ddfd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_teleop/0.6.13-0"; + sha256 = "sha256-yetX/cITyYx1GGFo57Bkz+oo0OWMPz39JqW9gEInR5w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-thruster-manager/default.nix b/distros/melodic/uuv-thruster-manager/default.nix index 92e05c6530..d3fed6d6ba 100644 --- a/distros/melodic/uuv-thruster-manager/default.nix +++ b/distros/melodic/uuv-thruster-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-thruster-manager"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_thruster_manager/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "1ab65fc013e0365a7d680c40c82f7ed9a1d1ab91514376795bf5160f80f0cdea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_thruster_manager/0.6.13-0"; + sha256 = "sha256-HSNR5X+O8JY5IoOHTHH8kUQeg8n4uYcP1Tv1X/mwodw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/uuv-trajectory-control/default.nix b/distros/melodic/uuv-trajectory-control/default.nix index 31a8796e0a..4bf084e514 100644 --- a/distros/melodic/uuv-trajectory-control/default.nix +++ b/distros/melodic/uuv-trajectory-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-trajectory-control"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_trajectory_control/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "a20414665f3403e5ba772634d148eaef5bc2d703c4d5e5ff4196f8b6557bd3cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_trajectory_control/0.6.13-0"; + sha256 = "sha256-HZBLqmMi9pO1ssJS796RRJMvtTxvsjkIcvEBogue9Uc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-world-plugins/default.nix b/distros/melodic/uuv-world-plugins/default.nix index 5500239f98..34a43488e0 100644 --- a/distros/melodic/uuv-world-plugins/default.nix +++ b/distros/melodic/uuv-world-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-world-plugins"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_world_plugins/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "b36f8971609bacb0040109f63d8df1d70c130a4056ed8d0f3084b6deaf8f5ad1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_world_plugins/0.6.13-0"; + sha256 = "sha256-UZc6YV1oJBAF/7MG9ii104RZY5pDHA3puEIiLwPE0Q4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uuv-world-ros-plugins-msgs/default.nix b/distros/melodic/uuv-world-ros-plugins-msgs/default.nix index 81fa9cee4f..2c08b99cec 100644 --- a/distros/melodic/uuv-world-ros-plugins-msgs/default.nix +++ b/distros/melodic/uuv-world-ros-plugins-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-world-ros-plugins-msgs"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_world_ros_plugins_msgs/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "ba13fec3c313d07c75b858d904461d4edbec745a2f8ceed0d3e7142c6edd8184"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_world_ros_plugins_msgs/0.6.13-0"; + sha256 = "sha256-F6m/mgCU8ogMsN36dAfHHYJ0x4pqA05JF3cqCrpsbhg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/uuv-world-ros-plugins/default.nix b/distros/melodic/uuv-world-ros-plugins/default.nix index 0e1c5021a0..6102e3cacc 100644 --- a/distros/melodic/uuv-world-ros-plugins/default.nix +++ b/distros/melodic/uuv-world-ros-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uuv-world-ros-plugins"; version = "0.6.13"; - src = fetchurl { - url = "https://github.com/uuvsimulator/uuv_simulator-release/archive/release/melodic/uuv_world_ros_plugins/0.6.13-0.tar.gz"; - name = "0.6.13-0.tar.gz"; - sha256 = "446876d4136616bf7c1762824b5d849a7275d4364ad2b56c8f249cb293de248a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uuvsimulator"; + repo = "uuv_simulator-release"; + rev = "release/melodic/uuv_world_ros_plugins/0.6.13-0"; + sha256 = "sha256-HGgSONlclNC940XWKvcAWOi2aJaH+KGnimkkKwrxo5s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uvc-camera/default.nix b/distros/melodic/uvc-camera/default.nix index a67494fca9..c40443a2ad 100644 --- a/distros/melodic/uvc-camera/default.nix +++ b/distros/melodic/uvc-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uvc-camera"; version = "0.2.7"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/camera_umd-release/archive/release/melodic/uvc_camera/0.2.7-0.tar.gz"; - name = "0.2.7-0.tar.gz"; - sha256 = "3a760fad6164fa6a5ed47d7cd6302f5378bae282f5018dc568d2666b867cdb46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "camera_umd-release"; + rev = "release/melodic/uvc_camera/0.2.7-0"; + sha256 = "sha256-QHunEw5cFOK07rJo4wNgewKy7ugxNRNRaYf4LwRdwcI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/uwsim-bullet/default.nix b/distros/melodic/uwsim-bullet/default.nix index d994d5ad71..6bcb553640 100644 --- a/distros/melodic/uwsim-bullet/default.nix +++ b/distros/melodic/uwsim-bullet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uwsim-bullet"; version = "2.82.2-r1"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/uwsim_bullet-release/archive/release/melodic/uwsim_bullet/2.82.2-1.tar.gz"; - name = "2.82.2-1.tar.gz"; - sha256 = "e2d8638aff5002aa0ce7d104c68258d055ea31ed51eb7555e6694faf66ee35b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "uwsim_bullet-release"; + rev = "release/melodic/uwsim_bullet/2.82.2-1"; + sha256 = "sha256-YAYcFcvAyEV7kfFXCVuXcydDR88uzRrFvJOdV4taH0g="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/uwsim-osgbullet/default.nix b/distros/melodic/uwsim-osgbullet/default.nix index 54d6db039e..a494f3c565 100644 --- a/distros/melodic/uwsim-osgbullet/default.nix +++ b/distros/melodic/uwsim-osgbullet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uwsim-osgbullet"; version = "3.0.1-r3"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/uwsim_osgbullet-release/archive/release/melodic/uwsim_osgbullet/3.0.1-3.tar.gz"; - name = "3.0.1-3.tar.gz"; - sha256 = "02837902799dfbced008ccff28abccb0b7115e2c3efeb2733496e2246a031582"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "uwsim_osgbullet-release"; + rev = "release/melodic/uwsim_osgbullet/3.0.1-3"; + sha256 = "sha256-/sbcHHRjaUH+73/cNlFfFvvSJ1yEekEUWXFRky6HUvU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/uwsim-osgocean/default.nix b/distros/melodic/uwsim-osgocean/default.nix index 1f9ebcead3..779aadc243 100644 --- a/distros/melodic/uwsim-osgocean/default.nix +++ b/distros/melodic/uwsim-osgocean/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uwsim-osgocean"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/uwsim_osgocean-release/archive/release/melodic/uwsim_osgocean/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "f1fa072efeefdae435dbad0e4e11364da90dd778018d0c83b5d183a0fe587cc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "uwsim_osgocean-release"; + rev = "release/melodic/uwsim_osgocean/1.0.4-1"; + sha256 = "sha256-dYAw3dtxJFEpx/oNh6Vu/GvlEVWTdFjQ1ENRADz2cKU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/uwsim-osgworks/default.nix b/distros/melodic/uwsim-osgworks/default.nix index 1dd745214e..b804c8c2a9 100644 --- a/distros/melodic/uwsim-osgworks/default.nix +++ b/distros/melodic/uwsim-osgworks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uwsim-osgworks"; version = "3.0.3-r2"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/uwsim_osgworks-release/archive/release/melodic/uwsim_osgworks/3.0.3-2.tar.gz"; - name = "3.0.3-2.tar.gz"; - sha256 = "c1c8871ee6ee12995a6964a45f8a46d2a347e8c9871bec8d1e573850576e01d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "uwsim_osgworks-release"; + rev = "release/melodic/uwsim_osgworks/3.0.3-2"; + sha256 = "sha256-haOgU4DIs56qzCLTmqkgQ7RhoFlLFUIFclA5hT2pjz4="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/uwsim/default.nix b/distros/melodic/uwsim/default.nix index a262b9ca52..b7eb7f55a1 100644 --- a/distros/melodic/uwsim/default.nix +++ b/distros/melodic/uwsim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-uwsim"; version = "1.4.2-r3"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/underwater_simulation-release/archive/release/melodic/uwsim/1.4.2-3.tar.gz"; - name = "1.4.2-3.tar.gz"; - sha256 = "c1ca2ee772888d4cc33f58ee5399ad49b0b9fb36362c009236bebd82ecf091ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "underwater_simulation-release"; + rev = "release/melodic/uwsim/1.4.2-3"; + sha256 = "sha256-dG7WN7SpOjjgzixDSf5sSi3qfxn1udcKcTvsOP71zO4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vapor-master/default.nix b/distros/melodic/vapor-master/default.nix index 15eac79f17..79b32977e2 100644 --- a/distros/melodic/vapor-master/default.nix +++ b/distros/melodic/vapor-master/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vapor-master"; version = "0.3.0"; - src = fetchurl { - url = "https://github.com/roshub/vapor_master-release/archive/release/melodic/vapor_master/0.3.0-0.tar.gz"; - name = "0.3.0-0.tar.gz"; - sha256 = "c6fc8a631a9237b71a58f298e1394f498f3374ba2698c365f0aae44e5a75ca32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roshub"; + repo = "vapor_master-release"; + rev = "release/melodic/vapor_master/0.3.0-0"; + sha256 = "sha256-3tUQsEFC64rhgljsQ7QlvkEeEFUikm/Y85XXIGHyGeU="; + }; buildType = "catkin"; buildInputs = [ catkin nodePackages.npm ]; diff --git a/distros/melodic/variant-msgs/default.nix b/distros/melodic/variant-msgs/default.nix index c97acd6a6b..e98f101a87 100644 --- a/distros/melodic/variant-msgs/default.nix +++ b/distros/melodic/variant-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-variant-msgs"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/anybotics/variant-release/archive/release/melodic/variant_msgs/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "ae614a42d4d601049053d44911ab4ed4d97deaa47e2ea608f05b7826a450b5ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "variant-release"; + rev = "release/melodic/variant_msgs/0.1.6-1"; + sha256 = "sha256-o1hU5/p2HzoYGy8ZR6skvbO7Qv7tRgQ5+X30RkVS4kw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/variant-topic-tools/default.nix b/distros/melodic/variant-topic-tools/default.nix index cdfe4f4161..47ecd20b4a 100644 --- a/distros/melodic/variant-topic-tools/default.nix +++ b/distros/melodic/variant-topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-variant-topic-tools"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/anybotics/variant-release/archive/release/melodic/variant_topic_tools/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "c22ec49ac6b15f1670b487212d1ff3c840c667c8f55f719f68ceddb02f2e317e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "variant-release"; + rev = "release/melodic/variant_topic_tools/0.1.6-1"; + sha256 = "sha256-aXS5Fb1EdHRYRVJoyxvJJH5PFfvjfPPlo24AgSwYjeY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/variant/default.nix b/distros/melodic/variant/default.nix index 2a078e4830..47f3fb01b0 100644 --- a/distros/melodic/variant/default.nix +++ b/distros/melodic/variant/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-variant"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/anybotics/variant-release/archive/release/melodic/variant/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "80377608569aefc0f130260b9455cab543d039cbc510880c59fe6fb9872401b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "variant-release"; + rev = "release/melodic/variant/0.1.6-1"; + sha256 = "sha256-D6v8UCyLn/joFMxRRW2ABqZ5Wwl+S0ThszFILC/Vs8E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vector-map-msgs/default.nix b/distros/melodic/vector-map-msgs/default.nix index b16a9957a3..47b7b3cf59 100644 --- a/distros/melodic/vector-map-msgs/default.nix +++ b/distros/melodic/vector-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vector-map-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/melodic/vector_map_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "116c8842e3f610f9c6c59fe5db04d2f6cf998a11fb1f85bcb8748cfe247490ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/melodic/vector_map_msgs/1.14.0-1"; + sha256 = "sha256-p+DObvasMzVjl44apS0+ZwczFdtdmsggTOyIDTiYhGE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/velocity-controllers/default.nix b/distros/melodic/velocity-controllers/default.nix index 44ae864114..9d1a6dd320 100644 --- a/distros/melodic/velocity-controllers/default.nix +++ b/distros/melodic/velocity-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velocity-controllers"; version = "0.17.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/velocity_controllers/0.17.2-1.tar.gz"; - name = "0.17.2-1.tar.gz"; - sha256 = "08a54e78a180a7e56154d1860450a7c3c3f36158944b60cd584cfed0baf463f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/melodic/velocity_controllers/0.17.2-1"; + sha256 = "sha256-cCn8khYU61nr8QNOPPaae369ID5p2y1g4EZKNvu7SJs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/velodyne-description/default.nix b/distros/melodic/velodyne-description/default.nix index e223b3fcd6..20df13afad 100644 --- a/distros/melodic/velodyne-description/default.nix +++ b/distros/melodic/velodyne-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velodyne-description"; version = "1.0.13-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/velodyne_simulator-release/archive/release/melodic/velodyne_description/1.0.13-1.tar.gz"; - name = "1.0.13-1.tar.gz"; - sha256 = "57bb443679204c53f4317727e8fe67a5f34ad7373ba47a93de81851e8166902d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "velodyne_simulator-release"; + rev = "release/melodic/velodyne_description/1.0.13-1"; + sha256 = "sha256-DEoikvGnQRius0OoSSdXyDcU8Rm6tCHA+ByDiijt0+M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/velodyne-driver/default.nix b/distros/melodic/velodyne-driver/default.nix index afafbb03f5..84342c668f 100644 --- a/distros/melodic/velodyne-driver/default.nix +++ b/distros/melodic/velodyne-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velodyne-driver"; version = "1.5.2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/melodic/velodyne_driver/1.5.2-0.tar.gz"; - name = "1.5.2-0.tar.gz"; - sha256 = "81b88ba93fe2af5da93cb4e2a8865912c11f35985cbb3636bf480c568b7a6fe4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/melodic/velodyne_driver/1.5.2-0"; + sha256 = "sha256-Pl2QWcrh7JTfTo/orjTjo2l7sELrKMHTL9+XVp/U7wI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/velodyne-gazebo-plugins/default.nix b/distros/melodic/velodyne-gazebo-plugins/default.nix index 008bf7bc7c..a82a0394a1 100644 --- a/distros/melodic/velodyne-gazebo-plugins/default.nix +++ b/distros/melodic/velodyne-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velodyne-gazebo-plugins"; version = "1.0.13-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/velodyne_simulator-release/archive/release/melodic/velodyne_gazebo_plugins/1.0.13-1.tar.gz"; - name = "1.0.13-1.tar.gz"; - sha256 = "191487afff2cca5a03f11d85cb6f4f3af3c95e846a344d68ecfbb8eceeddb3b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "velodyne_simulator-release"; + rev = "release/melodic/velodyne_gazebo_plugins/1.0.13-1"; + sha256 = "sha256-L5IN+BvQ38y1lX91dD7v8We1MonA9i21PQRAj+zv7C8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/velodyne-laserscan/default.nix b/distros/melodic/velodyne-laserscan/default.nix index f1adf6698a..2d01e0fc74 100644 --- a/distros/melodic/velodyne-laserscan/default.nix +++ b/distros/melodic/velodyne-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velodyne-laserscan"; version = "1.5.2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/melodic/velodyne_laserscan/1.5.2-0.tar.gz"; - name = "1.5.2-0.tar.gz"; - sha256 = "7a79ee1a1f2efe7e9e20695fea816a595f442ad661d13a345a918df1a9e39fa3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/melodic/velodyne_laserscan/1.5.2-0"; + sha256 = "sha256-LISO6VfJLss9S8piAk63retsVjwjvcvCcZUByz+sf4g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/velodyne-msgs/default.nix b/distros/melodic/velodyne-msgs/default.nix index 1e7ecb9ecf..221324fc15 100644 --- a/distros/melodic/velodyne-msgs/default.nix +++ b/distros/melodic/velodyne-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velodyne-msgs"; version = "1.5.2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/melodic/velodyne_msgs/1.5.2-0.tar.gz"; - name = "1.5.2-0.tar.gz"; - sha256 = "59f623187d275f018300f623402c97eb9ce5dd06d0c95936d5d63916ccabb168"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/melodic/velodyne_msgs/1.5.2-0"; + sha256 = "sha256-y0A5ArRLt5bcbr9ijj3GUuCpcqk2DFa0SkfyuvDkd4E="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/velodyne-pointcloud/default.nix b/distros/melodic/velodyne-pointcloud/default.nix index 608b667f35..c9dfde27a4 100644 --- a/distros/melodic/velodyne-pointcloud/default.nix +++ b/distros/melodic/velodyne-pointcloud/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velodyne-pointcloud"; version = "1.5.2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/melodic/velodyne_pointcloud/1.5.2-0.tar.gz"; - name = "1.5.2-0.tar.gz"; - sha256 = "4ba277761a8c63407bf615e2aae6edf06f70f5c0349717afa3fc8be4d828dc76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/melodic/velodyne_pointcloud/1.5.2-0"; + sha256 = "sha256-7H3+glfK5vpInojgopVHvxc/QhfnnDOEP1EXWb+dp7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/velodyne-simulator/default.nix b/distros/melodic/velodyne-simulator/default.nix index d8fd9c926b..05ba3dee51 100644 --- a/distros/melodic/velodyne-simulator/default.nix +++ b/distros/melodic/velodyne-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velodyne-simulator"; version = "1.0.13-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/velodyne_simulator-release/archive/release/melodic/velodyne_simulator/1.0.13-1.tar.gz"; - name = "1.0.13-1.tar.gz"; - sha256 = "7574ca6fbb50b4be06b3a8a582fbe2724b87115f020189b90096eba7fe3ef165"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "velodyne_simulator-release"; + rev = "release/melodic/velodyne_simulator/1.0.13-1"; + sha256 = "sha256-oF1JWozzAYqx/fbMitOq7lpOTvKoDs8dNvxuCFaFxc8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/velodyne/default.nix b/distros/melodic/velodyne/default.nix index 498c1d11f0..e512c488ab 100644 --- a/distros/melodic/velodyne/default.nix +++ b/distros/melodic/velodyne/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-velodyne"; version = "1.5.2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/melodic/velodyne/1.5.2-0.tar.gz"; - name = "1.5.2-0.tar.gz"; - sha256 = "31d4489ac69e37ba7a4d928e66b9d25af331252dca9ebdd9a3be6a2a0c52dde9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/melodic/velodyne/1.5.2-0"; + sha256 = "sha256-U+qAp8e3xuzYE7AKuSSyy2X8buOtw9M6cWvLCrX1l+M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vesc-ackermann/default.nix b/distros/melodic/vesc-ackermann/default.nix index 622e57788d..2ec7095014 100644 --- a/distros/melodic/vesc-ackermann/default.nix +++ b/distros/melodic/vesc-ackermann/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vesc-ackermann"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/f1tenth/vesc-release/archive/release/melodic/vesc_ackermann/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "55d81b4911aceacfd99577263e426533fd70421f98d41257f36602e1d21e02de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "f1tenth"; + repo = "vesc-release"; + rev = "release/melodic/vesc_ackermann/1.1.0-1"; + sha256 = "sha256-wzk+jClgQuFZ38OYHpLesICUm7mGsmo44YeZrEmPeLA="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/vesc-driver/default.nix b/distros/melodic/vesc-driver/default.nix index b3b2a77535..4a9154ed40 100644 --- a/distros/melodic/vesc-driver/default.nix +++ b/distros/melodic/vesc-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vesc-driver"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/f1tenth/vesc-release/archive/release/melodic/vesc_driver/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "735753d64e77b087a403b36386420cda79ede5a5544f541b0a1406fccff95115"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "f1tenth"; + repo = "vesc-release"; + rev = "release/melodic/vesc_driver/1.1.0-1"; + sha256 = "sha256-8oqBKvY0mOKd/uRgyxBFHkKozmbo7PoQonn/40Xa/Z8="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/vesc-msgs/default.nix b/distros/melodic/vesc-msgs/default.nix index ca44de9dad..8a47a4f3f8 100644 --- a/distros/melodic/vesc-msgs/default.nix +++ b/distros/melodic/vesc-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vesc-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/f1tenth/vesc-release/archive/release/melodic/vesc_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "c27b9c954ea768983a2c50138c508b083af5d46d7e8d4907b7c0441037c5eb94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "f1tenth"; + repo = "vesc-release"; + rev = "release/melodic/vesc_msgs/1.1.0-1"; + sha256 = "sha256-o3gYx9SO+Y0hJa4smg9nHEhcziTw8GNsqbgQ+oNdars="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/vesc/default.nix b/distros/melodic/vesc/default.nix index de6ae39abc..4b787849a6 100644 --- a/distros/melodic/vesc/default.nix +++ b/distros/melodic/vesc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vesc"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/f1tenth/vesc-release/archive/release/melodic/vesc/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "ae523ded38e9e6b6a650cfa5b6b6f122f9a5cbc80b69aebae298e3c87dd81d4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "f1tenth"; + repo = "vesc-release"; + rev = "release/melodic/vesc/1.1.0-1"; + sha256 = "sha256-Um+eGDzsSU4sbpvCELsRxLP8x/VO3I9UZ4lVpFjb1gw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/video-stream-opencv/default.nix b/distros/melodic/video-stream-opencv/default.nix index afd6b8c666..c0098f6dc7 100644 --- a/distros/melodic/video-stream-opencv/default.nix +++ b/distros/melodic/video-stream-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-video-stream-opencv"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers/video_stream_opencv-release/archive/release/melodic/video_stream_opencv/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "a2fbecdf05b636214d3559aeffcee22617506d2924fde4b1d7ad3d9e527d1321"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers"; + repo = "video_stream_opencv-release"; + rev = "release/melodic/video_stream_opencv/1.1.6-1"; + sha256 = "sha256-mmYU4wI52SzjtL5nXKOY5jdySp1hq1esfqPUm8h1fPY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/view-controller-msgs/default.nix b/distros/melodic/view-controller-msgs/default.nix index 72105c5863..14b91ea8ab 100644 --- a/distros/melodic/view-controller-msgs/default.nix +++ b/distros/melodic/view-controller-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-view-controller-msgs"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/view_controller_msgs-release/archive/release/melodic/view_controller_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "cec91dd973a711c951445740ee4d743fb4907de310411e62bbd9796d3fcf54fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "view_controller_msgs-release"; + rev = "release/melodic/view_controller_msgs/0.2.0-1"; + sha256 = "sha256-HVswly+YiZAEVU8VXD/fq/u/HBI7ZG71PHm4e3OD1vM="; + }; buildType = "catkin"; buildInputs = [ catkin genmsg message-generation ]; diff --git a/distros/melodic/virtual-force-publisher/default.nix b/distros/melodic/virtual-force-publisher/default.nix index 5201a2bc25..b4046df854 100644 --- a/distros/melodic/virtual-force-publisher/default.nix +++ b/distros/melodic/virtual-force-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-virtual-force-publisher"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/melodic/virtual_force_publisher/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "245a450e7927f034a1f0bf7529ba983cb8bc1003f3c41771720afc25a6cc9161"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/melodic/virtual_force_publisher/2.2.12-1"; + sha256 = "sha256-dG82XAJu9RwjPifnBPv4urgsJdnqiQd1UCWssNU5oXY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vision-msgs/default.nix b/distros/melodic/vision-msgs/default.nix index daf51cbe77..e49be3afec 100644 --- a/distros/melodic/vision-msgs/default.nix +++ b/distros/melodic/vision-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vision-msgs"; version = "0.0.1"; - src = fetchurl { - url = "https://github.com/Kukanani/vision_msgs-release/archive/release/melodic/vision_msgs/0.0.1-0.tar.gz"; - name = "0.0.1-0.tar.gz"; - sha256 = "aea7d0a539a76bbd0072f74bb3c7ebc0a7f3b3277963f8d696de42a5c4066e90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kukanani"; + repo = "vision_msgs-release"; + rev = "release/melodic/vision_msgs/0.0.1-0"; + sha256 = "sha256-PdtZBRsXwV30z2ixuabHlNPix0ylWiNkasSoDFIp0sM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vision-opencv/default.nix b/distros/melodic/vision-opencv/default.nix index b9f457766a..d65daa804f 100644 --- a/distros/melodic/vision-opencv/default.nix +++ b/distros/melodic/vision-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vision-opencv"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vision_opencv-release/archive/release/melodic/vision_opencv/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "2fc42a57860c1b384804629fd2b7eba003f8d9f6ecb449e877bc6a798ca3ec89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vision_opencv-release"; + rev = "release/melodic/vision_opencv/1.13.1-1"; + sha256 = "sha256-KPAttZSCg9LxLt8BAJm5Ceb2aVUJJvqKKQZv2wfLCHE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vision-visp/default.nix b/distros/melodic/vision-visp/default.nix index 8b6165d547..f49847993c 100644 --- a/distros/melodic/vision-visp/default.nix +++ b/distros/melodic/vision-visp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vision-visp"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/melodic/vision_visp/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "0a76c249630101b60c70add2b31d25dac25fcd59381f49e7858dc2d1c668a984"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/melodic/vision_visp/0.13.0-1"; + sha256 = "sha256-WU6DEFJF4NqlEZG03Bn0E/UE88CaktRwoq+C7rJYpww="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visp-auto-tracker/default.nix b/distros/melodic/visp-auto-tracker/default.nix index a307d2449a..1bb114c06b 100644 --- a/distros/melodic/visp-auto-tracker/default.nix +++ b/distros/melodic/visp-auto-tracker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visp-auto-tracker"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/melodic/visp_auto_tracker/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "b948414716d7f747a63aeeaf042eddf7065551773c8ffccaa836ea1ebdde6839"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/melodic/visp_auto_tracker/0.13.0-1"; + sha256 = "sha256-LFwahnrejxUc6nENzhxJxCNFBmCZocO6sYA5BdH/h7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visp-bridge/default.nix b/distros/melodic/visp-bridge/default.nix index 17a352c9b8..579a298bf0 100644 --- a/distros/melodic/visp-bridge/default.nix +++ b/distros/melodic/visp-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visp-bridge"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/melodic/visp_bridge/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "c0d87800295906d6a4c37792309e436c87bbdefdbe9747328a98a0752bb7b80a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/melodic/visp_bridge/0.13.0-1"; + sha256 = "sha256-+BgcaBGBDt8FbmM1wYp2bZo/mSRBbf0xfAELUeV1K80="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visp-camera-calibration/default.nix b/distros/melodic/visp-camera-calibration/default.nix index 36eb993479..70fd50665c 100644 --- a/distros/melodic/visp-camera-calibration/default.nix +++ b/distros/melodic/visp-camera-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visp-camera-calibration"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/melodic/visp_camera_calibration/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "ef2de16ff7312fb6a866e490631f1b50858ec645d39f778cf3c2752a8b20cbf9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/melodic/visp_camera_calibration/0.13.0-1"; + sha256 = "sha256-ddC64899+b5KmMFXInvkkF0tgfXQbN5YCot7OqI4NQQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visp-hand2eye-calibration/default.nix b/distros/melodic/visp-hand2eye-calibration/default.nix index dd8be73923..c3572cd7f7 100644 --- a/distros/melodic/visp-hand2eye-calibration/default.nix +++ b/distros/melodic/visp-hand2eye-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visp-hand2eye-calibration"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/melodic/visp_hand2eye_calibration/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "62d20eef830a222518bb722659edc62b25275ba714fed9385dc57795fd75ce35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/melodic/visp_hand2eye_calibration/0.13.0-1"; + sha256 = "sha256-MgjDG9pn2HzhNZVVTooZCJohzy9ZcvGUA/q3Pq7VKb8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visp-tracker/default.nix b/distros/melodic/visp-tracker/default.nix index 69dc3842de..41c5ffa899 100644 --- a/distros/melodic/visp-tracker/default.nix +++ b/distros/melodic/visp-tracker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visp-tracker"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/melodic/visp_tracker/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "6edbf4ca9f56491dabadd0e3f68819feda1fda85f4d46ff95a02f6ee3eba6210"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/melodic/visp_tracker/0.13.0-1"; + sha256 = "sha256-toCy4cpwx9JtKe7F8EhX7xCkBObENHNnBZW0Rccih4c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visualization-marker-tutorials/default.nix b/distros/melodic/visualization-marker-tutorials/default.nix index dd187e2d71..710ffe3258 100644 --- a/distros/melodic/visualization-marker-tutorials/default.nix +++ b/distros/melodic/visualization-marker-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visualization-marker-tutorials"; version = "0.10.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/melodic/visualization_marker_tutorials/0.10.5-1.tar.gz"; - name = "0.10.5-1.tar.gz"; - sha256 = "8ca12243a96785409c4d590d8eadc711d6b0ac0fe94cef2fb188ed8d36e10eec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/melodic/visualization_marker_tutorials/0.10.5-1"; + sha256 = "sha256-yqAYU3k+t8Wjs58xm0DLyWn4rnZSW7MtDPzPrYX2leY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visualization-msgs/default.nix b/distros/melodic/visualization-msgs/default.nix index 7370b608d2..dc67deecdb 100644 --- a/distros/melodic/visualization-msgs/default.nix +++ b/distros/melodic/visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visualization-msgs"; version = "1.12.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/visualization_msgs/1.12.8-1.tar.gz"; - name = "1.12.8-1.tar.gz"; - sha256 = "9eb9cb4338fafb1b93c08a7bb029161cdfd700a0d027ff8c48fe02d55b0fedba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/melodic/visualization_msgs/1.12.8-1"; + sha256 = "sha256-sE87nrYk5vzT6QQoHZWvSstRlWd261uCIuPTB08Pmdg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/visualization-osg/default.nix b/distros/melodic/visualization-osg/default.nix index fdf9fc9070..e1cacb7067 100644 --- a/distros/melodic/visualization-osg/default.nix +++ b/distros/melodic/visualization-osg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visualization-osg"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/uji-ros-pkg/visualization_osg-release/archive/release/melodic/visualization_osg/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "49cee62d712e9d538aaac8ce03c2222705074e11365f6c89d108dfb2decbf164"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uji-ros-pkg"; + repo = "visualization_osg-release"; + rev = "release/melodic/visualization_osg/1.0.2-2"; + sha256 = "sha256-N2rsrAp6YKDNQUnUgFKbjmFQCiHc8InChpYElSdXzuE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visualization-rwt/default.nix b/distros/melodic/visualization-rwt/default.nix index 141b783e20..ee170db62b 100644 --- a/distros/melodic/visualization-rwt/default.nix +++ b/distros/melodic/visualization-rwt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visualization-rwt"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/melodic/visualization_rwt/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "8aa62e182a1ec6a2f54cd4701d81358c7de4c3e7d99272003243c2c5cead42dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/melodic/visualization_rwt/0.1.1-1"; + sha256 = "sha256-3cruRexM/a6EZqJjRS4oXTWNJoNUdindwDT+TELeg0A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/visualization-tutorials/default.nix b/distros/melodic/visualization-tutorials/default.nix index 75b74e61cd..2845c84dab 100644 --- a/distros/melodic/visualization-tutorials/default.nix +++ b/distros/melodic/visualization-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-visualization-tutorials"; version = "0.10.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/melodic/visualization_tutorials/0.10.5-1.tar.gz"; - name = "0.10.5-1.tar.gz"; - sha256 = "dbec72a547b5fda75d087ce1801cd563c298831f206450a48fd24cbce0c75b12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/melodic/visualization_tutorials/0.10.5-1"; + sha256 = "sha256-OBDRBPhdGLZ4qcx1P3NyRqF6tQdgyGBIGCGkLEkI3Qw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/viz/default.nix b/distros/melodic/viz/default.nix index 73ee8253bd..608e63f480 100644 --- a/distros/melodic/viz/default.nix +++ b/distros/melodic/viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-viz"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/melodic/viz/1.4.1-0.tar.gz"; - name = "1.4.1-0.tar.gz"; - sha256 = "c2cdc23508adf393957c192b8d62b0278260342d34dbcc58a3bac3abbd61dcf4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/melodic/viz/1.4.1-0"; + sha256 = "sha256-vFyc+W6pF5nSt2YsWwV7SJlAaoWkyzsa0jmTGmMV76k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vl53l1x/default.nix b/distros/melodic/vl53l1x/default.nix index c285af3c28..430e4a0c12 100644 --- a/distros/melodic/vl53l1x/default.nix +++ b/distros/melodic/vl53l1x/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vl53l1x"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/okalachev/vl53l1x_ros-release/archive/release/melodic/vl53l1x/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "ccfaa924238bb45acc5d373e81e72c47aca4ebdebf6a576c9ce1c77ba47c27c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "okalachev"; + repo = "vl53l1x_ros-release"; + rev = "release/melodic/vl53l1x/1.0.0-1"; + sha256 = "sha256-Cojkizq4TxodpUybeWi2ddEtU+uJggu5FEN8cqTGwqA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/voice-text/default.nix b/distros/melodic/voice-text/default.nix index 739a694c17..64f0f18ac6 100644 --- a/distros/melodic/voice-text/default.nix +++ b/distros/melodic/voice-text/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-voice-text"; version = "2.1.24-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/melodic/voice_text/2.1.24-2.tar.gz"; - name = "2.1.24-2.tar.gz"; - sha256 = "be625a2d0c79a132c7f14afdaa7c31051f581c974fb414a9dbefed7b36ac7892"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/melodic/voice_text/2.1.24-2"; + sha256 = "sha256-hkOtOua6/snq3kx6v2TJHl6iEPsXsCU4lJEsSlwHstQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roscpp ]; diff --git a/distros/melodic/volksbot-driver/default.nix b/distros/melodic/volksbot-driver/default.nix index cb79ef2f22..8fad8a09d1 100644 --- a/distros/melodic/volksbot-driver/default.nix +++ b/distros/melodic/volksbot-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volksbot-driver"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/volksbot_driver-release/archive/release/melodic/volksbot_driver/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "e6e0fa49a8ba75f9f7f8e784d53250f53779337d0fd4bda5274433bb54dfc271"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "volksbot_driver-release"; + rev = "release/melodic/volksbot_driver/1.0.1-1"; + sha256 = "sha256-Eh4mmCS8/6Of9G/G1Pn3DOXI7L5EO5teEY5pdjpPJL0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/volta-base/default.nix b/distros/melodic/volta-base/default.nix index 9ac0524a41..eea184d765 100644 --- a/distros/melodic/volta-base/default.nix +++ b/distros/melodic/volta-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-base"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/melodic/volta_base/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "165b4d5edafbdf1eed85b686accd5fb6a8d71cd056b3183c414a15b6c73ee23c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/melodic/volta_base/1.1.1-1"; + sha256 = "sha256-/N0PyqwlEUfApl3Ig02+3gs/1zcDz5suW2bbjTtEWfI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/volta-control/default.nix b/distros/melodic/volta-control/default.nix index 4f735b340c..aaa120c0d4 100644 --- a/distros/melodic/volta-control/default.nix +++ b/distros/melodic/volta-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-control"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/melodic/volta_control/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "cd9044f1c440c754dfd80735dfb69c93d12268a9aeb0d2fcc76928fee6bb9a70"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/melodic/volta_control/1.1.1-1"; + sha256 = "sha256-JE5iCjtFFv+eR/DNQcPY4GUAe7qAuvF/7+l08rP/ZKE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/volta-description/default.nix b/distros/melodic/volta-description/default.nix index ac6d75f61e..36453d0dd8 100644 --- a/distros/melodic/volta-description/default.nix +++ b/distros/melodic/volta-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-description"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/melodic/volta_description/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "80633b2b216c10f16302292ce97c59aa6d1a95ce122ec8c729fcc7661961d60f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/melodic/volta_description/1.1.1-1"; + sha256 = "sha256-raEO4h1y2KE1RN1K2DCVc9OeqSwHrDxu772cUNEpvNw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/volta-localization/default.nix b/distros/melodic/volta-localization/default.nix index 5008241605..8d8d534b18 100644 --- a/distros/melodic/volta-localization/default.nix +++ b/distros/melodic/volta-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-localization"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/melodic/volta_localization/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "8b63b7df42d7f42a6d313fabb4b7d48babcde31c73cc33600b7c1ff99a7a2db2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/melodic/volta_localization/1.1.1-1"; + sha256 = "sha256-pwIlcwiQ9m3tcFCSr0vNDGh4xksfOjdNvi64hRuhR8k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/volta-msgs/default.nix b/distros/melodic/volta-msgs/default.nix index 11fd1a63ad..7fa8e1257e 100644 --- a/distros/melodic/volta-msgs/default.nix +++ b/distros/melodic/volta-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-msgs"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/melodic/volta_msgs/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "483381d91e81756f81cf7a9f0e5a9de5f96f3cf7d8de27e530a497433fe1e33c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/melodic/volta_msgs/1.1.1-1"; + sha256 = "sha256-g9bQ0l9lPY3MyON8usWCo9UVX/Av/m41pQ8ScITvIqk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/volta-navigation/default.nix b/distros/melodic/volta-navigation/default.nix index 5d638463e3..6731e9965a 100644 --- a/distros/melodic/volta-navigation/default.nix +++ b/distros/melodic/volta-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-navigation"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/melodic/volta_navigation/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "9590f489e4b119ad2478dd4aeb7bfb538f145dc8e6d3e2710cb3e417cc92cabb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/melodic/volta_navigation/1.1.1-1"; + sha256 = "sha256-sOABG/HHWKON/KrHsvocsOq8abT2lFyB+tzwZKTVK/0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/volta-rules/default.nix b/distros/melodic/volta-rules/default.nix index 61182e6572..210bb23898 100644 --- a/distros/melodic/volta-rules/default.nix +++ b/distros/melodic/volta-rules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-rules"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/melodic/volta_rules/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "99e60e515400135a52f641b9e5980b9e96c2b3f6412dd87594fb7f600cc68f1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/melodic/volta_rules/1.1.1-1"; + sha256 = "sha256-hdTLbNQO0Sd0de6O5qWQATs0HUX59Gtz1VQeb/ACNi4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/volta-simulation/default.nix b/distros/melodic/volta-simulation/default.nix index 3d6ff3edba..97481e683d 100644 --- a/distros/melodic/volta-simulation/default.nix +++ b/distros/melodic/volta-simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-simulation"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta_simulation-release/archive/release/melodic/volta_simulation/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "8819262427c6cb04c561d9148ddd31788a6ec2da49c21972c58b5f9403270e09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta_simulation-release"; + rev = "release/melodic/volta_simulation/1.1.0-2"; + sha256 = "sha256-3eCJ74kuCwlRc3azNzMsQtJ9upZaKi4UP5vQxAl+lOw="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/volta-teleoperator/default.nix b/distros/melodic/volta-teleoperator/default.nix index e2c3f13178..b4312db986 100644 --- a/distros/melodic/volta-teleoperator/default.nix +++ b/distros/melodic/volta-teleoperator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-volta-teleoperator"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/melodic/volta_teleoperator/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "c78de0dec74b640a9643cae3f908e3e198fe1884e1d0fc56ab27802596fd4353"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/melodic/volta_teleoperator/1.1.1-1"; + sha256 = "sha256-IJFN+xg+bR2IJ+BYnIriGl8D3BuxVawTjpCM9WbGiUw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/voxel-grid/default.nix b/distros/melodic/voxel-grid/default.nix index 721390617c..b641a5fa0e 100644 --- a/distros/melodic/voxel-grid/default.nix +++ b/distros/melodic/voxel-grid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-voxel-grid"; version = "1.16.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/melodic/voxel_grid/1.16.7-1.tar.gz"; - name = "1.16.7-1.tar.gz"; - sha256 = "48627660198a216087071f3653236191b16357a2a7b803d827e4e7051ff0d286"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/melodic/voxel_grid/1.16.7-1"; + sha256 = "sha256-VPL2BiRJBlF7plN/dE2K9mjwLsQn4O+RIUPokiLve/0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vrpn-client-ros/default.nix b/distros/melodic/vrpn-client-ros/default.nix index 4ba331a6e7..6f24f97faa 100644 --- a/distros/melodic/vrpn-client-ros/default.nix +++ b/distros/melodic/vrpn-client-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vrpn-client-ros"; version = "0.2.2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/vrpn_client_ros-release/archive/release/melodic/vrpn_client_ros/0.2.2-0.tar.gz"; - name = "0.2.2-0.tar.gz"; - sha256 = "1aab125d405ed53be48b7f49db7594343f35cccfecd3f4ef14571311ff5ae0f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "vrpn_client_ros-release"; + rev = "release/melodic/vrpn_client_ros/0.2.2-0"; + sha256 = "sha256-ITmpgU8fS0E7LnQgj0wl+8RVyq4hydk+Keqm69lxG1U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/vrpn/default.nix b/distros/melodic/vrpn/default.nix index 9633d3d515..a08455992f 100644 --- a/distros/melodic/vrpn/default.nix +++ b/distros/melodic/vrpn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vrpn"; version = "7.34.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/vrpn-release/archive/release/melodic/vrpn/7.34.0-1.tar.gz"; - name = "7.34.0-1.tar.gz"; - sha256 = "1dd53934e26a049fba648ddb79d87c96a229181479c14a8c743fde9bddf854c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "vrpn-release"; + rev = "release/melodic/vrpn/7.34.0-1"; + sha256 = "sha256-6j5kKUAO8qNvfpS3TURnAzasQ4kmtoCIyY5g1T7PBK4="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/vrx-gazebo/default.nix b/distros/melodic/vrx-gazebo/default.nix index f3733eb54f..daf2880378 100644 --- a/distros/melodic/vrx-gazebo/default.nix +++ b/distros/melodic/vrx-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-vrx-gazebo"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vrx-release/archive/release/melodic/vrx_gazebo/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "5bcd4e7ec999a9f617586ef2098d3a1fb42b36384d53b661637e5baceb4bb22b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vrx-release"; + rev = "release/melodic/vrx_gazebo/1.3.0-1"; + sha256 = "sha256-Y4eTMMtXI5MJ60cfL3xBuWaPKWfqDWeeyQZsqQZO/bQ="; + }; buildType = "catkin"; buildInputs = [ catkin protobuf ]; diff --git a/distros/melodic/wamv-description/default.nix b/distros/melodic/wamv-description/default.nix index c2a53d4f34..b771ccb069 100644 --- a/distros/melodic/wamv-description/default.nix +++ b/distros/melodic/wamv-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wamv-description"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vrx-release/archive/release/melodic/wamv_description/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "69652845bda9556aaf54f825c7f0554ed7a0d0270cd521bd50d5f6299250318b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vrx-release"; + rev = "release/melodic/wamv_description/1.3.0-1"; + sha256 = "sha256-4+WWEhWc2cTAlrWVSRUpEUVF2lg4/DvU2HVesEpDfgw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/wamv-gazebo/default.nix b/distros/melodic/wamv-gazebo/default.nix index b01fb44f14..a180aec062 100644 --- a/distros/melodic/wamv-gazebo/default.nix +++ b/distros/melodic/wamv-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wamv-gazebo"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vrx-release/archive/release/melodic/wamv_gazebo/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "2e8cab052d235a6490d05aeae417efc2a193431d47aabef89f14b3814ea016d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vrx-release"; + rev = "release/melodic/wamv_gazebo/1.3.0-1"; + sha256 = "sha256-JAYZ62KEk8nfx2hAIqgEV/BjDkBZtrL9vULE+nnSe5Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/warehouse-ros-sqlite/default.nix b/distros/melodic/warehouse-ros-sqlite/default.nix index a03400b8a1..39f44c074b 100644 --- a/distros/melodic/warehouse-ros-sqlite/default.nix +++ b/distros/melodic/warehouse-ros-sqlite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-warehouse-ros-sqlite"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/warehouse_ros_sqlite-release/archive/release/melodic/warehouse_ros_sqlite/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "dcdad8deebb3ee56669b1e27bbde2bb3d923937108b0a590ede4b69eab89e181"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "warehouse_ros_sqlite-release"; + rev = "release/melodic/warehouse_ros_sqlite/0.9.0-1"; + sha256 = "sha256-z5/KIpwAXQ1Jg6wVi1hiN+SivA/IgdCfbeK4Bl1EcfY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/warehouse-ros/default.nix b/distros/melodic/warehouse-ros/default.nix index 2a0e7d6b6b..377302cc09 100644 --- a/distros/melodic/warehouse-ros/default.nix +++ b/distros/melodic/warehouse-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-warehouse-ros"; version = "0.9.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/warehouse_ros-release/archive/release/melodic/warehouse_ros/0.9.5-1.tar.gz"; - name = "0.9.5-1.tar.gz"; - sha256 = "5ca7ab01596b0a016cd246426d942d88e503ebbcf407e379589560459a64f88d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "warehouse_ros-release"; + rev = "release/melodic/warehouse_ros/0.9.5-1"; + sha256 = "sha256-8aBMYtKJlumdTSjtOsEop3STuiCIgk6UZGICrWG2zJg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/warthog-control/default.nix b/distros/melodic/warthog-control/default.nix index b67b21cc1f..5a38881bee 100644 --- a/distros/melodic/warthog-control/default.nix +++ b/distros/melodic/warthog-control/default.nix @@ -5,13 +5,17 @@ { 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-warthog-control"; - version = "0.1.5-r1"; + version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog-release/archive/release/melodic/warthog_control/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "57f23805ee7fe02e49a667344fc9d83c9da862f0d5ca656cfe07aa2499a9fb2e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog-release"; + rev = "release/melodic/warthog_control/0.1.6-1"; + sha256 = "sha256-uHVkhvkbpHdqBvylKnBn0N7u65tbzMV/Maczqnaea2E="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/warthog-description/default.nix b/distros/melodic/warthog-description/default.nix index 05a746e255..6dde9b0243 100644 --- a/distros/melodic/warthog-description/default.nix +++ b/distros/melodic/warthog-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, robot-state-publisher, roslaunch, urdf, xacro }: buildRosPackage { pname = "ros-melodic-warthog-description"; - version = "0.1.5-r1"; + version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog-release/archive/release/melodic/warthog_description/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "4c6b2233e81e8a3fd83af6f9cf2815dcfff21edaa579a2ce39ad5c1aa3f1d473"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog-release"; + rev = "release/melodic/warthog_description/0.1.6-1"; + sha256 = "sha256-VjHhwfqvd3RzPx0/t5s7zzwDILcZUNLfQ2Wzdjbll70="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/warthog-desktop/default.nix b/distros/melodic/warthog-desktop/default.nix index 986b8c0219..d17daca4fa 100644 --- a/distros/melodic/warthog-desktop/default.nix +++ b/distros/melodic/warthog-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-warthog-desktop"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog_desktop-release/archive/release/melodic/warthog_desktop/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "67791be4dee0cd2f12e04c840c20146a589fb2bf3dcc009f6376ea2899062807"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog_desktop-release"; + rev = "release/melodic/warthog_desktop/0.1.1-1"; + sha256 = "sha256-aajHMpN2BaXAgDcNV0Sfr5qRovXqZyZnY4wR2a9n4Nw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/warthog-gazebo/default.nix b/distros/melodic/warthog-gazebo/default.nix index ab25586ae6..ea724c3714 100644 --- a/distros/melodic/warthog-gazebo/default.nix +++ b/distros/melodic/warthog-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-warthog-gazebo"; version = "0.2.2-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog_simulator-release/archive/release/melodic/warthog_gazebo/0.2.2-2.tar.gz"; - name = "0.2.2-2.tar.gz"; - sha256 = "8440194957dc342739f264bfc6c722aade6e49bcadc6d2e64506b2378e9bab59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog_simulator-release"; + rev = "release/melodic/warthog_gazebo/0.2.2-2"; + sha256 = "sha256-yob3+P6Bg5MlFISzlyS6k0lgJDoN+Zq59JdAdEjRsDQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/warthog-msgs/default.nix b/distros/melodic/warthog-msgs/default.nix index 30b3b729d4..b522743675 100644 --- a/distros/melodic/warthog-msgs/default.nix +++ b/distros/melodic/warthog-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-melodic-warthog-msgs"; - version = "0.1.5-r1"; + version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog-release/archive/release/melodic/warthog_msgs/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "625e326f76ef82103595d8a059df3413afc9d829eca8c4a434655b2b5407ccba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog-release"; + rev = "release/melodic/warthog_msgs/0.1.6-1"; + sha256 = "sha256-tnkTcKoV3KOKMXbJSAofKWSssEwdPirpM3gVTYfXB9M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/warthog-simulator/default.nix b/distros/melodic/warthog-simulator/default.nix index 77371678c6..8a0f35b534 100644 --- a/distros/melodic/warthog-simulator/default.nix +++ b/distros/melodic/warthog-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-warthog-simulator"; version = "0.2.2-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog_simulator-release/archive/release/melodic/warthog_simulator/0.2.2-2.tar.gz"; - name = "0.2.2-2.tar.gz"; - sha256 = "be0d98e29d052f06df7da430fa0363812a499e4ac58cd1d47ba30f960c487f26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog_simulator-release"; + rev = "release/melodic/warthog_simulator/0.2.2-2"; + sha256 = "sha256-EInTf4WSk6cmFaouzRRac4kX4vUhFIXU2r5gvT4iQ+c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/warthog-viz/default.nix b/distros/melodic/warthog-viz/default.nix index 8ac47555c2..eaaaff2a0e 100644 --- a/distros/melodic/warthog-viz/default.nix +++ b/distros/melodic/warthog-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-warthog-viz"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog_desktop-release/archive/release/melodic/warthog_viz/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "0b8051c8bb18f3e0bbfcaaa6a3659dd27644f40512e07a0a9b8dcc41af1d477c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog_desktop-release"; + rev = "release/melodic/warthog_viz/0.1.1-1"; + sha256 = "sha256-p1w59p3XcIBH/bSsVVCjOY8E6f+wvbuwvnmQ4jTglo4="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/melodic/wave-gazebo-plugins/default.nix b/distros/melodic/wave-gazebo-plugins/default.nix index ccf0a2d437..ab5a4872c0 100644 --- a/distros/melodic/wave-gazebo-plugins/default.nix +++ b/distros/melodic/wave-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wave-gazebo-plugins"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vrx-release/archive/release/melodic/wave_gazebo_plugins/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "2e377ffb712c23f3e9f3a3affbd5d43bc4663197e358327fbf54822ffb00983a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vrx-release"; + rev = "release/melodic/wave_gazebo_plugins/1.3.0-1"; + sha256 = "sha256-eFdfocU6jv7OhvoOgYakU95Gw9gpIb/L3oSWSQ2sVaA="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/melodic/wave-gazebo/default.nix b/distros/melodic/wave-gazebo/default.nix index 419f7f3955..a1208f626a 100644 --- a/distros/melodic/wave-gazebo/default.nix +++ b/distros/melodic/wave-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wave-gazebo"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vrx-release/archive/release/melodic/wave_gazebo/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "c9307ade2ceee4823cec9ad2501a074b8ffaa00ca535fa951e098203d9347099"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vrx-release"; + rev = "release/melodic/wave_gazebo/1.3.0-1"; + sha256 = "sha256-BuV7qRwgpiXq8afG3wi6Ws3syjBnq3YXBNcZ8f4KVY8="; + }; buildType = "catkin"; buildInputs = [ catkin ruby ]; diff --git a/distros/melodic/web-video-server/default.nix b/distros/melodic/web-video-server/default.nix index 4513cd29cf..93c50f1a34 100644 --- a/distros/melodic/web-video-server/default.nix +++ b/distros/melodic/web-video-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-web-video-server"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/web_video_server-release/archive/release/melodic/web_video_server/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "6280be50271f4d288665701715b2053fd31bc2fc0032a26956aad9cd17fc761b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "web_video_server-release"; + rev = "release/melodic/web_video_server/0.2.1-1"; + sha256 = "sha256-w++hr6hEgw4PzjhdA6grjz/yv2dbndwSVdw8EqiUf94="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/webkit-dependency/default.nix b/distros/melodic/webkit-dependency/default.nix index a17089e3a7..0678cf4508 100644 --- a/distros/melodic/webkit-dependency/default.nix +++ b/distros/melodic/webkit-dependency/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-webkit-dependency"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/webkit_dependency-release/archive/release/melodic/webkit_dependency/1.1.0-0.tar.gz"; - name = "1.1.0-0.tar.gz"; - sha256 = "a187ab79ea2545b2dec0f48d74af9b4f3875f73ac649c8527e54e9ea6cda0e29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "webkit_dependency-release"; + rev = "release/melodic/webkit_dependency/1.1.0-0"; + sha256 = "sha256-1DKs7C9YuJcIi07pWTq/Ixuz8rAUqbqy1B1AiXT5uNY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/webots-ros/default.nix b/distros/melodic/webots-ros/default.nix index e7ff6d8f83..6f8e23dc68 100644 --- a/distros/melodic/webots-ros/default.nix +++ b/distros/melodic/webots-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-webots-ros"; version = "5.0.1-r2"; - src = fetchurl { - url = "https://github.com/cyberbotics/webots_ros-release/archive/release/melodic/webots_ros/5.0.1-2.tar.gz"; - name = "5.0.1-2.tar.gz"; - sha256 = "eba56b3a93053246bbce5f7269abb99da3ee8d1ef5cce05a83f17651d7b66d89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cyberbotics"; + repo = "webots_ros-release"; + rev = "release/melodic/webots_ros/5.0.1-2"; + sha256 = "sha256-G/jrBflGsmNt2UkOVf2y3/Wwf9wvarW+kWM2sROj0oI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/webrtc-ros/default.nix b/distros/melodic/webrtc-ros/default.nix index 4d81f8eed0..139d833d82 100644 --- a/distros/melodic/webrtc-ros/default.nix +++ b/distros/melodic/webrtc-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-webrtc-ros"; version = "59.0.4-r1"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/webrtc_ros-release/archive/release/melodic/webrtc_ros/59.0.4-1.tar.gz"; - name = "59.0.4-1.tar.gz"; - sha256 = "134243c7a0ebad22eec7f32cad62908716de537fce354fe1b8853478b58e862c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "webrtc_ros-release"; + rev = "release/melodic/webrtc_ros/59.0.4-1"; + sha256 = "sha256-8uk6R26iOfjloslllhLgQXyPKZ81VYQZlWsuWUllb0c="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/webrtc/default.nix b/distros/melodic/webrtc/default.nix index 16c68de6ca..cd86017023 100644 --- a/distros/melodic/webrtc/default.nix +++ b/distros/melodic/webrtc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-webrtc"; version = "59.0.4-r1"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/webrtc_ros-release/archive/release/melodic/webrtc/59.0.4-1.tar.gz"; - name = "59.0.4-1.tar.gz"; - sha256 = "2889d9f998f589846868676e8bed291496807b9bb8e8f88bbdbf97b8ab5223a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "webrtc_ros-release"; + rev = "release/melodic/webrtc/59.0.4-1"; + sha256 = "sha256-4DG/X7ZyxhqTXmlJ0XDyOokpNyRIKi81KVxfoiA5aO4="; + }; buildType = "cmake"; buildInputs = [ cmake git wget ]; diff --git a/distros/melodic/wfov-camera-msgs/default.nix b/distros/melodic/wfov-camera-msgs/default.nix index e4008edfdf..64dc3d2e51 100644 --- a/distros/melodic/wfov-camera-msgs/default.nix +++ b/distros/melodic/wfov-camera-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wfov-camera-msgs"; version = "0.14.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/melodic/wfov_camera_msgs/0.14.2-1.tar.gz"; - name = "0.14.2-1.tar.gz"; - sha256 = "6082f10c40e6051afe2fd9e75d062bc0246e99d57d607959a016d95e9a0ad22c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/melodic/wfov_camera_msgs/0.14.2-1"; + sha256 = "sha256-jk5AVd7LOurjCjYndKsst+OLd9nfDvlsw2eITANcHMc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/wge100-camera-firmware/default.nix b/distros/melodic/wge100-camera-firmware/default.nix index eecf5a4925..bd22f79caa 100644 --- a/distros/melodic/wge100-camera-firmware/default.nix +++ b/distros/melodic/wge100-camera-firmware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wge100-camera-firmware"; version = "1.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/melodic/wge100_camera_firmware/1.8.2-1.tar.gz"; - name = "1.8.2-1.tar.gz"; - sha256 = "4e0908e101472e4247b1c23782764c9576b37103db122bd196de406e9e951e50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "wge100_driver-release"; + rev = "release/melodic/wge100_camera_firmware/1.8.2-1"; + sha256 = "sha256-5Bi8yHvW+sVP93sbemLKMd/QqvT+jzwzVdWbo4PVNXg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/wge100-camera/default.nix b/distros/melodic/wge100-camera/default.nix index dfd68abfb7..fdfc339387 100644 --- a/distros/melodic/wge100-camera/default.nix +++ b/distros/melodic/wge100-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wge100-camera"; version = "1.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/melodic/wge100_camera/1.8.2-1.tar.gz"; - name = "1.8.2-1.tar.gz"; - sha256 = "555d7b0249e43457e5ce245fb1c7fe895a0510b8a142197717e046e7cc1e18fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "wge100_driver-release"; + rev = "release/melodic/wge100_camera/1.8.2-1"; + sha256 = "sha256-xBn8w/h38GhE+1Ccq0PTT3DncrPDmO19B+QCVv50sg8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/melodic/wge100-driver/default.nix b/distros/melodic/wge100-driver/default.nix index 00b28578a6..5b2b925850 100644 --- a/distros/melodic/wge100-driver/default.nix +++ b/distros/melodic/wge100-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wge100-driver"; version = "1.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/melodic/wge100_driver/1.8.2-1.tar.gz"; - name = "1.8.2-1.tar.gz"; - sha256 = "1ad42f5a276e3238007f5c28d16536288c3cccb009e4a0822eaf86304d2ec153"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "wge100_driver-release"; + rev = "release/melodic/wge100_driver/1.8.2-1"; + sha256 = "sha256-EFJUGPTmqPyFov3teHkzNwbYVD7kKin11ifNXO9RUkI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/wifi-ddwrt/default.nix b/distros/melodic/wifi-ddwrt/default.nix index 0dd230494f..a437df1798 100644 --- a/distros/melodic/wifi-ddwrt/default.nix +++ b/distros/melodic/wifi-ddwrt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wifi-ddwrt"; version = "0.2.0"; - src = fetchurl { - url = "https://github.com/ros-gbp/wifi_ddwrt-release/archive/release/melodic/wifi_ddwrt/0.2.0-0.tar.gz"; - name = "0.2.0-0.tar.gz"; - sha256 = "d9315fb98ca9d63cd7fd67895b3430e832d674a01469a5af7ec18fbd0c57dc7e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "wifi_ddwrt-release"; + rev = "release/melodic/wifi_ddwrt/0.2.0-0"; + sha256 = "sha256-FCjgIm4TXBxmhJ5FbR3FK0qS5EVdd8mHCjYODGgCXnI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/willow-maps/default.nix b/distros/melodic/willow-maps/default.nix index 364be0275b..0c440e74df 100644 --- a/distros/melodic/willow-maps/default.nix +++ b/distros/melodic/willow-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-willow-maps"; version = "1.0.3"; - src = fetchurl { - url = "https://github.com/ros-gbp/willow_maps-release/archive/release/melodic/willow_maps/1.0.3-0.tar.gz"; - name = "1.0.3-0.tar.gz"; - sha256 = "8c9dbbaeabb4464c98637228bddfd69f2b0e8692e40d9a0f0921b4b910e0dfe9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "willow_maps-release"; + rev = "release/melodic/willow_maps/1.0.3-0"; + sha256 = "sha256-IIn8UQEUNVNd+OCgqtSbqflAXMrQItZZjwiSGzuJKd4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/wireless-msgs/default.nix b/distros/melodic/wireless-msgs/default.nix index 7ee12ec550..0532e41b77 100644 --- a/distros/melodic/wireless-msgs/default.nix +++ b/distros/melodic/wireless-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wireless-msgs"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/wireless-release/archive/release/melodic/wireless_msgs/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "6483e8277a037291b1b539f4047df7ce7f194fd10b270dd0d1862ab87538f3ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "wireless-release"; + rev = "release/melodic/wireless_msgs/0.1.1-1"; + sha256 = "sha256-TZJIhudGUEey1U/FfWaRu/ON7O4eZY8zACqCPRJNeYk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/wireless-watcher/default.nix b/distros/melodic/wireless-watcher/default.nix index e373c1aef3..b0110838f1 100644 --- a/distros/melodic/wireless-watcher/default.nix +++ b/distros/melodic/wireless-watcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wireless-watcher"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/wireless-release/archive/release/melodic/wireless_watcher/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "32d768d95a5b8d27ebf9dcc66110b1dfac0e042292ddfe597725f62c954f36d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "wireless-release"; + rev = "release/melodic/wireless_watcher/0.1.1-1"; + sha256 = "sha256-x+DGAY9zrogalssgS9kX41yPsZxZI46FIMN1q/eCwkk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ws281x/default.nix b/distros/melodic/ws281x/default.nix index 4902d60f26..c74e1f7cf2 100644 --- a/distros/melodic/ws281x/default.nix +++ b/distros/melodic/ws281x/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ws281x"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/ros_led-release/archive/release/melodic/ws281x/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "67ddd33a54d28457380dddec2ef26b102389b174e1f8a5efa16ab85cea1ce310"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "ros_led-release"; + rev = "release/melodic/ws281x/0.0.11-1"; + sha256 = "sha256-izc3WIENufDJGluuKyE19SEX0vEez8E5kP2svi5yL/I="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/melodic/wu-ros-tools/default.nix b/distros/melodic/wu-ros-tools/default.nix index 8a9f587433..ce3ae67c91 100644 --- a/distros/melodic/wu-ros-tools/default.nix +++ b/distros/melodic/wu-ros-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-wu-ros-tools"; version = "0.2.6-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/melodic/wu_ros_tools/0.2.6-1.tar.gz"; - name = "0.2.6-1.tar.gz"; - sha256 = "557457c728d9cafede598ef48db73051845b4d377959a8b5ccd9b7a2847e14a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/melodic/wu_ros_tools/0.2.6-1"; + sha256 = "sha256-H4WLdrpPaYQU1S4NueNh8WAI9bhdlDRfqlaAtzgnPlA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xacro/default.nix b/distros/melodic/xacro/default.nix index b4d8f9ec99..6a6e92b8b9 100644 --- a/distros/melodic/xacro/default.nix +++ b/distros/melodic/xacro/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xacro"; version = "1.13.18-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/xacro-release/archive/release/melodic/xacro/1.13.18-1.tar.gz"; - name = "1.13.18-1.tar.gz"; - sha256 = "92576c8fd6939763933cac849cfd10559d134c24deee9336936e551bc4186ab6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "xacro-release"; + rev = "release/melodic/xacro/1.13.18-1"; + sha256 = "sha256-+1aR/vquQBfXfi+KWVA4q9aHTRG+3rSzcL4KGVaPSoM="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/xmlrpcpp/default.nix b/distros/melodic/xmlrpcpp/default.nix index b4f7dc5a67..2dc3befc15 100644 --- a/distros/melodic/xmlrpcpp/default.nix +++ b/distros/melodic/xmlrpcpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xmlrpcpp"; version = "1.14.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/xmlrpcpp/1.14.13-1.tar.gz"; - name = "1.14.13-1.tar.gz"; - sha256 = "751ddf0d3bf22779e408a924efaebff82d4fa16a9b3557b881c1018b49a0e841"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/melodic/xmlrpcpp/1.14.13-1"; + sha256 = "sha256-Ef8TD4X01VXyp0SUvSKllryVFfXd3PEvf/sSsKLcdTo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xpp-examples/default.nix b/distros/melodic/xpp-examples/default.nix index befaed9397..8e30700583 100644 --- a/distros/melodic/xpp-examples/default.nix +++ b/distros/melodic/xpp-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xpp-examples"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/melodic/xpp_examples/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "df300b82eb4135d5c0343d75f1c11dc6e3c03df09b07582ab3a4f753338522df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/melodic/xpp_examples/1.0.10-0"; + sha256 = "sha256-PpyjBX1+7MvPo3hOUsOdgnSi84MgcGAJYxkUIHyIfsA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xpp-hyq/default.nix b/distros/melodic/xpp-hyq/default.nix index 1d3d0bd32b..6c2db50c8a 100644 --- a/distros/melodic/xpp-hyq/default.nix +++ b/distros/melodic/xpp-hyq/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xpp-hyq"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/melodic/xpp_hyq/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "92f200e4ca8f3bb5c9b5e4b9657aadd436267efeae2f74f235a682ad9c3fca62"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/melodic/xpp_hyq/1.0.10-0"; + sha256 = "sha256-MlgPqAXIWfZ+S/1u17CCaqUkw3Yi6bsTVA86CTvdUaY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xpp-msgs/default.nix b/distros/melodic/xpp-msgs/default.nix index 3b498b8a5a..617a06dd09 100644 --- a/distros/melodic/xpp-msgs/default.nix +++ b/distros/melodic/xpp-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xpp-msgs"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/melodic/xpp_msgs/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "0835118248689817293f9399f3c3a7ece360dc9b6ac866ba80fa8c0c74554cd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/melodic/xpp_msgs/1.0.10-0"; + sha256 = "sha256-as6DQ6JwbUTT3pJpV7Uf0k6+mM2q0M+gjGsQShT+NNM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xpp-quadrotor/default.nix b/distros/melodic/xpp-quadrotor/default.nix index 00ff7a7979..ae0e80a28f 100644 --- a/distros/melodic/xpp-quadrotor/default.nix +++ b/distros/melodic/xpp-quadrotor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xpp-quadrotor"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/melodic/xpp_quadrotor/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "8a3c7cbaa6def3250bf3825790f587b3626799b51dc7105917c20af6b8f5d3b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/melodic/xpp_quadrotor/1.0.10-0"; + sha256 = "sha256-IzqI3I16uhtlIMIfOrzGhD8+YdeJA5psofm0JmMrW9I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xpp-states/default.nix b/distros/melodic/xpp-states/default.nix index 1ef7309a34..ed9d609951 100644 --- a/distros/melodic/xpp-states/default.nix +++ b/distros/melodic/xpp-states/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xpp-states"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/melodic/xpp_states/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "7844597910c688e3ae3664b58bf6d3f17f0364d049d890156ed4675a2a2825f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/melodic/xpp_states/1.0.10-0"; + sha256 = "sha256-6tRWtoNGYmKG79eGQPk28C00gV9Wl7AXN+SxcezJ05U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xpp-vis/default.nix b/distros/melodic/xpp-vis/default.nix index 2c4af5c282..5daaa8fd4c 100644 --- a/distros/melodic/xpp-vis/default.nix +++ b/distros/melodic/xpp-vis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xpp-vis"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/melodic/xpp_vis/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "a28dddd1ac40ec97257e52ee5f1dc6b2a0989fcf0fceccba4698019bbcfe56e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/melodic/xpp_vis/1.0.10-0"; + sha256 = "sha256-AHVyk9igM9Bt87Es87HfMaDs530HGaX05Obv1uehiJg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xpp/default.nix b/distros/melodic/xpp/default.nix index 45eaad1f53..319f4a0771 100644 --- a/distros/melodic/xpp/default.nix +++ b/distros/melodic/xpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xpp"; version = "1.0.10"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/melodic/xpp/1.0.10-0.tar.gz"; - name = "1.0.10-0.tar.gz"; - sha256 = "b5df600ccf29b0c24148d6eac7312ddd566f19024c48a49779a9f6905cef89ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/melodic/xpp/1.0.10-0"; + sha256 = "sha256-o7pRgC0V4tObF34zu4ZKDWHct3z5D7NrnySs9PjnyYE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xsens-driver/default.nix b/distros/melodic/xsens-driver/default.nix index 9828a45d28..fd654dd905 100644 --- a/distros/melodic/xsens-driver/default.nix +++ b/distros/melodic/xsens-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xsens-driver"; version = "2.2.2"; - src = fetchurl { - url = "https://github.com/ethz-asl/ethzasl_xsens_driver-release/archive/release/melodic/xsens_driver/2.2.2-0.tar.gz"; - name = "2.2.2-0.tar.gz"; - sha256 = "bf0a13bb4fd0e2891ca1f6b18c1d8bb071f8eb2446a07ee31abb850d821da693"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ethz-asl"; + repo = "ethzasl_xsens_driver-release"; + rev = "release/melodic/xsens_driver/2.2.2-0"; + sha256 = "sha256-52xvkHyI7IVas3jJqDU17vE+FDEJWlj086OeLYey/lg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/xv-11-laser-driver/default.nix b/distros/melodic/xv-11-laser-driver/default.nix index 60dd7259a0..974e2063e0 100644 --- a/distros/melodic/xv-11-laser-driver/default.nix +++ b/distros/melodic/xv-11-laser-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-xv-11-laser-driver"; version = "0.3.0"; - src = fetchurl { - url = "https://github.com/rohbotics/xv_11_laser_driver-release/archive/release/melodic/xv_11_laser_driver/0.3.0-0.tar.gz"; - name = "0.3.0-0.tar.gz"; - sha256 = "7c6485e8b062b95fd61b2eceb47f042f5d069f1c6aad947f5c237f8968ec595c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rohbotics"; + repo = "xv_11_laser_driver-release"; + rev = "release/melodic/xv_11_laser_driver/0.3.0-0"; + sha256 = "sha256-xd8dH35fK1pMgD4JhX69dVG7ofLih5D/yYoha5A2M4M="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp sensor-msgs ]; diff --git a/distros/melodic/yocs-ar-marker-tracking/default.nix b/distros/melodic/yocs-ar-marker-tracking/default.nix index 9d008917d8..aa71180e70 100644 --- a/distros/melodic/yocs-ar-marker-tracking/default.nix +++ b/distros/melodic/yocs-ar-marker-tracking/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-ar-marker-tracking"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_ar_marker_tracking/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "10cb24072d6c3a4eb12bd24686276fe3ee8b70ec4cef5c4e38257fdd5bdf0ac7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_ar_marker_tracking/0.8.2-0"; + sha256 = "sha256-AJ0bDpou4FFFkxhGrXN8paK5oeg4LnrTq6KBbr6j3xs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-ar-pair-approach/default.nix b/distros/melodic/yocs-ar-pair-approach/default.nix index 3abbea940c..763d207a5c 100644 --- a/distros/melodic/yocs-ar-pair-approach/default.nix +++ b/distros/melodic/yocs-ar-pair-approach/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-ar-pair-approach"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_ar_pair_approach/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "57ea6195fb9edc5fd0e5a0e89a7c82773a4a809b56a85fa6cd396c88bbd5a6f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_ar_pair_approach/0.8.2-0"; + sha256 = "sha256-cyuIZAYCTHcPNROIuNq9+hBOct0ZOJqRQsXIh2dHOy0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-ar-pair-tracking/default.nix b/distros/melodic/yocs-ar-pair-tracking/default.nix index 5377512e91..41f15c94c3 100644 --- a/distros/melodic/yocs-ar-pair-tracking/default.nix +++ b/distros/melodic/yocs-ar-pair-tracking/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-ar-pair-tracking"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_ar_pair_tracking/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "60179e49a3644effdd14bf503e183c3ef7c0690f550b89e64847399f3934c7df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_ar_pair_tracking/0.8.2-0"; + sha256 = "sha256-+WUAc/rzW/azv8TfJFdPQNE01gjs293xF1Zmvx8Aq88="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-cmd-vel-mux/default.nix b/distros/melodic/yocs-cmd-vel-mux/default.nix index 06d6f325a9..185fcee46d 100644 --- a/distros/melodic/yocs-cmd-vel-mux/default.nix +++ b/distros/melodic/yocs-cmd-vel-mux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-cmd-vel-mux"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_cmd_vel_mux/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "fb7a0444d33e684e14c5c1b78fa3c2cda433abbd202401316232daff02af5791"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_cmd_vel_mux/0.8.2-0"; + sha256 = "sha256-0p5eigiL/G/rn+aNHN3y3JTMhrQn1hCapYHcsZTDyNg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-controllers/default.nix b/distros/melodic/yocs-controllers/default.nix index bddbe142b7..ccefd6b3a9 100644 --- a/distros/melodic/yocs-controllers/default.nix +++ b/distros/melodic/yocs-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-controllers"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_controllers/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "f45d647a26a653328fe0a94eb13c786fe4854c891e03509806d0fa013d09f797"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_controllers/0.8.2-0"; + sha256 = "sha256-5GlDyWCpOrdSGtPiNwLkC8ja53w7CdZZJVP3q5dY6/M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-diff-drive-pose-controller/default.nix b/distros/melodic/yocs-diff-drive-pose-controller/default.nix index b83d01f59f..a8d66d28fa 100644 --- a/distros/melodic/yocs-diff-drive-pose-controller/default.nix +++ b/distros/melodic/yocs-diff-drive-pose-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-diff-drive-pose-controller"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_diff_drive_pose_controller/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "fbe23c95911cfbb840e28142bf91da168207ff3cde4ef61f703674672c2e5431"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_diff_drive_pose_controller/0.8.2-0"; + sha256 = "sha256-PDFQBACQS3TEzQw5kLKvbtttqZS+DdI2wAz2pCnITzs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-joyop/default.nix b/distros/melodic/yocs-joyop/default.nix index cbb36b74d6..3d9aa341bc 100644 --- a/distros/melodic/yocs-joyop/default.nix +++ b/distros/melodic/yocs-joyop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-joyop"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_joyop/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "e44414b71e3e378a83012afa9219ae787162895a4bab5bf7353528d07cc24ab7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_joyop/0.8.2-0"; + sha256 = "sha256-GgLVSB0jomDotXGp5VnrjqnhrJS7dAuuIP74ezLWE/Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-keyop/default.nix b/distros/melodic/yocs-keyop/default.nix index d8d4c0c3a9..7b43ac135b 100644 --- a/distros/melodic/yocs-keyop/default.nix +++ b/distros/melodic/yocs-keyop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-keyop"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_keyop/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "9b6de8d0572c1d3c31cca79bf6ad19f484cc7f0bbb4c6af27012f6eaf010f26d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_keyop/0.8.2-0"; + sha256 = "sha256-Oh5zWu9f9fgFLXVO+M4O0q+s0yjFyZWQaAcY6Lg/PfU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-localization-manager/default.nix b/distros/melodic/yocs-localization-manager/default.nix index cc592a0e5c..4946617ca2 100644 --- a/distros/melodic/yocs-localization-manager/default.nix +++ b/distros/melodic/yocs-localization-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-localization-manager"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_localization_manager/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "eb2e39a17f8f78cbe98c04b73a63d666fb5937156490539ae49ad1e94b607a49"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_localization_manager/0.8.2-0"; + sha256 = "sha256-AXeKsYM9pQKOHSOmYquCkVK9kmFw28HNmvXFN8bvBNk="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/yocs-math-toolkit/default.nix b/distros/melodic/yocs-math-toolkit/default.nix index 984b4e1f15..e7e600175c 100644 --- a/distros/melodic/yocs-math-toolkit/default.nix +++ b/distros/melodic/yocs-math-toolkit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-math-toolkit"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_math_toolkit/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "53550a80b4e50074b5c5b15fe44f2d4e463ff9f768e6e662b7a7b3d65f2c32fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_math_toolkit/0.8.2-0"; + sha256 = "sha256-J9FBvfxSFaDwyWh+Fwy466gVP2VQWY9l5wMc7wZj7Zs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-msgs/default.nix b/distros/melodic/yocs-msgs/default.nix index 3bb8567262..011a34a7ce 100644 --- a/distros/melodic/yocs-msgs/default.nix +++ b/distros/melodic/yocs-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-msgs"; version = "0.7.0"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yocs_msgs-release/archive/release/melodic/yocs_msgs/0.7.0-0.tar.gz"; - name = "0.7.0-0.tar.gz"; - sha256 = "92aa5df09147dc1819de1d4415efe58d267744ca6cbf9ffe4dbb742d1713cdcc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yocs_msgs-release"; + rev = "release/melodic/yocs_msgs/0.7.0-0"; + sha256 = "sha256-+BaetgJdswQoEXv4kOv0+M1Uz1sys5Ff3uVM7oQJZPM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/yocs-navi-toolkit/default.nix b/distros/melodic/yocs-navi-toolkit/default.nix index 464e987c22..3e37c52d1a 100644 --- a/distros/melodic/yocs-navi-toolkit/default.nix +++ b/distros/melodic/yocs-navi-toolkit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-navi-toolkit"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_navi_toolkit/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "fbf635ac9b081ac52ced067b1d5b6ffdb7c17a320ba7d229e92d53538a44ac5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_navi_toolkit/0.8.2-0"; + sha256 = "sha256-f+kkI0Ox4iSb/M9NkqXQjzn0jOa1KeiP3uwkEI+Dxc0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-navigator/default.nix b/distros/melodic/yocs-navigator/default.nix index 8c4a2d797d..c0cfed5287 100644 --- a/distros/melodic/yocs-navigator/default.nix +++ b/distros/melodic/yocs-navigator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-navigator"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_navigator/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "ce9cacbbb9e4456865e0c8591d0dc48d821e1823a97127deb9963bb6f3a5a75a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_navigator/0.8.2-0"; + sha256 = "sha256-AEwpJXIONxgZrdmjuglEpXOsXINPA1hrZggU6j0uX7Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-rapps/default.nix b/distros/melodic/yocs-rapps/default.nix index 41a721da20..63e325a995 100644 --- a/distros/melodic/yocs-rapps/default.nix +++ b/distros/melodic/yocs-rapps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-rapps"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_rapps/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "2767288fa43f309509dcd227d01f558b8c28ab860a65f63e92a2456abff0b1ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_rapps/0.8.2-0"; + sha256 = "sha256-swwMl1T9AsrnWwZr7Z//1cpQXmq3CydJeiDUl6GOKyM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-safety-controller/default.nix b/distros/melodic/yocs-safety-controller/default.nix index 0bbdc677cc..c64db736f3 100644 --- a/distros/melodic/yocs-safety-controller/default.nix +++ b/distros/melodic/yocs-safety-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-safety-controller"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_safety_controller/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "83f0799143de08c0f6c8aa93c665fbac01d8a7dc3e8e04752bdc59e042244557"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_safety_controller/0.8.2-0"; + sha256 = "sha256-8KHTvBhERq/6a7hM7znUzqdT1+8tc9ocz0awa0o/8lA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-velocity-smoother/default.nix b/distros/melodic/yocs-velocity-smoother/default.nix index 13dddccfda..01f94176aa 100644 --- a/distros/melodic/yocs-velocity-smoother/default.nix +++ b/distros/melodic/yocs-velocity-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-velocity-smoother"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_velocity_smoother/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "9de916242e06317201e15ac26eb33949b8f7aeb84dc262ee44e82ce5ceb3328a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_velocity_smoother/0.8.2-0"; + sha256 = "sha256-OMA0Wrmj1syv9GHsCZ2CM6thsLlMkBNH/SuA642PtnE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-virtual-sensor/default.nix b/distros/melodic/yocs-virtual-sensor/default.nix index dcbfbf6f7a..66bb00fbf3 100644 --- a/distros/melodic/yocs-virtual-sensor/default.nix +++ b/distros/melodic/yocs-virtual-sensor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-virtual-sensor"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_virtual_sensor/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "4505ba05080e444b2000591f1628a4e204e1efb9e9e45be6a8ccb19506193631"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_virtual_sensor/0.8.2-0"; + sha256 = "sha256-8YASngwB+B3BxDtmvtw/6PxtVscVerFmMy/aOgCW5tE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-waypoint-provider/default.nix b/distros/melodic/yocs-waypoint-provider/default.nix index ed46ea10ae..c954df3a65 100644 --- a/distros/melodic/yocs-waypoint-provider/default.nix +++ b/distros/melodic/yocs-waypoint-provider/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-waypoint-provider"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_waypoint_provider/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "af1f87405e022fbc50096287d8b679f0198b09307dc22b04aa1b8a3bcfc4f9f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_waypoint_provider/0.8.2-0"; + sha256 = "sha256-G/8Hp3t3IVWEEKOR+HUsBKTd2QPidJclidEG/TWYAC0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yocs-waypoints-navi/default.nix b/distros/melodic/yocs-waypoints-navi/default.nix index eefee7423b..b81a04c454 100644 --- a/distros/melodic/yocs-waypoints-navi/default.nix +++ b/distros/melodic/yocs-waypoints-navi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yocs-waypoints-navi"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yocs_waypoints_navi/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "b0134c5b12ed2067775780964a54a4d339efc42bcb4481b013913c93550f0e96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yocs_waypoints_navi/0.8.2-0"; + sha256 = "sha256-jbzYPxA6mv8lI7QvPV0XzbDZr28ByO6DpoPemAzz5Y0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/yosemite-valley/default.nix b/distros/melodic/yosemite-valley/default.nix index c1c25c7015..78ba52d068 100644 --- a/distros/melodic/yosemite-valley/default.nix +++ b/distros/melodic/yosemite-valley/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yosemite-valley"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/uav_testing-release/archive/release/melodic/yosemite_valley/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "17ea9be47c92993675a8ed37c5debe9afe9143406b2f2db5660305e58f02ce23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "uav_testing-release"; + rev = "release/melodic/yosemite_valley/0.0.1-1"; + sha256 = "sha256-RG6ylp+s5JBvWw4UQsgWwMDbvuUd7VVkXYU39hFEwnA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/ypspur-ros/default.nix b/distros/melodic/ypspur-ros/default.nix index 008ea5eaa9..1ae3c7ecdd 100644 --- a/distros/melodic/ypspur-ros/default.nix +++ b/distros/melodic/ypspur-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ypspur-ros"; version = "0.3.5-r1"; - src = fetchurl { - url = "https://github.com/openspur/ypspur_ros-release/archive/release/melodic/ypspur_ros/0.3.5-1.tar.gz"; - name = "0.3.5-1.tar.gz"; - sha256 = "32bb414bf802855cc4d468b7a5078fa17d3ea81358b1867a301f67f31c7e58d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "openspur"; + repo = "ypspur_ros-release"; + rev = "release/melodic/ypspur_ros/0.3.5-1"; + sha256 = "sha256-XiPZVLAKSJXxNRrJQnS+2VJu8ynlm5hRbAYYVWSj10U="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/melodic/ypspur/default.nix b/distros/melodic/ypspur/default.nix index db7a070f3e..8154ae32b1 100644 --- a/distros/melodic/ypspur/default.nix +++ b/distros/melodic/ypspur/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-ypspur"; version = "1.20.2-r1"; - src = fetchurl { - url = "https://github.com/openspur/yp-spur-release/archive/release/melodic/ypspur/1.20.2-1.tar.gz"; - name = "1.20.2-1.tar.gz"; - sha256 = "f53c5d73a3a604bbd5f2e1bd286a16d094a8541c428e355129289145da471647"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "openspur"; + repo = "yp-spur-release"; + rev = "release/melodic/ypspur/1.20.2-1"; + sha256 = "sha256-6X3eQ6hN+LQ1a4j6LumjyVGeUZogRwfhGDy9709Sl+8="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/melodic/yujin-ocs/default.nix b/distros/melodic/yujin-ocs/default.nix index 0e15b87705..7cc21de8f6 100644 --- a/distros/melodic/yujin-ocs/default.nix +++ b/distros/melodic/yujin-ocs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-yujin-ocs"; version = "0.8.2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/yujin_ocs-release/archive/release/melodic/yujin_ocs/0.8.2-0.tar.gz"; - name = "0.8.2-0.tar.gz"; - sha256 = "fda374e1eaa08d31770f20eb374a2f781cf7a284403323c7d197f31428d9b1e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "yujin_ocs-release"; + rev = "release/melodic/yujin_ocs/0.8.2-0"; + sha256 = "sha256-jDHGad1lvfDZjFKHdotf6xIF9NoiedxbG9GdGkl+5ZQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/melodic/zbar-ros/default.nix b/distros/melodic/zbar-ros/default.nix index 6375385a1f..ed5baecdc7 100644 --- a/distros/melodic/zbar-ros/default.nix +++ b/distros/melodic/zbar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-zbar-ros"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/zbar_ros-release/archive/release/melodic/zbar_ros/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "62350ba0852b9f2f140a2495a162190ae01ec361bebd28782115ac6d32366f87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "zbar_ros-release"; + rev = "release/melodic/zbar_ros/0.3.0-2"; + sha256 = "sha256-J0VRvJf2Gp1KWe/TUJ3mZzLw/N8chmXsA3anbPO6hlQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/melodic/zeroconf-msgs/default.nix b/distros/melodic/zeroconf-msgs/default.nix index c67b9c7d96..ca668e9e5c 100644 --- a/distros/melodic/zeroconf-msgs/default.nix +++ b/distros/melodic/zeroconf-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-melodic-zeroconf-msgs"; version = "0.2.1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/zeroconf_msgs-release/archive/release/melodic/zeroconf_msgs/0.2.1-0.tar.gz"; - name = "0.2.1-0.tar.gz"; - sha256 = "2e5d7e5adc4153b4b1f9e166a13cd4ed2fdcb0944d966dfaaf6811e63b89cdef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "zeroconf_msgs-release"; + rev = "release/melodic/zeroconf_msgs/0.2.1-0"; + sha256 = "sha256-Ou+MZahdKRl+1Hrioz5APrlWl5j71AeiLFPgR2KqFZo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/abb-driver/default.nix b/distros/noetic/abb-driver/default.nix index ad88ac4a3f..a83091eb1e 100644 --- a/distros/noetic/abb-driver/default.nix +++ b/distros/noetic/abb-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-abb-driver"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_driver-release/archive/release/noetic/abb_driver/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "c5f09291bfcb18a477d3150f0abdb955be52dd69140ac3e417b0256a6f4aaec5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_driver-release"; + rev = "release/noetic/abb_driver/1.4.0-1"; + sha256 = "sha256-QCPnvlFdvkk7nnewpvTTdBl4WKl1+Ze5Vjz5oQ69ANk="; + }; buildType = "catkin"; buildInputs = [ catkin simple-message ]; diff --git a/distros/noetic/abb-egm-msgs/default.nix b/distros/noetic/abb-egm-msgs/default.nix index 334fd137d4..c4b926e6a6 100644 --- a/distros/noetic/abb-egm-msgs/default.nix +++ b/distros/noetic/abb-egm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-abb-egm-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_robot_driver_interfaces-release/archive/release/noetic/abb_egm_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "1caf1244bc234cfed82bfcbb9ea1a11737ed948034dd1ff1c60adbd7bb521613"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_robot_driver_interfaces-release"; + rev = "release/noetic/abb_egm_msgs/0.5.2-1"; + sha256 = "sha256-7NOYqs9MtuQ82tQDExABpBC/B/VhiB5fOqGZ7LKr4yc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/abb-rapid-msgs/default.nix b/distros/noetic/abb-rapid-msgs/default.nix index 5e05b61bdd..13af13e1b8 100644 --- a/distros/noetic/abb-rapid-msgs/default.nix +++ b/distros/noetic/abb-rapid-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-abb-rapid-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_robot_driver_interfaces-release/archive/release/noetic/abb_rapid_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "ec6ec37becde2640a617ce58971b11e976fa4fad1fad20d3a59eed92e496eaaa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_robot_driver_interfaces-release"; + rev = "release/noetic/abb_rapid_msgs/0.5.2-1"; + sha256 = "sha256-JEaaBwJgjTm8YdevLdMx5hnzOEVUO5IhemIKHW6eeh4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/abb-rapid-sm-addin-msgs/default.nix b/distros/noetic/abb-rapid-sm-addin-msgs/default.nix index d9bf8a400c..d8bb41386c 100644 --- a/distros/noetic/abb-rapid-sm-addin-msgs/default.nix +++ b/distros/noetic/abb-rapid-sm-addin-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-abb-rapid-sm-addin-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_robot_driver_interfaces-release/archive/release/noetic/abb_rapid_sm_addin_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "76ba918d06ada15575c03935eb39a242b3d90c8ca9337f6a46e442e057a3a6ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_robot_driver_interfaces-release"; + rev = "release/noetic/abb_rapid_sm_addin_msgs/0.5.2-1"; + sha256 = "sha256-ZAZUq1W0+r5nOaUZNkiT8goHvJ2LFDQZC5i/aOGCq90="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/abb-robot-msgs/default.nix b/distros/noetic/abb-robot-msgs/default.nix index 935dfe3049..f6c2fceaa7 100644 --- a/distros/noetic/abb-robot-msgs/default.nix +++ b/distros/noetic/abb-robot-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-abb-robot-msgs"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/abb_robot_driver_interfaces-release/archive/release/noetic/abb_robot_msgs/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "e870f1171c052b5f9975e6e6ad87c264d795c77c8f057504361f2330d200d4ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "abb_robot_driver_interfaces-release"; + rev = "release/noetic/abb_robot_msgs/0.5.2-1"; + sha256 = "sha256-DWW0KNFYO80EHowJZF5XABykmf2ksQ/Z22fvPSSPaGQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ackermann-msgs/default.nix b/distros/noetic/ackermann-msgs/default.nix index 248490a659..379149b3a9 100644 --- a/distros/noetic/ackermann-msgs/default.nix +++ b/distros/noetic/ackermann-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ackermann-msgs"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/ackermann_msgs-release/archive/release/noetic/ackermann_msgs/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "07e95f3c6d2f07e9533ff7a2fb99ff6ca5abc394b6ef2c4428431802709fa702"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "ackermann_msgs-release"; + rev = "release/noetic/ackermann_msgs/1.0.2-1"; + sha256 = "sha256-joTO8ndBZRqL02NGe2gciiQjTooE60i22xDcTOus8Rk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ackermann-steering-controller/default.nix b/distros/noetic/ackermann-steering-controller/default.nix index a20253cf53..f73ae507c0 100644 --- a/distros/noetic/ackermann-steering-controller/default.nix +++ b/distros/noetic/ackermann-steering-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, controller-interface, controller-manager, controller-manager-msgs, diff-drive-controller, geometry-msgs, hardware-interface, nav-msgs, pluginlib, realtime-tools, roscpp, rostest, std-msgs, std-srvs, tf, urdfdom, xacro }: buildRosPackage { pname = "ros-noetic-ackermann-steering-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/ackermann_steering_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "f48ecda6c297da3a8a25179219ddb619790598d50a89871804fca0610f56c2fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/ackermann_steering_controller/0.21.1-1"; + sha256 = "sha256-TpG2P7Xv+ocuSQoG278KjbAK7s3OqGkUbGV43WJTkU8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/actionlib-lisp/default.nix b/distros/noetic/actionlib-lisp/default.nix index 564c49ae28..048106e222 100644 --- a/distros/noetic/actionlib-lisp/default.nix +++ b/distros/noetic/actionlib-lisp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-actionlib-lisp"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/actionlib_lisp/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "483db5278fc49c4382e7a0c7a9d162ddae25f87df598778dd921b42660b0d177"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/actionlib_lisp/0.2.14-1"; + sha256 = "sha256-SWRJeH7iYurQCzUdSE7d4xvZKpybsGxHM5s5B7+0TY8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/actionlib-msgs/default.nix b/distros/noetic/actionlib-msgs/default.nix index 0e92e2328b..3b04d0dd3c 100644 --- a/distros/noetic/actionlib-msgs/default.nix +++ b/distros/noetic/actionlib-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-actionlib-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/actionlib_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "e16b4b95908df5f29cd6cedba7b928c8bcefbedfa091a616d9677397452bf0c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/actionlib_msgs/1.13.1-1"; + sha256 = "sha256-qWUeHPvyVAS0keRrP60eAJUky8Zyo6sqUNjKCSlHwNI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/actionlib-tools/default.nix b/distros/noetic/actionlib-tools/default.nix index f83e6e9d10..ee88cbcd16 100644 --- a/distros/noetic/actionlib-tools/default.nix +++ b/distros/noetic/actionlib-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-actionlib-tools"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/actionlib-release/archive/release/noetic/actionlib_tools/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "cb6b03293d18061e310738bd3aa2f7c3a2114879c5b653969f55770579f878ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "actionlib-release"; + rev = "release/noetic/actionlib_tools/1.14.0-1"; + sha256 = "sha256-HzNFQqe5OwRxrs3xq6xxxddKlLSRzAndqZp8VRM5PMo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/actionlib-tutorials/default.nix b/distros/noetic/actionlib-tutorials/default.nix index 989378f534..f5f945b58a 100644 --- a/distros/noetic/actionlib-tutorials/default.nix +++ b/distros/noetic/actionlib-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-actionlib-tutorials"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/noetic/actionlib_tutorials/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "ed23df795555dc2032041aaaf30d85adc0856aef3e5a02fbaa3010229eb2b200"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/noetic/actionlib_tutorials/0.2.0-1"; + sha256 = "sha256-N81Xjwkt1F73f+gKOZaCa28KE065Q9kFZM7AdY/597A="; + }; buildType = "catkin"; buildInputs = [ actionlib-msgs catkin message-generation std-msgs ]; diff --git a/distros/noetic/actionlib/default.nix b/distros/noetic/actionlib/default.nix index 1f12307d57..1ba3036a08 100644 --- a/distros/noetic/actionlib/default.nix +++ b/distros/noetic/actionlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-actionlib"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/actionlib-release/archive/release/noetic/actionlib/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "cc2f1a34e4fc117f845a8ee44102ac3e2bfeb7d9de2a448d741641f6923cb203"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "actionlib-release"; + rev = "release/noetic/actionlib/1.14.0-1"; + sha256 = "sha256-Ohz6+/L4BU4JE8QzhjFDqXhEqKPKfNB0A2+zphAyyag="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/agni-tf-tools/default.nix b/distros/noetic/agni-tf-tools/default.nix index 687e75dbdf..e6ef112ab9 100644 --- a/distros/noetic/agni-tf-tools/default.nix +++ b/distros/noetic/agni-tf-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-agni-tf-tools"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/ubi-agni-gbp/agni_tf_tools-release/archive/release/noetic/agni_tf_tools/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "43daaec7c8cc80d4b4114d5f6401947f23c7a2ae8a1f8661bfb9ded96c435392"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ubi-agni-gbp"; + repo = "agni_tf_tools-release"; + rev = "release/noetic/agni_tf_tools/0.1.6-1"; + sha256 = "sha256-ANse47fGab2q9ILqK5dUHib1zRpQOvNxAKBNsp6zy10="; + }; buildType = "catkin"; buildInputs = [ catkin eigen qt5.qtbase ]; diff --git a/distros/noetic/allocators/default.nix b/distros/noetic/allocators/default.nix index de76500f40..d0dba7d01f 100644 --- a/distros/noetic/allocators/default.nix +++ b/distros/noetic/allocators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-allocators"; version = "1.0.25-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/noetic/allocators/1.0.25-1.tar.gz"; - name = "1.0.25-1.tar.gz"; - sha256 = "c633a844f59bc64c53bf03c8f5007a466b79e24d9e405b7fdea0238e727b391c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/noetic/allocators/1.0.25-1"; + sha256 = "sha256-kh95NO/roS12CTvVD5hRxNh9+JqxX+s+LmK3hUfGHJY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/amcl/default.nix b/distros/noetic/amcl/default.nix index 63cbca00ac..ebaef0e255 100644 --- a/distros/noetic/amcl/default.nix +++ b/distros/noetic/amcl/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, diagnostic-updater, dynamic-reconfigure, geometry-msgs, map-server, message-filters, nav-msgs, python3Packages, rosbag, roscpp, rostest, sensor-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-msgs, tf2-py, tf2-ros }: buildRosPackage { pname = "ros-noetic-amcl"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/amcl/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "176626de453a712746fd4d999d87fec0529884168f63587fba32bdc9a3a27abb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/amcl/1.17.3-1"; + sha256 = "sha256-1fClpkzFdKXhZKTU9hCJdSzR+T6md9sL+9eRWXuVCZY="; + }; buildType = "catkin"; buildInputs = [ catkin message-filters tf2-geometry-msgs ]; diff --git a/distros/noetic/angles/default.nix b/distros/noetic/angles/default.nix index 1cf1bf58a4..a3c85dbd37 100644 --- a/distros/noetic/angles/default.nix +++ b/distros/noetic/angles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-angles"; version = "1.9.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry_angles_utils-release/archive/release/noetic/angles/1.9.13-1.tar.gz"; - name = "1.9.13-1.tar.gz"; - sha256 = "bd33e903e57fce8b8cfc4444924e684088609475b61cdd8343e80be60a4861ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry_angles_utils-release"; + rev = "release/noetic/angles/1.9.13-1"; + sha256 = "sha256-NEcHC6sDSdM0c1Wgb7uui7vdwT+WxWiCmOZOhCTndgk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/apriltag-ros/default.nix b/distros/noetic/apriltag-ros/default.nix index 2323c20d0d..da18193412 100644 --- a/distros/noetic/apriltag-ros/default.nix +++ b/distros/noetic/apriltag-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-apriltag-ros"; version = "3.2.1-r3"; - src = fetchurl { - url = "https://github.com/AprilRobotics/apriltag_ros-release/archive/release/noetic/apriltag_ros/3.2.1-3.tar.gz"; - name = "3.2.1-3.tar.gz"; - sha256 = "831217c3c023b76328b58657ab89f70691dffbe0bf3363bd2e60408c1cea8152"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AprilRobotics"; + repo = "apriltag_ros-release"; + rev = "release/noetic/apriltag_ros/3.2.1-3"; + sha256 = "sha256-RVlsQgytlz/UF1NgJDC+KrxYIIwmst7rX5+iuP+8DPE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/noetic/apriltag/default.nix b/distros/noetic/apriltag/default.nix index 461b4dc021..2776134e13 100644 --- a/distros/noetic/apriltag/default.nix +++ b/distros/noetic/apriltag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-apriltag"; version = "3.2.0-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AprilRobotics"; + repo = "apriltag-release"; + rev = "release/noetic/apriltag/3.2.0-1"; + sha256 = "sha256-6kUYVWACrNDZBeDwDanrR3mgspXi5sPGKoy4chT7IrM="; + }; buildType = "cmake"; buildInputs = [ cmake python3Packages.numpy ]; diff --git a/distros/noetic/arbotix-controllers/default.nix b/distros/noetic/arbotix-controllers/default.nix index ebf5a189ba..95b1c35ca0 100644 --- a/distros/noetic/arbotix-controllers/default.nix +++ b/distros/noetic/arbotix-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-arbotix-controllers"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/noetic/arbotix_controllers/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "ce77c261a63367fadaf8e22ee1d5106c290bf60644fdf50788804092fc259b24"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/noetic/arbotix_controllers/0.11.0-1"; + sha256 = "sha256-K4G8gOvOSIUWfkf9bAZEvvBPkA92GKV2OXZy8d985kg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/arbotix-firmware/default.nix b/distros/noetic/arbotix-firmware/default.nix index 9e267a4d0e..748725e75f 100644 --- a/distros/noetic/arbotix-firmware/default.nix +++ b/distros/noetic/arbotix-firmware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-arbotix-firmware"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/noetic/arbotix_firmware/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "a43128a750f19da3267baeb751f4854e60dc0ca1df0514a2afa019986e4dadcd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/noetic/arbotix_firmware/0.11.0-1"; + sha256 = "sha256-BkxzExAmLRcYekdIOoqt17MqM5wJMZAwzbm/ogv2mbI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/arbotix-msgs/default.nix b/distros/noetic/arbotix-msgs/default.nix index 36bd390078..bb500c2381 100644 --- a/distros/noetic/arbotix-msgs/default.nix +++ b/distros/noetic/arbotix-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-arbotix-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/noetic/arbotix_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "03ff359d04aed70e2049aff70e16596e345af7808ce1d4c39ceaa8887b0cac08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/noetic/arbotix_msgs/0.11.0-1"; + sha256 = "sha256-SE0mMZCdJfHPND1Z5SlCWqL9GV4//SvB5Zw0abfMpks="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/arbotix-python/default.nix b/distros/noetic/arbotix-python/default.nix index 3596bdd5ad..f49e61d2e5 100644 --- a/distros/noetic/arbotix-python/default.nix +++ b/distros/noetic/arbotix-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-arbotix-python"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/noetic/arbotix_python/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "36e5ba1ab702e2d730e6b496bc9ff556f4222e45369ee91d3977c0f77fb39a82"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/noetic/arbotix_python/0.11.0-1"; + sha256 = "sha256-PdPE5YjdiKrgVVI1mZB5KAUjqmipV0aAM2mnnqpUii0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/arbotix-sensors/default.nix b/distros/noetic/arbotix-sensors/default.nix index a4dbd26346..7aff395de8 100644 --- a/distros/noetic/arbotix-sensors/default.nix +++ b/distros/noetic/arbotix-sensors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-arbotix-sensors"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/noetic/arbotix_sensors/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "061fc41c63c7798da8e2bcd35c913ef2f8da1e8f3c0a115ff7e877c595ebff7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/noetic/arbotix_sensors/0.11.0-1"; + sha256 = "sha256-GiWTQHwpWt5V1KdFH9rEIzVeqBu4U1/SNRoYWAU3ojU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/arbotix/default.nix b/distros/noetic/arbotix/default.nix index eda7f28bda..385b246f39 100644 --- a/distros/noetic/arbotix/default.nix +++ b/distros/noetic/arbotix/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-arbotix"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/vanadiumlabs/arbotix_ros-release/archive/release/noetic/arbotix/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "bd36a4d8e0f023d62f2d5cf4de9362e416ad71b00bb9f0e4a05109ef24a95ad1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vanadiumlabs"; + repo = "arbotix_ros-release"; + rev = "release/noetic/arbotix/0.11.0-1"; + sha256 = "sha256-MNVRbOK/6zQS+HHO8EaWKfkvzYTjHLsDMwxKvj1hMtc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/aruco-detect/default.nix b/distros/noetic/aruco-detect/default.nix index d674109a74..2f83dfac9f 100644 --- a/distros/noetic/aruco-detect/default.nix +++ b/distros/noetic/aruco-detect/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-aruco-detect"; version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/fiducials-release/archive/release/noetic/aruco_detect/0.12.0-1.tar.gz"; - name = "0.12.0-1.tar.gz"; - sha256 = "5949eaf2d974b54630da131ff5727df18d49caa8ce66de5120b33bbdf9ff8548"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "fiducials-release"; + rev = "release/noetic/aruco_detect/0.12.0-1"; + sha256 = "sha256-QDMNoy3U9niXKbNEO7gWQRh7pYx044yX4Odb4B4oEZ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/aruco-msgs/default.nix b/distros/noetic/aruco-msgs/default.nix index 7648f246b5..178fb964c2 100644 --- a/distros/noetic/aruco-msgs/default.nix +++ b/distros/noetic/aruco-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-aruco-msgs"; version = "3.1.3-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/aruco_ros-release/archive/release/noetic/aruco_msgs/3.1.3-1.tar.gz"; - name = "3.1.3-1.tar.gz"; - sha256 = "5594a1b779c90a433dad84313dc629112e7acb124c8ba90854e7345c8d917172"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "aruco_ros-release"; + rev = "release/noetic/aruco_msgs/3.1.3-1"; + sha256 = "sha256-wW4fxxG/oWsMsl6fVcHDQ2F7fGyaQzQmWsO6dd5gOO0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/aruco-opencv-msgs/default.nix b/distros/noetic/aruco-opencv-msgs/default.nix index b90df8834a..423089afb8 100644 --- a/distros/noetic/aruco-opencv-msgs/default.nix +++ b/distros/noetic/aruco-opencv-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-aruco-opencv-msgs"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/aruco_opencv-release/archive/release/noetic/aruco_opencv_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "af7f10cf9574096846e43acb5716e80b259c3ca1fa608fb89a969fa4e98b76b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "aruco_opencv-release"; + rev = "release/noetic/aruco_opencv_msgs/0.2.0-1"; + sha256 = "sha256-zqjUjXjOwAqDdhUG8BoGk6eGD1BXYdCrDupAckYZP5M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/aruco-opencv/default.nix b/distros/noetic/aruco-opencv/default.nix index faff69040f..d066cc84a7 100644 --- a/distros/noetic/aruco-opencv/default.nix +++ b/distros/noetic/aruco-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-aruco-opencv"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/aruco_opencv-release/archive/release/noetic/aruco_opencv/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "173ba86a5ab4ea37c1fd173609664cc459946fb22d54542d8fe0009eb49351aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "aruco_opencv-release"; + rev = "release/noetic/aruco_opencv/0.2.0-1"; + sha256 = "sha256-Jeu8Pmk6oz03zZanWZPcJxqokU7EZYMWFPrgRkW6HLQ="; + }; buildType = "catkin"; buildInputs = [ aruco-opencv-msgs catkin ]; diff --git a/distros/noetic/aruco-ros/default.nix b/distros/noetic/aruco-ros/default.nix index c66b56c497..dc6037189c 100644 --- a/distros/noetic/aruco-ros/default.nix +++ b/distros/noetic/aruco-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-aruco-ros"; version = "3.1.3-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/aruco_ros-release/archive/release/noetic/aruco_ros/3.1.3-1.tar.gz"; - name = "3.1.3-1.tar.gz"; - sha256 = "a06dc78e52d1b342a5ce09c5d8ec98100fd26c4afbfc0c3c7a0a5b2efdbb3529"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "aruco_ros-release"; + rev = "release/noetic/aruco_ros/3.1.3-1"; + sha256 = "sha256-56F+PLQBYLrO/s7jjbBRxisp8yE7zEbziuDr461HXNc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/aruco/default.nix b/distros/noetic/aruco/default.nix index b6764e4a49..e5426730ae 100644 --- a/distros/noetic/aruco/default.nix +++ b/distros/noetic/aruco/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-aruco"; version = "3.1.3-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/aruco_ros-release/archive/release/noetic/aruco/3.1.3-1.tar.gz"; - name = "3.1.3-1.tar.gz"; - sha256 = "ba94a6aba21543e6b0c7695d947cdb14f54b3747d0c7ec6a55d3b3a6be7dba6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "aruco_ros-release"; + rev = "release/noetic/aruco/3.1.3-1"; + sha256 = "sha256-qsoBOOYGhnuO1sHoss5rODukw3uGYK2mv0NVyRyRlIY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/assimp-devel/default.nix b/distros/noetic/assimp-devel/default.nix index 236f01424e..c0c1800f09 100644 --- a/distros/noetic/assimp-devel/default.nix +++ b/distros/noetic/assimp-devel/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-assimp-devel"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/assimp_devel/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "6263583e257e9315af21c2303407fc683187673d6a618e294385b7498bb6f2e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/assimp_devel/2.1.21-2"; + sha256 = "sha256-0cbf5wSJ3qoSZEzEz5Cb/PSXSF8+/PmWzn+0D/Yzzdc="; + }; buildType = "catkin"; buildInputs = [ cacert catkin git mk openssl rosboost-cfg rosbuild unzip ]; diff --git a/distros/noetic/assisted-teleop/default.nix b/distros/noetic/assisted-teleop/default.nix index 4b75de095f..cc53709aaa 100644 --- a/distros/noetic/assisted-teleop/default.nix +++ b/distros/noetic/assisted-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-assisted-teleop"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/noetic/assisted_teleop/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "9e042f7baa2bde5b61167779213879d69fd495edc48afdb0ba4d407878256af2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/noetic/assisted_teleop/0.4.1-1"; + sha256 = "sha256-NUEhH4Dhv3IAq9y6AdUfH1LSwbphqdGa/zeDMXUaCnY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/async-comm/default.nix b/distros/noetic/async-comm/default.nix index a6fdcbd409..e968d2ee6a 100644 --- a/distros/noetic/async-comm/default.nix +++ b/distros/noetic/async-comm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-async-comm"; version = "0.2.1-r2"; - src = fetchurl { - url = "https://github.com/dpkoch/async_comm-release/archive/release/noetic/async_comm/0.2.1-2.tar.gz"; - name = "0.2.1-2.tar.gz"; - sha256 = "630becd7f8b1606e501f863e02617f7f3898dca05bfee506cc7eac7681f3b16d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dpkoch"; + repo = "async_comm-release"; + rev = "release/noetic/async_comm/0.2.1-2"; + sha256 = "sha256-MdiwNzQGrXD3qJY2PCrpJJapB/vVvxbq7tf01owqm2Q="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/async-web-server-cpp/default.nix b/distros/noetic/async-web-server-cpp/default.nix index 32c0083f41..81e2c54ddf 100644 --- a/distros/noetic/async-web-server-cpp/default.nix +++ b/distros/noetic/async-web-server-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-async-web-server-cpp"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/fkie-release/async_web_server_cpp-release/archive/release/noetic/async_web_server_cpp/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "9656bf97c0fc534351f9d3914cd7eb40b690c9272d02733ab05b62486663d30e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "async_web_server_cpp-release"; + rev = "release/noetic/async_web_server_cpp/1.0.3-1"; + sha256 = "sha256-S72a09saKwNEGbxvzKD79vbsvzC1mjhbHQU2YtkoKOw="; + }; buildType = "catkin"; buildInputs = [ catkin openssl ]; diff --git a/distros/noetic/audibot-description/default.nix b/distros/noetic/audibot-description/default.nix index b81d06e044..b1b6b74e94 100644 --- a/distros/noetic/audibot-description/default.nix +++ b/distros/noetic/audibot-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audibot-description"; version = "0.2.2-r5"; - src = fetchurl { - url = "https://github.com/robustify/audibot-release/archive/release/noetic/audibot_description/0.2.2-5.tar.gz"; - name = "0.2.2-5.tar.gz"; - sha256 = "331949031776854babd340f7e4628a1adf80a5aab2c55addc8dea91e843be816"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "audibot-release"; + rev = "release/noetic/audibot_description/0.2.2-5"; + sha256 = "sha256-CXKnvtJseo0vtFTI5yjsYrxVmaWNyjc7Aqs4DHQB6/Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/audibot-gazebo/default.nix b/distros/noetic/audibot-gazebo/default.nix index 9db465a796..efcca519a3 100644 --- a/distros/noetic/audibot-gazebo/default.nix +++ b/distros/noetic/audibot-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audibot-gazebo"; version = "0.2.2-r5"; - src = fetchurl { - url = "https://github.com/robustify/audibot-release/archive/release/noetic/audibot_gazebo/0.2.2-5.tar.gz"; - name = "0.2.2-5.tar.gz"; - sha256 = "15de37b5d94d06fb41dba843b99a81ab686289f625255971ac3e40e3c8523f61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "audibot-release"; + rev = "release/noetic/audibot_gazebo/0.2.2-5"; + sha256 = "sha256-kLudYnhJaw9x3YAGfujkERcI6069582ssOGyp/PLk5M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/audibot/default.nix b/distros/noetic/audibot/default.nix index 38bb9be697..bc023561cd 100644 --- a/distros/noetic/audibot/default.nix +++ b/distros/noetic/audibot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audibot"; version = "0.2.2-r5"; - src = fetchurl { - url = "https://github.com/robustify/audibot-release/archive/release/noetic/audibot/0.2.2-5.tar.gz"; - name = "0.2.2-5.tar.gz"; - sha256 = "fa76761120c15a251f51d1c59e27986bb85a4b85768a907a34f46f05ff13e530"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robustify"; + repo = "audibot-release"; + rev = "release/noetic/audibot/0.2.2-5"; + sha256 = "sha256-yLsqwt2iM4LLdIvmxcEbaUB0qqS5FzpxGPi1qqwFT0E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/audio-capture/default.nix b/distros/noetic/audio-capture/default.nix index 7493167d8a..fd191ada77 100644 --- a/distros/noetic/audio-capture/default.nix +++ b/distros/noetic/audio-capture/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audio-capture"; version = "0.3.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/audio_common-release/archive/release/noetic/audio_capture/0.3.16-1.tar.gz"; - name = "0.3.16-1.tar.gz"; - sha256 = "626d795fb98a6998b9f26fff333c78a9d0d901a9f35a4306a6ca5bda8ae3b25f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "audio_common-release"; + rev = "release/noetic/audio_capture/0.3.16-1"; + sha256 = "sha256-cGFx7OG950YwKE6O5tEKDxSCpfI2ituNXsRJ588n9n0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/audio-common-msgs/default.nix b/distros/noetic/audio-common-msgs/default.nix index bb03f11859..5c2d38ba3f 100644 --- a/distros/noetic/audio-common-msgs/default.nix +++ b/distros/noetic/audio-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audio-common-msgs"; version = "0.3.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/audio_common-release/archive/release/noetic/audio_common_msgs/0.3.16-1.tar.gz"; - name = "0.3.16-1.tar.gz"; - sha256 = "458a9ed7aaa3142eb8d983fcba4ad0d74382553af4461739902eba8181857534"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "audio_common-release"; + rev = "release/noetic/audio_common_msgs/0.3.16-1"; + sha256 = "sha256-o6EnHxlRGOHFGpg6HtNjRjrlbe6hUvRyH4Rxhv5ghmQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/audio-common/default.nix b/distros/noetic/audio-common/default.nix index 245f313cb7..36d3f0dba3 100644 --- a/distros/noetic/audio-common/default.nix +++ b/distros/noetic/audio-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audio-common"; version = "0.3.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/audio_common-release/archive/release/noetic/audio_common/0.3.16-1.tar.gz"; - name = "0.3.16-1.tar.gz"; - sha256 = "026aea3afcbd816b184e626c65f7541c9c0915d7bfc13e5b7efaa91ba830a5c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "audio_common-release"; + rev = "release/noetic/audio_common/0.3.16-1"; + sha256 = "sha256-tiuvSCP9y4tImZv5qRMTKI+r/sUB6hur5sWDlq7s6Hc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/audio-play/default.nix b/distros/noetic/audio-play/default.nix index 28c932d207..d85339ec12 100644 --- a/distros/noetic/audio-play/default.nix +++ b/distros/noetic/audio-play/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audio-play"; version = "0.3.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/audio_common-release/archive/release/noetic/audio_play/0.3.16-1.tar.gz"; - name = "0.3.16-1.tar.gz"; - sha256 = "e78f77eba5770ccb841f30c3eba0ec9b214d78e0f5de51707bcce224f3b5486c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "audio_common-release"; + rev = "release/noetic/audio_play/0.3.16-1"; + sha256 = "sha256-KGvZAZzm90e0WEboyJcRVI4XaGeJ6yg8BxrCsvxBhzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/audio-to-spectrogram/default.nix b/distros/noetic/audio-to-spectrogram/default.nix index 07e0d397d8..683ef22dfe 100644 --- a/distros/noetic/audio-to-spectrogram/default.nix +++ b/distros/noetic/audio-to-spectrogram/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audio-to-spectrogram"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/noetic/audio_to_spectrogram/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "0fab3f1ebc2e5af100b82a3212977344ed94c59fdac0f0bb7c71b2fb3b65d216"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/noetic/audio_to_spectrogram/1.2.15-1"; + sha256 = "sha256-3JZL2ciRG8aecL9sBrfEGNYlAcdP0xrezuHrdZKswMw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/audio-video-recorder/default.nix b/distros/noetic/audio-video-recorder/default.nix index 2b38f87470..25993afaea 100644 --- a/distros/noetic/audio-video-recorder/default.nix +++ b/distros/noetic/audio-video-recorder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-audio-video-recorder"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/audio_video_recorder/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "e5d81483f8363b44f037d1bb399a315c5aab9a60e23a2c9815670c1ff1c67c43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/audio_video_recorder/2.2.12-1"; + sha256 = "sha256-qUBSWrRNFP01zJz0aclbPO/bM7CITaupTR0eGuvwZJI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/automotive-autonomy-msgs/default.nix b/distros/noetic/automotive-autonomy-msgs/default.nix index 1abb33bebb..074eeaf98c 100644 --- a/distros/noetic/automotive-autonomy-msgs/default.nix +++ b/distros/noetic/automotive-autonomy-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-automotive-autonomy-msgs"; version = "3.0.4-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/noetic/automotive_autonomy_msgs/3.0.4-1.tar.gz"; - name = "3.0.4-1.tar.gz"; - sha256 = "5eee587986b5025f1686c5cfba6136629675942dd69467c2c5a81442cf8a1a0d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/noetic/automotive_autonomy_msgs/3.0.4-1"; + sha256 = "sha256-R/GduU+VD3B9INpzOpa84Bl42xFAtGthn8PEt8iYmpw="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/noetic/automotive-navigation-msgs/default.nix b/distros/noetic/automotive-navigation-msgs/default.nix index 605437bbe6..72e4ba55d2 100644 --- a/distros/noetic/automotive-navigation-msgs/default.nix +++ b/distros/noetic/automotive-navigation-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-automotive-navigation-msgs"; version = "3.0.4-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/noetic/automotive_navigation_msgs/3.0.4-1.tar.gz"; - name = "3.0.4-1.tar.gz"; - sha256 = "d3836627522b715e7afddf0f40cf980f2f1d53dda2c685fca3a2baabe2ac5186"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/noetic/automotive_navigation_msgs/3.0.4-1"; + sha256 = "sha256-N+QDJUyFWyIto9hqSOYNMPTrVLJR+tIO2J4ExUZ27+0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/automotive-platform-msgs/default.nix b/distros/noetic/automotive-platform-msgs/default.nix index fd514af96a..b1632ca5fa 100644 --- a/distros/noetic/automotive-platform-msgs/default.nix +++ b/distros/noetic/automotive-platform-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-automotive-platform-msgs"; version = "3.0.4-r1"; - src = fetchurl { - url = "https://github.com/astuff/automotive_autonomy_msgs-release/archive/release/noetic/automotive_platform_msgs/3.0.4-1.tar.gz"; - name = "3.0.4-1.tar.gz"; - sha256 = "c23e8da3fd7506345d719d3ca818f8ea4d70f56c1f325e54c5f3b10a91ff8b9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/noetic/automotive_platform_msgs/3.0.4-1"; + sha256 = "sha256-HMhXhLS41h9P1STIbuEdhOgxNORj/YJrfDldGKeMKfA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/autoware-can-msgs/default.nix b/distros/noetic/autoware-can-msgs/default.nix index 07a12ae66f..3091d73461 100644 --- a/distros/noetic/autoware-can-msgs/default.nix +++ b/distros/noetic/autoware-can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-autoware-can-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/autoware_can_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "5748fa3830917c00b34adc2d5e3873b259807230d05cd8469ad99ae0a547e6c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/autoware_can_msgs/1.14.0-1"; + sha256 = "sha256-cYR5wQOEsFuNLRn5Lo9gFdPZCkE/sM0MM/Eh0sD/tXk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/autoware-config-msgs/default.nix b/distros/noetic/autoware-config-msgs/default.nix index 6962b4a327..070685e3e8 100644 --- a/distros/noetic/autoware-config-msgs/default.nix +++ b/distros/noetic/autoware-config-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-autoware-config-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/autoware_config_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "6ed8afd9b570d46d1957fd3aa581d9cc0fc16ada8f3d826c5c488d60957b39a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/autoware_config_msgs/1.14.0-1"; + sha256 = "sha256-LnjiFHp8RAOybuiYvaB7dQNLh6hWlsNqj5EXRHZEcHk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/autoware-external-msgs/default.nix b/distros/noetic/autoware-external-msgs/default.nix index 53a078f4c3..c134536a5b 100644 --- a/distros/noetic/autoware-external-msgs/default.nix +++ b/distros/noetic/autoware-external-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-autoware-external-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/autoware_external_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "b9437beeb25e6a7ced4e934c7b4f959ddadd62ce1e29c27142f4b693137052be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/autoware_external_msgs/1.14.0-1"; + sha256 = "sha256-oA7G2JChxlLR6VtW3innvM4XLOtdyfy6c7j7zZUJrCU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/autoware-lanelet2-msgs/default.nix b/distros/noetic/autoware-lanelet2-msgs/default.nix index 3833d9b4c4..80b0f655c3 100644 --- a/distros/noetic/autoware-lanelet2-msgs/default.nix +++ b/distros/noetic/autoware-lanelet2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-autoware-lanelet2-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/autoware_lanelet2_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "3c187aaea630f63cb1c0988407ffd065bd2fc5c393e4ca0d27acbad5f2bd8c75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/autoware_lanelet2_msgs/1.14.0-1"; + sha256 = "sha256-TE9EkqOEUSUa7lmZRTxUGB1jF5iToF7To+fqLBCMiL4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/autoware-map-msgs/default.nix b/distros/noetic/autoware-map-msgs/default.nix index 3b70bae103..f5a19d2473 100644 --- a/distros/noetic/autoware-map-msgs/default.nix +++ b/distros/noetic/autoware-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-autoware-map-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/autoware_map_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "766ca0323e7e168b4ff3bf6f748df6ebb1dcd55f9e2f76c05138492fa3a59af6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/autoware_map_msgs/1.14.0-1"; + sha256 = "sha256-RZDcJO2vJJLEolC+3+XSRwT5Snm7bjNGSsAoE0do4xY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/autoware-msgs/default.nix b/distros/noetic/autoware-msgs/default.nix index 105fd13d79..5a2f07a226 100644 --- a/distros/noetic/autoware-msgs/default.nix +++ b/distros/noetic/autoware-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-autoware-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/autoware_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "c5016d542bf88e545096e2fef89cb49ee05afe6dde62c3da59df33a11d02444f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/autoware_msgs/1.14.0-1"; + sha256 = "sha256-ENK+9lpQNKoVWYST4JEG/7gZyY4SNwkqlrRg1I6m4E8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/autoware-system-msgs/default.nix b/distros/noetic/autoware-system-msgs/default.nix index 32d62d5003..7b5ddb0faf 100644 --- a/distros/noetic/autoware-system-msgs/default.nix +++ b/distros/noetic/autoware-system-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-autoware-system-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/autoware_system_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "04c9598cea451a0f0f7aea0480985b8f3d23c89c3bdc50f4596c51b9b5301a1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/autoware_system_msgs/1.14.0-1"; + sha256 = "sha256-SIEfTLBAP2uML4EY0BlOP14wFdi7FHjb29c79rzNEkU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/auv-msgs/default.nix b/distros/noetic/auv-msgs/default.nix index a7a1caf4a1..35d89dc15e 100644 --- a/distros/noetic/auv-msgs/default.nix +++ b/distros/noetic/auv-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-auv-msgs"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/oceansystemslab/auv_msgs-release/archive/release/noetic/auv_msgs/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "190104bb958cf67a5ff4ca7cc1ee355c44ed127eb5e074441b0004bc40da61e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "oceansystemslab"; + repo = "auv_msgs-release"; + rev = "release/noetic/auv_msgs/0.1.1-1"; + sha256 = "sha256-cs5oRlyiuV6Es/pjqEwJdiKfwE83/1Ii28Cw1RU5pMg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/avt-vimba-camera/default.nix b/distros/noetic/avt-vimba-camera/default.nix index f5f2c8f75d..dd6d0d1196 100644 --- a/distros/noetic/avt-vimba-camera/default.nix +++ b/distros/noetic/avt-vimba-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-avt-vimba-camera"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/avt_vimba_camera-release/archive/release/noetic/avt_vimba_camera/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "f8050c08a4f1699866f490cb04fd69deee510a24bd6a4ddfd0e537b0e8488320"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "avt_vimba_camera-release"; + rev = "release/noetic/avt_vimba_camera/1.2.0-1"; + sha256 = "sha256-Ykrkl50T1YM/nw8eIdpcqvFcdKnNh828nL+np0TlbEA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/azure-iot-sdk-c/default.nix b/distros/noetic/azure-iot-sdk-c/default.nix index 9f97b78d52..f5db23ea23 100644 --- a/distros/noetic/azure-iot-sdk-c/default.nix +++ b/distros/noetic/azure-iot-sdk-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-azure-iot-sdk-c"; version = "1.9.0-r1"; - src = fetchurl { - url = "https://github.com/nobleo/azure-iot-sdk-c-release/archive/release/noetic/azure-iot-sdk-c/1.9.0-1.tar.gz"; - name = "1.9.0-1.tar.gz"; - sha256 = "7469da7623ea4c361543d55efcf307dd70e9dda2d888e51ddb1f68f80d0ad085"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "azure-iot-sdk-c-release"; + rev = "release/noetic/azure-iot-sdk-c/1.9.0-1"; + sha256 = "sha256-FJVwvHyahwGzy8Sugmv9HURjIVwREDx5+FNs/CvnWH4="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/backward-ros/default.nix b/distros/noetic/backward-ros/default.nix index ed88b03016..014bdd0705 100644 --- a/distros/noetic/backward-ros/default.nix +++ b/distros/noetic/backward-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-backward-ros"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/backward_ros-release/archive/release/noetic/backward_ros/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "64789ad4703518a057483120d2df9ef2780f4f4436e1752311bd62e46368309c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "backward_ros-release"; + rev = "release/noetic/backward_ros/0.1.7-1"; + sha256 = "sha256-MolJFqHoajXdXEJBQR2LBa37fiXOh7IY1nSLt4/OMKw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/bagger/default.nix b/distros/noetic/bagger/default.nix index 8fddf955cb..868c376c94 100644 --- a/distros/noetic/bagger/default.nix +++ b/distros/noetic/bagger/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-bagger"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/squarerobot/bagger-release/archive/release/noetic/bagger/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "781c7b23f9e302fabb4b9067e62e3ef8158a8ea4f3a2276fe5ce03530884eed3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "squarerobot"; + repo = "bagger-release"; + rev = "release/noetic/bagger/0.1.4-1"; + sha256 = "sha256-NgFl84O/lN157zxxPcg4scJK3+O0FnUe9W5+kyk6ACE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/noetic/baldor/default.nix b/distros/noetic/baldor/default.nix index 1f0bee5fc1..ba4311fde9 100644 --- a/distros/noetic/baldor/default.nix +++ b/distros/noetic/baldor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-baldor"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/crigroup/baldor-release/archive/release/noetic/baldor/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "8972681a0bed3dd77a9ec679b4d7b22a957ab14eb9e62e1acbe29a343b8ed35d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "crigroup"; + repo = "baldor-release"; + rev = "release/noetic/baldor/0.1.3-1"; + sha256 = "sha256-w0bigdJyTMcuTczFOKblQIlTzRB8UMg/XRZcQlV1Gmo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/base-local-planner/default.nix b/distros/noetic/base-local-planner/default.nix index 30a1283321..d270dd0666 100644 --- a/distros/noetic/base-local-planner/default.nix +++ b/distros/noetic/base-local-planner/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, catkin, cmake-modules, costmap-2d, dynamic-reconfigure, eigen, geometry-msgs, message-generation, message-runtime, nav-core, nav-msgs, pluginlib, rosconsole, roscpp, rospy, rosunit, sensor-msgs, std-msgs, tf2, tf2-geometry-msgs, tf2-ros, visualization-msgs, voxel-grid }: buildRosPackage { pname = "ros-noetic-base-local-planner"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/base_local_planner/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "b3c85eea5390620d3a05541e22652a1458925d9adbbbcb5e5cea8edd9251e18e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/base_local_planner/1.17.3-1"; + sha256 = "sha256-jcSmuZvxgNIH/wf5wBzkHfBrQ9o2iI6tMtf40IDtKNs="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation tf2-geometry-msgs ]; diff --git a/distros/noetic/bayesian-belief-networks/default.nix b/distros/noetic/bayesian-belief-networks/default.nix index 8254bf9bc7..d2334058fb 100644 --- a/distros/noetic/bayesian-belief-networks/default.nix +++ b/distros/noetic/bayesian-belief-networks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-bayesian-belief-networks"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/bayesian_belief_networks/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "d1d29e63bcd7143dda22e3de735cb375146b274c9c2e3c34859759f091665ed9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/bayesian_belief_networks/2.1.21-2"; + sha256 = "sha256-6z4DG6mWh71EnXx+qgDvPbpH89eYvn3PrVxOnTHYkSs="; + }; buildType = "catkin"; buildInputs = [ catkin git message-generation mk unzip ]; diff --git a/distros/noetic/behaviortree-cpp-v3/default.nix b/distros/noetic/behaviortree-cpp-v3/default.nix index ea12db19dc..1aefe3bdb2 100644 --- a/distros/noetic/behaviortree-cpp-v3/default.nix +++ b/distros/noetic/behaviortree-cpp-v3/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cppzmq, ncurses, ros-environment, roslib }: buildRosPackage { pname = "ros-noetic-behaviortree-cpp-v3"; - version = "3.8.1-r1"; + version = "3.8.2-r1"; - src = fetchurl { - url = "https://github.com/BehaviorTree/behaviortree_cpp-release/archive/release/noetic/behaviortree_cpp_v3/3.8.1-1.tar.gz"; - name = "3.8.1-1.tar.gz"; - sha256 = "cfceff0272ff4c5cbd3245ce4ae0689cd5789003e9d99dbff638f4a29be2b4ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "BehaviorTree"; + repo = "behaviortree_cpp_v3-release"; + rev = "release/noetic/behaviortree_cpp_v3/3.8.2-1"; + sha256 = "sha256-KuS/C9quRgq4cnqiu7BeZt1GD2vayxHHdnFZtvQBnck="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/noetic/bond-core/default.nix b/distros/noetic/bond-core/default.nix index d05dfd2fe3..067b0e723d 100644 --- a/distros/noetic/bond-core/default.nix +++ b/distros/noetic/bond-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-bond-core"; version = "1.8.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/noetic/bond_core/1.8.6-1.tar.gz"; - name = "1.8.6-1.tar.gz"; - sha256 = "32a0898dc6881cf91f411f8eef9b329950f006017ab1c037a801cbbf9b0bbcd2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/noetic/bond_core/1.8.6-1"; + sha256 = "sha256-4MncWs6b3oH1OnOcZC8QblsvbLfGo0XGddc6Tkx8URk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/bond/default.nix b/distros/noetic/bond/default.nix index 33b13eb31b..02f985601e 100644 --- a/distros/noetic/bond/default.nix +++ b/distros/noetic/bond/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-bond"; version = "1.8.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/noetic/bond/1.8.6-1.tar.gz"; - name = "1.8.6-1.tar.gz"; - sha256 = "4d36aea04cde0bd1f8cc0e7a2136584a5ebe15ebbe6eb6a65637aa3e09918a5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/noetic/bond/1.8.6-1"; + sha256 = "sha256-Gj8R7gQHF1+mLunKHsobXFbEI94xmS9YOFcBUW1sbr0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/bondcpp/default.nix b/distros/noetic/bondcpp/default.nix index 1c6d116509..846f636e67 100644 --- a/distros/noetic/bondcpp/default.nix +++ b/distros/noetic/bondcpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-bondcpp"; version = "1.8.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/noetic/bondcpp/1.8.6-1.tar.gz"; - name = "1.8.6-1.tar.gz"; - sha256 = "0757b8c5410ae008a9238d13371c374eef0843c208aeb6be4965061239a56afc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/noetic/bondcpp/1.8.6-1"; + sha256 = "sha256-VySlSMYgK0CtDOaundap7bv6HoNSV0Nzmn4CJmXPY3s="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/bondpy/default.nix b/distros/noetic/bondpy/default.nix index 33b7245670..1a925e85ed 100644 --- a/distros/noetic/bondpy/default.nix +++ b/distros/noetic/bondpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-bondpy"; version = "1.8.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/noetic/bondpy/1.8.6-1.tar.gz"; - name = "1.8.6-1.tar.gz"; - sha256 = "392cc88d81ede0d5902f36458a88cefe3c66213f4def1cb972d4c4fe80af693b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/noetic/bondpy/1.8.6-1"; + sha256 = "sha256-cqfnNxlKTXuHdNfPkD0t7fhQ45gEM9icNi+yLXC2EeY="; + }; buildType = "catkin"; buildInputs = [ bond catkin python3Packages.setuptools ]; diff --git a/distros/noetic/boost-plugin-loader/default.nix b/distros/noetic/boost-plugin-loader/default.nix index b9cfd79579..9e56bd2a82 100644 --- a/distros/noetic/boost-plugin-loader/default.nix +++ b/distros/noetic/boost-plugin-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-boost-plugin-loader"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/tesseract-robotics-release/boost_plugin_loader-release/archive/release/noetic/boost_plugin_loader/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "5b25d104c423656c625823667d299ab922c345f0aacdd9de0f1c4e16381e3951"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tesseract-robotics-release"; + repo = "boost_plugin_loader-release"; + rev = "release/noetic/boost_plugin_loader/0.2.1-1"; + sha256 = "sha256-ZjoSvWcFE3AzAO8UquQff8huxjOm3V5FJ6XZ07XyYDs="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/boost-sml/default.nix b/distros/noetic/boost-sml/default.nix index 2ae4007037..ca7cb47b81 100644 --- a/distros/noetic/boost-sml/default.nix +++ b/distros/noetic/boost-sml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-boost-sml"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/boost_sml-release/archive/release/noetic/boost_sml/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "9c30d429372d194d44eefd350ff8d03df8b7cada5b4bedba2c6a0a0628760830"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "boost_sml-release"; + rev = "release/noetic/boost_sml/0.1.2-1"; + sha256 = "sha256-U5JdTzaA7FImbwM2qRa+mZT4NTqGb7cYCUNfiulQNQI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/bosch-locator-bridge/default.nix b/distros/noetic/bosch-locator-bridge/default.nix index 5403380fed..f08fa80371 100644 --- a/distros/noetic/bosch-locator-bridge/default.nix +++ b/distros/noetic/bosch-locator-bridge/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, nav-msgs, pcl-conversions, poco, roscpp, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-bosch-locator-bridge"; - version = "1.0.7-r1"; + version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/locator_ros_bridge-release/archive/release/noetic/bosch_locator_bridge/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "8f074e3d6d13ef356be42a772650e883ed64792d05775d353c41badd74779dec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "locator_ros_bridge-release"; + rev = "release/noetic/bosch_locator_bridge/1.0.8-1"; + sha256 = "sha256-1kqzu9+UdPEiSxxsiXc1tWiT5BjSO6iNg41RI9fqFSA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/calibration-estimation/default.nix b/distros/noetic/calibration-estimation/default.nix index e227bc7ae6..d9540d83b9 100644 --- a/distros/noetic/calibration-estimation/default.nix +++ b/distros/noetic/calibration-estimation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-calibration-estimation"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/calibration_estimation/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "d48efed94ad8e717abd4e2b2ee34ef8de8085b6b1a12b9dc6e451b5485073ce6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/calibration_estimation/0.10.15-1"; + sha256 = "sha256-zA++EMqqTySSrx2yPtv1cQUiUjqe7nk5G/9wkuxw5OQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/calibration-launch/default.nix b/distros/noetic/calibration-launch/default.nix index 3afca25c38..2b77c0b5fa 100644 --- a/distros/noetic/calibration-launch/default.nix +++ b/distros/noetic/calibration-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-calibration-launch"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/calibration_launch/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "7e5507f6f3f4762be434ed51f893ef940c17e2b4fec1397e33c7d4d2989585d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/calibration_launch/0.10.15-1"; + sha256 = "sha256-8xngboNaokVyCndanGjnb4SHt9tXkCMvL/1lLcR3E64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/calibration-msgs/default.nix b/distros/noetic/calibration-msgs/default.nix index 7780b9c7cb..fbb8f04b65 100644 --- a/distros/noetic/calibration-msgs/default.nix +++ b/distros/noetic/calibration-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-calibration-msgs"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/calibration_msgs/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "03ddbddde4c22035d93800b77a4cd89fe22a3774f96ac5e0112d074fea455e66"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/calibration_msgs/0.10.15-1"; + sha256 = "sha256-TJJfCZYOI84eDQWd3zHkeTouPRbozw2MN+ahDRVcvtc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/calibration-setup-helper/default.nix b/distros/noetic/calibration-setup-helper/default.nix index e562144438..10b7044af7 100644 --- a/distros/noetic/calibration-setup-helper/default.nix +++ b/distros/noetic/calibration-setup-helper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-calibration-setup-helper"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/calibration_setup_helper/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "c03aba4f47f351f5a1aca2b3ce28e19395c430f3d88f502d8339c8daa01687ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/calibration_setup_helper/0.10.15-1"; + sha256 = "sha256-4xVtdKgRFZOCY5sMJ2kh9IRvozNNkdYBvwWF3PfwRNU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/calibration/default.nix b/distros/noetic/calibration/default.nix index 8565b9dd48..b5a61d7962 100644 --- a/distros/noetic/calibration/default.nix +++ b/distros/noetic/calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-calibration"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/calibration/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "5753175e7e772508c85f6fe6652b8f9da83617c33d008a2ceb18a6192eb6276d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/calibration/0.10.15-1"; + sha256 = "sha256-3d5pFcpjXipJo9NLtZF+a2egwmgSglX6/pASpfiorww="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/camera-aravis/default.nix b/distros/noetic/camera-aravis/default.nix index f0ad2f385e..f0ed70a3a9 100644 --- a/distros/noetic/camera-aravis/default.nix +++ b/distros/noetic/camera-aravis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-camera-aravis"; version = "4.0.4-r1"; - src = fetchurl { - url = "https://github.com/FraunhoferIOSB/camera_aravis-release/archive/release/noetic/camera_aravis/4.0.4-1.tar.gz"; - name = "4.0.4-1.tar.gz"; - sha256 = "23bd279e3382106cb647927a31090866637de295e8bbded62dd33d9f59f1d378"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "FraunhoferIOSB"; + repo = "camera_aravis-release"; + rev = "release/noetic/camera_aravis/4.0.4-1"; + sha256 = "sha256-C9+TnlbswjC3Sh+nlCLazuuYaeuUdczxlZ+XWFHDc60="; + }; buildType = "catkin"; buildInputs = [ catkin glib message-generation ]; diff --git a/distros/noetic/camera-calibration-parsers/default.nix b/distros/noetic/camera-calibration-parsers/default.nix index 1859a8e8bf..37ac40bc7f 100644 --- a/distros/noetic/camera-calibration-parsers/default.nix +++ b/distros/noetic/camera-calibration-parsers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-camera-calibration-parsers"; version = "1.12.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/noetic/camera_calibration_parsers/1.12.0-1.tar.gz"; - name = "1.12.0-1.tar.gz"; - sha256 = "9a61cdd6c7c363a7edb9e58315680826f1fccd4ed43418b4a3ff02c5fad30503"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/noetic/camera_calibration_parsers/1.12.0-1"; + sha256 = "sha256-DPbEY0vEuZJ98NqlibpJh7fy81kdRbeuYw7Lp1ofRso="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config rosconsole ]; diff --git a/distros/noetic/camera-calibration/default.nix b/distros/noetic/camera-calibration/default.nix index e346e17ced..3120b56a9a 100644 --- a/distros/noetic/camera-calibration/default.nix +++ b/distros/noetic/camera-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-camera-calibration"; version = "1.17.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/noetic/camera_calibration/1.17.0-1.tar.gz"; - name = "1.17.0-1.tar.gz"; - sha256 = "994c197fa74fcc8d8506e314e6fe5f42fc6f7be99855058e7c2457128d0a06f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/noetic/camera_calibration/1.17.0-1"; + sha256 = "sha256-7PVkzkbFtWYyUD1L3m4IOJ9ABqVeRtasU0LTsnp+PPc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/camera-info-manager/default.nix b/distros/noetic/camera-info-manager/default.nix index c27881fce9..4fc85bc8a5 100644 --- a/distros/noetic/camera-info-manager/default.nix +++ b/distros/noetic/camera-info-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-camera-info-manager"; version = "1.12.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/noetic/camera_info_manager/1.12.0-1.tar.gz"; - name = "1.12.0-1.tar.gz"; - sha256 = "665ff2dc8fd366d67b1fd535bbf3bae4eca13f43e622b8ec4232afc0b8844c51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/noetic/camera_info_manager/1.12.0-1"; + sha256 = "sha256-UarjrjPCMzNdKZwY8Uxcnrp53jRf280wWXc/BGUasdk="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/can-dbc-parser/default.nix b/distros/noetic/can-dbc-parser/default.nix index 548979e39e..d8095ec2e4 100644 --- a/distros/noetic/can-dbc-parser/default.nix +++ b/distros/noetic/can-dbc-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-can-dbc-parser"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/nobleo/raptor-dbw-ros-release/archive/release/noetic/can_dbc_parser/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "aaa9ba0d987a7a2ac39f8c714346a4dc0cce310ca3748b78a013ddb34bc54eff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "raptor-dbw-ros-release"; + rev = "release/noetic/can_dbc_parser/1.0.0-1"; + sha256 = "sha256-6BAZH71AnTRtkkW03VDGUQaGXXk2jKPOPTWzjr4DeJI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/can-msgs/default.nix b/distros/noetic/can-msgs/default.nix index 14849478ca..2969da995a 100644 --- a/distros/noetic/can-msgs/default.nix +++ b/distros/noetic/can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-can-msgs"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/noetic/can_msgs/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "8b92a29487f697d796327b534a499e7021afd7ad5c6a0a86987d3af9371eb41d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/noetic/can_msgs/0.8.5-1"; + sha256 = "sha256-4pRolBZC1J+7Zggo2u/QMQb+iATTX7QceeXgRRIJB0c="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/canopen-402/default.nix b/distros/noetic/canopen-402/default.nix index 8628479994..db3304d3f3 100644 --- a/distros/noetic/canopen-402/default.nix +++ b/distros/noetic/canopen-402/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-canopen-402"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/noetic/canopen_402/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "b9480b8db5b584f817caf494d54634dc3deeaa75026096c6de3760c662ed5110"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/noetic/canopen_402/0.8.5-1"; + sha256 = "sha256-ayRBz0+Ikxjluz1EbD7/5sE0ls47EQXFZwdRG8x6OLg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/canopen-chain-node/default.nix b/distros/noetic/canopen-chain-node/default.nix index 64919fa585..734d9cba55 100644 --- a/distros/noetic/canopen-chain-node/default.nix +++ b/distros/noetic/canopen-chain-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-canopen-chain-node"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/noetic/canopen_chain_node/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "5853943d7f7e158ea8c7e0e48babf23c01988c88768537a63f701c3106e5c79e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/noetic/canopen_chain_node/0.8.5-1"; + sha256 = "sha256-GVUHL4gKOePn64morrMeQqAurcRx9TkMFq9XLDxAWHM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/canopen-master/default.nix b/distros/noetic/canopen-master/default.nix index a291929bd4..7f3c5b50ec 100644 --- a/distros/noetic/canopen-master/default.nix +++ b/distros/noetic/canopen-master/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-canopen-master"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/noetic/canopen_master/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "96664493e18cf66e5e6e53e7c0de4036d72fe3543885f757b63a046642b21f2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/noetic/canopen_master/0.8.5-1"; + sha256 = "sha256-89qyDBshOPfP6Bi0UJD0BxOCW6t4dIzEPuOutk6AOJQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/canopen-motor-node/default.nix b/distros/noetic/canopen-motor-node/default.nix index a110391621..22d9b40c08 100644 --- a/distros/noetic/canopen-motor-node/default.nix +++ b/distros/noetic/canopen-motor-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-canopen-motor-node"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/noetic/canopen_motor_node/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "7c87557f7149e32db48ae6d11db31f03a1de517c03942e9253d6e3884314c9ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/noetic/canopen_motor_node/0.8.5-1"; + sha256 = "sha256-Ixrnh1WkXt2VF0R2Ffc4IMemiq+eMXCE+x6z8OwEIWg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/capabilities/default.nix b/distros/noetic/capabilities/default.nix index 12ea7860d8..38fce994ac 100644 --- a/distros/noetic/capabilities/default.nix +++ b/distros/noetic/capabilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-capabilities"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/capabilities-release/archive/release/noetic/capabilities/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "1501424f9e0037067b6f14cc81563056d02b9d642f7a2cc6c7cc1af68aa98dbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "capabilities-release"; + rev = "release/noetic/capabilities/0.3.1-1"; + sha256 = "sha256-oZaBTlkl2LxXaaHDGuQkAWZwJERUJ3RHLLMwgcnzgRs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/noetic/care-o-bot-robot/default.nix b/distros/noetic/care-o-bot-robot/default.nix index bcf04a907c..59a8df00c2 100644 --- a/distros/noetic/care-o-bot-robot/default.nix +++ b/distros/noetic/care-o-bot-robot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-bringup, cob-manipulation, cob-navigation }: buildRosPackage { pname = "ros-noetic-care-o-bot-robot"; - version = "0.7.9-r1"; + version = "0.7.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/care-o-bot-release/archive/release/noetic/care_o_bot_robot/0.7.9-1.tar.gz"; - name = "0.7.9-1.tar.gz"; - sha256 = "717e9a938cb65432fb85d8238aead1a7e62e7cada341d0d7ac4683d453535f66"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "care-o-bot-release"; + rev = "release/noetic/care_o_bot_robot/0.7.10-1"; + sha256 = "sha256-B++G9OgAbM4WNeR2qC1RXPmUtJhH5aMwR9bh+SOY4JQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/care-o-bot-simulation/default.nix b/distros/noetic/care-o-bot-simulation/default.nix index 9cc6b0770b..d009842a85 100644 --- a/distros/noetic/care-o-bot-simulation/default.nix +++ b/distros/noetic/care-o-bot-simulation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-bringup-sim, cob-manipulation, cob-navigation }: buildRosPackage { pname = "ros-noetic-care-o-bot-simulation"; - version = "0.7.9-r1"; + version = "0.7.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/care-o-bot-release/archive/release/noetic/care_o_bot_simulation/0.7.9-1.tar.gz"; - name = "0.7.9-1.tar.gz"; - sha256 = "91623e07b61804ab5a7ae319ad71c40cd78e7e536a9d461edb36d183908b995c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "care-o-bot-release"; + rev = "release/noetic/care_o_bot_simulation/0.7.10-1"; + sha256 = "sha256-Oit+jFUcz/pfF/RQ+a3g+dF4vuPinLvBTeyNO6r7jp4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/care-o-bot/default.nix b/distros/noetic/care-o-bot/default.nix index b8d59828cb..9d0a59e06d 100644 --- a/distros/noetic/care-o-bot/default.nix +++ b/distros/noetic/care-o-bot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, care-o-bot-robot, care-o-bot-simulation, catkin, cob-manipulation, cob-navigation }: buildRosPackage { pname = "ros-noetic-care-o-bot"; - version = "0.7.9-r1"; + version = "0.7.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/care-o-bot-release/archive/release/noetic/care_o_bot/0.7.9-1.tar.gz"; - name = "0.7.9-1.tar.gz"; - sha256 = "89308468561ee24060307f9b7164910b955708aba821e7184c476d082bf3dfcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "care-o-bot-release"; + rev = "release/noetic/care_o_bot/0.7.10-1"; + sha256 = "sha256-EqF3H0wmKtySF6lrMzz8KcYNqXX/cN2AZzrNTGDRgkw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/carla-msgs/default.nix b/distros/noetic/carla-msgs/default.nix index f7b73d5125..6818c94531 100644 --- a/distros/noetic/carla-msgs/default.nix +++ b/distros/noetic/carla-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-carla-msgs"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/carla-simulator/ros-carla-msgs-release/archive/release/noetic/carla_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "3566e5cc4d2f62ca20a6472842357cfa3193c5f03430e2525182ec461a3bdc32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carla-simulator"; + repo = "ros-carla-msgs-release"; + rev = "release/noetic/carla_msgs/1.3.0-1"; + sha256 = "sha256-NTgm6pRu+Vv0vfOcZJd3y+UUP4VS3rzyU+ZdNre+prE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/carrot-planner/default.nix b/distros/noetic/carrot-planner/default.nix index e56b8fb5a8..4921ff4ad6 100644 --- a/distros/noetic/carrot-planner/default.nix +++ b/distros/noetic/carrot-planner/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, base-local-planner, catkin, costmap-2d, eigen, nav-core, pluginlib, roscpp, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-carrot-planner"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/carrot_planner/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "4b97d1b64c80686f5e27d0bc312f2cdc1cc158bc6cf25b15c4d8489fdb7b7f73"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/carrot_planner/1.17.3-1"; + sha256 = "sha256-9xwFetD93SZ5uQNz83DSysx8RtUmTZtIU86fbzDtV1Q="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-geometry-msgs ]; diff --git a/distros/noetic/cartesian-control-msgs/default.nix b/distros/noetic/cartesian-control-msgs/default.nix index 9a91ec37af..75cbd463e0 100644 --- a/distros/noetic/cartesian-control-msgs/default.nix +++ b/distros/noetic/cartesian-control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cartesian-control-msgs"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_cartesian_control_msgs-release/archive/release/noetic/cartesian_control_msgs/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "88d6f5a6c0add62f1ade742e8741e077fe434382cd7b9f0a743aeb24c15caa1b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_cartesian_control_msgs-release"; + rev = "release/noetic/cartesian_control_msgs/0.1.0-1"; + sha256 = "sha256-uPW2h5O83C0HDN+7KJPJyMYjI3+bCHV9PPDf2bqI1ys="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cartesian-interface/default.nix b/distros/noetic/cartesian-interface/default.nix index e361f08153..d28b22b37a 100644 --- a/distros/noetic/cartesian-interface/default.nix +++ b/distros/noetic/cartesian-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cartesian-interface"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/noetic/cartesian_interface/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "1f2aa6bb27030a2dfc1eabab2549db60369b49ed65f3a5f8452aea0ea4957b8e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/noetic/cartesian_interface/0.1.5-1"; + sha256 = "sha256-VkxVF/nJmrMeNzLiErhvriN6kgiYZPmJj0U2RzYfsrQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cartesian-msgs/default.nix b/distros/noetic/cartesian-msgs/default.nix index ea77a3939b..2d5e7dbf44 100644 --- a/distros/noetic/cartesian-msgs/default.nix +++ b/distros/noetic/cartesian-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cartesian-msgs"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/cartesian_msgs-release/archive/release/noetic/cartesian_msgs/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "427c2c1230df05e280ed460acc844e45c32f3cb64cc1d6b868d14d75848b7afe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "cartesian_msgs-release"; + rev = "release/noetic/cartesian_msgs/0.0.3-1"; + sha256 = "sha256-EsIPvtidY69PT/bIxbUcJNoD47MXWgg/pXQ+qfIvSEQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cartesian-trajectory-controller/default.nix b/distros/noetic/cartesian-trajectory-controller/default.nix index 6e346754b8..beba1e700c 100644 --- a/distros/noetic/cartesian-trajectory-controller/default.nix +++ b/distros/noetic/cartesian-trajectory-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cartesian-trajectory-controller"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/noetic/cartesian_trajectory_controller/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "a76d6faca9681d71b4d5cb2c8112ebaa045dde95182797cc95c01bb02a34133f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/noetic/cartesian_trajectory_controller/0.1.5-1"; + sha256 = "sha256-KziRZFtLlZqRl2iEHIxDap2ARaDjT/HzNz7E11n4QJc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cartesian-trajectory-interpolation/default.nix b/distros/noetic/cartesian-trajectory-interpolation/default.nix index 8507a94b60..248cfcbd75 100644 --- a/distros/noetic/cartesian-trajectory-interpolation/default.nix +++ b/distros/noetic/cartesian-trajectory-interpolation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cartesian-trajectory-interpolation"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/noetic/cartesian_trajectory_interpolation/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "40b4294cc4e8a4072c862714ba343b6a00446c0e79e4d31c420028cd3fbba31d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/noetic/cartesian_trajectory_interpolation/0.1.5-1"; + sha256 = "sha256-8ouZUJgN/V7WjqMEQjumV2Q8h11bF2/jF0V/Byz26cU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/catch-ros/default.nix b/distros/noetic/catch-ros/default.nix index f9914aca61..f1554bc389 100644 --- a/distros/noetic/catch-ros/default.nix +++ b/distros/noetic/catch-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-catch-ros"; version = "0.5.0-r2"; - src = fetchurl { - url = "https://github.com/AIS-Bonn/catch_ros-release/archive/release/noetic/catch_ros/0.5.0-2.tar.gz"; - name = "0.5.0-2.tar.gz"; - sha256 = "27b522f2d7b6237b97deae26ce18b14d3e1d65af14ba1ff1fd3fab1822f657e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AIS-Bonn"; + repo = "catch_ros-release"; + rev = "release/noetic/catch_ros/0.5.0-2"; + sha256 = "sha256-xpObhUYqMm+iVvSJgkHdqkm94zq3JVB0kYn0Ud9ioiA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/catkin-virtualenv/default.nix b/distros/noetic/catkin-virtualenv/default.nix index 971da62872..7cdb22956b 100644 --- a/distros/noetic/catkin-virtualenv/default.nix +++ b/distros/noetic/catkin-virtualenv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-catkin-virtualenv"; version = "0.6.1-r2"; - src = fetchurl { - url = "https://github.com/locusrobotics/catkin_virtualenv-release/archive/release/noetic/catkin_virtualenv/0.6.1-2.tar.gz"; - name = "0.6.1-2.tar.gz"; - sha256 = "a64e2bee1b82cb22c0ff35aea995ade6e9ab4b4f65a56bea61e928bd27acc608"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "catkin_virtualenv-release"; + rev = "release/noetic/catkin_virtualenv/0.6.1-2"; + sha256 = "sha256-nu9aKuMCPIrm23vZshhs2WHT41X7QgkgqHgwsxxpXvk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/catkin/default.nix b/distros/noetic/catkin/default.nix index 8f9624ec42..26c4a6bd43 100644 --- a/distros/noetic/catkin/default.nix +++ b/distros/noetic/catkin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-catkin"; version = "0.8.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/catkin-release/archive/release/noetic/catkin/0.8.10-1.tar.gz"; - name = "0.8.10-1.tar.gz"; - sha256 = "08401b37f85d0a6b153e00408b6e51fdf7b0fd0d485da6ccb808aba401a5518f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "catkin-release"; + rev = "release/noetic/catkin/0.8.10-1"; + sha256 = "sha256-/lfjWvuKyVXYA/YNaEI9ec44evTOnPZ4rqZQ1Zz0YIw="; + }; buildType = "catkin"; checkInputs = [ python3Packages.mock python3Packages.nose ]; diff --git a/distros/noetic/checkerboard-detector/default.nix b/distros/noetic/checkerboard-detector/default.nix index 9122c4f5a6..5b5d408451 100644 --- a/distros/noetic/checkerboard-detector/default.nix +++ b/distros/noetic/checkerboard-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-checkerboard-detector"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/noetic/checkerboard_detector/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "70b9133ad9add9dcad01366b8a2969cdf43acea745ba922d1497d887aa58fed9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/noetic/checkerboard_detector/1.2.15-1"; + sha256 = "sha256-iX6S82etL1rz97KfvrS8FJhqcF4VEEPY4NiXZRWNUUA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/chomp-motion-planner/default.nix b/distros/noetic/chomp-motion-planner/default.nix index 141c8d2797..249bbd39dd 100644 --- a/distros/noetic/chomp-motion-planner/default.nix +++ b/distros/noetic/chomp-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-chomp-motion-planner"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/chomp_motion_planner/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "85dd9768021a63512b2411ae6a4bbd23dc171091a50499d7a1bd92839f1fdd7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/chomp_motion_planner/1.1.11-1"; + sha256 = "sha256-PSlRqWEWKSJDBjT546YNuTa5kSYWnGh11AuQo2icn7E="; + }; buildType = "catkin"; buildInputs = [ catkin moveit-core roscpp ]; diff --git a/distros/noetic/cl-tf/default.nix b/distros/noetic/cl-tf/default.nix index c97ffbe853..c80a1b2123 100644 --- a/distros/noetic/cl-tf/default.nix +++ b/distros/noetic/cl-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cl-tf"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/cl_tf/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "e56cc5053da875177959914f2c0c88d94a6b8a357499951f89d437b7cd5c8b08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/cl_tf/0.2.14-1"; + sha256 = "sha256-xaRXFfPNz9pKlS01bdnVDGGYtA1FppBZbtN/DdPJ33k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cl-tf2/default.nix b/distros/noetic/cl-tf2/default.nix index ca7c9c46da..2f36924bd5 100644 --- a/distros/noetic/cl-tf2/default.nix +++ b/distros/noetic/cl-tf2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cl-tf2"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/cl_tf2/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "2178ba1c487b3a50653184b6998294d887a0a44d0af459fa59d439d77d487686"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/cl_tf2/0.2.14-1"; + sha256 = "sha256-DAk7z4dP3vzhJxtCNSQSR0mlgSuDofREWK1HmvqFRWs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cl-transforms-stamped/default.nix b/distros/noetic/cl-transforms-stamped/default.nix index 17e8f5947d..3474208fa3 100644 --- a/distros/noetic/cl-transforms-stamped/default.nix +++ b/distros/noetic/cl-transforms-stamped/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cl-transforms-stamped"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/cl_transforms_stamped/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "9455b466eaca1765ff31ee517ec637d2e5980ca4332c2eda8c2c039e9c16b232"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/cl_transforms_stamped/0.2.14-1"; + sha256 = "sha256-Sh/ZxO0JB/nsqTBh/QAxFFb8mzIy1nXGVWS28CIAuEY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cl-transforms/default.nix b/distros/noetic/cl-transforms/default.nix index 1609b09b95..29474d911a 100644 --- a/distros/noetic/cl-transforms/default.nix +++ b/distros/noetic/cl-transforms/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cl-transforms"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/cl_transforms/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "a58218fd1b3efe177d2c83bc37443dcd1b33ece203af4d5df00c41b994da5e76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/cl_transforms/0.2.14-1"; + sha256 = "sha256-njq2blq/F5C7SjWWmPOYL9/qE5LVDU9YmcCcY9fp3Fw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cl-urdf/default.nix b/distros/noetic/cl-urdf/default.nix index 5a8a70b15b..ac0b1ef7cb 100644 --- a/distros/noetic/cl-urdf/default.nix +++ b/distros/noetic/cl-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cl-urdf"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/cl_urdf/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "41abfb6b2a67bb3c43034ef5fecd9d1a4a6e7f27f92455bf5519c0528c786415"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/cl_urdf/0.2.14-1"; + sha256 = "sha256-XpWIw8X3Ohaso+DgAXQ5eov/m+092vup/jZov599ct0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cl-utils/default.nix b/distros/noetic/cl-utils/default.nix index 3a28c3fa76..22b549575d 100644 --- a/distros/noetic/cl-utils/default.nix +++ b/distros/noetic/cl-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cl-utils"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/cl_utils/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "9c25d5cbd6698016c63fa549b6a6079574ceb5a8f784ae80134232f7df0872fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/cl_utils/0.2.14-1"; + sha256 = "sha256-3KdrKuNlja1akY68ZH1xABAUs2KOK31hiNRjPrBicgg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/class-loader/default.nix b/distros/noetic/class-loader/default.nix index 26bded428e..189b6403ce 100644 --- a/distros/noetic/class-loader/default.nix +++ b/distros/noetic/class-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-class-loader"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/class_loader-release/archive/release/noetic/class_loader/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "7c1c002eac68d9c1b8bb82ea68004a444955fb844e444b806b1639501644de1b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "class_loader-release"; + rev = "release/noetic/class_loader/0.5.0-1"; + sha256 = "sha256-HyiWrPd/ywGE2mPrDf66eAfbvJcKWtja834dvCcf45Y="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/clear-costmap-recovery/default.nix b/distros/noetic/clear-costmap-recovery/default.nix index 340734755e..4c947b96e9 100644 --- a/distros/noetic/clear-costmap-recovery/default.nix +++ b/distros/noetic/clear-costmap-recovery/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, costmap-2d, eigen, nav-core, pluginlib, roscpp, rostest, tf2-ros }: buildRosPackage { pname = "ros-noetic-clear-costmap-recovery"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/clear_costmap_recovery/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "332dce9e91e3da8c242b94d812cb29f488403bdc5febab4ab4b52c8e6bcc6948"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/clear_costmap_recovery/1.17.3-1"; + sha256 = "sha256-zwzV2FjYZahcEOuzsoR9cycpeE+HhZ3xsAMMVp9mJfQ="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/clober-msgs/default.nix b/distros/noetic/clober-msgs/default.nix index 135c4ed5c7..025c1d6a06 100644 --- a/distros/noetic/clober-msgs/default.nix +++ b/distros/noetic/clober-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-clober-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/CLOBOT-Co-Ltd-release/clober_msgs-release/archive/release/noetic/clober_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "f48c9dc40117870ac70ce005760f86554406dec4969b975f5d7f115b7af1669a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CLOBOT-Co-Ltd-release"; + repo = "clober_msgs-release"; + rev = "release/noetic/clober_msgs/1.0.1-1"; + sha256 = "sha256-6Ezg+uD3chy/MysednpP5PKOvzUD2/ddXijOaxerKSo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/clpe-ros-msgs/default.nix b/distros/noetic/clpe-ros-msgs/default.nix index d26585f50e..2e303c352b 100644 --- a/distros/noetic/clpe-ros-msgs/default.nix +++ b/distros/noetic/clpe-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-clpe-ros-msgs"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/canlab-co/clpe_ros_msgs-ros-release/archive/release/noetic/clpe_ros_msgs/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "e76ba2f0efdcbb49aaa82369fd564216d6410ce5c0477f71ba27a12fe7307e60"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "canlab-co"; + repo = "clpe_ros_msgs-ros-release"; + rev = "release/noetic/clpe_ros_msgs/0.1.0-1"; + sha256 = "sha256-agDzkIxGixmIEr5fojkmhNNu9riIN6PC6bewWCty08U="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/clpe-ros/default.nix b/distros/noetic/clpe-ros/default.nix index 3cf1b80295..d892f41ae0 100644 --- a/distros/noetic/clpe-ros/default.nix +++ b/distros/noetic/clpe-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-clpe-ros"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/canlab-co/clpe_ros-ros-release/archive/release/noetic/clpe_ros/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "f2d304c94819912ddf2cfeea13bf551744e6d4ec71a3016b59f2342698ffc5c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "canlab-co"; + repo = "clpe_ros-ros-release"; + rev = "release/noetic/clpe_ros/0.1.1-1"; + sha256 = "sha256-cY1Z0D9WVOsePJQ2qUB0VZUZJ/lCyGocFUJmRhEMevw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/clpe/default.nix b/distros/noetic/clpe/default.nix index a90c5e65eb..581f1cdc28 100644 --- a/distros/noetic/clpe/default.nix +++ b/distros/noetic/clpe/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-clpe"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/canlab-co/CLPE_G_NVP2650D_SDK-ros-release/archive/release/noetic/clpe/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "45810c0873214b49d02b4e810a2172b24931239eee4a53686c3afaad065a2277"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "canlab-co"; + repo = "CLPE_G_NVP2650D_SDK-ros-release"; + rev = "release/noetic/clpe/0.1.1-1"; + sha256 = "sha256-lYeqbmx4YnEN/ZD3I/ufk2s0MgsloJ3usbGQ7GtSesc="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/cmake-modules/default.nix b/distros/noetic/cmake-modules/default.nix index 8873c2e857..4fc3edcaf7 100644 --- a/distros/noetic/cmake-modules/default.nix +++ b/distros/noetic/cmake-modules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cmake-modules"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/cmake_modules-release/archive/release/noetic/cmake_modules/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "dfeaf30ec1bc678393abb6429ee19d99582a6df73cdfdf5d8a165bd408ebc46b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "cmake_modules-release"; + rev = "release/noetic/cmake_modules/0.5.0-1"; + sha256 = "sha256-5/ipnK3HVqck/Czo+tngnVz3VhQVhDB2XhTfETa1Dgw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cmd-vel-smoother/default.nix b/distros/noetic/cmd-vel-smoother/default.nix index 829c1c09ab..5848a1828c 100644 --- a/distros/noetic/cmd-vel-smoother/default.nix +++ b/distros/noetic/cmd-vel-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cmd-vel-smoother"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/cmd_vel_smoother/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "3651226a9405b8293669bdacdb001fc175bb871e759c073b6173696768953c65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/cmd_vel_smoother/0.1.16-1"; + sha256 = "sha256-raT83xBHWrvsxU4lGvHZTWOzLgTTlOzSanrfyPD+VcQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cmvision/default.nix b/distros/noetic/cmvision/default.nix index 4b9d6a36ac..1582de0ac4 100644 --- a/distros/noetic/cmvision/default.nix +++ b/distros/noetic/cmvision/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cmvision"; version = "0.5.0-r2"; - src = fetchurl { - url = "https://github.com/teshanshanuka/cmvision-release/archive/release/noetic/cmvision/0.5.0-2.tar.gz"; - name = "0.5.0-2.tar.gz"; - sha256 = "edbbbcac9c23621ab1408052274744ddbd47e972d2d6c3db1657baa893fec78c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "teshanshanuka"; + repo = "cmvision-release"; + rev = "release/noetic/cmvision/0.5.0-2"; + sha256 = "sha256-rjJdq5kNcBuZhW/A8C0WcEIqaAigj7A/GqsTmfD2t2k="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cnpy/default.nix b/distros/noetic/cnpy/default.nix index 1e70715cd4..f3c93b12a8 100644 --- a/distros/noetic/cnpy/default.nix +++ b/distros/noetic/cnpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cnpy"; version = "0.0.8-r1"; - src = fetchurl { - url = "https://github.com/PeterMitrano/cnpy-release/archive/release/noetic/cnpy/0.0.8-1.tar.gz"; - name = "0.0.8-1.tar.gz"; - sha256 = "87f066147c2ba2f9c142065072514b6cecef45bf5aa506dcc85fbc0b07c5eee3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PeterMitrano"; + repo = "cnpy-release"; + rev = "release/noetic/cnpy/0.0.8-1"; + sha256 = "sha256-jrOoTg772vMXbU5KCB/V9EAokyf6kHqgVGbuOuIpk6A="; + }; buildType = "catkin"; buildInputs = [ catkin zlib ]; diff --git a/distros/noetic/cob-3d-mapping-msgs/default.nix b/distros/noetic/cob-3d-mapping-msgs/default.nix index 440416ece8..60470214a9 100644 --- a/distros/noetic/cob-3d-mapping-msgs/default.nix +++ b/distros/noetic/cob-3d-mapping-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-3d-mapping-msgs"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/cob_3d_mapping_msgs/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "8b92297cbf0b9b29fe7ab6ab41dec0971d2982eafaf994131d64a23d760b81e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/cob_3d_mapping_msgs/0.6.19-1"; + sha256 = "sha256-VNl0KZI+JnjsyjxQtVNs2RygkNIPQtA/bh048jJ+UYM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-actions/default.nix b/distros/noetic/cob-actions/default.nix index a888141508..505b620559 100644 --- a/distros/noetic/cob-actions/default.nix +++ b/distros/noetic/cob-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-actions"; version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/noetic/cob_actions/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "3b6e6a6d4a3ba976bcde2c76c69f24fcd752961e88550d912d0cdad0445abe06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/noetic/cob_actions/0.7.8-1"; + sha256 = "sha256-29VW8YCFLet5ZaqZikDe49y5EquWynms24Rbt61s2iI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-android-msgs/default.nix b/distros/noetic/cob-android-msgs/default.nix index a723100c4d..0bb2e47fc5 100644 --- a/distros/noetic/cob-android-msgs/default.nix +++ b/distros/noetic/cob-android-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-android-msgs"; version = "0.1.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/noetic/cob_android_msgs/0.1.10-1.tar.gz"; - name = "0.1.10-1.tar.gz"; - sha256 = "aaf0b59312ca1282c2344fc7ed2f338d55e7711d2f03e90b14f2985d924ddb75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/noetic/cob_android_msgs/0.1.10-1"; + sha256 = "sha256-k1iyipCdOIxBW2SU1M+3yiVRihFYHkTzd9q8wNW9QU4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-android-resource-server/default.nix b/distros/noetic/cob-android-resource-server/default.nix index d80e2ddb42..04ab77a48a 100644 --- a/distros/noetic/cob-android-resource-server/default.nix +++ b/distros/noetic/cob-android-resource-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-android-resource-server"; version = "0.1.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/noetic/cob_android_resource_server/0.1.10-1.tar.gz"; - name = "0.1.10-1.tar.gz"; - sha256 = "259bfab83811916e28ae201e2bb4aeb2961509844c722584b375203ebb8c5697"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/noetic/cob_android_resource_server/0.1.10-1"; + sha256 = "sha256-YmN2CRfB7tJq2sFmpjKLS/AgSHx9hm/el/RJoH+mT1c="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/cob-android-script-server/default.nix b/distros/noetic/cob-android-script-server/default.nix index 78f1b3612b..b16582da57 100644 --- a/distros/noetic/cob-android-script-server/default.nix +++ b/distros/noetic/cob-android-script-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-android-script-server"; version = "0.1.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/noetic/cob_android_script_server/0.1.10-1.tar.gz"; - name = "0.1.10-1.tar.gz"; - sha256 = "ce3448c78c5d5239a142baed1c050904d157b5f60823ddc7cc23c7ee49fd86ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/noetic/cob_android_script_server/0.1.10-1"; + sha256 = "sha256-Ic5VAqizysXuarOwxJCdeU9A9No66yr0E305dx6CeRc="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/cob-android-settings/default.nix b/distros/noetic/cob-android-settings/default.nix index ba0b7a6d0e..09d59d893a 100644 --- a/distros/noetic/cob-android-settings/default.nix +++ b/distros/noetic/cob-android-settings/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-android-settings"; version = "0.1.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/noetic/cob_android_settings/0.1.10-1.tar.gz"; - name = "0.1.10-1.tar.gz"; - sha256 = "e4038140c231cf067a0de76b46b2d902bf15f4aad761bd4b03422c0acd2b9214"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/noetic/cob_android_settings/0.1.10-1"; + sha256 = "sha256-SGR5OPgQL8OgJzFjPYdwPiXeYOYbuSebqXpauyjdYPE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-android/default.nix b/distros/noetic/cob-android/default.nix index 6428e379de..1f5a6cd498 100644 --- a/distros/noetic/cob-android/default.nix +++ b/distros/noetic/cob-android/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-android"; version = "0.1.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_android-release/archive/release/noetic/cob_android/0.1.10-1.tar.gz"; - name = "0.1.10-1.tar.gz"; - sha256 = "99c030bef5a2dda143c534296504d8e7badb84353c2cb83aac676b0e93fa42e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_android-release"; + rev = "release/noetic/cob_android/0.1.10-1"; + sha256 = "sha256-wpGMKJzBiQaSI863cnsN53bCbRX93SpAp86V4lOHGqc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-base-controller-utils/default.nix b/distros/noetic/cob-base-controller-utils/default.nix index 5134c57226..5fe8c4bd19 100644 --- a/distros/noetic/cob-base-controller-utils/default.nix +++ b/distros/noetic/cob-base-controller-utils/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, controller-manager-msgs, geometry-msgs, message-generation, message-runtime, nav-msgs, roscpp, rospy, std-msgs, std-srvs, tf, tf2, urdf }: +{ lib, buildRosPackage, fetchurl, catkin, controller-manager-msgs, diagnostic-msgs, geometry-msgs, message-generation, message-runtime, nav-msgs, roscpp, rospy, std-msgs, std-srvs, tf, tf2, urdf }: buildRosPackage { pname = "ros-noetic-cob-base-controller-utils"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_base_controller_utils/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "bfd74091ad76741b9fdc7d590cf901c68a84d2feb77c12e27a6a7fc1472a479c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_base_controller_utils/0.8.21-1"; + sha256 = "sha256-lrOza19Loo0A6ILFBxnJszOKRzGccI3uwtLXGGy2ciQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; - propagatedBuildInputs = [ controller-manager-msgs geometry-msgs message-runtime nav-msgs roscpp rospy std-msgs std-srvs tf tf2 urdf ]; + propagatedBuildInputs = [ controller-manager-msgs diagnostic-msgs geometry-msgs message-runtime nav-msgs roscpp rospy std-msgs std-srvs tf tf2 urdf ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/cob-base-drive-chain/default.nix b/distros/noetic/cob-base-drive-chain/default.nix index 052393f82b..d10c04093d 100644 --- a/distros/noetic/cob-base-drive-chain/default.nix +++ b/distros/noetic/cob-base-drive-chain/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-base-drive-chain"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_base_drive_chain/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "915e9b75cfe6cde57dcdcfa87bff346c6f2a4bffd212461282efb8f9125c8900"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_base_drive_chain/0.7.14-1"; + sha256 = "sha256-qGgKbEVkm2hqnF3T2aL6D8ldPTPdvJSYJB7qhsS5vLU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-base-velocity-smoother/default.nix b/distros/noetic/cob-base-velocity-smoother/default.nix index 83a8498b14..b0a3435a40 100644 --- a/distros/noetic/cob-base-velocity-smoother/default.nix +++ b/distros/noetic/cob-base-velocity-smoother/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, dynamic-reconfigure, geometry-msgs, nav-msgs, roscpp, roslint, std-msgs }: buildRosPackage { pname = "ros-noetic-cob-base-velocity-smoother"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_base_velocity_smoother/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "45e76c5e637ec93e27f71b70f4173af6ce896a4918156b900e552e7657b66d7d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_base_velocity_smoother/0.8.21-1"; + sha256 = "sha256-bDm+sP8RPxD/lSXC+2agbH9DOtczO/DgTZkq6jy3+Kw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-bms-driver/default.nix b/distros/noetic/cob-bms-driver/default.nix index c910278aca..1968100464 100644 --- a/distros/noetic/cob-bms-driver/default.nix +++ b/distros/noetic/cob-bms-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-bms-driver"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_bms_driver/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "01bc847a132e3e17c52fb9d3a648ae73483a1f9682408787038611891b033606"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_bms_driver/0.7.14-1"; + sha256 = "sha256-J4y7Il6NZdjPtI8SoHT2HDYCOd8y+56704aMdSkDEGE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-bringup-sim/default.nix b/distros/noetic/cob-bringup-sim/default.nix index 78ed643b67..9ed5dd36b6 100644 --- a/distros/noetic/cob-bringup-sim/default.nix +++ b/distros/noetic/cob-bringup-sim/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-default-env-config, cob-default-robot-config, cob-gazebo, cob-gazebo-worlds, cob-supported-robots, gazebo-ros, roslaunch }: buildRosPackage { pname = "ros-noetic-cob-bringup-sim"; - version = "0.7.6-r1"; + version = "0.7.7-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/noetic/cob_bringup_sim/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "ef8347f2708c8f49fc87acbcbe510fdc70dbc3be97e7764c4d79429292bfbd91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/noetic/cob_bringup_sim/0.7.7-1"; + sha256 = "sha256-+5Fzs+5J6aaSQ6wzZeUMBczfNTL7I5qPkZyuIeLmWKk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-bringup/default.nix b/distros/noetic/cob-bringup/default.nix index 9c94060187..6ba00d7846 100644 --- a/distros/noetic/cob-bringup/default.nix +++ b/distros/noetic/cob-bringup/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, canopen-chain-node, canopen-motor-node, catkin, cob-android-script-server, cob-base-controller-utils, cob-base-velocity-smoother, cob-bms-driver, cob-calibration-data, cob-cam3d-throttle, cob-collision-monitor, cob-collision-velocity-filter, cob-command-gui, cob-control-mode-adapter, cob-dashboard, cob-default-env-config, cob-default-robot-behavior, cob-default-robot-config, cob-docker-control, cob-frame-tracker, cob-hand-bridge, cob-hardware-config, cob-helper-tools, cob-image-flip, cob-light, cob-linear-nav, cob-mecanum-controller, cob-mimic, cob-monitoring, cob-moveit-config, cob-obstacle-distance, cob-omni-drive-controller, cob-phidget-em-state, cob-phidget-power-state, cob-phidgets, cob-reflector-referencing, cob-safety-controller, cob-scan-unifier, cob-script-server, cob-sick-lms1xx, cob-sick-s300, cob-sound, cob-supported-robots, cob-teleop, cob-twist-controller, cob-voltage-control, compressed-depth-image-transport, compressed-image-transport, controller-manager, costmap-2d, diagnostic-aggregator, generic-throttle, image-proc, joint-state-controller, joint-state-publisher, joint-trajectory-controller, joy, laser-filters, nodelet, openni2-launch, position-controllers, realsense2-camera, rgbd-launch, robot-state-publisher, roslaunch, rosserial-python, rosserial-server, rostopic, rviz, spacenav-node, tf2-ros, theora-image-transport, topic-tools, twist-mux, usb-cam, velocity-controllers }: buildRosPackage { pname = "ros-noetic-cob-bringup"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/noetic/cob_bringup/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "c61ff669b583fef439b31f311ff06549b3916d056030f3ae066f40f0ec5ce51b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/noetic/cob_bringup/0.7.9-1"; + sha256 = "sha256-sJtT13L6ZTgK0b/GFSLkS4ig6KXcrXoWSb8cbO85cKo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-calibration-data/default.nix b/distros/noetic/cob-calibration-data/default.nix index 5d8f79fc07..4dd965be70 100644 --- a/distros/noetic/cob-calibration-data/default.nix +++ b/distros/noetic/cob-calibration-data/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-calibration-data"; version = "0.6.18-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_calibration_data-release/archive/release/noetic/cob_calibration_data/0.6.18-1.tar.gz"; - name = "0.6.18-1.tar.gz"; - sha256 = "c0a110318bf61e339d863b480e66599205a518185054e0796dfc90bf7f3d61cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_calibration_data-release"; + rev = "release/noetic/cob_calibration_data/0.6.18-1"; + sha256 = "sha256-gBb+CDfr7ZsrfItMjvODMkEZKfy7W1CZ8rbxtCikQPE="; + }; buildType = "catkin"; buildInputs = [ catkin cob-supported-robots ]; diff --git a/distros/noetic/cob-cam3d-throttle/default.nix b/distros/noetic/cob-cam3d-throttle/default.nix index d8e0b3975c..88f5b10d4c 100644 --- a/distros/noetic/cob-cam3d-throttle/default.nix +++ b/distros/noetic/cob-cam3d-throttle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-cam3d-throttle"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/cob_cam3d_throttle/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "3401f950f372a490fe11b3128a01e9b531d1f6a5c6c1ed27d0ddefdbd76acac0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/cob_cam3d_throttle/0.6.19-1"; + sha256 = "sha256-N1NLX/dSGXcwapi6yicXxpWE6c3D+jJgwr3lmX2Xe4g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-canopen-motor/default.nix b/distros/noetic/cob-canopen-motor/default.nix index f9d72b487e..583e90186d 100644 --- a/distros/noetic/cob-canopen-motor/default.nix +++ b/distros/noetic/cob-canopen-motor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-canopen-motor"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_canopen_motor/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "0219fd0b3a685455a1a1ed460ead00d5a3a56bf7dcd4bf3ed1f4acd889802444"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_canopen_motor/0.7.14-1"; + sha256 = "sha256-NXJfuJ8WyU8x+RuNHAW6vp9cAzo7ih5et+d6J43dShg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-cartesian-controller/default.nix b/distros/noetic/cob-cartesian-controller/default.nix index 6e97f2cc8a..3442106b81 100644 --- a/distros/noetic/cob-cartesian-controller/default.nix +++ b/distros/noetic/cob-cartesian-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, boost, catkin, cob-frame-tracker, cob-script-server, cob-srvs, cob-twist-controller, geometry-msgs, message-generation, message-runtime, python3Packages, robot-state-publisher, roscpp, roslint, rospy, rviz, std-msgs, std-srvs, tf, topic-tools, visualization-msgs, xacro }: buildRosPackage { pname = "ros-noetic-cob-cartesian-controller"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_cartesian_controller/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "c51605793d6202f07088b484dbb759bb9547cb946eef451edd232cf1da384cff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_cartesian_controller/0.8.21-1"; + sha256 = "sha256-ojOs53/8yeMBWXP3SYX1Vuqa/7uOm2X4xP/F/UjL9/U="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools roslint ]; diff --git a/distros/noetic/cob-collision-monitor/default.nix b/distros/noetic/cob-collision-monitor/default.nix index 6d802b789c..56876e0394 100644 --- a/distros/noetic/cob-collision-monitor/default.nix +++ b/distros/noetic/cob-collision-monitor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-moveit-config, moveit-ros-move-group, moveit-ros-planning, pluginlib, std-msgs, tf, tf2-ros }: buildRosPackage { pname = "ros-noetic-cob-collision-monitor"; - version = "0.7.7-r1"; + version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/noetic/cob_collision_monitor/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "4c80e266153a19cb2b424355a6cd5b825a4a53bf1300f82389ef149e4d2517f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/noetic/cob_collision_monitor/0.7.8-1"; + sha256 = "sha256-KqXjLlddK7qngMHGkgFMS/ULBo9keE+HFVSzhzpDWwA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-collision-velocity-filter/default.nix b/distros/noetic/cob-collision-velocity-filter/default.nix index c2fbd2e098..3bc5f414f4 100644 --- a/distros/noetic/cob-collision-velocity-filter/default.nix +++ b/distros/noetic/cob-collision-velocity-filter/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cob-footprint-observer, costmap-2d, dynamic-reconfigure, geometry-msgs, nav-msgs, roscpp, tf, tf2-ros, visualization-msgs }: buildRosPackage { pname = "ros-noetic-cob-collision-velocity-filter"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_collision_velocity_filter/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "a62a06bcac7ea4ad578961eef8eef26cc2ed3b648161804e9d79944be0cab644"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_collision_velocity_filter/0.8.21-1"; + sha256 = "sha256-9UcecRaZSmd9Ame1YC6FeM1zRQAdWzA/sOxT717jnpA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-command-gui/default.nix b/distros/noetic/cob-command-gui/default.nix index c7990f88da..98b0d2c50c 100644 --- a/distros/noetic/cob-command-gui/default.nix +++ b/distros/noetic/cob-command-gui/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, cob-script-server, python3Packages, roslib, rospy }: buildRosPackage { pname = "ros-noetic-cob-command-gui"; - version = "0.6.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_command_gui/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "666ad7dac6c58297898a5c7993959fead393b7e7df01f33568bd35e9cc2bb892"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/cob_command_gui/0.6.31-1"; + sha256 = "sha256-8pzM1e61VoNttapZAHHFy6EhxhGpAHQRp5ZqY16KPsU="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/cob-command-tools/default.nix b/distros/noetic/cob-command-tools/default.nix index 19a8850a61..aa6b3b2ec0 100644 --- a/distros/noetic/cob-command-tools/default.nix +++ b/distros/noetic/cob-command-tools/default.nix @@ -5,13 +5,17 @@ { 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.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_command_tools/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "d059af62ad9fba22aef1458b6f7e4d3800a9b1e1a13b8e343eb208a90dfbf334"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/cob_command_tools/0.6.31-1"; + sha256 = "sha256-jK1YfIR64wq5FWttAZYSC71Jlgs8Z1y4feNNEVf34q8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-common/default.nix b/distros/noetic/cob-common/default.nix index 9ec1a043f5..b9d08d3116 100644 --- a/distros/noetic/cob-common/default.nix +++ b/distros/noetic/cob-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-common"; version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/noetic/cob_common/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "107d9ddf164b8d0bb175b49675311c97558a5b5f84cba6555c2bb15544595acc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/noetic/cob_common/0.7.8-1"; + sha256 = "sha256-2cyNbM8n3q/c6g5FrWFlWvHXt1xe94/i7DCYR0HYgZE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-control-mode-adapter/default.nix b/distros/noetic/cob-control-mode-adapter/default.nix index 9fb0783993..df025d1dfa 100644 --- a/distros/noetic/cob-control-mode-adapter/default.nix +++ b/distros/noetic/cob-control-mode-adapter/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, controller-manager-msgs, roscpp, roslint, std-msgs }: buildRosPackage { pname = "ros-noetic-cob-control-mode-adapter"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_control_mode_adapter/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "2cd29002c11fb35ca51cebc79b37e604f2c9de427055d5e2d05be58bda2ae75a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_control_mode_adapter/0.8.21-1"; + sha256 = "sha256-1DsFJd3PPRA8CfXrsdQ8okii3RJR3AJIqA2YUsSVhPo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-control-msgs/default.nix b/distros/noetic/cob-control-msgs/default.nix index 3bcfd930c1..74107c69c0 100644 --- a/distros/noetic/cob-control-msgs/default.nix +++ b/distros/noetic/cob-control-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-cob-control-msgs"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_control_msgs/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "8e7d48ef48e5a9f42d7f2a952e89262a60c57b7acb4ff8dc68ff17de4db42480"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_control_msgs/0.8.21-1"; + sha256 = "sha256-MvHsYuP/wEpBp3uxJoHiwR9MSiJNhaBDKfbHtAMW57w="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-control/default.nix b/distros/noetic/cob-control/default.nix index 8b16126841..207791ea06 100644 --- a/distros/noetic/cob-control/default.nix +++ b/distros/noetic/cob-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-base-controller-utils, cob-base-velocity-smoother, cob-cartesian-controller, cob-collision-velocity-filter, cob-control-mode-adapter, cob-control-msgs, cob-footprint-observer, cob-frame-tracker, cob-hardware-emulation, cob-mecanum-controller, cob-model-identifier, cob-obstacle-distance, cob-omni-drive-controller, cob-trajectory-controller, cob-tricycle-controller, cob-twist-controller }: buildRosPackage { pname = "ros-noetic-cob-control"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_control/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "731f03bceaeec67b413c473f2452e93330059e24093a1810d00026f519aa8068"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_control/0.8.21-1"; + sha256 = "sha256-K1hkIutleYR7/diEVz/gqqFdjt8aGJ8DZNd/6SEXIIQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-dashboard/default.nix b/distros/noetic/cob-dashboard/default.nix index 9d3a9ce1b3..63b067a150 100644 --- a/distros/noetic/cob-dashboard/default.nix +++ b/distros/noetic/cob-dashboard/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, python3Packages, roslib, rospy, rqt-gui, rqt-robot-dashboard }: buildRosPackage { pname = "ros-noetic-cob-dashboard"; - version = "0.6.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_dashboard/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "d8f7f6575d5b7ac07db7c310473556b1a64af6baa157608b915e5f8def2148c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/cob_dashboard/0.6.31-1"; + sha256 = "sha256-18HsO1gA/S3zwnWpsMzDdF18eFqY0fhD4BypcwErgN0="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/cob-default-env-config/default.nix b/distros/noetic/cob-default-env-config/default.nix index 517f975e8b..195ce4d02e 100644 --- a/distros/noetic/cob-default-env-config/default.nix +++ b/distros/noetic/cob-default-env-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-default-env-config"; version = "0.6.13-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_environments-release/archive/release/noetic/cob_default_env_config/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "6cde5633df93fa2800618827ee773455398dc8cd7da437f0ae49b363a12d9a7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_environments-release"; + rev = "release/noetic/cob_default_env_config/0.6.13-1"; + sha256 = "sha256-DHW/6AgqjOD5zFWSo+uD6KKMv5654VpmmGammyRSZbg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-default-robot-behavior/default.nix b/distros/noetic/cob-default-robot-behavior/default.nix index 1cbd716112..c6fad8599d 100644 --- a/distros/noetic/cob-default-robot-behavior/default.nix +++ b/distros/noetic/cob-default-robot-behavior/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-light, cob-script-server, python3Packages, rospy, std-msgs, std-srvs }: buildRosPackage { pname = "ros-noetic-cob-default-robot-behavior"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/noetic/cob_default_robot_behavior/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "e8ecfc9ad2070f2f1cdf974cc6592612f1b83dc5e555fe870068c64df1dce2f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/noetic/cob_default_robot_behavior/0.7.9-1"; + sha256 = "sha256-J/NZ0qcsbGUbKQX2CZ+Ns9wxaN8WzCyNsOVx3tHsK4s="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/cob-default-robot-config/default.nix b/distros/noetic/cob-default-robot-config/default.nix index 835b33366f..d4cb7d152c 100644 --- a/distros/noetic/cob-default-robot-config/default.nix +++ b/distros/noetic/cob-default-robot-config/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-supported-robots, roslaunch }: buildRosPackage { pname = "ros-noetic-cob-default-robot-config"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/noetic/cob_default_robot_config/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "08a1eff200bc22eb8b6b0e3e875f3738aa35f2632d7d66c81762dd324c3cf375"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/noetic/cob_default_robot_config/0.7.9-1"; + sha256 = "sha256-JffhEFnPXJXnOewqY38Y7r2qhEcu4JtXXex6DqEF/Hk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-description/default.nix b/distros/noetic/cob-description/default.nix index 9c6b7445de..ea1a107bf7 100644 --- a/distros/noetic/cob-description/default.nix +++ b/distros/noetic/cob-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-description"; version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/noetic/cob_description/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "ce971c4a6a08880102a23b90812eb0f97f7ee4f03a03887fc8d216a910e7231e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/noetic/cob_description/0.7.8-1"; + sha256 = "sha256-RbUZ6VmhxR0JwFNY+JocDcu/ouMRN356ZcZhGQI58sI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-docker-control/default.nix b/distros/noetic/cob-docker-control/default.nix index ad29d2ebb1..d54f970366 100644 --- a/distros/noetic/cob-docker-control/default.nix +++ b/distros/noetic/cob-docker-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-docker-control"; version = "0.6.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/noetic/cob_docker_control/0.6.12-1.tar.gz"; - name = "0.6.12-1.tar.gz"; - sha256 = "184596b166694089649886c56c4209805fcab2af3be203793b4a38f200736061"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/noetic/cob_docker_control/0.6.12-1"; + sha256 = "sha256-xC6P2ZkXr0vm54AMqNieRy4OYhcaGgDLOvE9wTEZrCY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-driver/default.nix b/distros/noetic/cob-driver/default.nix index 7a4676ce88..aaa97a96d4 100644 --- a/distros/noetic/cob-driver/default.nix +++ b/distros/noetic/cob-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-driver"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_driver/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "f046db20dfebfe21501bc744b142335792dbed670af852c5c591c5f0f393d681"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_driver/0.7.14-1"; + sha256 = "sha256-ld8BUerBckNGJgnyShfG/EH2S6u6xQijIru0iq9oKQg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-elmo-homing/default.nix b/distros/noetic/cob-elmo-homing/default.nix index 2677baf874..edfb56271c 100644 --- a/distros/noetic/cob-elmo-homing/default.nix +++ b/distros/noetic/cob-elmo-homing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-elmo-homing"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_elmo_homing/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "7a87cbfc820d91e4530bb0e3e362b02424df4233210d67587639041a24bbe0a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_elmo_homing/0.7.14-1"; + sha256 = "sha256-0iTKTOoWdMfWAhNSTCMRqu4ruOziX8VcPpZ+OaoC1vc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-environments/default.nix b/distros/noetic/cob-environments/default.nix index 8ec6eb9750..33d08148cb 100644 --- a/distros/noetic/cob-environments/default.nix +++ b/distros/noetic/cob-environments/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-environments"; version = "0.6.13-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_environments-release/archive/release/noetic/cob_environments/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "f6056d5196ddb7a95f096a3fa54a62bf18614e51b30a3e185df9bfb60fa36498"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_environments-release"; + rev = "release/noetic/cob_environments/0.6.13-1"; + sha256 = "sha256-gRBKpUiT1RWHji/bzUwFSqDeiuC8YS1FG0ocmBtCiBA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-extern/default.nix b/distros/noetic/cob-extern/default.nix index 46a4cb5a4f..def3aff88b 100644 --- a/distros/noetic/cob-extern/default.nix +++ b/distros/noetic/cob-extern/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-extern"; version = "0.6.18-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/noetic/cob_extern/0.6.18-1.tar.gz"; - name = "0.6.18-1.tar.gz"; - sha256 = "97e887c73b8759c68eea45d53b7ff0473908de639d557b8c88ea428aa88df5d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/noetic/cob_extern/0.6.18-1"; + sha256 = "sha256-iAe3gJIjpqdU8furIXfKjBnj3Wg8xo0uKkQEIuNk93I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-footprint-observer/default.nix b/distros/noetic/cob-footprint-observer/default.nix index b2578789ee..faad71a52e 100644 --- a/distros/noetic/cob-footprint-observer/default.nix +++ b/distros/noetic/cob-footprint-observer/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, geometry-msgs, message-generation, message-runtime, roscpp, std-msgs, tf }: buildRosPackage { pname = "ros-noetic-cob-footprint-observer"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_footprint_observer/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "b011b7686dedd14aa2b7ae48f67035729f4c450bc107accb1e263d74d5bced19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_footprint_observer/0.8.21-1"; + sha256 = "sha256-z7faKspkG1GlE0ARf7AUXsXjYGM89XvVb8CXfACxNCg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-frame-tracker/default.nix b/distros/noetic/cob-frame-tracker/default.nix index 6cb637e8dd..e315bb343e 100644 --- a/distros/noetic/cob-frame-tracker/default.nix +++ b/distros/noetic/cob-frame-tracker/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, boost, catkin, cob-srvs, control-toolbox, dynamic-reconfigure, geometry-msgs, interactive-markers, kdl-conversions, kdl-parser, message-generation, message-runtime, orocos-kdl, roscpp, roslint, rospy, sensor-msgs, std-msgs, std-srvs, tf, visualization-msgs }: buildRosPackage { pname = "ros-noetic-cob-frame-tracker"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_frame_tracker/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "3b34c54bf48dfab2c12e6cfc46395fe30b6cb62071d1bb3afe0188eca2c69b38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_frame_tracker/0.8.21-1"; + sha256 = "sha256-CUt7vg6cmfpjK+ybjwQKLbK31wRuC160cSbR/XsPYP4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-gazebo-objects/default.nix b/distros/noetic/cob-gazebo-objects/default.nix index bba2d93ae8..259076d8fd 100644 --- a/distros/noetic/cob-gazebo-objects/default.nix +++ b/distros/noetic/cob-gazebo-objects/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-description, gazebo-ros }: buildRosPackage { pname = "ros-noetic-cob-gazebo-objects"; - version = "0.7.6-r1"; + version = "0.7.7-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/noetic/cob_gazebo_objects/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "8ae54baf00927db2c1bc5c8aee5670c6ebb7af9232b8f296db5b5257b3c69ce9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/noetic/cob_gazebo_objects/0.7.7-1"; + sha256 = "sha256-7RhJwkOk0yFroXWqhee15qLILswdMEA5x1xjPUBi1F8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-gazebo-plugins/default.nix b/distros/noetic/cob-gazebo-plugins/default.nix index ea0a4635e3..022d026d77 100644 --- a/distros/noetic/cob-gazebo-plugins/default.nix +++ b/distros/noetic/cob-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-gazebo-plugins"; version = "0.7.7-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_gazebo_plugins-release/archive/release/noetic/cob_gazebo_plugins/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "41e7a4febc5a00ef86017729f5bf1b89896fa406578b7903cc388dc715606e15"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_gazebo_plugins-release"; + rev = "release/noetic/cob_gazebo_plugins/0.7.7-1"; + sha256 = "sha256-94XQWWS+zZHECKS2T+TXhIV6vXs6GdFiN3wh2R8AD2A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-gazebo-ros-control/default.nix b/distros/noetic/cob-gazebo-ros-control/default.nix index b1a461e274..b1d81e86e0 100644 --- a/distros/noetic/cob-gazebo-ros-control/default.nix +++ b/distros/noetic/cob-gazebo-ros-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-gazebo-ros-control"; version = "0.7.7-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_gazebo_plugins-release/archive/release/noetic/cob_gazebo_ros_control/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "fd49e81694642749589b62ad73957b9e4504ca1f3beb0b7350fb77e1440863db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_gazebo_plugins-release"; + rev = "release/noetic/cob_gazebo_ros_control/0.7.7-1"; + sha256 = "sha256-V87qCMHQeeWDA9UnEuuj3Xa/JB5luk2lUh/xwhAPULU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-gazebo-tools/default.nix b/distros/noetic/cob-gazebo-tools/default.nix index 785b96549d..e8cf9b2924 100644 --- a/distros/noetic/cob-gazebo-tools/default.nix +++ b/distros/noetic/cob-gazebo-tools/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, gazebo-msgs, geometry-msgs, python3Packages, roslib, rospy, tf }: buildRosPackage { pname = "ros-noetic-cob-gazebo-tools"; - version = "0.7.6-r1"; + version = "0.7.7-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/noetic/cob_gazebo_tools/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "d354f1ae9181425d0b36e10ae73180830a90739ed58842ea92853047eba47985"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/noetic/cob_gazebo_tools/0.7.7-1"; + sha256 = "sha256-gynULmDOVrbcuNzqLvuJsT/Q8CNSvwsu8CYZKIM6U9I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-gazebo-worlds/default.nix b/distros/noetic/cob-gazebo-worlds/default.nix index e966fdb45d..1553aa47a7 100644 --- a/distros/noetic/cob-gazebo-worlds/default.nix +++ b/distros/noetic/cob-gazebo-worlds/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-default-env-config, controller-manager, gazebo-msgs, gazebo-ros, gazebo-ros-control, joint-state-controller, joint-state-publisher, position-controllers, robot-state-publisher, roslaunch, rospy, rostest, std-msgs, tf, tf2-ros, velocity-controllers, xacro }: buildRosPackage { pname = "ros-noetic-cob-gazebo-worlds"; - version = "0.7.6-r1"; + version = "0.7.7-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/noetic/cob_gazebo_worlds/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "3cdd4b11daf900c8536a5d186f129d5269defe1d8d532fe3117dc9460880541f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/noetic/cob_gazebo_worlds/0.7.7-1"; + sha256 = "sha256-3SP1xy8JA+o6sOJnERyKT6f2mS7GIA/SygndqvAqr7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-gazebo/default.nix b/distros/noetic/cob-gazebo/default.nix index 032c9571b1..31458e5722 100644 --- a/distros/noetic/cob-gazebo/default.nix +++ b/distros/noetic/cob-gazebo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-bringup, cob-default-robot-config, cob-gazebo-ros-control, cob-hardware-config, cob-script-server, cob-supported-robots, control-msgs, gazebo-plugins, gazebo-ros, gazebo-ros-control, roslaunch, rospy, rostest, trajectory-msgs }: buildRosPackage { pname = "ros-noetic-cob-gazebo"; - version = "0.7.6-r1"; + version = "0.7.7-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/noetic/cob_gazebo/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "fccbdaaee37073d405016ca4d3d75a1b46a7c7b9b12daf5a186f79526d5fdffc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/noetic/cob_gazebo/0.7.7-1"; + sha256 = "sha256-MnwOTSskNK/yzyjTwgOdRXE7CbAptURl/3Wa+7YiX7E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-generic-can/default.nix b/distros/noetic/cob-generic-can/default.nix index 3e9a4cb276..eaacb60c28 100644 --- a/distros/noetic/cob-generic-can/default.nix +++ b/distros/noetic/cob-generic-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-generic-can"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_generic_can/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "5f7ecd3c637e6db0dc36805b2025cb5c229c1270abc17cee5a6445e310f593f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_generic_can/0.7.14-1"; + sha256 = "sha256-ZNEF0E/mBVldb2CjjYEVbDePbM2046i2xNpB0bmff34="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-grasp-generation/default.nix b/distros/noetic/cob-grasp-generation/default.nix index d1195cec56..17383a466e 100644 --- a/distros/noetic/cob-grasp-generation/default.nix +++ b/distros/noetic/cob-grasp-generation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, catkin, cob-description, cob-manipulation-msgs, geometry-msgs, moveit-msgs, python3Packages, robot-state-publisher, roslib, rospy, rviz, schunk-description, sensor-msgs, std-msgs, tf, tf2-ros, trajectory-msgs, visualization-msgs, xacro }: buildRosPackage { pname = "ros-noetic-cob-grasp-generation"; - version = "0.7.7-r1"; + version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/noetic/cob_grasp_generation/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "1e4af3b7808b40ffd3e1493ed190554496055255a46c103db3e291c92bdb9f36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/noetic/cob_grasp_generation/0.7.8-1"; + sha256 = "sha256-JR592GCt/zQD+nC7VHY68qz2fK9qKctt+BPDGkq8QuQ="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/cob-hand-bridge/default.nix b/distros/noetic/cob-hand-bridge/default.nix index 04c8563cb3..28c85f15e7 100644 --- a/distros/noetic/cob-hand-bridge/default.nix +++ b/distros/noetic/cob-hand-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-hand-bridge"; version = "0.6.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_hand-release/archive/release/noetic/cob_hand_bridge/0.6.10-1.tar.gz"; - name = "0.6.10-1.tar.gz"; - sha256 = "1f91d2568bc33a99e5fe3548714a1f6525890811228c74477a5418651ed8c528"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_hand-release"; + rev = "release/noetic/cob_hand_bridge/0.6.10-1"; + sha256 = "sha256-q/DUZL7GR2vE7h7IC0xCJ34JveS09XEXOdYZSs564ww="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-hand/default.nix b/distros/noetic/cob-hand/default.nix index 05a9b2ebb0..b90e4b2a6f 100644 --- a/distros/noetic/cob-hand/default.nix +++ b/distros/noetic/cob-hand/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-hand"; version = "0.6.10-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_hand-release/archive/release/noetic/cob_hand/0.6.10-1.tar.gz"; - name = "0.6.10-1.tar.gz"; - sha256 = "def20ffe69e0af6e5d173018e5d5e7fdb287a80eecb71217dc8fb7ceaf721899"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_hand-release"; + rev = "release/noetic/cob_hand/0.6.10-1"; + sha256 = "sha256-hOzmRiVwc5D5CP7kUi6TOddMUplEr/wJxOGjC0MgLCI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-hardware-config/default.nix b/distros/noetic/cob-hardware-config/default.nix index 68eb9239e5..1c0250f797 100644 --- a/distros/noetic/cob-hardware-config/default.nix +++ b/distros/noetic/cob-hardware-config/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-calibration-data, cob-description, cob-omni-drive-controller, cob-supported-robots, costmap-2d, diagnostic-aggregator, joint-state-controller, joint-state-publisher, joint-state-publisher-gui, joint-trajectory-controller, laser-filters, position-controllers, raw-description, robot-state-publisher, roslaunch, rostest, rviz, velocity-controllers, xacro }: buildRosPackage { pname = "ros-noetic-cob-hardware-config"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/noetic/cob_hardware_config/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "a57ed950e46875dc5c7bfe7168e4f41d7dda8866535c8943db10f890f13edf64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/noetic/cob_hardware_config/0.7.9-1"; + sha256 = "sha256-Oi9w2aP7ZRVQelGhdZuHXIZduwI4LeLYvPWIOeJOCE4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-hardware-emulation/default.nix b/distros/noetic/cob-hardware-emulation/default.nix index c1b15252e4..1b8a554258 100644 --- a/distros/noetic/cob-hardware-emulation/default.nix +++ b/distros/noetic/cob-hardware-emulation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, catkin, control-msgs, move-base-msgs, nav-msgs, roscpp, rosgraph-msgs, rospy, sensor-msgs, std-srvs, tf-conversions, tf2-ros }: buildRosPackage { pname = "ros-noetic-cob-hardware-emulation"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_hardware_emulation/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "daa71fdec6c58093cddc33f6f09b2490a697d2d574bde284711c38038b9303a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_hardware_emulation/0.8.21-1"; + sha256 = "sha256-Nr7BdKHUlhxkLtb0ktANH8kadoIluQOgyxa7BhphKXE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-helper-tools/default.nix b/distros/noetic/cob-helper-tools/default.nix index 1ce647b50e..f1611abf93 100644 --- a/distros/noetic/cob-helper-tools/default.nix +++ b/distros/noetic/cob-helper-tools/default.nix @@ -5,13 +5,17 @@ { 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.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_helper_tools/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "a53970854796971542220b58afea1d380843cc8650303b38432565ea49ba0466"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/cob_helper_tools/0.6.31-1"; + sha256 = "sha256-MMXOAGZ+yaN35SRdP5GULhiQ0yGgrevN+/JKAB0JBZ0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools ]; diff --git a/distros/noetic/cob-image-flip/default.nix b/distros/noetic/cob-image-flip/default.nix index 9d3e0dc8c2..cf46524f03 100644 --- a/distros/noetic/cob-image-flip/default.nix +++ b/distros/noetic/cob-image-flip/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-image-flip"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/cob_image_flip/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "c99621835873ca678c8ae4e5311c5667f66c9f142a97f310d058604319a09ac8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/cob_image_flip/0.6.19-1"; + sha256 = "sha256-C/4MI9wfllMHF0HYW4KVswjJQT0xbfxh7/J6brGtuG0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-interactive-teleop/default.nix b/distros/noetic/cob-interactive-teleop/default.nix index d2ca356f54..a33e48412f 100644 --- a/distros/noetic/cob-interactive-teleop/default.nix +++ b/distros/noetic/cob-interactive-teleop/default.nix @@ -5,13 +5,17 @@ { 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.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_interactive_teleop/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "f80632f75245f67acd7ddd4c530e0e7e0cd8ec54b9c1231a7d0be1141e2820a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/cob_interactive_teleop/0.6.31-1"; + sha256 = "sha256-JMdjSL/PIi5NYRPGAeW4OFvqyLrKrOPLJpuTqIreuPc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-light/default.nix b/distros/noetic/cob-light/default.nix index 85d4ebaec0..f5c2adbc13 100644 --- a/distros/noetic/cob-light/default.nix +++ b/distros/noetic/cob-light/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-light"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_light/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "83dc95b81792ea0ed57658f09109ca19f514a6d0620a7e0e2b010989e5e3a4d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_light/0.7.14-1"; + sha256 = "sha256-GUYGNWDtIbW5vts+db/+1zyV98BqFkhS89KPhIpqKzs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-linear-nav/default.nix b/distros/noetic/cob-linear-nav/default.nix index 5e3d1a86ef..322649189e 100644 --- a/distros/noetic/cob-linear-nav/default.nix +++ b/distros/noetic/cob-linear-nav/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, angles, catkin, cob-srvs, geometry-msgs, move-base-msgs, nav-msgs, roscpp, tf }: buildRosPackage { pname = "ros-noetic-cob-linear-nav"; - version = "0.6.13-r1"; + version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/noetic/cob_linear_nav/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "713e99b6492a0821b52b9e6baa08dc6b109d5bf10395cca74a8f6e1eaa5d7dba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/noetic/cob_linear_nav/0.6.14-1"; + sha256 = "sha256-XGPulV0eBE2+2xwhY47IU88Ao572cZMVTK9JpPCCn/M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-lookat-action/default.nix b/distros/noetic/cob-lookat-action/default.nix index 0d6c089f6f..67fdec175d 100644 --- a/distros/noetic/cob-lookat-action/default.nix +++ b/distros/noetic/cob-lookat-action/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, angles, catkin, control-msgs, geometry-msgs, kdl-conversions, kdl-parser, message-generation, message-runtime, move-base-msgs, orocos-kdl, roscpp, rospy, sensor-msgs, tf, tf-conversions, tf2-ros, trajectory-msgs }: buildRosPackage { pname = "ros-noetic-cob-lookat-action"; - version = "0.7.7-r1"; + version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/noetic/cob_lookat_action/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "9416d9ec5db5b45e4a9606a4cc679a6a89ca911e76ad8b6bf4d0ea6fa3724254"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/noetic/cob_lookat_action/0.7.8-1"; + sha256 = "sha256-1e+jHUoV5Vzx9ujlqqDqlzg6whE8iEUqpmTE0VenNH4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-manipulation-msgs/default.nix b/distros/noetic/cob-manipulation-msgs/default.nix index 50444d89eb..be06589814 100644 --- a/distros/noetic/cob-manipulation-msgs/default.nix +++ b/distros/noetic/cob-manipulation-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, message-generation, message-runtime, moveit-msgs }: buildRosPackage { pname = "ros-noetic-cob-manipulation-msgs"; - version = "0.7.7-r1"; + version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/noetic/cob_manipulation_msgs/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "abacddc3016ee4a538ffcb6f6e86a13cd6937428f6aed1fa8c3eaa676b1869b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/noetic/cob_manipulation_msgs/0.7.8-1"; + sha256 = "sha256-/zeo1mpkMvx2g5lmJeodbRYgtb3TtYHYKOD3O3oaha8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-manipulation/default.nix b/distros/noetic/cob-manipulation/default.nix index 43deecef28..c529a08259 100644 --- a/distros/noetic/cob-manipulation/default.nix +++ b/distros/noetic/cob-manipulation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-collision-monitor, cob-grasp-generation, cob-lookat-action, cob-manipulation-msgs, cob-moveit-bringup, cob-moveit-interface }: buildRosPackage { pname = "ros-noetic-cob-manipulation"; - version = "0.7.7-r1"; + version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/noetic/cob_manipulation/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "654eecbac177bcfc3d3e049d98747b987bed67feba09377aac7163838898e5a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/noetic/cob_manipulation/0.7.8-1"; + sha256 = "sha256-ZIivxC4ythJBdSijLGLojAOxR1G5dnsbGtH21YDxRso="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-map-accessibility-analysis/default.nix b/distros/noetic/cob-map-accessibility-analysis/default.nix index 90272d4f82..e2ac7f686a 100644 --- a/distros/noetic/cob-map-accessibility-analysis/default.nix +++ b/distros/noetic/cob-map-accessibility-analysis/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cob-3d-mapping-msgs, cv-bridge, geometry-msgs, image-transport, message-filters, message-generation, message-runtime, nav-msgs, opencv, pcl, pcl-ros, python3Packages, roscpp, rospy, sensor-msgs, tf }: buildRosPackage { pname = "ros-noetic-cob-map-accessibility-analysis"; - version = "0.6.13-r1"; + version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/noetic/cob_map_accessibility_analysis/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "a35e3f416d74dde0074be244b44ca72dc7ebcec934d42cf22e71e08320963202"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/noetic/cob_map_accessibility_analysis/0.6.14-1"; + sha256 = "sha256-DzDJaCrCNwwGkmqQUPUsVdGWJoynbxh7OOtq1oPUQnM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools ]; diff --git a/distros/noetic/cob-mapping-slam/default.nix b/distros/noetic/cob-mapping-slam/default.nix index 8864840719..3efb52ccba 100644 --- a/distros/noetic/cob-mapping-slam/default.nix +++ b/distros/noetic/cob-mapping-slam/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-navigation-global, cob-supported-robots, gmapping, roslaunch }: buildRosPackage { pname = "ros-noetic-cob-mapping-slam"; - version = "0.6.13-r1"; + version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/noetic/cob_mapping_slam/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "0babda24aa46428095fdd3a8c2ac17bd85edac062da85c8b25ac27d86634219a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/noetic/cob_mapping_slam/0.6.14-1"; + sha256 = "sha256-3KMc3vflF4oJaBul2Wm3p2zSeXWhwQmqKbR+CNX6IKM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-mecanum-controller/default.nix b/distros/noetic/cob-mecanum-controller/default.nix index 8cb13c4120..326b343586 100644 --- a/distros/noetic/cob-mecanum-controller/default.nix +++ b/distros/noetic/cob-mecanum-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, eigen, geometry-msgs, nav-msgs, roscpp, sensor-msgs }: buildRosPackage { pname = "ros-noetic-cob-mecanum-controller"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_mecanum_controller/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "63d2edacbbd8a3553508dfd7ba8ac3b8e4538dde97efd62bf6afb6a0b57399b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_mecanum_controller/0.8.21-1"; + sha256 = "sha256-RMcgxSwLLI0TH8zps1CXRky7ln0r+JuHzzqQmDkRmfg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-mimic/default.nix b/distros/noetic/cob-mimic/default.nix index 48600ce7e9..9cae21a4e6 100644 --- a/distros/noetic/cob-mimic/default.nix +++ b/distros/noetic/cob-mimic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-mimic"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_mimic/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "0834a9843a3d1ff9d4967b827a08d909b4efbc3b845ede93fba24cff178b029d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_mimic/0.7.14-1"; + sha256 = "sha256-86f4A1MxBPT0CcQnFiuYaAPC5aNT512vXj3HvdxqwZo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-model-identifier/default.nix b/distros/noetic/cob-model-identifier/default.nix index b79d19c455..26e95d1772 100644 --- a/distros/noetic/cob-model-identifier/default.nix +++ b/distros/noetic/cob-model-identifier/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cmake-modules, geometry-msgs, kdl-parser, orocos-kdl, roscpp, roslint, rospy, sensor-msgs, std-srvs, tf }: buildRosPackage { pname = "ros-noetic-cob-model-identifier"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_model_identifier/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "a8465a55589f21798d94222f7d57fdd8f0439e3e6753f2059545fa737aa8bb5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_model_identifier/0.8.21-1"; + sha256 = "sha256-c3aEevNUu5Soi37HbvWu1APoSaJ7ULLIDg8Rkwu0lI0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-monitoring/default.nix b/distros/noetic/cob-monitoring/default.nix index b482f7a34e..4aac797cc8 100644 --- a/distros/noetic/cob-monitoring/default.nix +++ b/distros/noetic/cob-monitoring/default.nix @@ -5,17 +5,21 @@ { 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.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_monitoring/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "3c3fdfc94d2948302c063b5aa37891e5e16006aec2e7f4968697073fe6df2f55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/cob_monitoring/0.6.31-1"; + sha256 = "sha256-1OpFVTExlW1jfkaSG4v8oatlwknGTlFVM5iJyf4FL4M="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; - 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 ]; + propagatedBuildInputs = [ actionlib cob-light cob-msgs cob-script-server diagnostic-msgs diagnostic-updater ifstat-legacy ipmitool ntp python3Packages.packaging python3Packages.paramiko python3Packages.psutil python3Packages.requests roscpp rospy rostopic sensor-msgs std-msgs sysstat topic-tools ]; nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { diff --git a/distros/noetic/cob-moveit-bringup/default.nix b/distros/noetic/cob-moveit-bringup/default.nix index 47dbe0e2c0..7e3668ba7a 100644 --- a/distros/noetic/cob-moveit-bringup/default.nix +++ b/distros/noetic/cob-moveit-bringup/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-hardware-config, cob-moveit-config, joint-state-publisher, moveit-planners-ompl, moveit-plugins, moveit-ros-move-group, moveit-ros-perception, moveit-ros-visualization, moveit-setup-assistant, robot-state-publisher, rviz, tf, warehouse-ros }: buildRosPackage { pname = "ros-noetic-cob-moveit-bringup"; - version = "0.7.7-r1"; + version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/noetic/cob_moveit_bringup/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "3661f3fac58130b8c00172d3be7c1be4292e46d1cee7d775bf36b2fcee974e1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/noetic/cob_moveit_bringup/0.7.8-1"; + sha256 = "sha256-LyueyEvnkv462ora9DNMVZmWWfuOdwjH5GfY2HpPUkc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-moveit-config/default.nix b/distros/noetic/cob-moveit-config/default.nix index 9f86b8366b..d5dd2bd251 100644 --- a/distros/noetic/cob-moveit-config/default.nix +++ b/distros/noetic/cob-moveit-config/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, xacro }: buildRosPackage { pname = "ros-noetic-cob-moveit-config"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/noetic/cob_moveit_config/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "f8d1e17c0970edad6587a2efcde0f4267d4014c4afe78871f3819dd77fc81d38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/noetic/cob_moveit_config/0.7.9-1"; + sha256 = "sha256-NJFW1hnkNA1p2ep6527uKKb2s5ZEi5iWiaFrySXPuXM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-moveit-interface/default.nix b/distros/noetic/cob-moveit-interface/default.nix index 2aa59c2f00..70f7ceb5a1 100644 --- a/distros/noetic/cob-moveit-interface/default.nix +++ b/distros/noetic/cob-moveit-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-script-server, geometry-msgs, moveit-commander, python3Packages, rospy, tf }: buildRosPackage { pname = "ros-noetic-cob-moveit-interface"; - version = "0.7.7-r1"; + version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_manipulation-release/archive/release/noetic/cob_moveit_interface/0.7.7-1.tar.gz"; - name = "0.7.7-1.tar.gz"; - sha256 = "38d484d7b5c2eb4916448b15d3ff49c81cda6d6e8190bc8b16a659f54f9a3d05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_manipulation-release"; + rev = "release/noetic/cob_moveit_interface/0.7.8-1"; + sha256 = "sha256-DrqKzKlNDkWv4LwT4eJEVLqdVrN0Sxh54KsrEYbPM/Q="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/cob-msgs/default.nix b/distros/noetic/cob-msgs/default.nix index a26edba9e0..36d9d1d25a 100644 --- a/distros/noetic/cob-msgs/default.nix +++ b/distros/noetic/cob-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-msgs"; version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/noetic/cob_msgs/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "e871d7c85cfe1b83c13d3102365ec95e0d3741fa9820ea10b47a26aea9829571"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/noetic/cob_msgs/0.7.8-1"; + sha256 = "sha256-uzKFi/OEpQ0pk1FGStDelwZ2G3oiA0xMBzkEAdnEdiU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-navigation-config/default.nix b/distros/noetic/cob-navigation-config/default.nix index fac53fd769..b91a25220d 100644 --- a/distros/noetic/cob-navigation-config/default.nix +++ b/distros/noetic/cob-navigation-config/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-noetic-cob-navigation-config"; - version = "0.6.13-r1"; + version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/noetic/cob_navigation_config/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "7bd8380ec54e08b901b93eac51e96993f667abe16229df31593fd71cbc34fb21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/noetic/cob_navigation_config/0.6.14-1"; + sha256 = "sha256-S6b9LFp9eaLSaEkk5xNn7wGTPLPrOtt6GWDPsgAVBTw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-navigation-global/default.nix b/distros/noetic/cob-navigation-global/default.nix index 5bd13bbabc..952083a951 100644 --- a/distros/noetic/cob-navigation-global/default.nix +++ b/distros/noetic/cob-navigation-global/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, amcl, catkin, cob-default-env-config, cob-linear-nav, cob-navigation-config, cob-scan-unifier, cob-supported-robots, dwa-local-planner, map-server, move-base, roslaunch, rviz, topic-tools }: buildRosPackage { pname = "ros-noetic-cob-navigation-global"; - version = "0.6.13-r1"; + version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/noetic/cob_navigation_global/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "7e3b3ccaf428da57d016882cea7f84a716afc91183157be722137e8db7057a17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/noetic/cob_navigation_global/0.6.14-1"; + sha256 = "sha256-6Q3piPDig6MEghDW4RNKyY0NNKG4PXjo2JA8bi131Pg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-navigation-local/default.nix b/distros/noetic/cob-navigation-local/default.nix index c0934ee687..c4352d722f 100644 --- a/distros/noetic/cob-navigation-local/default.nix +++ b/distros/noetic/cob-navigation-local/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-navigation-config, cob-supported-robots, dwa-local-planner, move-base, roslaunch, rviz }: buildRosPackage { pname = "ros-noetic-cob-navigation-local"; - version = "0.6.13-r1"; + version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/noetic/cob_navigation_local/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "150eb6e0c9a3365780db8804ad3f26a890efc754d231abc682fed8d42adac12c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/noetic/cob_navigation_local/0.6.14-1"; + sha256 = "sha256-KeoqTyw//V2tGfT93g4em69CGbQrYcJAINWf5XTtJLg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-navigation-slam/default.nix b/distros/noetic/cob-navigation-slam/default.nix index a54bb92e29..5da4905077 100644 --- a/distros/noetic/cob-navigation-slam/default.nix +++ b/distros/noetic/cob-navigation-slam/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-mapping-slam, cob-navigation-config, cob-navigation-global, cob-supported-robots, roslaunch, rviz }: buildRosPackage { pname = "ros-noetic-cob-navigation-slam"; - version = "0.6.13-r1"; + version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/noetic/cob_navigation_slam/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "1454b5ece53c1d29e516e8b47c13b3242edbc4d1912cb0f34b14e62644244e3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/noetic/cob_navigation_slam/0.6.14-1"; + sha256 = "sha256-f1hPgVa2gg9/f0iLP4rCNnFk0X8xFhHt6/kHHeJzr/0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-navigation/default.nix b/distros/noetic/cob-navigation/default.nix index 902a209caa..ac3f5a7841 100644 --- a/distros/noetic/cob-navigation/default.nix +++ b/distros/noetic/cob-navigation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-linear-nav, cob-map-accessibility-analysis, cob-mapping-slam, cob-navigation-config, cob-navigation-global, cob-navigation-local, cob-navigation-slam }: buildRosPackage { pname = "ros-noetic-cob-navigation"; - version = "0.6.13-r1"; + version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_navigation-release/archive/release/noetic/cob_navigation/0.6.13-1.tar.gz"; - name = "0.6.13-1.tar.gz"; - sha256 = "6a4d2b7d7b118e176f6f433a6c4d77162d7fa1520f2c3e615e794cb0996a65e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_navigation-release"; + rev = "release/noetic/cob_navigation/0.6.14-1"; + sha256 = "sha256-n5v9c371/7cK88RUUwjCyH/ONXrmVgKr3Fk/kFAucQ4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-object-detection-msgs/default.nix b/distros/noetic/cob-object-detection-msgs/default.nix index 2d26fa6a5d..9f6ea22a6f 100644 --- a/distros/noetic/cob-object-detection-msgs/default.nix +++ b/distros/noetic/cob-object-detection-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-object-detection-msgs"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/cob_object_detection_msgs/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "3545063cd63a307c29456b39f68ab1fcd842b90423e61da31d08942c5d093888"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/cob_object_detection_msgs/0.6.19-1"; + sha256 = "sha256-fZb1Xh3sqmep1SfC6D+yq/pVJt/uIinh4ukapJNzYoY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-object-detection-visualizer/default.nix b/distros/noetic/cob-object-detection-visualizer/default.nix index c6f57a3232..a8f3679057 100644 --- a/distros/noetic/cob-object-detection-visualizer/default.nix +++ b/distros/noetic/cob-object-detection-visualizer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-object-detection-visualizer"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/cob_object_detection_visualizer/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "70c64219bb8f8f7bd3316550733227c9defcdbace1172268308370caf34bc925"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/cob_object_detection_visualizer/0.6.19-1"; + sha256 = "sha256-kVjrVeuefnnSMhngiLLH/Rgona7WK6bUSNVUk3J/9KU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-obstacle-distance/default.nix b/distros/noetic/cob-obstacle-distance/default.nix index f92f57cd23..0c8803e29e 100644 --- a/distros/noetic/cob-obstacle-distance/default.nix +++ b/distros/noetic/cob-obstacle-distance/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, assimp, boost, catkin, cob-control-msgs, cob-srvs, dynamic-reconfigure, eigen, eigen-conversions, fcl, geometry-msgs, interactive-markers, joint-state-publisher, kdl-conversions, kdl-parser, moveit-msgs, orocos-kdl, pkg-config, robot-state-publisher, roscpp, roslib, roslint, rospy, rviz, sensor-msgs, shape-msgs, std-msgs, tf, tf-conversions, urdf, visualization-msgs, xacro }: buildRosPackage { pname = "ros-noetic-cob-obstacle-distance"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_obstacle_distance/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "6bcf902f3bf1fcaf5cb288f95f9f3bfd2c009bbb3376e2be9207ca59b4ed496f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_obstacle_distance/0.8.21-1"; + sha256 = "sha256-CumoNrFL2iuJRwZlmUvIFqMQv5NQfczU2j9hN2qOhAE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-omni-drive-controller/default.nix b/distros/noetic/cob-omni-drive-controller/default.nix index 6ad94422d1..8ab2b31699 100644 --- a/distros/noetic/cob-omni-drive-controller/default.nix +++ b/distros/noetic/cob-omni-drive-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, boost, catkin, cob-base-controller-utils, controller-interface, dynamic-reconfigure, geometry-msgs, hardware-interface, nav-msgs, pluginlib, realtime-tools, roscpp, sensor-msgs, std-msgs, std-srvs, tf, tf2, urdf }: buildRosPackage { pname = "ros-noetic-cob-omni-drive-controller"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_omni_drive_controller/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "2f7215f82edf7f0047e61f0ffd212cc92ec419e128611424b736ec44dc842917"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_omni_drive_controller/0.8.21-1"; + sha256 = "sha256-gGbEaCHwe4xdwKMzGgQWeCZ+9C3RHTWvmP0iaDC7jGM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-perception-common/default.nix b/distros/noetic/cob-perception-common/default.nix index 59e5d19f7a..d54205bbbb 100644 --- a/distros/noetic/cob-perception-common/default.nix +++ b/distros/noetic/cob-perception-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-perception-common"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/cob_perception_common/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "f5cd06f99e618d50e13e1a5c79858d58d464414ebcf3db9c90feb4082ef8bcaa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/cob_perception_common/0.6.19-1"; + sha256 = "sha256-5qCQSDVrUq3WQP7hl2SX5hTPf+1ccB0UyR/w201miAw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-perception-msgs/default.nix b/distros/noetic/cob-perception-msgs/default.nix index fc08f30243..3eee3f3e79 100644 --- a/distros/noetic/cob-perception-msgs/default.nix +++ b/distros/noetic/cob-perception-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-perception-msgs"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/cob_perception_msgs/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "c46c5760c1ea6f9494679c6673872abac8b25e4ea6b4f698263eacf2106cabaa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/cob_perception_msgs/0.6.19-1"; + sha256 = "sha256-pAqqIVt6Gc51+KAomUZwV7oiDRv7BNrQ0YtYQe9uit4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-phidget-em-state/default.nix b/distros/noetic/cob-phidget-em-state/default.nix index 55a613dc5a..860a6609f3 100644 --- a/distros/noetic/cob-phidget-em-state/default.nix +++ b/distros/noetic/cob-phidget-em-state/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-phidget-em-state"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidget_em_state/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "7d9e3689ea439dffdfd0131286d75baf6c19d70d7e627eca986873ae84b9f975"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_phidget_em_state/0.7.14-1"; + sha256 = "sha256-emDLRsItKLKFdv9xyFRtKaUmz5/IvuSld9ykG9PqGNQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-phidget-power-state/default.nix b/distros/noetic/cob-phidget-power-state/default.nix index c615dd9c81..7ba97779b0 100644 --- a/distros/noetic/cob-phidget-power-state/default.nix +++ b/distros/noetic/cob-phidget-power-state/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-phidget-power-state"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidget_power_state/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "395047888e44c9a50a2de37d87a362eabb27251b86b2814e5d42787e61410986"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_phidget_power_state/0.7.14-1"; + sha256 = "sha256-5sMqaHP7sTtzpKFqbG4N0hCBVm0nwEE5oeNJkEokI6Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-phidgets/default.nix b/distros/noetic/cob-phidgets/default.nix index 482ca49b18..5316e8456a 100644 --- a/distros/noetic/cob-phidgets/default.nix +++ b/distros/noetic/cob-phidgets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-phidgets"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidgets/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "d8951094e295eac9327e5a380b248ae135494ed2bc1cbea7589d1d078cb7b9b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_phidgets/0.7.14-1"; + sha256 = "sha256-uL91MHluODnYUcsCD7ADV9eWHE+5azBJCB5BYJDxzsM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-reflector-referencing/default.nix b/distros/noetic/cob-reflector-referencing/default.nix index 67ad06048e..4c0426e875 100644 --- a/distros/noetic/cob-reflector-referencing/default.nix +++ b/distros/noetic/cob-reflector-referencing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-reflector-referencing"; version = "0.6.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/noetic/cob_reflector_referencing/0.6.12-1.tar.gz"; - name = "0.6.12-1.tar.gz"; - sha256 = "6631e274bff81a1e2b68c33d055157ed3dfd0c80c7af0feb9fd9eebaeb6454b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/noetic/cob_reflector_referencing/0.6.12-1"; + sha256 = "sha256-yupV/pC15zhbZ75JqAGl2mi1ijdJwzWrzUys3GGvJQg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-relayboard/default.nix b/distros/noetic/cob-relayboard/default.nix index 1695291ade..19a6b2dc42 100644 --- a/distros/noetic/cob-relayboard/default.nix +++ b/distros/noetic/cob-relayboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-relayboard"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_relayboard/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "f649508e0d12c9f65cbe2c0d25dc369a6f7b604ccc29c4e97118569a91557ce3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_relayboard/0.7.14-1"; + sha256 = "sha256-Srt5IlJ+uNaEPy3v2CZUi8jkxKcXBCqCf7xjPEnlmNI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-robots/default.nix b/distros/noetic/cob-robots/default.nix index d7301e1113..99bf875ab5 100644 --- a/distros/noetic/cob-robots/default.nix +++ b/distros/noetic/cob-robots/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-bringup, cob-default-robot-behavior, cob-default-robot-config, cob-hardware-config, cob-moveit-config }: buildRosPackage { pname = "ros-noetic-cob-robots"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_robots-release/archive/release/noetic/cob_robots/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "93410e05d8c11684e83233cc7785b248c21dae1c2ccec75cf3502ee5e5431d4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_robots-release"; + rev = "release/noetic/cob_robots/0.7.9-1"; + sha256 = "sha256-voyoKMYzJ1trWbDhhaC3ifn5CDog7tBN3VBBDu10siQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-safety-controller/default.nix b/distros/noetic/cob-safety-controller/default.nix index 37b3f3fb3d..69c09f89c5 100644 --- a/distros/noetic/cob-safety-controller/default.nix +++ b/distros/noetic/cob-safety-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-safety-controller"; version = "0.6.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/noetic/cob_safety_controller/0.6.12-1.tar.gz"; - name = "0.6.12-1.tar.gz"; - sha256 = "747c9afba9892dabb5d2be7cf75d8c48294badb4125098fd6304a6dae434838a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/noetic/cob_safety_controller/0.6.12-1"; + sha256 = "sha256-4DQpKAGIZLFF4T174vCXNIOBzWZd4eerpizmDHqU2a0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-scan-unifier/default.nix b/distros/noetic/cob-scan-unifier/default.nix index aa44cd6b19..614dd6eb15 100644 --- a/distros/noetic/cob-scan-unifier/default.nix +++ b/distros/noetic/cob-scan-unifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-scan-unifier"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_scan_unifier/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "153771a870182ea0984850ae5ae3c7a620cf269d3694a988494a7004c07b4f00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_scan_unifier/0.7.14-1"; + sha256 = "sha256-Ip+9OSiVSPaayu/LwCdFbvqay8oIAx97ZfK4Z6I6nxE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-script-server/default.nix b/distros/noetic/cob-script-server/default.nix index 52cdd1066f..ba320a9df7 100644 --- a/distros/noetic/cob-script-server/default.nix +++ b/distros/noetic/cob-script-server/default.nix @@ -5,13 +5,17 @@ { 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.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_script_server/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "a1e995fc20699852b74a77753ebc2e9d77403e7538b9b5851ec2ac4f84a3e047"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/cob_script_server/0.6.31-1"; + sha256 = "sha256-5SlxQv0gmVgdExQZR0TJJG5hkBaEVP7akBlYGzHEAuo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools ]; diff --git a/distros/noetic/cob-sick-lms1xx/default.nix b/distros/noetic/cob-sick-lms1xx/default.nix index 35ba70cccd..722fb1b9ed 100644 --- a/distros/noetic/cob-sick-lms1xx/default.nix +++ b/distros/noetic/cob-sick-lms1xx/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-sick-lms1xx"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sick_lms1xx/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "3a2a3faa3e57d2bbbd8fe63b9ec0a7f1b179f51cc324f76d7eae06e87cd5443a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_sick_lms1xx/0.7.14-1"; + sha256 = "sha256-cEVMkW0tPPSDTmFZqQfabcMH1te460NtTZPYUi2LCKA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-sick-s300/default.nix b/distros/noetic/cob-sick-s300/default.nix index 99c535328c..fe8a58463a 100644 --- a/distros/noetic/cob-sick-s300/default.nix +++ b/distros/noetic/cob-sick-s300/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-sick-s300"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sick_s300/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "88a77ecaa55d61e9745ce8575b5b42b8913d841ab124c74f3d1e32a10c697519"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_sick_s300/0.7.14-1"; + sha256 = "sha256-heopCH0VTTy+aKMtB1QeNbHrFVIr+zM7yIQPLVIw5cY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-simulation/default.nix b/distros/noetic/cob-simulation/default.nix index 71ec0b0147..67c321a073 100644 --- a/distros/noetic/cob-simulation/default.nix +++ b/distros/noetic/cob-simulation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cob-bringup-sim, cob-gazebo, cob-gazebo-objects, cob-gazebo-tools, cob-gazebo-worlds }: buildRosPackage { pname = "ros-noetic-cob-simulation"; - version = "0.7.6-r1"; + version = "0.7.7-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_simulation-release/archive/release/noetic/cob_simulation/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "c99f3a562752d04de2a51d85ccb2ef9417111d556dc3c9492935e5ed11124b2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_simulation-release"; + rev = "release/noetic/cob_simulation/0.7.7-1"; + sha256 = "sha256-9DWwCMbB/WNurTKGJWr9ivALtcgwbkATFtu478d/1UU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-sound/default.nix b/distros/noetic/cob-sound/default.nix index c040667a46..03c788fdf2 100644 --- a/distros/noetic/cob-sound/default.nix +++ b/distros/noetic/cob-sound/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-sound"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sound/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "0092e727c1de838ab9fd4ebef5776cc6e3f0b9a07e083e3416868ab978cff60a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_sound/0.7.14-1"; + sha256 = "sha256-SIsBq+r56xVt433DMTzxD2aKVhbW1cRoUILYnQNH7sE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-srvs/default.nix b/distros/noetic/cob-srvs/default.nix index 11d04ed834..fd889ca019 100644 --- a/distros/noetic/cob-srvs/default.nix +++ b/distros/noetic/cob-srvs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-srvs"; version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/noetic/cob_srvs/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "de7cbdbbd0eb14c1b9753b5e398fea1a492f63458de1b91beeec89e56d7e62e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/noetic/cob_srvs/0.7.8-1"; + sha256 = "sha256-OpibWPM3bRciYuG3WUpJP2+uj6Zsk/URLLqYAXKt+zg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/cob-substitute/default.nix b/distros/noetic/cob-substitute/default.nix index 9c24d54257..f443905e32 100644 --- a/distros/noetic/cob-substitute/default.nix +++ b/distros/noetic/cob-substitute/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-substitute"; version = "0.6.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/noetic/cob_substitute/0.6.12-1.tar.gz"; - name = "0.6.12-1.tar.gz"; - sha256 = "a14002b4ff9ddf10ae68616f6c2b9bc23d5c390f987e902332cb9d5d7bc68fde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/noetic/cob_substitute/0.6.12-1"; + sha256 = "sha256-7XkdS4/kC4sPJN+dp2jY9gi4yibOm0NtLaXx0JJdviE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-supported-robots/default.nix b/distros/noetic/cob-supported-robots/default.nix index a5a4d64312..6d1a80f1f5 100644 --- a/distros/noetic/cob-supported-robots/default.nix +++ b/distros/noetic/cob-supported-robots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-supported-robots"; version = "0.6.17-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_supported_robots-release/archive/release/noetic/cob_supported_robots/0.6.17-1.tar.gz"; - name = "0.6.17-1.tar.gz"; - sha256 = "759491f7332143a68c6f8b74311f2f62fb06ebed5f091f3fd29625517328f217"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_supported_robots-release"; + rev = "release/noetic/cob_supported_robots/0.6.17-1"; + sha256 = "sha256-SWZKKedYtdzoGw7M4nyCLXwdArI/fkaaDs0I63wdafo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-teleop/default.nix b/distros/noetic/cob-teleop/default.nix index 3a99197400..2bff9fe3ba 100644 --- a/distros/noetic/cob-teleop/default.nix +++ b/distros/noetic/cob-teleop/default.nix @@ -5,13 +5,17 @@ { 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.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_teleop/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "b1bf67890df7f2e7345a14630cddbaa4461f2603ae0434dca487787ad09902d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/cob_teleop/0.6.31-1"; + sha256 = "sha256-gaCB95jz2hb9NekDyAZSzr3JaUCndnuJdhqLV37kW/w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-trajectory-controller/default.nix b/distros/noetic/cob-trajectory-controller/default.nix index c2dc14b519..2949267e46 100644 --- a/distros/noetic/cob-trajectory-controller/default.nix +++ b/distros/noetic/cob-trajectory-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, cob-srvs, control-msgs, dynamic-reconfigure, roscpp, sensor-msgs, std-msgs, std-srvs, trajectory-msgs }: buildRosPackage { pname = "ros-noetic-cob-trajectory-controller"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_trajectory_controller/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "ce2951c0f6ba2d5e69a3d8e21391d0baf2f0456bf0b65c45b86f87f47c27378f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_trajectory_controller/0.8.21-1"; + sha256 = "sha256-LumVKoMb0AarzbQCTbRVqvWepJOlSccBYqFBr07zsbc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-tricycle-controller/default.nix b/distros/noetic/cob-tricycle-controller/default.nix index 9ad9bc5fa4..a0eb405b39 100644 --- a/distros/noetic/cob-tricycle-controller/default.nix +++ b/distros/noetic/cob-tricycle-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, boost, catkin, cob-base-controller-utils, controller-interface, geometry-msgs, hardware-interface, nav-msgs, pluginlib, realtime-tools, roscpp, std-srvs, tf }: buildRosPackage { pname = "ros-noetic-cob-tricycle-controller"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_tricycle_controller/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "16ea625858fc6c755a5833ea9b7f52cc30110584a162672c58bf27ed4d15176e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_tricycle_controller/0.8.21-1"; + sha256 = "sha256-ZK5rFqt348QTuwCQyZ+7qv6mg0DT9EdEy4bSdUYRk2E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-twist-controller/default.nix b/distros/noetic/cob-twist-controller/default.nix index b58c2c1c85..4ff1080633 100644 --- a/distros/noetic/cob-twist-controller/default.nix +++ b/distros/noetic/cob-twist-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cmake-modules, cob-control-msgs, cob-frame-tracker, cob-script-server, cob-srvs, control-msgs, dynamic-reconfigure, eigen, eigen-conversions, geometry-msgs, kdl-conversions, kdl-parser, nav-msgs, orocos-kdl, pluginlib, python3Packages, robot-state-publisher, roscpp, roslint, rospy, rviz, sensor-msgs, std-msgs, tf, tf-conversions, topic-tools, trajectory-msgs, urdf, visualization-msgs, xacro }: buildRosPackage { pname = "ros-noetic-cob-twist-controller"; - version = "0.8.20-r1"; + version = "0.8.21-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_control-release/archive/release/noetic/cob_twist_controller/0.8.20-1.tar.gz"; - name = "0.8.20-1.tar.gz"; - sha256 = "38df65df8dac9718eee9ce5125b5ea6dc7e24c9faace938a0f84a67679e7e9b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_control-release"; + rev = "release/noetic/cob_twist_controller/0.8.21-1"; + sha256 = "sha256-nv37MYJgNHwIWBwTkgmWjaBE7wZRScpySswr7lI02UE="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools roslint ]; diff --git a/distros/noetic/cob-undercarriage-ctrl/default.nix b/distros/noetic/cob-undercarriage-ctrl/default.nix index 2e229ee5f7..a0d6d954ee 100644 --- a/distros/noetic/cob-undercarriage-ctrl/default.nix +++ b/distros/noetic/cob-undercarriage-ctrl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-undercarriage-ctrl"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_undercarriage_ctrl/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "444d361b2320f23d6544b8eb45ed949b320e8e6f00bf5d516c920ae4ad061309"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_undercarriage_ctrl/0.7.14-1"; + sha256 = "sha256-22g3lqhiPO6y47RPDWGrOVm8ffM/6Ntm6K3hO2VPGJ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-utilities/default.nix b/distros/noetic/cob-utilities/default.nix index 754cd35c8d..304cec2c92 100644 --- a/distros/noetic/cob-utilities/default.nix +++ b/distros/noetic/cob-utilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-utilities"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_utilities/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "37d06a8c88254f4b1b18cf6b7b02fb9802434381f034d7b61be073c4f74869ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_utilities/0.7.14-1"; + sha256 = "sha256-BvY+twjH9kT+JZ3pQbMf90agvjw1wwUNM3qNWM1wj7g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-vision-utils/default.nix b/distros/noetic/cob-vision-utils/default.nix index 8f2da79823..cff264d8d0 100644 --- a/distros/noetic/cob-vision-utils/default.nix +++ b/distros/noetic/cob-vision-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-vision-utils"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/cob_vision_utils/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "48ed5233202433f45c6c541e46a0cad2f5ae1c352498fcd9584300050d8897bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/cob_vision_utils/0.6.19-1"; + sha256 = "sha256-k4iI/vawfZyk/Om1/lCfXgSGPogdgyTUfIhuYZ4wct4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cob-voltage-control/default.nix b/distros/noetic/cob-voltage-control/default.nix index 8a2807760d..ee577a0ca4 100644 --- a/distros/noetic/cob-voltage-control/default.nix +++ b/distros/noetic/cob-voltage-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cob-voltage-control"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_voltage_control/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "23444630337c05279f657b9295693b7f565d3887af09056b6ee60633b0607ac0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/cob_voltage_control/0.7.14-1"; + sha256 = "sha256-ER12b2Il7mA1rH5BOjyh1dnos5z0ptTbmBs59KsxNAQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/code-coverage/default.nix b/distros/noetic/code-coverage/default.nix index 864a03538a..85ddddf63e 100644 --- a/distros/noetic/code-coverage/default.nix +++ b/distros/noetic/code-coverage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-code-coverage"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/code_coverage-gbp/archive/release/noetic/code_coverage/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "9b9a65c55bcf50a7a90c55a13d0376e59aa1d331a6a2ae75d1c452caa9cb03f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "code_coverage-gbp"; + rev = "release/noetic/code_coverage/0.4.4-1"; + sha256 = "sha256-fKLxP4ry2JxTuyzUBrKpjFCsYYY2ceN5PKZZ5LRucPA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/codec-image-transport/default.nix b/distros/noetic/codec-image-transport/default.nix index c139ff62c2..d846815811 100644 --- a/distros/noetic/codec-image-transport/default.nix +++ b/distros/noetic/codec-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-codec-image-transport"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/codec_image_transport-release/archive/release/noetic/codec_image_transport/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "23b6eb7c711c21a9d58cbfb8b6e10d19b47429e40bd6035a405f3eaa05ae448b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "codec_image_transport-release"; + rev = "release/noetic/codec_image_transport/0.0.5-1"; + sha256 = "sha256-D/MNtMRUoxFZ65mnLHNCTWBtVxBlAiR8fLg79fSI0WM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/collada-parser/default.nix b/distros/noetic/collada-parser/default.nix index fb3bf78456..0b4a5a2d72 100644 --- a/distros/noetic/collada-parser/default.nix +++ b/distros/noetic/collada-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-collada-parser"; version = "1.12.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/collada_urdf-release/archive/release/noetic/collada_parser/1.12.13-1.tar.gz"; - name = "1.12.13-1.tar.gz"; - sha256 = "a8f581653cdb7959042888e450bb0a814e1fe99cd3e1e9e608c35bddcce78712"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "collada_urdf-release"; + rev = "release/noetic/collada_parser/1.12.13-1"; + sha256 = "sha256-7NP/MTNf2aRw5QAwXjBXPaJHgmeNi8hjqUBoHt6xK2w="; + }; buildType = "catkin"; buildInputs = [ catkin urdfdom-headers ]; diff --git a/distros/noetic/collada-urdf/default.nix b/distros/noetic/collada-urdf/default.nix index 8b9950185c..5ec5d725a6 100644 --- a/distros/noetic/collada-urdf/default.nix +++ b/distros/noetic/collada-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-collada-urdf"; version = "1.12.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/collada_urdf-release/archive/release/noetic/collada_urdf/1.12.13-1.tar.gz"; - name = "1.12.13-1.tar.gz"; - sha256 = "779ef6779c062cc025f262cc360e4a5ece09203a3bc30e4d754a22148dfdd265"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "collada_urdf-release"; + rev = "release/noetic/collada_urdf/1.12.13-1"; + sha256 = "sha256-wCc+mgNvgIJrdphObUrPAAyUhSO2eGhpUNVD0vT9DdU="; + }; buildType = "catkin"; buildInputs = [ angles catkin cmake-modules eigen ]; diff --git a/distros/noetic/color-util/default.nix b/distros/noetic/color-util/default.nix index 05ed873f36..b111018a27 100644 --- a/distros/noetic/color-util/default.nix +++ b/distros/noetic/color-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-color-util"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/color_util/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "06984acc0498511a27dbc98f9bfdc281e5605e8e166f3056e547e417fbda7671"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/color_util/0.3.0-2"; + sha256 = "sha256-jPlMr4t8eeeqJOIX/lVOF7L6Xy6obFj7CTvVeZjl7hw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/combined-robot-hw-tests/default.nix b/distros/noetic/combined-robot-hw-tests/default.nix index bc4d670fd3..322bd3f407 100644 --- a/distros/noetic/combined-robot-hw-tests/default.nix +++ b/distros/noetic/combined-robot-hw-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-combined-robot-hw-tests"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/combined_robot_hw_tests/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "86d51969bc55aff67c18cf9016c5afeed7a780afb8003c27df7149732b80b794"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/combined_robot_hw_tests/0.19.6-1"; + sha256 = "sha256-xtzLEu1g8OCf1s8fNZ4Y5PWg6g2S5vKjcwGxXf8RbUs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/combined-robot-hw/default.nix b/distros/noetic/combined-robot-hw/default.nix index 971cf0dfa9..1c9ba84384 100644 --- a/distros/noetic/combined-robot-hw/default.nix +++ b/distros/noetic/combined-robot-hw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-combined-robot-hw"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/combined_robot_hw/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "2ce6f5eb92e2f715af90b0500bf4755752c1c44bf4da512476bb5a0152dbf76d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/combined_robot_hw/0.19.6-1"; + sha256 = "sha256-pV0J/a25Ob8/42S3YQwSWjnj7JRMs9mn9CDnn+73rvM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/common-msgs/default.nix b/distros/noetic/common-msgs/default.nix index 01fdbefa1c..2a5a395306 100644 --- a/distros/noetic/common-msgs/default.nix +++ b/distros/noetic/common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-common-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/common_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "a07ae973d983a954f643671a79287bbc2249b080fd6a517e1b128e380cc75a1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/common_msgs/1.13.1-1"; + sha256 = "sha256-HvNfpqwdQR3pa5AsmemiVQ8ryoo/4Zq9pW4H82Tswsk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/common-tutorials/default.nix b/distros/noetic/common-tutorials/default.nix index 3865f35ab8..5f8d55ec0f 100644 --- a/distros/noetic/common-tutorials/default.nix +++ b/distros/noetic/common-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-common-tutorials"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/noetic/common_tutorials/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "85949cb65616ef22c9134fddb9d0e3a8c0242bb4077061aa4d0112288bf02315"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/noetic/common_tutorials/0.2.0-1"; + sha256 = "sha256-EGtOI7YlE5OYkierPInUtwz9XeuxNzbI8d+SVJumA4k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/compressed-depth-image-transport/default.nix b/distros/noetic/compressed-depth-image-transport/default.nix index d3f9c000cc..d5d22038f8 100644 --- a/distros/noetic/compressed-depth-image-transport/default.nix +++ b/distros/noetic/compressed-depth-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-compressed-depth-image-transport"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_transport_plugins-release/archive/release/noetic/compressed_depth_image_transport/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "e1d9148c00c4ca8e7a71faea92217cb02ed97a74e7b065eae76b70f021f5ba25"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/noetic/compressed_depth_image_transport/1.14.0-1"; + sha256 = "sha256-GC75soM11esxQTh4bbY3rEY2M4cOL7KNvwKCFQw+YvU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/compressed-image-transport/default.nix b/distros/noetic/compressed-image-transport/default.nix index 12df859809..2ae74580ee 100644 --- a/distros/noetic/compressed-image-transport/default.nix +++ b/distros/noetic/compressed-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-compressed-image-transport"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_transport_plugins-release/archive/release/noetic/compressed_image_transport/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "e6e3ada1e7da3d37a2b3d73c9bad5c9c6acc1535ba0f24916f8de15fad7d85d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/noetic/compressed_image_transport/1.14.0-1"; + sha256 = "sha256-APaQ0pfr0A29YbSDSb2sUW1vxcFhKiw+umu5nNXqG+Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/computer-status-msgs/default.nix b/distros/noetic/computer-status-msgs/default.nix index a562b33613..9bb03eafc4 100644 --- a/distros/noetic/computer-status-msgs/default.nix +++ b/distros/noetic/computer-status-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-computer-status-msgs"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/130s/computer_status_msgs-release/archive/release/noetic/computer_status_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "45c5641d25d2b6021629fcc253fd5e6d093dfc8b2603c842bf1beee24fb5f8b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "130s"; + repo = "computer_status_msgs-release"; + rev = "release/noetic/computer_status_msgs/2.1.0-1"; + sha256 = "sha256-FgVw4PNwtA2MUSIEBO2nWBt19mEMJ/1oGYnaf0BZfWw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/contact-states-observer/default.nix b/distros/noetic/contact-states-observer/default.nix index 9909e8cca8..fd2e4eee84 100644 --- a/distros/noetic/contact-states-observer/default.nix +++ b/distros/noetic/contact-states-observer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-contact-states-observer"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/contact_states_observer/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "88c288a02dac2522b264eccaef37196c36948c6e3c94cae37c910ca22fcf2609"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/contact_states_observer/0.1.16-1"; + sha256 = "sha256-U8za93qS+G9b+3u2FnsN9yvZ0ScYyL+wDZvnULweex0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/control-msgs/default.nix b/distros/noetic/control-msgs/default.nix index fb8d5e7b69..826db21d51 100644 --- a/distros/noetic/control-msgs/default.nix +++ b/distros/noetic/control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-control-msgs"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/control_msgs-release/archive/release/noetic/control_msgs/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "a1fc24186afc292cd6e94eec5b30eae1fef0c05776c5bac7606a63c5223c9d63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "control_msgs-release"; + rev = "release/noetic/control_msgs/1.5.2-1"; + sha256 = "sha256-GSE7ntUKLYfvrN/UnDGjcn8Aqxv7WulbCgRXOfciglA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/control-toolbox/default.nix b/distros/noetic/control-toolbox/default.nix index fae0c08e6d..4c0de6159c 100644 --- a/distros/noetic/control-toolbox/default.nix +++ b/distros/noetic/control-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-control-toolbox"; version = "1.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/control_toolbox-release/archive/release/noetic/control_toolbox/1.19.0-1.tar.gz"; - name = "1.19.0-1.tar.gz"; - sha256 = "64f03769fcf0512c51bca4e1cc1278d05dfee163887a851b48f83b5c30524cfe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "control_toolbox-release"; + rev = "release/noetic/control_toolbox/1.19.0-1"; + sha256 = "sha256-NqCiktyzf2fr20qocOQRAYRWDeHBjmB+vnXlPYU3INg="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/noetic/controller-interface/default.nix b/distros/noetic/controller-interface/default.nix index 095e9e6b3a..8e64b69d59 100644 --- a/distros/noetic/controller-interface/default.nix +++ b/distros/noetic/controller-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-controller-interface"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/controller_interface/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "ed852ecb719bc3e220f37a6ab14faf0f2b2c2a6429265503bffef8c0934fd649"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/controller_interface/0.19.6-1"; + sha256 = "sha256-GUKfqsb13qPdmBAhU91x2w97DWDjdF3BkvEB0VwRhfM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/controller-manager-msgs/default.nix b/distros/noetic/controller-manager-msgs/default.nix index 6538ed8b29..d0572a972d 100644 --- a/distros/noetic/controller-manager-msgs/default.nix +++ b/distros/noetic/controller-manager-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-controller-manager-msgs"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/controller_manager_msgs/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "d2dffc22d89e2c629a4f48688f175c6744058d749b8cf22db703edea21c558e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/controller_manager_msgs/0.19.6-1"; + sha256 = "sha256-c2s6AkZIPdPp/BIDm1khivzFrGqAbacl2X/sCJgaAGo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools ]; diff --git a/distros/noetic/controller-manager-tests/default.nix b/distros/noetic/controller-manager-tests/default.nix index ac1215fab4..066f6ab1c8 100644 --- a/distros/noetic/controller-manager-tests/default.nix +++ b/distros/noetic/controller-manager-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-controller-manager-tests"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/controller_manager_tests/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "23441bb9d222eca1bc830c43f8babbc961b28517a4491f60239883bb63a8bd52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/controller_manager_tests/0.19.6-1"; + sha256 = "sha256-uP7eFr03RdhJpE9GIP2tfc6BsKeJgzyFhEBEqRj1plQ="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/controller-manager/default.nix b/distros/noetic/controller-manager/default.nix index 1cdf3502aa..1332de1361 100644 --- a/distros/noetic/controller-manager/default.nix +++ b/distros/noetic/controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-controller-manager"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/controller_manager/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "205f276492f5a5e9caf112e287e49a7579a2831fc10a9b6446dd48f44f3229fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/controller_manager/0.19.6-1"; + sha256 = "sha256-IEVsbbRmfchMSHJg0S4yAtgjcKKdQOu1/wqLTVqzVZk="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/convex-decomposition/default.nix b/distros/noetic/convex-decomposition/default.nix index 978a128812..0595ab91c1 100644 --- a/distros/noetic/convex-decomposition/default.nix +++ b/distros/noetic/convex-decomposition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-convex-decomposition"; version = "0.1.12-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/convex_decomposition-release/archive/release/noetic/convex_decomposition/0.1.12-1.tar.gz"; - name = "0.1.12-1.tar.gz"; - sha256 = "bc47b7c456b6dc779558c0819365ce50602c14ec304799195c535965f17b4507"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "convex_decomposition-release"; + rev = "release/noetic/convex_decomposition/0.1.12-1"; + sha256 = "sha256-GzzlVqeAQWWsiZq7qhDDtVI8i7bh/4pomZnPYy7SWHw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/costmap-2d/default.nix b/distros/noetic/costmap-2d/default.nix index f7ab5291ff..2e1c86d00f 100644 --- a/distros/noetic/costmap-2d/default.nix +++ b/distros/noetic/costmap-2d/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, dynamic-reconfigure, eigen, geometry-msgs, laser-geometry, map-msgs, map-server, message-filters, message-generation, message-runtime, nav-msgs, pluginlib, rosbag, rosconsole, roscpp, rostest, rosunit, sensor-msgs, std-msgs, tf2, tf2-geometry-msgs, tf2-ros, tf2-sensor-msgs, visualization-msgs, voxel-grid }: buildRosPackage { pname = "ros-noetic-costmap-2d"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/costmap_2d/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "9006e8366006566d6f5a859dbd972c4a572cd5723ed01cb125436d7da37e2d7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/costmap_2d/1.17.3-1"; + sha256 = "sha256-PiOPZLzRwOGpqXtVtVMJA4SLLLXXM1NLI0LD3McQ+Do="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation tf2-geometry-msgs tf2-sensor-msgs ]; diff --git a/distros/noetic/costmap-converter/default.nix b/distros/noetic/costmap-converter/default.nix index 8116eb499e..3dbd7acf6c 100644 --- a/distros/noetic/costmap-converter/default.nix +++ b/distros/noetic/costmap-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-costmap-converter"; version = "0.0.13-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/costmap_converter-release/archive/release/noetic/costmap_converter/0.0.13-1.tar.gz"; - name = "0.0.13-1.tar.gz"; - sha256 = "1fc08ca45b83e4fc557b9b34b5f3fb1684af9a87dabd655fc72a1f3106f26d1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "costmap_converter-release"; + rev = "release/noetic/costmap_converter/0.0.13-1"; + sha256 = "sha256-0ks1nT5DMSkuhdq8Y37kdFLSp2gwatQDCjlCnRPJnwI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/costmap-cspace-msgs/default.nix b/distros/noetic/costmap-cspace-msgs/default.nix index 9bebd95123..3a017fc0cd 100644 --- a/distros/noetic/costmap-cspace-msgs/default.nix +++ b/distros/noetic/costmap-cspace-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-costmap-cspace-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/noetic/costmap_cspace_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "3554cbf6c004d7b8a1d237cd8dd0156695fb8d0d45c08e36667e175a67f6bff7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/noetic/costmap_cspace_msgs/0.12.0-1"; + sha256 = "sha256-mE9VARUCs79SCPEdRtRYkrEE7kVcPjJ/dEYOo1pSP9c="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/costmap-cspace-rviz-plugins/default.nix b/distros/noetic/costmap-cspace-rviz-plugins/default.nix index 302690a8d8..b999e49165 100644 --- a/distros/noetic/costmap-cspace-rviz-plugins/default.nix +++ b/distros/noetic/costmap-cspace-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-costmap-cspace-rviz-plugins"; version = "0.11.6-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_rviz_plugins-release/archive/release/noetic/costmap_cspace_rviz_plugins/0.11.6-1.tar.gz"; - name = "0.11.6-1.tar.gz"; - sha256 = "6c2f6975ca322e23f1254669e5744fffdebe59cefbca478728e34cb73f4b2dce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_rviz_plugins-release"; + rev = "release/noetic/costmap_cspace_rviz_plugins/0.11.6-1"; + sha256 = "sha256-AZXjHbkeKfD4qwfQ4109dCTQVvKOpA6QfPkrNsvaiOc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/costmap-cspace/default.nix b/distros/noetic/costmap-cspace/default.nix index 629d37a66b..438ebcb464 100644 --- a/distros/noetic/costmap-cspace/default.nix +++ b/distros/noetic/costmap-cspace/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-cspace-msgs, geometry-msgs, laser-geometry, nav-msgs, neonavigation-common, roscpp, roslint, rostest, sensor-msgs, tf2-geometry-msgs, tf2-ros, tf2-sensor-msgs, xmlrpcpp }: buildRosPackage { pname = "ros-noetic-costmap-cspace"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/costmap_cspace/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "efec10685a4a0fcaa41f82998f83ef4d76e7e38266f681d62c2539249b2777d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/costmap_cspace/0.12.0-1"; + sha256 = "sha256-PKiGV8gzo5I0z6ieBPT96AvCR13n+uN3Bwy8ik/psw0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/costmap-queue/default.nix b/distros/noetic/costmap-queue/default.nix index a66ce07d6f..ff94002bc2 100644 --- a/distros/noetic/costmap-queue/default.nix +++ b/distros/noetic/costmap-queue/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-costmap-queue"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/costmap_queue/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "7870f42776a61cf4b3e5b610ac897aadeb72a007c942e199df365d86184b1e5a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/costmap_queue/0.3.0-2"; + sha256 = "sha256-2C0xeebRaXV/wQ4UFFo9my9nHzxAH51HS23MuiZtVb8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cpp-common/default.nix b/distros/noetic/cpp-common/default.nix index 4182067092..ef41ebd314 100644 --- a/distros/noetic/cpp-common/default.nix +++ b/distros/noetic/cpp-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cpp-common"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/noetic/cpp_common/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "28a7892680c8c40eb4e77cd9c962abd22a0459fa9e69d73730ed3ebe3be5b9b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/noetic/cpp_common/0.7.2-1"; + sha256 = "sha256-CUSuPUvvjwN5srdZnIBG45wKkHh680//1UcyjzR1mQQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/criutils/default.nix b/distros/noetic/criutils/default.nix index b046dffc7d..8a19e1b9f5 100644 --- a/distros/noetic/criutils/default.nix +++ b/distros/noetic/criutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-criutils"; version = "0.1.4-r2"; - src = fetchurl { - url = "https://github.com/crigroup/criutils-release/archive/release/noetic/criutils/0.1.4-2.tar.gz"; - name = "0.1.4-2.tar.gz"; - sha256 = "04ebb642b895d176a9a777f4f2e0493a25a17a3f3e990e7617e21a7184fb4918"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "crigroup"; + repo = "criutils-release"; + rev = "release/noetic/criutils/0.1.4-2"; + sha256 = "sha256-R3nSgzoaWF/s9Ra4I460RkOxU9n+TaCjMrPey/4QYQc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/csm/default.nix b/distros/noetic/csm/default.nix index ef3c1b1016..bea86c6c92 100644 --- a/distros/noetic/csm/default.nix +++ b/distros/noetic/csm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-csm"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/csm-release/archive/release/noetic/csm/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "fe2a7259863aa1f3761ce799b35dedfb332cd0a877a9710c3817ae410cd95e23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "csm-release"; + rev = "release/noetic/csm/1.0.2-2"; + sha256 = "sha256-uZu+koOjuc9LuuyHpIZeKmDCo0yktDvLrFJeDr9diQg="; + }; buildType = "catkin"; buildInputs = [ cmake ]; diff --git a/distros/noetic/cv-bridge/default.nix b/distros/noetic/cv-bridge/default.nix index 1cb6227da3..2717c10b51 100644 --- a/distros/noetic/cv-bridge/default.nix +++ b/distros/noetic/cv-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cv-bridge"; version = "1.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vision_opencv-release/archive/release/noetic/cv_bridge/1.16.2-1.tar.gz"; - name = "1.16.2-1.tar.gz"; - sha256 = "053f0d3ab82a3183e1e087ada3e97a111071423d6a5f60f5f22ee71b0e3f1cb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vision_opencv-release"; + rev = "release/noetic/cv_bridge/1.16.2-1"; + sha256 = "sha256-IzzKvoV0hdwdIWvgaWiQm9Ko2FNqmGdCqkuVcpicmjk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/cv-camera/default.nix b/distros/noetic/cv-camera/default.nix index 97b670bce8..d13230dfd3 100644 --- a/distros/noetic/cv-camera/default.nix +++ b/distros/noetic/cv-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cv-camera"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/OTL/cv_camera-release/archive/release/noetic/cv_camera/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "fe2a15b06ca996cdf5eb2272ec070d5b6e7cc442abb7d17e48ced7c3bc73afa4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OTL"; + repo = "cv_camera-release"; + rev = "release/noetic/cv_camera/0.6.0-1"; + sha256 = "sha256-7T5In/R3WjH3y4nDLuWFz4JD6KSjRN3FhrpfnzgM0hM="; + }; buildType = "catkin"; buildInputs = [ catkin roslint rostest ]; diff --git a/distros/noetic/cvp-mesh-planner/default.nix b/distros/noetic/cvp-mesh-planner/default.nix index 9f8ddd0642..add2032a51 100644 --- a/distros/noetic/cvp-mesh-planner/default.nix +++ b/distros/noetic/cvp-mesh-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-cvp-mesh-planner"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/cvp_mesh_planner/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "51975aa6b41005194eee9f02a08f7ca7dc6e490d18e354a989f161548e2fd2dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/cvp_mesh_planner/1.0.1-2"; + sha256 = "sha256-RbPYuvZiCDhgnFZuUBkYFtdpaiHRQcsby6m+UlFSoTs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/darknet-ros-msgs/default.nix b/distros/noetic/darknet-ros-msgs/default.nix index 89c8bb17cb..24bc6edd76 100644 --- a/distros/noetic/darknet-ros-msgs/default.nix +++ b/distros/noetic/darknet-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-darknet-ros-msgs"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/darknet_ros-release/archive/release/noetic/darknet_ros_msgs/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "ffb4a63ef48a67dc35cf7887b0c120951ad3b293bf4e0f259660ff7e3d26e29d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "darknet_ros-release"; + rev = "release/noetic/darknet_ros_msgs/1.1.5-1"; + sha256 = "sha256-oPBJl0rzVAhQ6G51afRs+6RAcsn2ibDuVXkMZqZgNGM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/darknet-ros/default.nix b/distros/noetic/darknet-ros/default.nix index e10b46386a..bac5a11ac4 100644 --- a/distros/noetic/darknet-ros/default.nix +++ b/distros/noetic/darknet-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-darknet-ros"; version = "1.1.5-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/darknet_ros-release/archive/release/noetic/darknet_ros/1.1.5-1.tar.gz"; - name = "1.1.5-1.tar.gz"; - sha256 = "1ab3b50195ea9537bf73b5c9e756bece85da94e0f77792314699e8ed9c607bd1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "darknet_ros-release"; + rev = "release/noetic/darknet_ros/1.1.5-1"; + sha256 = "sha256-4i//MgNTTmJGAF1kDNmm+byM31xK4gtzkNZwpcYYph4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dataspeed-can-msg-filters/default.nix b/distros/noetic/dataspeed-can-msg-filters/default.nix index 55ff38ba72..d93807d2ee 100644 --- a/distros/noetic/dataspeed-can-msg-filters/default.nix +++ b/distros/noetic/dataspeed-can-msg-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-can-msg-filters"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/noetic/dataspeed_can_msg_filters/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "39fc3a83ca608df4e078cc17f8e95a9993f60c4391f09e89a88235447e0f4001"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/noetic/dataspeed_can_msg_filters/1.0.16-1"; + sha256 = "sha256-ICPML442r6xLfVXCkHbtWQGBE3R+AFoblo0W9AoIKNc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dataspeed-can-tools/default.nix b/distros/noetic/dataspeed-can-tools/default.nix index f2cc767cd6..be676e652e 100644 --- a/distros/noetic/dataspeed-can-tools/default.nix +++ b/distros/noetic/dataspeed-can-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-can-tools"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/noetic/dataspeed_can_tools/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "8feafa2c97762920a39d19000342a5b43249ca61c87d80858fde32302dbeb83d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/noetic/dataspeed_can_tools/1.0.16-1"; + sha256 = "sha256-jV9I06FAip4ro+A5Clp3HaznUCAJR3GEyAVolPulD+A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dataspeed-can-usb/default.nix b/distros/noetic/dataspeed-can-usb/default.nix index b366835672..fee5f7e358 100644 --- a/distros/noetic/dataspeed-can-usb/default.nix +++ b/distros/noetic/dataspeed-can-usb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-can-usb"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/noetic/dataspeed_can_usb/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "9bff56a17cd8dcad256c71383b56a1058a209e2ec090b234fb20f8f4fc838c75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/noetic/dataspeed_can_usb/1.0.16-1"; + sha256 = "sha256-qDYokEGVgyvE1BoMRu80KFyjkZniJCpOysGOzLnaosk="; + }; buildType = "catkin"; buildInputs = [ catkin roslib ]; diff --git a/distros/noetic/dataspeed-can/default.nix b/distros/noetic/dataspeed-can/default.nix index d57aad3f76..162019674c 100644 --- a/distros/noetic/dataspeed-can/default.nix +++ b/distros/noetic/dataspeed-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-can"; version = "1.0.16-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_can-release/archive/release/noetic/dataspeed_can/1.0.16-1.tar.gz"; - name = "1.0.16-1.tar.gz"; - sha256 = "38e1ac834ec961a5b75345f4cfd413a1279ca1d89d09adeb00794e270d771e54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_can-release"; + rev = "release/noetic/dataspeed_can/1.0.16-1"; + sha256 = "sha256-GvbRVesJOGrwL3+VbE61M7y4gwE8DBFTqb59LzdwXxA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dataspeed-pds-can/default.nix b/distros/noetic/dataspeed-pds-can/default.nix index f7195ee177..71b2dbbe67 100644 --- a/distros/noetic/dataspeed-pds-can/default.nix +++ b/distros/noetic/dataspeed-pds-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-pds-can"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/noetic/dataspeed_pds_can/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "3013fe2ad968c981c9af9147401262a624d168dc18e75b8ae68e9ce9bb5608da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/noetic/dataspeed_pds_can/1.0.6-1"; + sha256 = "sha256-32FxGBWjrNSrWhFkPQ+nHTkmiDuYbUOX6FGTCgXZpaI="; + }; buildType = "catkin"; buildInputs = [ catkin dataspeed-can-msg-filters ]; diff --git a/distros/noetic/dataspeed-pds-msgs/default.nix b/distros/noetic/dataspeed-pds-msgs/default.nix index 22c6572ac4..f45ed503ba 100644 --- a/distros/noetic/dataspeed-pds-msgs/default.nix +++ b/distros/noetic/dataspeed-pds-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-pds-msgs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/noetic/dataspeed_pds_msgs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "3fef22aba59316e7daf38726ded577eead137cd17cbcf800888b0095e0a6546b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/noetic/dataspeed_pds_msgs/1.0.6-1"; + sha256 = "sha256-T6S2l2IuCi7rEupPJ3JZaLAqiNvD6+PRTUm+DOY3pjc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dataspeed-pds-rqt/default.nix b/distros/noetic/dataspeed-pds-rqt/default.nix index f80a6027f7..7fb399ef60 100644 --- a/distros/noetic/dataspeed-pds-rqt/default.nix +++ b/distros/noetic/dataspeed-pds-rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-pds-rqt"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/noetic/dataspeed_pds_rqt/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "bbb99a9aa319880f7f8f23a2c835d61025249f938e9a7cd9d10e9272f3f2ac7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/noetic/dataspeed_pds_rqt/1.0.6-1"; + sha256 = "sha256-9J0rmj2Ilzm9sDZE3BRuvft3ZFzdtmO303XBMLePAHs="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/dataspeed-pds-scripts/default.nix b/distros/noetic/dataspeed-pds-scripts/default.nix index 25bac9c2d6..6b9d5579c6 100644 --- a/distros/noetic/dataspeed-pds-scripts/default.nix +++ b/distros/noetic/dataspeed-pds-scripts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-pds-scripts"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/noetic/dataspeed_pds_scripts/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "872aaddc11dad62f89dc85b08b4060bc082dd0a4e712f3d4d23be388adcff8ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/noetic/dataspeed_pds_scripts/1.0.6-1"; + sha256 = "sha256-sDXfYOFnZaf7x/Re8ebwXEdzkfM0kX9+olQrlNwFqMY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dataspeed-pds/default.nix b/distros/noetic/dataspeed-pds/default.nix index 6d4bdecbc7..c749a76b3a 100644 --- a/distros/noetic/dataspeed-pds/default.nix +++ b/distros/noetic/dataspeed-pds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-pds"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_pds-release/archive/release/noetic/dataspeed_pds/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "93c905bc798c40a8342c4179e3648e58d8f267a2d684286a67fb142e85db2bc2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_pds-release"; + rev = "release/noetic/dataspeed_pds/1.0.6-1"; + sha256 = "sha256-XOk61kLYuHHf1FM9ziU/6qigUSLORr+O3OdcjMIADfw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dataspeed-ulc-can/default.nix b/distros/noetic/dataspeed-ulc-can/default.nix index b2d42781a7..e91b8dc794 100644 --- a/distros/noetic/dataspeed-ulc-can/default.nix +++ b/distros/noetic/dataspeed-ulc-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-ulc-can"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_ulc_ros-release/archive/release/noetic/dataspeed_ulc_can/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "be30b8dd3bd2ea035d5fdd71c5dd08eca3defa87fe28f1ded0c44934c7e892f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_ulc_ros-release"; + rev = "release/noetic/dataspeed_ulc_can/0.1.0-1"; + sha256 = "sha256-TXMu+fqYixQX9l5P7ZBzr1d7Gsr1XcPldWqHkDXGXwg="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/dataspeed-ulc-msgs/default.nix b/distros/noetic/dataspeed-ulc-msgs/default.nix index 9c3dab10b7..817831b635 100644 --- a/distros/noetic/dataspeed-ulc-msgs/default.nix +++ b/distros/noetic/dataspeed-ulc-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-ulc-msgs"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_ulc_ros-release/archive/release/noetic/dataspeed_ulc_msgs/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "b71cf208e820acf4b90a516d69e662fb6b1a8b6423f1db816bd40c46be1196df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_ulc_ros-release"; + rev = "release/noetic/dataspeed_ulc_msgs/0.1.0-1"; + sha256 = "sha256-8+SpCh3N5uZOC687Ac50FnELyyOpzTa+2tnL8TyQf8A="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dataspeed-ulc/default.nix b/distros/noetic/dataspeed-ulc/default.nix index 39eca22a21..c33caf0ee0 100644 --- a/distros/noetic/dataspeed-ulc/default.nix +++ b/distros/noetic/dataspeed-ulc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dataspeed-ulc"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dataspeed_ulc_ros-release/archive/release/noetic/dataspeed_ulc/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "993f6b533c39430a39700d33242ede541ed8d9f8c6b69bd8869446443696480d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dataspeed_ulc_ros-release"; + rev = "release/noetic/dataspeed_ulc/0.1.0-1"; + sha256 = "sha256-8ZYV6yz2+tK5L61CPzhTjbosO9Ga23y35Dw2dRiMY3Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-fca-can/default.nix b/distros/noetic/dbw-fca-can/default.nix index f4417d08c6..8937f2ccf7 100644 --- a/distros/noetic/dbw-fca-can/default.nix +++ b/distros/noetic/dbw-fca-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-fca-can"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/noetic/dbw_fca_can/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "7ada7c56a985ff17631887059d277fa76134f3917937fd2f7758b89ac7edd797"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/noetic/dbw_fca_can/1.3.0-1"; + sha256 = "sha256-3oae3i+Le894UArl9843cH/mIt5LJqFMbI4eG9a8z3I="; + }; buildType = "catkin"; buildInputs = [ catkin dataspeed-can-msg-filters ]; diff --git a/distros/noetic/dbw-fca-description/default.nix b/distros/noetic/dbw-fca-description/default.nix index 9635011dca..413a45e6d7 100644 --- a/distros/noetic/dbw-fca-description/default.nix +++ b/distros/noetic/dbw-fca-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-fca-description"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/noetic/dbw_fca_description/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "47b5160196cc4e2cb5c44ac7ad8bb9955008d1b06b74ee311eabecd146157daf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/noetic/dbw_fca_description/1.3.0-1"; + sha256 = "sha256-35Wzci2X40KxcIeUwLvxv/QLalbDtLo/W6V2LQn/bpE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-fca-joystick-demo/default.nix b/distros/noetic/dbw-fca-joystick-demo/default.nix index 880e509263..9ab6cb783d 100644 --- a/distros/noetic/dbw-fca-joystick-demo/default.nix +++ b/distros/noetic/dbw-fca-joystick-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-fca-joystick-demo"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/noetic/dbw_fca_joystick_demo/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "4fe787498a1794d237365d13aeb5cf9c02ddae44aa7968704f82f0742d7279c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/noetic/dbw_fca_joystick_demo/1.3.0-1"; + sha256 = "sha256-Fn8+InBX58ewDJm9AyqUOEIDpxZ7KuOgK9en71GBakU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-fca-msgs/default.nix b/distros/noetic/dbw-fca-msgs/default.nix index 0f35cd497e..14121cb749 100644 --- a/distros/noetic/dbw-fca-msgs/default.nix +++ b/distros/noetic/dbw-fca-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-fca-msgs"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/noetic/dbw_fca_msgs/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "28c05fd2d2621983975bdf7a4a8febc1e2cbdedcd2cbfce0417ce44c809ef515"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/noetic/dbw_fca_msgs/1.3.0-1"; + sha256 = "sha256-TwMR9JWmysOOf9jSWRcaWOnfbMIKXUa0TgkPvJqiGpg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dbw-fca/default.nix b/distros/noetic/dbw-fca/default.nix index d848df48e0..a68a378e49 100644 --- a/distros/noetic/dbw-fca/default.nix +++ b/distros/noetic/dbw-fca/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-fca"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_fca_ros-release/archive/release/noetic/dbw_fca/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "937e7500b7dd4c1d9fc1cdf5e810699cc6e53bf4f5aef6dbacbce8ee6a75a009"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_fca_ros-release"; + rev = "release/noetic/dbw_fca/1.3.0-1"; + sha256 = "sha256-7IHpyvyfDFtHmloRt9iZAI52oBUNCYz3WiGgCmQiMzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-mkz-can/default.nix b/distros/noetic/dbw-mkz-can/default.nix index 41a5417b59..a8bf5ec906 100644 --- a/distros/noetic/dbw-mkz-can/default.nix +++ b/distros/noetic/dbw-mkz-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-mkz-can"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/noetic/dbw_mkz_can/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "40e72e11a91c42f4118be832870e68198ad787d1fd04fe8e7aaf24cc086848b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/noetic/dbw_mkz_can/1.6.0-1"; + sha256 = "sha256-P6BE6AEmLOFi4LDM7Zwm6Ghvk0/7tg1MmpeZ7Icjz+8="; + }; buildType = "catkin"; buildInputs = [ catkin dataspeed-can-msg-filters ]; diff --git a/distros/noetic/dbw-mkz-description/default.nix b/distros/noetic/dbw-mkz-description/default.nix index 9ca9307930..3ee50c522f 100644 --- a/distros/noetic/dbw-mkz-description/default.nix +++ b/distros/noetic/dbw-mkz-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-mkz-description"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/noetic/dbw_mkz_description/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "910acb3bcadbca9107c6b94bbfb1530078ffa012694061f6a69ecb2479342972"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/noetic/dbw_mkz_description/1.6.0-1"; + sha256 = "sha256-QNgneMb38+oRtzL7dC0l9uhzXGUnHg9gcml7JwnVkbw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-mkz-joystick-demo/default.nix b/distros/noetic/dbw-mkz-joystick-demo/default.nix index db57606f37..0ad1fce52f 100644 --- a/distros/noetic/dbw-mkz-joystick-demo/default.nix +++ b/distros/noetic/dbw-mkz-joystick-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-mkz-joystick-demo"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/noetic/dbw_mkz_joystick_demo/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "97ac3f61dff26b108262155a3b65a3329dbf1c792e64e836bfa065b7cf78cab5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/noetic/dbw_mkz_joystick_demo/1.6.0-1"; + sha256 = "sha256-rwm6KNrm3whiLIq07anS6H5tS7pY8G/vEorJYmCFPVE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-mkz-msgs/default.nix b/distros/noetic/dbw-mkz-msgs/default.nix index 2eb5ad1a44..207c1deed2 100644 --- a/distros/noetic/dbw-mkz-msgs/default.nix +++ b/distros/noetic/dbw-mkz-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-mkz-msgs"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/noetic/dbw_mkz_msgs/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "eccec84960b373eb380368373413d97fbbfa9ed94597d543e3901cf12351ed1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/noetic/dbw_mkz_msgs/1.6.0-1"; + sha256 = "sha256-yPKRzKr33qeNpT5S8q4jiaWwOSYJiUajsXZ99c/rEXA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dbw-mkz/default.nix b/distros/noetic/dbw-mkz/default.nix index 9b5e3afea8..eeddb70040 100644 --- a/distros/noetic/dbw-mkz/default.nix +++ b/distros/noetic/dbw-mkz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-mkz"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_mkz_ros-release/archive/release/noetic/dbw_mkz/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "d7c670c10032cde9de5179ebcfc445a54abf4a68568625c059660f77a16fad6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_mkz_ros-release"; + rev = "release/noetic/dbw_mkz/1.6.0-1"; + sha256 = "sha256-w4IV2nf+dA0ifMWT+nnV/ryowWtzZiBdk6HJjMiSKAo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-polaris-can/default.nix b/distros/noetic/dbw-polaris-can/default.nix index d3e075d727..9670d6e466 100644 --- a/distros/noetic/dbw-polaris-can/default.nix +++ b/distros/noetic/dbw-polaris-can/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-polaris-can"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/noetic/dbw_polaris_can/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "061736379ea85c1884ea1b006bb2b2c0e902b8b67d9821fd44aeaaedd22c7a92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/noetic/dbw_polaris_can/1.1.0-1"; + sha256 = "sha256-/t28Mhp2LDRwMEN4RJuXKt/imjxSdLpPT4izLkdCEqc="; + }; buildType = "catkin"; buildInputs = [ catkin dataspeed-can-msg-filters ]; diff --git a/distros/noetic/dbw-polaris-description/default.nix b/distros/noetic/dbw-polaris-description/default.nix index d187a0695f..9053759774 100644 --- a/distros/noetic/dbw-polaris-description/default.nix +++ b/distros/noetic/dbw-polaris-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-polaris-description"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/noetic/dbw_polaris_description/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "341a41bd0252c37c6bd74a3e640499a9ca67e5dbbd03f572dec947bd564155b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/noetic/dbw_polaris_description/1.1.0-1"; + sha256 = "sha256-EQ5HHDM+LU/iSupxm5xlJ16nZkoK8DlZ6bABxtikN64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-polaris-joystick-demo/default.nix b/distros/noetic/dbw-polaris-joystick-demo/default.nix index 8e44e7968a..21fb516bd9 100644 --- a/distros/noetic/dbw-polaris-joystick-demo/default.nix +++ b/distros/noetic/dbw-polaris-joystick-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-polaris-joystick-demo"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/noetic/dbw_polaris_joystick_demo/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "2dd9a9f970cd893988278d0be424ec92f468a3f7e830cee43be686dd092f2e97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/noetic/dbw_polaris_joystick_demo/1.1.0-1"; + sha256 = "sha256-IScNwPCoynOnNCzpFxHEM2mRUhyOE6p1ECD0THPCZQs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dbw-polaris-msgs/default.nix b/distros/noetic/dbw-polaris-msgs/default.nix index 1c2081743e..db815d1f97 100644 --- a/distros/noetic/dbw-polaris-msgs/default.nix +++ b/distros/noetic/dbw-polaris-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-polaris-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/noetic/dbw_polaris_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "b5648764cef4109d45d9adf4dc432beaa6170b372d596ec7d47dabed1eddf06f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/noetic/dbw_polaris_msgs/1.1.0-1"; + sha256 = "sha256-pu+jBW6Q7vx0i6N2NEix+YPJqTF1uA/er0lHTgI/8l4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dbw-polaris/default.nix b/distros/noetic/dbw-polaris/default.nix index 15617549fd..fe9158ece0 100644 --- a/distros/noetic/dbw-polaris/default.nix +++ b/distros/noetic/dbw-polaris/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dbw-polaris"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/dbw_polaris_ros-release/archive/release/noetic/dbw_polaris/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "970e83d8a82805769497a7094a49a500a8d28084c8b780be892620b395084aff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "dbw_polaris_ros-release"; + rev = "release/noetic/dbw_polaris/1.1.0-1"; + sha256 = "sha256-n1NKuVMZa2Sk34YcHU30KTPQY/ikw2UyN10R12KJC9E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ddynamic-reconfigure-python/default.nix b/distros/noetic/ddynamic-reconfigure-python/default.nix index f31f4f03ce..be6b08eade 100644 --- a/distros/noetic/ddynamic-reconfigure-python/default.nix +++ b/distros/noetic/ddynamic-reconfigure-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ddynamic-reconfigure-python"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/ddynamic_reconfigure_python-release/archive/release/noetic/ddynamic_reconfigure_python/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "b99b19d692984bb83a34afb74dbe92b3d4e7bde5e89afd47cacbc57e3963df5a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "ddynamic_reconfigure_python-release"; + rev = "release/noetic/ddynamic_reconfigure_python/0.0.1-1"; + sha256 = "sha256-JLcpi+inwRitdo5Xol8fy27HaHg0wy9iD2NUtXfqdnc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ddynamic-reconfigure/default.nix b/distros/noetic/ddynamic-reconfigure/default.nix index 73c6d01f6b..3cf8163315 100644 --- a/distros/noetic/ddynamic-reconfigure/default.nix +++ b/distros/noetic/ddynamic-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ddynamic-reconfigure"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/pal-gbp/ddynamic_reconfigure/archive/release/noetic/ddynamic_reconfigure/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "1eb2ca206bff8c11dfc8522a25051d2f0ada8e36779e7c7f6f517ca3ac49a593"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pal-gbp"; + repo = "ddynamic_reconfigure"; + rev = "release/noetic/ddynamic_reconfigure/0.3.2-1"; + sha256 = "sha256-7wU8+pg/natOlu90zvVV2vjRO1Gv7TBEiKiPXcpxOuM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/delphi-esr-msgs/default.nix b/distros/noetic/delphi-esr-msgs/default.nix index a1444a3fe0..410e2ad8ff 100644 --- a/distros/noetic/delphi-esr-msgs/default.nix +++ b/distros/noetic/delphi-esr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-delphi-esr-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/delphi_esr_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "f4816ec2a907d27373333aa1f5b7cd7aa10acb4ef7f0559050306eff505e6bb6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/delphi_esr_msgs/3.3.0-1"; + sha256 = "sha256-D5LFqiNL8X7+DIB2qif7YohHCL6wyx9q8KIWwsTPyn0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/delphi-mrr-msgs/default.nix b/distros/noetic/delphi-mrr-msgs/default.nix index 128252b0cd..e7eff624de 100644 --- a/distros/noetic/delphi-mrr-msgs/default.nix +++ b/distros/noetic/delphi-mrr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-delphi-mrr-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/delphi_mrr_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "b39751d2d083eb15e6f451ea08c663e6a6df39fbdf798e1b7a14db97322b0171"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/delphi_mrr_msgs/3.3.0-1"; + sha256 = "sha256-heKRkgs78QUHlGupyi/wdBdSP2cly5RdfZ32B2eM8Ho="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/delphi-srr-msgs/default.nix b/distros/noetic/delphi-srr-msgs/default.nix index e4a9404bf8..392500dc73 100644 --- a/distros/noetic/delphi-srr-msgs/default.nix +++ b/distros/noetic/delphi-srr-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-delphi-srr-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/delphi_srr_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "e98611f4018f79280fcbe2cefaf100e7af127b2c76c9d42fbbeaf3f622e4c3d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/delphi_srr_msgs/3.3.0-1"; + sha256 = "sha256-G426FpIqDydAPAebMPtjIWTIDeoTaz6jEieww8g2g14="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/depth-image-proc/default.nix b/distros/noetic/depth-image-proc/default.nix index f9e204c3da..a8270030eb 100644 --- a/distros/noetic/depth-image-proc/default.nix +++ b/distros/noetic/depth-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-depth-image-proc"; version = "1.17.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/noetic/depth_image_proc/1.17.0-1.tar.gz"; - name = "1.17.0-1.tar.gz"; - sha256 = "7c544ac45766a57cb9375a00c56156ecec07133c4ebf1166b7325712df69020f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/noetic/depth_image_proc/1.17.0-1"; + sha256 = "sha256-dIMBZsoqwZH7iHwIj1Fv2IrBuwDIcBHnQXsFxvfNTn8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-filters stereo-msgs ]; diff --git a/distros/noetic/depthai-bridge/default.nix b/distros/noetic/depthai-bridge/default.nix index e0743c6f28..dd809dc32b 100644 --- a/distros/noetic/depthai-bridge/default.nix +++ b/distros/noetic/depthai-bridge/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, camera-info-manager, catkin, cv-bridge, depthai, depthai-ros-msgs, image-transport, opencv, robot-state-publisher, ros-environment, roscpp, sensor-msgs, std-msgs, stereo-msgs, vision-msgs, xacro }: buildRosPackage { pname = "ros-noetic-depthai-bridge"; - version = "2.5.3-r1"; + version = "2.6.1-r2"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/noetic/depthai_bridge/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "48385dce4792e5e91638822c6f89bed063f60de83940a5bd7d39a2b2680ca134"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/noetic/depthai_bridge/2.6.1-2"; + sha256 = "sha256-Re1ZHsJm3dpCvwnUSx44yAJR76EhEVMLKsVto0mokE0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/depthai-examples/default.nix b/distros/noetic/depthai-examples/default.nix index 07cce3076f..789c52a068 100644 --- a/distros/noetic/depthai-examples/default.nix +++ b/distros/noetic/depthai-examples/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, camera-info-manager, catkin, cv-bridge, depth-image-proc, depthai, depthai-bridge, depthai-ros-msgs, foxglove-msgs, image-transport, message-filters, nodelet, opencv, robot-state-publisher, ros-environment, roscpp, rospy, sensor-msgs, std-msgs, stereo-msgs, vision-msgs, xacro }: buildRosPackage { pname = "ros-noetic-depthai-examples"; - version = "2.5.3-r1"; + version = "2.6.1-r2"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/noetic/depthai_examples/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "edf6207f6f31210aace57db787018c6d9018f5bd980edb4bc3befb73209ce304"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/noetic/depthai_examples/2.6.1-2"; + sha256 = "sha256-wam9CAeMXFD4lrToym8d86I1pBbXUeopxjPnV/R/gIo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/depthai-ros-driver/default.nix b/distros/noetic/depthai-ros-driver/default.nix new file mode 100644 index 0000000000..2cbef259c8 --- /dev/null +++ b/distros/noetic/depthai-ros-driver/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, camera-info-manager, catkin, cv-bridge, depthai, depthai-bridge, diagnostic-msgs, dynamic-reconfigure, image-pipeline, image-transport, image-transport-plugins, message-filters, nodelet, roscpp, rospy, sensor-msgs, std-msgs, std-srvs, vision-msgs }: +buildRosPackage { + pname = "ros-noetic-depthai-ros-driver"; + version = "2.6.1-r2"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/noetic/depthai_ros_driver/2.6.1-2"; + sha256 = "sha256-OYC0ws1AOyrpXkMnqMjXVhPOYTqOxf0EPlvAGR2bPS0="; + }; + + buildType = "catkin"; + buildInputs = [ catkin ]; + propagatedBuildInputs = [ camera-info-manager cv-bridge depthai depthai-bridge diagnostic-msgs dynamic-reconfigure image-pipeline image-transport image-transport-plugins message-filters nodelet roscpp rospy sensor-msgs std-msgs std-srvs vision-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Depthai ROS Monolithic node.''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/noetic/depthai-ros-msgs/default.nix b/distros/noetic/depthai-ros-msgs/default.nix index f484d0ce0e..7a932f4a1d 100644 --- a/distros/noetic/depthai-ros-msgs/default.nix +++ b/distros/noetic/depthai-ros-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, sensor-msgs, std-msgs, vision-msgs }: buildRosPackage { pname = "ros-noetic-depthai-ros-msgs"; - version = "2.5.3-r1"; + version = "2.6.1-r2"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/noetic/depthai_ros_msgs/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "4d78472bab64daf71294237e094ee6e8d8af86f0fa8b4894aef1ff0dd6d779d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/noetic/depthai_ros_msgs/2.6.1-2"; + sha256 = "sha256-xwTkBcURS86idliDmhD9ReNqrlxGBCHINgMWlzXv6xA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/depthai-ros/default.nix b/distros/noetic/depthai-ros/default.nix index 563f5febb1..739fdbf955 100644 --- a/distros/noetic/depthai-ros/default.nix +++ b/distros/noetic/depthai-ros/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, depthai, depthai-bridge, depthai-examples, depthai-ros-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, depthai, depthai-bridge, depthai-examples, depthai-ros-driver, depthai-ros-msgs }: buildRosPackage { pname = "ros-noetic-depthai-ros"; - version = "2.5.3-r1"; + version = "2.6.1-r2"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-ros-release/archive/release/noetic/depthai-ros/2.5.3-1.tar.gz"; - name = "2.5.3-1.tar.gz"; - sha256 = "178efffc5af6e70fbe9387e1fc664ab280c6ec8e4318677b94042e32a39021b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-ros-release"; + rev = "release/noetic/depthai-ros/2.6.1-2"; + sha256 = "sha256-IkpiVkqInIBWDwXsg2PLCPstDJgABG5EHiRynPp28+k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; - propagatedBuildInputs = [ depthai depthai-bridge depthai-examples depthai-ros-msgs ]; + propagatedBuildInputs = [ depthai depthai-bridge depthai-examples depthai-ros-driver depthai-ros-msgs ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/depthai/default.nix b/distros/noetic/depthai/default.nix index 17ba8efb7b..f43e1f72e9 100644 --- a/distros/noetic/depthai/default.nix +++ b/distros/noetic/depthai/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cmake, libusb1, nlohmann_json, opencv, ros-environment }: buildRosPackage { pname = "ros-noetic-depthai"; - version = "2.19.1-r1"; + version = "2.20.1-r1"; - src = fetchurl { - url = "https://github.com/luxonis/depthai-core-release/archive/release/noetic/depthai/2.19.1-1.tar.gz"; - name = "2.19.1-1.tar.gz"; - sha256 = "5f817f4e7aee3fd7ed03f98efa135fd8ad6ca75154bd3dab4ee5415a62b5eb0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "luxonis"; + repo = "depthai-core-release"; + rev = "release/noetic/depthai/2.20.1-1"; + sha256 = "sha256-D6DnHY97UeGjzvx/NpYhNdvl92DNmrtjBeDmttX099E="; + }; buildType = "cmake"; buildInputs = [ cmake ros-environment ]; diff --git a/distros/noetic/depthimage-to-laserscan/default.nix b/distros/noetic/depthimage-to-laserscan/default.nix index 72d1b2518d..09c2bef34e 100644 --- a/distros/noetic/depthimage-to-laserscan/default.nix +++ b/distros/noetic/depthimage-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-depthimage-to-laserscan"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/depthimage_to_laserscan-release/archive/release/noetic/depthimage_to_laserscan/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "033bbea0e5df9638816345ee7fd5e049af5431d21c74550937d1fc725fa946b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "depthimage_to_laserscan-release"; + rev = "release/noetic/depthimage_to_laserscan/1.0.8-1"; + sha256 = "sha256-zklPnFlu3CesAV/Nn4VBxDh6s1nsRgshyE9r46A2ZA0="; + }; buildType = "catkin"; buildInputs = [ catkin gtest ]; diff --git a/distros/noetic/derived-object-msgs/default.nix b/distros/noetic/derived-object-msgs/default.nix index 24dcc7c5b8..9378c70896 100644 --- a/distros/noetic/derived-object-msgs/default.nix +++ b/distros/noetic/derived-object-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-derived-object-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/derived_object_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "4ea1519b31275a2df6f3ca203077fca8b5447d588c02e69898463d3c3a9a7037"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/derived_object_msgs/3.3.0-1"; + sha256 = "sha256-JYHamuEPnYN6s+XfH/sxGfpPj7dX/DoXQiekYjS7r3E="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/desktop-full/default.nix b/distros/noetic/desktop-full/default.nix index 0ca1101c50..f5991caed1 100644 --- a/distros/noetic/desktop-full/default.nix +++ b/distros/noetic/desktop-full/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-desktop-full"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/noetic/desktop_full/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "a464f2b0bc587ebc77fc1ac28c80f0f53945a21810c6f6d9002d1e47e71fc97a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/noetic/desktop_full/1.5.0-1"; + sha256 = "sha256-AGWIFkHAQ0EvTeZBj8VbLPcqCHnNcvzgy6bvPi+pYlc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/desktop/default.nix b/distros/noetic/desktop/default.nix index fcc98c7424..fd9d3854b8 100644 --- a/distros/noetic/desktop/default.nix +++ b/distros/noetic/desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-desktop"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/noetic/desktop/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "d7ee8d0df916f35d34edf1c1ef3449378ed5ce7a75657362e1dd523b7066f2f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/noetic/desktop/1.5.0-1"; + sha256 = "sha256-fFoE/pTXO+c8EA0U4oi/GDC61alw1n6H5MfLOF7E++4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diagnostic-aggregator/default.nix b/distros/noetic/diagnostic-aggregator/default.nix index d3b4ad3fa3..ef8cdec017 100644 --- a/distros/noetic/diagnostic-aggregator/default.nix +++ b/distros/noetic/diagnostic-aggregator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diagnostic-aggregator"; version = "1.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/noetic/diagnostic_aggregator/1.11.0-1.tar.gz"; - name = "1.11.0-1.tar.gz"; - sha256 = "7acf0c22898540886465c92fdc0706c9955dec5d83b44bbe4288acc6bb637132"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/noetic/diagnostic_aggregator/1.11.0-1"; + sha256 = "sha256-PJCqvMIz/qLvpokbLyRogCO3QKm5SSlUzQhJthFZX9k="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/diagnostic-analysis/default.nix b/distros/noetic/diagnostic-analysis/default.nix index 3efdd12ae8..9805a75085 100644 --- a/distros/noetic/diagnostic-analysis/default.nix +++ b/distros/noetic/diagnostic-analysis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diagnostic-analysis"; version = "1.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/noetic/diagnostic_analysis/1.11.0-1.tar.gz"; - name = "1.11.0-1.tar.gz"; - sha256 = "8873422f1afad67a9cba7827c1f8ab7191783ac7f7fb3d52718635a7a22a8514"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/noetic/diagnostic_analysis/1.11.0-1"; + sha256 = "sha256-UJ09lK86LZlNm+ecYohGZ+nWn+wsVSGnlBE8oL+Qwxo="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/diagnostic-common-diagnostics/default.nix b/distros/noetic/diagnostic-common-diagnostics/default.nix index af36ab1dda..be8d5c97be 100644 --- a/distros/noetic/diagnostic-common-diagnostics/default.nix +++ b/distros/noetic/diagnostic-common-diagnostics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diagnostic-common-diagnostics"; version = "1.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/noetic/diagnostic_common_diagnostics/1.11.0-1.tar.gz"; - name = "1.11.0-1.tar.gz"; - sha256 = "de4cad66e278b9be6736a81ae202d16515a5094989ee4b870dfdc1ad9624bc8e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/noetic/diagnostic_common_diagnostics/1.11.0-1"; + sha256 = "sha256-9WN6Hxj2HoIRSLa9CsX9cdiTY39MuWlxy+o7CdzmazI="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/diagnostic-msgs/default.nix b/distros/noetic/diagnostic-msgs/default.nix index 8a00b2645a..49353b1e3a 100644 --- a/distros/noetic/diagnostic-msgs/default.nix +++ b/distros/noetic/diagnostic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diagnostic-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/diagnostic_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "c7837360b3b3f69b02d2b452653827d70d4d24a209abdfed8f447b165f4c8d50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/diagnostic_msgs/1.13.1-1"; + sha256 = "sha256-biv7EguJNxUF4G1PlDsn9g0a0O3MnWm5mrCy8pYzbqA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/diagnostic-updater/default.nix b/distros/noetic/diagnostic-updater/default.nix index 70913b5375..615fb7062e 100644 --- a/distros/noetic/diagnostic-updater/default.nix +++ b/distros/noetic/diagnostic-updater/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diagnostic-updater"; version = "1.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/noetic/diagnostic_updater/1.11.0-1.tar.gz"; - name = "1.11.0-1.tar.gz"; - sha256 = "303c2443b8e3d5e414187368fda5461fa6db22756f40c067c86d0650af79975f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/noetic/diagnostic_updater/1.11.0-1"; + sha256 = "sha256-L4MZGdN1nuMuCggPARZ0Z/oAl5ZbSd6mUzHFQQ8HsSU="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/diagnostics/default.nix b/distros/noetic/diagnostics/default.nix index 7eea1f277f..b392ac04b6 100644 --- a/distros/noetic/diagnostics/default.nix +++ b/distros/noetic/diagnostics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diagnostics"; version = "1.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/noetic/diagnostics/1.11.0-1.tar.gz"; - name = "1.11.0-1.tar.gz"; - sha256 = "8418d2dc21687a19dbe909f4d00732768760bcd9b0ffaf39a99d0c6f18cc79cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/noetic/diagnostics/1.11.0-1"; + sha256 = "sha256-GFunp91GV5RcTZGwHV0zAJOr53mA7HS0ljp7q3RVO2E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diff-drive-controller/default.nix b/distros/noetic/diff-drive-controller/default.nix index ffcc062294..6c0545dacc 100644 --- a/distros/noetic/diff-drive-controller/default.nix +++ b/distros/noetic/diff-drive-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, control-msgs, controller-interface, controller-manager, dynamic-reconfigure, geometry-msgs, hardware-interface, nav-msgs, pluginlib, realtime-tools, rosgraph-msgs, rostest, rostopic, std-srvs, tf, urdf, xacro }: buildRosPackage { pname = "ros-noetic-diff-drive-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/diff_drive_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "40464044b17732a609ab6fec86b178c5dbddb662c69425f148c70fddd6688e1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/diff_drive_controller/0.21.1-1"; + sha256 = "sha256-sreddJNdlOpxrjFtSFCV4tCq8VtP4VXQONFgEWLAaBk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-base/default.nix b/distros/noetic/diffbot-base/default.nix index 739de6a3ea..33d3d47502 100644 --- a/distros/noetic/diffbot-base/default.nix +++ b/distros/noetic/diffbot-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-base"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_base/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "5793ae3fa559221f08b2ea983cd5178aa65c91c2bb4b76eb62ddb2cfc4369553"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_base/1.1.0-1"; + sha256 = "sha256-Ua3MnwRHUdFP0emVcj6bV7JhgXspnaJXcGw46ugvhBA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-bringup/default.nix b/distros/noetic/diffbot-bringup/default.nix index 17ce8bfb3c..ae51fec8f7 100644 --- a/distros/noetic/diffbot-bringup/default.nix +++ b/distros/noetic/diffbot-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-bringup"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_bringup/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "7baeb9418cea432d5c7bf5e33c071c1f0bb5fa3c48f5038fe9389f4e9558d230"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_bringup/1.1.0-1"; + sha256 = "sha256-OnBkzEidOCNC6DB6aAA06MHp/Q9wTqhzJNgMIcETZjc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-control/default.nix b/distros/noetic/diffbot-control/default.nix index 200fd5bc1b..1714111ade 100644 --- a/distros/noetic/diffbot-control/default.nix +++ b/distros/noetic/diffbot-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-control"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_control/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "ada0f8358f106cdae3eebc4c2b230777642ea690c221764cdd8d672c0bfa4c99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_control/1.1.0-1"; + sha256 = "sha256-ocP/MlfCsMVyJXl9x9thHsgjSBoCU5ys12Bp7U/FXes="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-description/default.nix b/distros/noetic/diffbot-description/default.nix index 43e9e485d4..2a6e4431d7 100644 --- a/distros/noetic/diffbot-description/default.nix +++ b/distros/noetic/diffbot-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-description"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_description/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "32719217c0f5e92134fe65d59e595ab4bf653ff6b93a1671cf10ba4f7811fca1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_description/1.1.0-1"; + sha256 = "sha256-fO1dtO9Ovl3OCYOnS2QlH17xaSSrmqzeda9kDIo7f+Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-gazebo/default.nix b/distros/noetic/diffbot-gazebo/default.nix index 03db170631..4e8fbf53d4 100644 --- a/distros/noetic/diffbot-gazebo/default.nix +++ b/distros/noetic/diffbot-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-gazebo"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_gazebo/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "95278be8b2a56029fc0fa84e5bb39f8047a0ee7ef7f7776a5db585fdbec844ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_gazebo/1.1.0-1"; + sha256 = "sha256-29/WafwJSKsISjxGKytdioQistVlep6oYk2WfJCesj0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-mbf/default.nix b/distros/noetic/diffbot-mbf/default.nix index 2c73ec0d4d..550bdd3b59 100644 --- a/distros/noetic/diffbot-mbf/default.nix +++ b/distros/noetic/diffbot-mbf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-mbf"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_mbf/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "40146515e32b5c6cab410888f442f88300f554b5f8e0156f4e6d08d53cfaf620"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_mbf/1.1.0-1"; + sha256 = "sha256-2R85w8ridvqhdpFHfdbsC80dWCZx7TipOdSetgAKITI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-msgs/default.nix b/distros/noetic/diffbot-msgs/default.nix index 9a9a490710..bb804c3d40 100644 --- a/distros/noetic/diffbot-msgs/default.nix +++ b/distros/noetic/diffbot-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "c6404745cd18b1c665f906125c24f00445e66a7f8a5934841e99185d03bd3823"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_msgs/1.1.0-1"; + sha256 = "sha256-uHos9tBdpSf/LXaRyocsP+xCT/KyBooCo4Hg40fe52g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/diffbot-navigation/default.nix b/distros/noetic/diffbot-navigation/default.nix index 6030978511..a0099e04fc 100644 --- a/distros/noetic/diffbot-navigation/default.nix +++ b/distros/noetic/diffbot-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-navigation"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_navigation/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "0c54acf1c3175299b7cc671a559f681e8a7d623685451a5d38b3bf2e47262706"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_navigation/1.1.0-1"; + sha256 = "sha256-IsXICj+MV3+q7H7i0NV5Dpr1nGPMY3TaE9KdhQrWqsg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-robot/default.nix b/distros/noetic/diffbot-robot/default.nix index 9090f13ea9..022d4216d1 100644 --- a/distros/noetic/diffbot-robot/default.nix +++ b/distros/noetic/diffbot-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-robot"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_robot/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "8bd9225c1c10e57da7791284740ba78979933f13d1250f965bbb32c72c0c4549"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_robot/1.1.0-1"; + sha256 = "sha256-EM2zhRUCrfaG7+lZPz3NUfYrrWvj4u7SUyx8UxxKNRs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/diffbot-slam/default.nix b/distros/noetic/diffbot-slam/default.nix index 2455025026..4a23586f26 100644 --- a/distros/noetic/diffbot-slam/default.nix +++ b/distros/noetic/diffbot-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-diffbot-slam"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-mobile-robots-release/diffbot-release/archive/release/noetic/diffbot_slam/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "c7f5bc4db8e9b59bdc242c1be21403d10e7c9245dca66f0db7a4ce01edde9d4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-mobile-robots-release"; + repo = "diffbot-release"; + rev = "release/noetic/diffbot_slam/1.1.0-1"; + sha256 = "sha256-Bbnl8Q0eSh2Uy4mOoQqmo7zNVz7KdRgO+tIZF5NEfFk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dijkstra-mesh-planner/default.nix b/distros/noetic/dijkstra-mesh-planner/default.nix index d54f118ade..6eb9370e6a 100644 --- a/distros/noetic/dijkstra-mesh-planner/default.nix +++ b/distros/noetic/dijkstra-mesh-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dijkstra-mesh-planner"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/dijkstra_mesh_planner/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "d010e737088b5c84fba9bb1926f574ac3a18138414963d84520bb3d0963507b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/dijkstra_mesh_planner/1.0.1-2"; + sha256 = "sha256-0jcTvJztBd30A7Qi+8EC432y/Kq2LavgyO4SVDU+nCY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dingo-control/default.nix b/distros/noetic/dingo-control/default.nix index 04ebe20ab2..db6de2f2fb 100644 --- a/distros/noetic/dingo-control/default.nix +++ b/distros/noetic/dingo-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-manager, diff-drive-controller, interactive-marker-twist-server, joint-state-controller, joy, ridgeback-control, robot-localization, roslaunch, teleop-twist-joy, topic-tools, twist-mux }: buildRosPackage { pname = "ros-noetic-dingo-control"; - version = "0.2.0-r1"; + version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo-release/archive/release/noetic/dingo_control/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "b3539f28b55abbe1e333a6c7fa90ec112638f2a7627fcdc527a3d4e9f132f671"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo-release"; + rev = "release/noetic/dingo_control/0.3.0-1"; + sha256 = "sha256-gznY0FjobnA3VLBVt3Brk9pUsnNunnJVuEfzyrv5Sdk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dingo-description/default.nix b/distros/noetic/dingo-description/default.nix index 62dd3f3e4e..a95f6b19c2 100644 --- a/distros/noetic/dingo-description/default.nix +++ b/distros/noetic/dingo-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, fath-pivot-mount-description, flir-camera-description, lms1xx, realsense2-description, robot-state-publisher, urdf, velodyne-description, xacro }: buildRosPackage { pname = "ros-noetic-dingo-description"; - version = "0.2.0-r1"; + version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo-release/archive/release/noetic/dingo_description/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "eb30f6ea53cd495b9f71a10b01b546c84020a7354be2fc667f767979a3310051"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo-release"; + rev = "release/noetic/dingo_description/0.3.0-1"; + sha256 = "sha256-fBg1OAa5QgHZ8UbmXfPw7g8ngq/3QFBbR4xJj0RPQh4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dingo-desktop/default.nix b/distros/noetic/dingo-desktop/default.nix index 6f59777e34..d5f43c1bd9 100644 --- a/distros/noetic/dingo-desktop/default.nix +++ b/distros/noetic/dingo-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dingo-desktop"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo_desktop-release/archive/release/noetic/dingo_desktop/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "c5fb29f0f394e512e4fd5b232ea7fb24a8f444cd235b8ec49b4944c7e276f572"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo_desktop-release"; + rev = "release/noetic/dingo_desktop/0.1.1-1"; + sha256 = "sha256-mt70lJ4KDtvQWqnlsuB1OGuylAfInV6alQ+HoV77Li0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dingo-gazebo/default.nix b/distros/noetic/dingo-gazebo/default.nix index f990388017..9366bd0e79 100644 --- a/distros/noetic/dingo-gazebo/default.nix +++ b/distros/noetic/dingo-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dingo-gazebo"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo_simulator-release/archive/release/noetic/dingo_gazebo/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "7b35e2a11f815c324bb1b6c9cbd9fab92f97c6f13602c1350080683b489b90c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo_simulator-release"; + rev = "release/noetic/dingo_gazebo/0.1.1-1"; + sha256 = "sha256-4ghgMo3ectl8JNje839fy5GJGW0m/DSO1b9dmmWQExA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dingo-msgs/default.nix b/distros/noetic/dingo-msgs/default.nix index ddd2f3d31c..a76a57629d 100644 --- a/distros/noetic/dingo-msgs/default.nix +++ b/distros/noetic/dingo-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-dingo-msgs"; - version = "0.2.0-r1"; + version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo-release/archive/release/noetic/dingo_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "df3705e9517d92870644ff2acfc87c04d82d87f592f710916adebd95d68e7a80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo-release"; + rev = "release/noetic/dingo_msgs/0.3.0-1"; + sha256 = "sha256-3xCv1wMIqrOF5xS5cJGwm1OIjd/vU2Ax/mgDzMFQfxY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dingo-navigation/default.nix b/distros/noetic/dingo-navigation/default.nix index fced601be2..e85cc4e4ca 100644 --- a/distros/noetic/dingo-navigation/default.nix +++ b/distros/noetic/dingo-navigation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, amcl, catkin, gmapping, map-server, move-base, roslaunch }: buildRosPackage { pname = "ros-noetic-dingo-navigation"; - version = "0.2.0-r1"; + version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo-release/archive/release/noetic/dingo_navigation/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "d5f5fa1a4c0e80e5945812a144fea859417545878af2e2dc6b3f35751fafc692"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo-release"; + rev = "release/noetic/dingo_navigation/0.3.0-1"; + sha256 = "sha256-4bE55vPWl6yQFd0lM+vs4xw3QpbjfQ15QJi3nRXB9+w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dingo-simulator/default.nix b/distros/noetic/dingo-simulator/default.nix index 31b94dc3a4..062d93cfe4 100644 --- a/distros/noetic/dingo-simulator/default.nix +++ b/distros/noetic/dingo-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dingo-simulator"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo_simulator-release/archive/release/noetic/dingo_simulator/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "09094dfe9128e2ce280c7c62ba092c9ac08630d405ce6639df972304f50b5394"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo_simulator-release"; + rev = "release/noetic/dingo_simulator/0.1.1-1"; + sha256 = "sha256-9NyRnFXS1gBIkjm/KniByJ8VwPTiYOlSd6srsLkqtZk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dingo-viz/default.nix b/distros/noetic/dingo-viz/default.nix index 5a7a9aca7c..0a1dcb6652 100644 --- a/distros/noetic/dingo-viz/default.nix +++ b/distros/noetic/dingo-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dingo-viz"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/dingo_desktop-release/archive/release/noetic/dingo_viz/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "e242422200e4b983ebf83c0e914c78cabbf80e81d5fc630154e4d4fe9de7f274"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "dingo_desktop-release"; + rev = "release/noetic/dingo_viz/0.1.1-1"; + sha256 = "sha256-IGPvo5OSnIyMik+askiIoowplG4Soh5t1TwuaNrJfcc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dlux-global-planner/default.nix b/distros/noetic/dlux-global-planner/default.nix index 725993ff5c..945fd9d5b1 100644 --- a/distros/noetic/dlux-global-planner/default.nix +++ b/distros/noetic/dlux-global-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dlux-global-planner"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/dlux_global_planner/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "0a7711a3efcb134f7051b4f785d07104bafe68db9c3e56e1a6f2f305a910fb77"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/dlux_global_planner/0.3.0-2"; + sha256 = "sha256-1VFV9n14wCm5VbSr5LnwMlHT6V2XqhUwjhVh4J0f0y4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dlux-plugins/default.nix b/distros/noetic/dlux-plugins/default.nix index 155174ed3f..66d7063753 100644 --- a/distros/noetic/dlux-plugins/default.nix +++ b/distros/noetic/dlux-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dlux-plugins"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/dlux_plugins/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "29ea1f12d379a9ee2b053d1d99e07437b9a5447405b5bbfb3fb32ced2be6385b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/dlux_plugins/0.3.0-2"; + sha256 = "sha256-muR7RnF/u1GeXx03ua3MUFiD4twIJrYxHYssAVIs8lo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dnn-detect/default.nix b/distros/noetic/dnn-detect/default.nix index 5a8a8f8731..347540b25f 100644 --- a/distros/noetic/dnn-detect/default.nix +++ b/distros/noetic/dnn-detect/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dnn-detect"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/dnn_detect-release/archive/release/noetic/dnn_detect/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "d19a621cdb0b368a4f90b5bb7d8f0b85b6efbf70c64aa1dd52503a60a85de8c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "dnn_detect-release"; + rev = "release/noetic/dnn_detect/0.1.0-1"; + sha256 = "sha256-ds47SUDZMjvdYPyA1eUrCQmY3sJf1+g9JZyQJYDQqa4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/downward/default.nix b/distros/noetic/downward/default.nix index 2dc7c811c2..3b5d4e2036 100644 --- a/distros/noetic/downward/default.nix +++ b/distros/noetic/downward/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-downward"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/downward/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "af167e3a93447efd3db9731aacadf13d6b554cb202743c05630892360766f16b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/downward/2.1.21-2"; + sha256 = "sha256-ONrwC/dFQhrEf2r7DIuw+pyOvdQnBixzdECItEMhhok="; + }; buildType = "catkin"; buildInputs = [ bison cacert catkin flex python3 rostest ]; diff --git a/distros/noetic/driver-base/default.nix b/distros/noetic/driver-base/default.nix index 2fb926dba5..1f40230d30 100644 --- a/distros/noetic/driver-base/default.nix +++ b/distros/noetic/driver-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-driver-base"; version = "1.6.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/driver_common-release/archive/release/noetic/driver_base/1.6.9-1.tar.gz"; - name = "1.6.9-1.tar.gz"; - sha256 = "9d65303877d39e80ed925f26cafd86198c0e3c3c047229d2788e87be22c3205c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "driver_common-release"; + rev = "release/noetic/driver_base/1.6.9-1"; + sha256 = "sha256-lGb9f9ZY6WbT3ZmQD5je0LtN7nmxQSONRsEUdNoiaF0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/driver-common/default.nix b/distros/noetic/driver-common/default.nix index f42fbddbe2..d853d6e61a 100644 --- a/distros/noetic/driver-common/default.nix +++ b/distros/noetic/driver-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-driver-common"; version = "1.6.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/driver_common-release/archive/release/noetic/driver_common/1.6.9-1.tar.gz"; - name = "1.6.9-1.tar.gz"; - sha256 = "8e08f0ae655f89083ab38cd386d116bcc1a3678fdc3b84e5cf93df7b0a016ab3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "driver_common-release"; + rev = "release/noetic/driver_common/1.6.9-1"; + sha256 = "sha256-Z8VuQlf0skvUIsyhaW12LKanIrVA6Y3BIjpMy3Wexs8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/drone-assets/default.nix b/distros/noetic/drone-assets/default.nix index cf25d7a49f..c92a25afd8 100644 --- a/distros/noetic/drone-assets/default.nix +++ b/distros/noetic/drone-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-drone-assets"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/noetic/drone_assets/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "b649dc4b8693580aecb298c383b786f15be7c225b7971356c7251536b63c1dd9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/noetic/drone_assets/1.4.2-1"; + sha256 = "sha256-mp9xtlJyumfzLlKhmu+p/wEAN5aKJDvB096q7CRfM3Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/drone-circuit-assets/default.nix b/distros/noetic/drone-circuit-assets/default.nix index e0c61eeee8..6aa74e340b 100644 --- a/distros/noetic/drone-circuit-assets/default.nix +++ b/distros/noetic/drone-circuit-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-drone-circuit-assets"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/noetic/drone_circuit_assets/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "1265679acee200442cbded215e33fc9b9e72734af75cd3b6b605becbf5eb8dc6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/noetic/drone_circuit_assets/1.4.2-1"; + sha256 = "sha256-G5br8VoFvZnNBH3LKoScfsHiPyNdHP4N9o0iDAgLAGg="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/drone-wrapper/default.nix b/distros/noetic/drone-wrapper/default.nix index c1ebd708ff..b5ffae6ad6 100644 --- a/distros/noetic/drone-wrapper/default.nix +++ b/distros/noetic/drone-wrapper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-drone-wrapper"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/noetic/drone_wrapper/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "a3b6b97dd4608ffae016999446165c3b7cdc2a25845cc7344482d58ded3e52c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/noetic/drone_wrapper/1.4.2-1"; + sha256 = "sha256-jNl2PttFc411NXhvNnMNN7k5fkmYL2F3KncGAflr1lg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dual-quaternions-ros/default.nix b/distros/noetic/dual-quaternions-ros/default.nix index bb6ccd38f9..d2cfa40438 100644 --- a/distros/noetic/dual-quaternions-ros/default.nix +++ b/distros/noetic/dual-quaternions-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dual-quaternions-ros"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/Achllle/dual_quaternions_ros-release/archive/release/noetic/dual_quaternions_ros/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "9b05be8641a2435cb8e1756cef909151c8d7ef114ef1776f13b552a6e249779d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Achllle"; + repo = "dual_quaternions_ros-release"; + rev = "release/noetic/dual_quaternions_ros/0.1.4-1"; + sha256 = "sha256-9HlzJw1t6/8gkDmdGVExS7qxjWPEriEnJ2kSy5DZCqs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dual-quaternions/default.nix b/distros/noetic/dual-quaternions/default.nix index 483b43a512..440d27f034 100644 --- a/distros/noetic/dual-quaternions/default.nix +++ b/distros/noetic/dual-quaternions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dual-quaternions"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/Achllle/dual_quaternions-release/archive/release/noetic/dual_quaternions/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "41c7d1914282dd7c9d27656d1a93088f30cefa8c95ec698b08c7d1a431230c28"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Achllle"; + repo = "dual_quaternions-release"; + rev = "release/noetic/dual_quaternions/0.3.2-1"; + sha256 = "sha256-MqSy4w6xMyoGTBTkUhni7eHaHhByXTQ1FXJPUd3du2c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dwa-local-planner/default.nix b/distros/noetic/dwa-local-planner/default.nix index 9f06d0cb57..15e03afa62 100644 --- a/distros/noetic/dwa-local-planner/default.nix +++ b/distros/noetic/dwa-local-planner/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, base-local-planner, catkin, cmake-modules, costmap-2d, dynamic-reconfigure, eigen, nav-core, nav-msgs, pluginlib, roscpp, sensor-msgs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-dwa-local-planner"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/dwa_local_planner/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "7a33aea335a10418c1df4816fbfc210c423151784bec50aad9c749d580b8d737"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/dwa_local_planner/1.17.3-1"; + sha256 = "sha256-P3o42x7I5xpja/gYopUkRMpOApvK7pXe4bmvtonLhow="; + }; buildType = "catkin"; buildInputs = [ angles catkin cmake-modules ]; diff --git a/distros/noetic/dwb-critics/default.nix b/distros/noetic/dwb-critics/default.nix index d5c1b70ca3..ef8008d931 100644 --- a/distros/noetic/dwb-critics/default.nix +++ b/distros/noetic/dwb-critics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dwb-critics"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/dwb_critics/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "72ca4fda86d9aa62fa0a422324a9e0cc065c7c2e587bf733d6d4b4e1beaa1667"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/dwb_critics/0.3.0-2"; + sha256 = "sha256-Kq+aG2XrXt2Carc22YW2tRpUWJ4IDmBrPJ6HX/hoHec="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dwb-local-planner/default.nix b/distros/noetic/dwb-local-planner/default.nix index 18f84a72b7..e895144c3a 100644 --- a/distros/noetic/dwb-local-planner/default.nix +++ b/distros/noetic/dwb-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dwb-local-planner"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/dwb_local_planner/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "8be2f90098ae07fa91f8e96c9bcdf1953a7d65ce21e6f1b592b4f8aa32c96367"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/dwb_local_planner/0.3.0-2"; + sha256 = "sha256-UW/FZW2BlEXJc4IId2C9vwru1AKxieWNYzA+Io81ZUc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dwb-msgs/default.nix b/distros/noetic/dwb-msgs/default.nix index 6b5c55d7e6..02fd01d58c 100644 --- a/distros/noetic/dwb-msgs/default.nix +++ b/distros/noetic/dwb-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dwb-msgs"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/dwb_msgs/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "f0bc6b295dd86e6b4925cb9710b763f455252030d1ff36beb6f276ef467f0713"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/dwb_msgs/0.3.0-2"; + sha256 = "sha256-6XfnYy+V8npkdg9y6OaG3LbO0YSTUcspv8RV8P74Mag="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dwb-plugins/default.nix b/distros/noetic/dwb-plugins/default.nix index f3ccdab628..32a8e9638f 100644 --- a/distros/noetic/dwb-plugins/default.nix +++ b/distros/noetic/dwb-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dwb-plugins"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/dwb_plugins/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "25246bce1d54d7eee93213312e53902c7e20db9431b517064c6db2c4009145bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/dwb_plugins/0.3.0-2"; + sha256 = "sha256-s31vclUUNwCOKDflO7TYPyvwNtn+wwLgCzhTr28OTzE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dynamic-edt-3d/default.nix b/distros/noetic/dynamic-edt-3d/default.nix index 3d1856d88a..653616acbb 100644 --- a/distros/noetic/dynamic-edt-3d/default.nix +++ b/distros/noetic/dynamic-edt-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamic-edt-3d"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/noetic/dynamic_edt_3d/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "bd1c960ffca2b94e4ee4501d83af1d11a7848d15842a689ce482733744efd81b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/noetic/dynamic_edt_3d/1.9.8-1"; + sha256 = "sha256-p28ass6agSiGQV14tRJGr41aVOpOe1vDp5HCLwOyx7A="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/dynamic-graph-python/default.nix b/distros/noetic/dynamic-graph-python/default.nix index 26a0a10a48..fd9a89dc9a 100644 --- a/distros/noetic/dynamic-graph-python/default.nix +++ b/distros/noetic/dynamic-graph-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamic-graph-python"; version = "4.0.11-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/dynamic-graph-python-ros-release/archive/release/noetic/dynamic-graph-python/4.0.11-1.tar.gz"; - name = "4.0.11-1.tar.gz"; - sha256 = "d4e0d899e0c0507985c92f3d9c8dc253eb6ba71935c5f85cc4bc40276cc027e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "dynamic-graph-python-ros-release"; + rev = "release/noetic/dynamic-graph-python/4.0.11-1"; + sha256 = "sha256-U7JPXNQmY2HZ3ts4GGNSg8Rzw99vdRZIJ2eqJfkWYOQ="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/noetic/dynamic-graph-tutorial/default.nix b/distros/noetic/dynamic-graph-tutorial/default.nix index 095798410c..342ec7f2f0 100644 --- a/distros/noetic/dynamic-graph-tutorial/default.nix +++ b/distros/noetic/dynamic-graph-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamic-graph-tutorial"; version = "1.3.5-r3"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/dynamic-graph-tutorial-ros-release/archive/release/noetic/dynamic-graph-tutorial/1.3.5-3.tar.gz"; - name = "1.3.5-3.tar.gz"; - sha256 = "25942f33ca8c7445def9b45a0dad355955669dc9d7fcf985d3e6737a0414e3d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "dynamic-graph-tutorial-ros-release"; + rev = "release/noetic/dynamic-graph-tutorial/1.3.5-3"; + sha256 = "sha256-rOFY1AaSzYzpQL/1QUIZikgpJtCS4Vl8imSm6bpZuoc="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen dynamic-graph dynamic-graph-python git ]; diff --git a/distros/noetic/dynamic-graph/default.nix b/distros/noetic/dynamic-graph/default.nix index f10df375da..9144ab74f3 100644 --- a/distros/noetic/dynamic-graph/default.nix +++ b/distros/noetic/dynamic-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamic-graph"; version = "4.4.3-r2"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/dynamic-graph-ros-release/archive/release/noetic/dynamic-graph/4.4.3-2.tar.gz"; - name = "4.4.3-2.tar.gz"; - sha256 = "ad0e881198a573563b54cfa2c496ab022e3e67e9e14ba6da08cbf156c29f5715"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "dynamic-graph-ros-release"; + rev = "release/noetic/dynamic-graph/4.4.3-2"; + sha256 = "sha256-ZjYVYmbMDjUMw0P7+KODSEEm94FSWSkq9bG/x6JNFYY="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/noetic/dynamic-reconfigure/default.nix b/distros/noetic/dynamic-reconfigure/default.nix index 516ee23b4b..19880c7a21 100644 --- a/distros/noetic/dynamic-reconfigure/default.nix +++ b/distros/noetic/dynamic-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamic-reconfigure"; version = "1.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/dynamic_reconfigure-release/archive/release/noetic/dynamic_reconfigure/1.7.3-1.tar.gz"; - name = "1.7.3-1.tar.gz"; - sha256 = "bb4e9834fe4b0da8a503c8060a5f4780ac29f4192b0f889a07be6362176b41f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "dynamic_reconfigure-release"; + rev = "release/noetic/dynamic_reconfigure/1.7.3-1"; + sha256 = "sha256-dSEvzNwGm4UZEPQSi167vFpb8CKnNDLVEF0K6417IFg="; + }; buildType = "catkin"; buildInputs = [ catkin cpp-common message-generation roscpp-serialization rostest ]; diff --git a/distros/noetic/dynamic-robot-state-publisher/default.nix b/distros/noetic/dynamic-robot-state-publisher/default.nix index 39c12faaa7..1282530e56 100644 --- a/distros/noetic/dynamic-robot-state-publisher/default.nix +++ b/distros/noetic/dynamic-robot-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamic-robot-state-publisher"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/peci1/dynamic_robot_state_publisher-release/archive/release/noetic/dynamic_robot_state_publisher/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "2f9f99a40f6371216a634914742c7056dc89aeedd525a09b6289048e1ef0f65d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "dynamic_robot_state_publisher-release"; + rev = "release/noetic/dynamic_robot_state_publisher/1.2.0-1"; + sha256 = "sha256-OTN+Gu/JzOkqOoGIWwtuv3R71IzKP6YnJMeYm4Tb+6o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dynamic-tf-publisher/default.nix b/distros/noetic/dynamic-tf-publisher/default.nix index 4387a7214b..caed018110 100644 --- a/distros/noetic/dynamic-tf-publisher/default.nix +++ b/distros/noetic/dynamic-tf-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamic-tf-publisher"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/dynamic_tf_publisher/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "d86fbdd0d5b80c942ab48aa045fb81528da2cc0d5814c25545ea708230d36b52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/dynamic_tf_publisher/2.2.12-1"; + sha256 = "sha256-SvIdIgTT5O7cGJNR73ecMOhdNOygMflMdawhghm2A+Y="; + }; buildType = "catkin"; buildInputs = [ catkin dynamic-reconfigure message-generation ]; diff --git a/distros/noetic/dynamixel-sdk-examples/default.nix b/distros/noetic/dynamixel-sdk-examples/default.nix index 3a99610abb..e199435a47 100644 --- a/distros/noetic/dynamixel-sdk-examples/default.nix +++ b/distros/noetic/dynamixel-sdk-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamixel-sdk-examples"; version = "3.7.51-r4"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/DynamixelSDK-release/archive/release/noetic/dynamixel_sdk_examples/3.7.51-4.tar.gz"; - name = "3.7.51-4.tar.gz"; - sha256 = "cdf263c504bef8621da2c23fb2aef0255eebe0c8966a29cd6169d0f3ac78223d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "DynamixelSDK-release"; + rev = "release/noetic/dynamixel_sdk_examples/3.7.51-4"; + sha256 = "sha256-Qo9VFpdJf9QyrQ5wFCLCVNtszTR25Pnda+6EAe3Mo9Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dynamixel-sdk/default.nix b/distros/noetic/dynamixel-sdk/default.nix index 7068b88daa..dec0dee515 100644 --- a/distros/noetic/dynamixel-sdk/default.nix +++ b/distros/noetic/dynamixel-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamixel-sdk"; version = "3.7.51-r4"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/DynamixelSDK-release/archive/release/noetic/dynamixel_sdk/3.7.51-4.tar.gz"; - name = "3.7.51-4.tar.gz"; - sha256 = "2af181d5c4a9fbadfaf2b4d52e26836aa038c22dcc233c85487712b7300a8c8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "DynamixelSDK-release"; + rev = "release/noetic/dynamixel_sdk/3.7.51-4"; + sha256 = "sha256-wTXs6YQHEhPL8cckdQ0sDogjfCPmOEQpGhWi5ao5EkU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dynamixel-workbench-controllers/default.nix b/distros/noetic/dynamixel-workbench-controllers/default.nix index d253e41944..49f477b311 100644 --- a/distros/noetic/dynamixel-workbench-controllers/default.nix +++ b/distros/noetic/dynamixel-workbench-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamixel-workbench-controllers"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-release/archive/release/noetic/dynamixel_workbench_controllers/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "0191c29aaa977c0ec9407d4743da05968a15cc97415f24bb845cc67e237bd6ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-release"; + rev = "release/noetic/dynamixel_workbench_controllers/2.2.1-1"; + sha256 = "sha256-wvyMaEAMuAzhi7Wcbhx9ikalj8HCofwBZ5J8lYZU4Rk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dynamixel-workbench-msgs/default.nix b/distros/noetic/dynamixel-workbench-msgs/default.nix index 1e829cff5a..6d975478cb 100644 --- a/distros/noetic/dynamixel-workbench-msgs/default.nix +++ b/distros/noetic/dynamixel-workbench-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamixel-workbench-msgs"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-msgs-release/archive/release/noetic/dynamixel_workbench_msgs/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "b77f92bb2a9927cb148b524e5132159fd3f536626b2742116f4b978c7951c088"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-msgs-release"; + rev = "release/noetic/dynamixel_workbench_msgs/2.0.2-2"; + sha256 = "sha256-tHd7uSD9J6bAJi1clistYePM0USmGEGyj+MeQm/iJOQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/dynamixel-workbench-operators/default.nix b/distros/noetic/dynamixel-workbench-operators/default.nix index e03542006b..23ee7f2dd0 100644 --- a/distros/noetic/dynamixel-workbench-operators/default.nix +++ b/distros/noetic/dynamixel-workbench-operators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamixel-workbench-operators"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-release/archive/release/noetic/dynamixel_workbench_operators/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "7a36a609437d621c5194faf13c738bad9d30721ca9d835d6be4f70b5e1a8e0fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-release"; + rev = "release/noetic/dynamixel_workbench_operators/2.2.1-1"; + sha256 = "sha256-ep75GQ0shZjm7SBFe5tkisMwgV6OM1IspCr37QTx+4w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dynamixel-workbench-toolbox/default.nix b/distros/noetic/dynamixel-workbench-toolbox/default.nix index 687829205d..e03dc381ed 100644 --- a/distros/noetic/dynamixel-workbench-toolbox/default.nix +++ b/distros/noetic/dynamixel-workbench-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamixel-workbench-toolbox"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-release/archive/release/noetic/dynamixel_workbench_toolbox/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "2c3513d9e4e8d1ac52e5c230c63ef6661cc74c97bd0cc1f71281fa11d2f56777"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-release"; + rev = "release/noetic/dynamixel_workbench_toolbox/2.2.1-1"; + sha256 = "sha256-yxy3ytmlFLHiKLcmdhJO4dXICLdRoAqq2h/YZKuq28o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/dynamixel-workbench/default.nix b/distros/noetic/dynamixel-workbench/default.nix index 4274d3d933..e562ef49b6 100644 --- a/distros/noetic/dynamixel-workbench/default.nix +++ b/distros/noetic/dynamixel-workbench/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-dynamixel-workbench"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/dynamixel-workbench-release/archive/release/noetic/dynamixel_workbench/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "d9ab814b23da7f58a8ef012d3c93c3c225340c5dd19d810b67a2093d6aac0b54"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "dynamixel-workbench-release"; + rev = "release/noetic/dynamixel_workbench/2.2.1-1"; + sha256 = "sha256-q61GkQtwb4+B5LBS7NrjpZynQj0xUDqXPR2zJXVNKH0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/easy-markers/default.nix b/distros/noetic/easy-markers/default.nix index b3399e34b8..a92dd32dfd 100644 --- a/distros/noetic/easy-markers/default.nix +++ b/distros/noetic/easy-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-easy-markers"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/noetic/easy_markers/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "6706cf26cb96afa9ee2aea827e3be776af427dd591d6cdfabbcc83f14cb6bc20"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/noetic/easy_markers/0.3.0-1"; + sha256 = "sha256-nEtiZ8GJns+g9bvQerxmJaM8SFzmthmI4Ss3DAoR5+s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-build/default.nix b/distros/noetic/ecl-build/default.nix index f5527c7b11..de62a7d79e 100644 --- a/distros/noetic/ecl-build/default.nix +++ b/distros/noetic/ecl-build/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-build"; version = "0.61.8-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/noetic/ecl_build/0.61.8-1.tar.gz"; - name = "0.61.8-1.tar.gz"; - sha256 = "fcfb4bd6e729545b04448786a1ab50b1496fc868391ae760d356561a852227e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/noetic/ecl_build/0.61.8-1"; + sha256 = "sha256-Ozch2lkzQNM3ejTVuvlHg8qUQkhDlhDkamLnUG92XLo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-command-line/default.nix b/distros/noetic/ecl-command-line/default.nix index 66d8ac6bb6..2d293d4b2e 100644 --- a/distros/noetic/ecl-command-line/default.nix +++ b/distros/noetic/ecl-command-line/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-command-line"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_command_line/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "b335dcdc6566bd392aa52b2e4a88fd8b9b7973227d0232cac74d25b6dd38239a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_command_line/0.62.3-1"; + sha256 = "sha256-mWUbZ23jx/WZvZMrSPQHa60ZS5iM/xzA00Ab1fLkPQU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-concepts/default.nix b/distros/noetic/ecl-concepts/default.nix index bd9ab886a6..c165a59d20 100644 --- a/distros/noetic/ecl-concepts/default.nix +++ b/distros/noetic/ecl-concepts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-concepts"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_concepts/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "ca986e4e7735e5afa7eb147248b82a7bb9f8aa5481da11ed0978f1cac537f417"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_concepts/0.62.3-1"; + sha256 = "sha256-bgWoUQjHVkyeflSFUt/hIUQItyOBupLqFll1C0n8grg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-config/default.nix b/distros/noetic/ecl-config/default.nix index 180653c5f8..8b721ea35b 100644 --- a/distros/noetic/ecl-config/default.nix +++ b/distros/noetic/ecl-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-config"; version = "0.61.6-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/noetic/ecl_config/0.61.6-1.tar.gz"; - name = "0.61.6-1.tar.gz"; - sha256 = "a9ea24d6890c90bd24d88ad48b5423e9cb07e9d8e682459173c92fb0dc015ec6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/noetic/ecl_config/0.61.6-1"; + sha256 = "sha256-0sot7I/1wIJE2Wd8WYEO3uM9LqX1znaq7dIaEKD91kk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-console/default.nix b/distros/noetic/ecl-console/default.nix index 647fe055a7..dda3ee84a3 100644 --- a/distros/noetic/ecl-console/default.nix +++ b/distros/noetic/ecl-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-console"; version = "0.61.6-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/noetic/ecl_console/0.61.6-1.tar.gz"; - name = "0.61.6-1.tar.gz"; - sha256 = "63176776ff8c55b804b1e31c543b03ea03b4b1fa901aa65ff3cce40f06499fc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/noetic/ecl_console/0.61.6-1"; + sha256 = "sha256-U80/WQjhe/jwjU3uIXnLoAiv6iYHRB6ZmIYmT25Lw6o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-containers/default.nix b/distros/noetic/ecl-containers/default.nix index a771e7364e..73ae0521cc 100644 --- a/distros/noetic/ecl-containers/default.nix +++ b/distros/noetic/ecl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-containers"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_containers/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "35524cfb59473cbf2e63c1899780fe96014925ddc96b8f6c02d390b91c4a4d26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_containers/0.62.3-1"; + sha256 = "sha256-4ZDdM9dt79EVqnwg6EYSvYLdh0T/kQmWRkX4mrxlkjs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-converters-lite/default.nix b/distros/noetic/ecl-converters-lite/default.nix index 0bd7f25b76..c08cdd54a2 100644 --- a/distros/noetic/ecl-converters-lite/default.nix +++ b/distros/noetic/ecl-converters-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-converters-lite"; version = "0.61.6-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/noetic/ecl_converters_lite/0.61.6-1.tar.gz"; - name = "0.61.6-1.tar.gz"; - sha256 = "dc53dde0c57b21b207c2d4fee29c7bacc566e401492b05e31e884f8876e43708"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/noetic/ecl_converters_lite/0.61.6-1"; + sha256 = "sha256-IfnDZd3OkuxUKkpmyp9nEu/l7BHnkCWWtcQlk7sm5Ak="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-converters/default.nix b/distros/noetic/ecl-converters/default.nix index e66de5124c..28083724b7 100644 --- a/distros/noetic/ecl-converters/default.nix +++ b/distros/noetic/ecl-converters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-converters"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_converters/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "9f2ed714c59a749e966239423ecda1f7e35c84bf9a74ddb99650c8dc6705873e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_converters/0.62.3-1"; + sha256 = "sha256-yJrx7NImsQBScnsZS/QF/RCiqAjy7VwgeTpeveo7x9g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-core-apps/default.nix b/distros/noetic/ecl-core-apps/default.nix index 8ad55d9b6c..125e3bc292 100644 --- a/distros/noetic/ecl-core-apps/default.nix +++ b/distros/noetic/ecl-core-apps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-core-apps"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_core_apps/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "56f1d22a224461a12e76c84341d6c917f39705e4d15525f93ed9dfb250f0ebc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_core_apps/0.62.3-1"; + sha256 = "sha256-0qCkBbkIJWOGRDp3q3HWHkGu+tYpejSNYb5bqabeP6Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-core/default.nix b/distros/noetic/ecl-core/default.nix index 0ebd08a7c3..b579055356 100644 --- a/distros/noetic/ecl-core/default.nix +++ b/distros/noetic/ecl-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-core"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_core/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "8370d36c81a97f43a32b2c7019d6675acf6cfc4765dd707397e3f73a0b8ed8a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_core/0.62.3-1"; + sha256 = "sha256-CQY5ftHeRmpvcgQwED78EEONCncU7a4TvAqusslo/BM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-devices/default.nix b/distros/noetic/ecl-devices/default.nix index 65046477e0..6e37d94ba8 100644 --- a/distros/noetic/ecl-devices/default.nix +++ b/distros/noetic/ecl-devices/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-devices"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_devices/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "d25c30f708faaf5f62b827ba45033950a8cd4c87a39cab5cbe6900774c03264e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_devices/0.62.3-1"; + sha256 = "sha256-NH85W4xb0AnWCI24EUB3RqkIfA7P+9mZi4869Y5FtX0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-eigen/default.nix b/distros/noetic/ecl-eigen/default.nix index 93644d8179..17c09c1094 100644 --- a/distros/noetic/ecl-eigen/default.nix +++ b/distros/noetic/ecl-eigen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-eigen"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_eigen/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "9704ee0c76f3fbce656f22cf38f0af3d28a57405cfedcb805ec12c3e6408abff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_eigen/0.62.3-1"; + sha256 = "sha256-QnNji8A1hEwOVConctXUfXJ+ZYKminsVXWIos27rpPE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/ecl-errors/default.nix b/distros/noetic/ecl-errors/default.nix index beebd7f0be..b32cfc9af9 100644 --- a/distros/noetic/ecl-errors/default.nix +++ b/distros/noetic/ecl-errors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-errors"; version = "0.61.6-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/noetic/ecl_errors/0.61.6-1.tar.gz"; - name = "0.61.6-1.tar.gz"; - sha256 = "d653796a07f7e8491cd9426028c9a2e040c8f28eba489fef23c0b06085752d9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/noetic/ecl_errors/0.61.6-1"; + sha256 = "sha256-4DIby9C1Z0gGOjQxuV9Mk11JDhEd/0U5Ng2Qgkw0yQs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-exceptions/default.nix b/distros/noetic/ecl-exceptions/default.nix index 416930549b..afb7222a58 100644 --- a/distros/noetic/ecl-exceptions/default.nix +++ b/distros/noetic/ecl-exceptions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-exceptions"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_exceptions/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "628711cbc195b9e839014887790d1ac2f793025c99e8f1bf1d84ed9cb8391d17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_exceptions/0.62.3-1"; + sha256 = "sha256-cRYtt62yUkboclp7HFDslz37y5Aqn7TIxhgMq4HhhQg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-filesystem/default.nix b/distros/noetic/ecl-filesystem/default.nix index 5ea1f152bc..fb63713c8d 100644 --- a/distros/noetic/ecl-filesystem/default.nix +++ b/distros/noetic/ecl-filesystem/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-filesystem"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_filesystem/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "00aa5f749c876148911be2f179efc2f46bb0c8cd5c3f8c9e6417a927dc086861"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_filesystem/0.62.3-1"; + sha256 = "sha256-fXkC9yMKUR8KTi64ig1M+liufswaRdrGZVtxWhmRn3s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-formatters/default.nix b/distros/noetic/ecl-formatters/default.nix index d04a6005cf..645035c80d 100644 --- a/distros/noetic/ecl-formatters/default.nix +++ b/distros/noetic/ecl-formatters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-formatters"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_formatters/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "ba5fde09f5c98585e99e3d20dce7f757fa7c37260b500108b7069b5a40ee32d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_formatters/0.62.3-1"; + sha256 = "sha256-qXwl7mb1e+d4y+FbJsoxsshUnOI249FwEdz56Ufu9uQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-geometry/default.nix b/distros/noetic/ecl-geometry/default.nix index 13368a3bdf..6d7d556cd0 100644 --- a/distros/noetic/ecl-geometry/default.nix +++ b/distros/noetic/ecl-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-geometry"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_geometry/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "3e788ecb243ac6521fd266f8178b9207d0b7ce13dfc9fe7bc2311a1f6e17e63b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_geometry/0.62.3-1"; + sha256 = "sha256-EeJaMJb6R1FMXRHMIXEpnwLCLoBrNp2egWZYmtZTf2w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-io/default.nix b/distros/noetic/ecl-io/default.nix index fbc30f072c..78964bdeb7 100644 --- a/distros/noetic/ecl-io/default.nix +++ b/distros/noetic/ecl-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-io"; version = "0.61.6-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/noetic/ecl_io/0.61.6-1.tar.gz"; - name = "0.61.6-1.tar.gz"; - sha256 = "9f99aa8e629d50743ff16d5fbcaa9a74b8af4a824b1c3250ed43a0cbb5dae588"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/noetic/ecl_io/0.61.6-1"; + sha256 = "sha256-BzfnkqKow3+4/LaN7sRKgwfZMKGLjTot/RWiYPhc7wA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-ipc/default.nix b/distros/noetic/ecl-ipc/default.nix index 309d69d094..cc13b04222 100644 --- a/distros/noetic/ecl-ipc/default.nix +++ b/distros/noetic/ecl-ipc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-ipc"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_ipc/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "34c58eb9fea5505ed920f8a88e10c5c3d97a18928999a34334689b69de9fad80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_ipc/0.62.3-1"; + sha256 = "sha256-Hvl/b0qZR8VGDnV6sExmpbh7tbAWKSQFrrbKC7UjV20="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-license/default.nix b/distros/noetic/ecl-license/default.nix index 3fd6cc27ff..1a5523738e 100644 --- a/distros/noetic/ecl-license/default.nix +++ b/distros/noetic/ecl-license/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-license"; version = "0.61.8-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/noetic/ecl_license/0.61.8-1.tar.gz"; - name = "0.61.8-1.tar.gz"; - sha256 = "4e3a7c697758861f96edcbebec01a3c9bd24d04da7b045a01ca66e413977a478"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/noetic/ecl_license/0.61.8-1"; + sha256 = "sha256-Ae8Cu9bRM9wxuMIwPLmO7H3J+cR+hnKFjAa4DB/tG7U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-linear-algebra/default.nix b/distros/noetic/ecl-linear-algebra/default.nix index 94f9676bf8..fa7519e4d1 100644 --- a/distros/noetic/ecl-linear-algebra/default.nix +++ b/distros/noetic/ecl-linear-algebra/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-linear-algebra"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_linear_algebra/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "6654eee4925d4979632e46ab357a7756ded61edb1a488e63ecb49b2b0ce290c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_linear_algebra/0.62.3-1"; + sha256 = "sha256-dgd1A/Los1c/WjW9cXLBXbDvcSMFgzxIdQdaaIS+xeM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-lite/default.nix b/distros/noetic/ecl-lite/default.nix index 09436eba36..02b7144db5 100644 --- a/distros/noetic/ecl-lite/default.nix +++ b/distros/noetic/ecl-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-lite"; version = "0.61.6-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/noetic/ecl_lite/0.61.6-1.tar.gz"; - name = "0.61.6-1.tar.gz"; - sha256 = "f39f774a0b9ad3bf9d50e6854a5b354016559dfc7e111f4992f098ec415d5586"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/noetic/ecl_lite/0.61.6-1"; + sha256 = "sha256-+aO11JAcqDfLzHAoQ+7m7x5ponH/sAxnsV1LACmzH/E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-math/default.nix b/distros/noetic/ecl-math/default.nix index ded3471217..f1d897be89 100644 --- a/distros/noetic/ecl-math/default.nix +++ b/distros/noetic/ecl-math/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-math"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_math/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "da5a2d63538ebc983af647fef48ff0173b1119eb7d9b4de89a5849012adc7c4d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_math/0.62.3-1"; + sha256 = "sha256-PRwdl42b6z20EXmH2UzmR4Zv2Q5mqI4KfF/Nznt/enE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-mobile-robot/default.nix b/distros/noetic/ecl-mobile-robot/default.nix index 92065167ca..7682725203 100644 --- a/distros/noetic/ecl-mobile-robot/default.nix +++ b/distros/noetic/ecl-mobile-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-mobile-robot"; version = "0.60.3-r2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_navigation-release/archive/release/noetic/ecl_mobile_robot/0.60.3-2.tar.gz"; - name = "0.60.3-2.tar.gz"; - sha256 = "bfd9dd999ab1344955ad66705249d1a109700da5fb80fddb6fc2d09e232d0ca2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_navigation-release"; + rev = "release/noetic/ecl_mobile_robot/0.60.3-2"; + sha256 = "sha256-51CJT+8WnuwK3b3txeAPa7U0mNSxeC7/ndBmD+yTTv0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-mpl/default.nix b/distros/noetic/ecl-mpl/default.nix index a952c54e20..f7b6d65516 100644 --- a/distros/noetic/ecl-mpl/default.nix +++ b/distros/noetic/ecl-mpl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-mpl"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_mpl/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "9d52b486b17768f60ea316403f1aa545153fae2331d7c7b09b5063b7e6d91f84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_mpl/0.62.3-1"; + sha256 = "sha256-gb5hfX7hhzbccuMCYkxhLfRyklv1AGwgmEOthfMBub8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-navigation/default.nix b/distros/noetic/ecl-navigation/default.nix index 849a24158e..df345aad0b 100644 --- a/distros/noetic/ecl-navigation/default.nix +++ b/distros/noetic/ecl-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-navigation"; version = "0.60.3-r2"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_navigation-release/archive/release/noetic/ecl_navigation/0.60.3-2.tar.gz"; - name = "0.60.3-2.tar.gz"; - sha256 = "10a7f173506208bbe293df32893d3f5581d6b19a6315f6fac036d91666054aa7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_navigation-release"; + rev = "release/noetic/ecl_navigation/0.60.3-2"; + sha256 = "sha256-z63hJpfoyqhP8rI/Ri/3Kt+em5xuoOr0LSYOyW1LPVU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-sigslots-lite/default.nix b/distros/noetic/ecl-sigslots-lite/default.nix index 4d9ff11ca8..0ddc7a7515 100644 --- a/distros/noetic/ecl-sigslots-lite/default.nix +++ b/distros/noetic/ecl-sigslots-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-sigslots-lite"; version = "0.61.6-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/noetic/ecl_sigslots_lite/0.61.6-1.tar.gz"; - name = "0.61.6-1.tar.gz"; - sha256 = "a39f77f28ffbde76c8d230b4c0b61261ed20b9c480220dd5c3db9a30cb472181"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/noetic/ecl_sigslots_lite/0.61.6-1"; + sha256 = "sha256-XRh+v69rNxpzDX3jNqCvJ14M9uF2Xe78WIKnnBt2rb8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-sigslots/default.nix b/distros/noetic/ecl-sigslots/default.nix index 1b0f990965..f2f34b38a1 100644 --- a/distros/noetic/ecl-sigslots/default.nix +++ b/distros/noetic/ecl-sigslots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-sigslots"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_sigslots/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "38a1cccb17b81e055ae00a2e4c4fa1a4dfb990143209077d67553ceb5bf69873"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_sigslots/0.62.3-1"; + sha256 = "sha256-Eg5ThkPbDsDuHB3Zc9qU5Lm0b+cgq4G64BG+oK5xl34="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-statistics/default.nix b/distros/noetic/ecl-statistics/default.nix index e8015ccd31..b9ce766507 100644 --- a/distros/noetic/ecl-statistics/default.nix +++ b/distros/noetic/ecl-statistics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-statistics"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_statistics/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "e067ac97b7e596d086fdbbeb6b31ef268bb7fe7fe63c76ffb40e5be3ff350af5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_statistics/0.62.3-1"; + sha256 = "sha256-EsUxs924h15HjwhOWwIaWpU8KZWSGMnjb/nyth5pWRc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-streams/default.nix b/distros/noetic/ecl-streams/default.nix index 87faba2550..79534c244e 100644 --- a/distros/noetic/ecl-streams/default.nix +++ b/distros/noetic/ecl-streams/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-streams"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_streams/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "6978f56fd03e6f3d7ca205c50af68634fa04a7f02d4a81b28053bf6551fe08d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_streams/0.62.3-1"; + sha256 = "sha256-Tw+IGR+9xAevqH0SkRsotrK5NQLewJ5uuBk+UsuVtZc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-threads/default.nix b/distros/noetic/ecl-threads/default.nix index 67310ae8a7..c6e10c66dc 100644 --- a/distros/noetic/ecl-threads/default.nix +++ b/distros/noetic/ecl-threads/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-threads"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_threads/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "14e5043e44dc02ad4b3750e34f6ec4918d71eb31d2375c3d1e24fb8740442027"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_threads/0.62.3-1"; + sha256 = "sha256-FkptCzZdD8z6lHaY0POzIzOCLsH2lpYM7JFCQUSQc0c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-time-lite/default.nix b/distros/noetic/ecl-time-lite/default.nix index 4bae56c71c..71e7d909a5 100644 --- a/distros/noetic/ecl-time-lite/default.nix +++ b/distros/noetic/ecl-time-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-time-lite"; version = "0.61.6-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/noetic/ecl_time_lite/0.61.6-1.tar.gz"; - name = "0.61.6-1.tar.gz"; - sha256 = "bffb469391c6ad528bba012ff940e0a8bc7530ed88b8b65b7dbdab686299626c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/noetic/ecl_time_lite/0.61.6-1"; + sha256 = "sha256-IwuMiDMWl6J6eL+qDd/gIs3NksOJuavR62+ED3Maqbk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-time/default.nix b/distros/noetic/ecl-time/default.nix index dccc89087e..8dd70190cb 100644 --- a/distros/noetic/ecl-time/default.nix +++ b/distros/noetic/ecl-time/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-time"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_time/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "e0d43cb6938c7d34f61cfc74f608509a9c95de0c6715f5e718cf90ea544a4b26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_time/0.62.3-1"; + sha256 = "sha256-7p4qF9rgBW5ndWJVZudwk5zeMf+nO7R0rVIjuR+Um70="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-tools/default.nix b/distros/noetic/ecl-tools/default.nix index cf03293358..606be2242a 100644 --- a/distros/noetic/ecl-tools/default.nix +++ b/distros/noetic/ecl-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-tools"; version = "0.61.8-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/noetic/ecl_tools/0.61.8-1.tar.gz"; - name = "0.61.8-1.tar.gz"; - sha256 = "c19172914ff3bcf92704c93a082382294b7b815a145ef5bce9f9a00b05274e96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/noetic/ecl_tools/0.61.8-1"; + sha256 = "sha256-IMbWk3ilrBgqjTCdHPUcDcDQNRqabzpGns+a64ac/ps="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-type-traits/default.nix b/distros/noetic/ecl-type-traits/default.nix index 947e784b25..8b1ebb5f65 100644 --- a/distros/noetic/ecl-type-traits/default.nix +++ b/distros/noetic/ecl-type-traits/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-type-traits"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_type_traits/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "3c344d595c1070b7aa7a44e669e201dbb9683f945cb668fe50b378fc25d199b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_type_traits/0.62.3-1"; + sha256 = "sha256-w0ZJ/PlCKFXoLluOw7mmMlTVEGznzQx4N6a5XtzT2sc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ecl-utilities/default.nix b/distros/noetic/ecl-utilities/default.nix index 1c8be6a753..7f69791536 100644 --- a/distros/noetic/ecl-utilities/default.nix +++ b/distros/noetic/ecl-utilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ecl-utilities"; version = "0.62.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/noetic/ecl_utilities/0.62.3-1.tar.gz"; - name = "0.62.3-1.tar.gz"; - sha256 = "aa61adc8fb24b902f8bd38b59fa1982b4335197ebf2a4c776fbe26a13a20f72e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/noetic/ecl_utilities/0.62.3-1"; + sha256 = "sha256-ezrRHIJBvLo8AKvPtqGfEYvyoHCXC6E0oQecodOR/Hc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/effort-controllers/default.nix b/distros/noetic/effort-controllers/default.nix index ba5186925c..0725de8c03 100644 --- a/distros/noetic/effort-controllers/default.nix +++ b/distros/noetic/effort-controllers/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, catkin, control-msgs, control-toolbox, controller-interface, controller-manager, forward-command-controller, hardware-interface, joint-state-controller, pluginlib, realtime-tools, robot-state-publisher, roscpp, rosgraph-msgs, rostest, sensor-msgs, std-msgs, urdf, xacro }: buildRosPackage { pname = "ros-noetic-effort-controllers"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/effort_controllers/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "d8a504ae0f9a64d8143dc1752b24571f59df7ecda9465439e0e29b76e903883d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/effort_controllers/0.21.1-1"; + sha256 = "sha256-jW6fex8ItM7Op3hk8r0jefX0Yxi3T6spHrm5u/aWxQE="; + }; buildType = "catkin"; buildInputs = [ angles catkin pluginlib ]; diff --git a/distros/noetic/eigen-conversions/default.nix b/distros/noetic/eigen-conversions/default.nix index b163c7a376..9db465b483 100644 --- a/distros/noetic/eigen-conversions/default.nix +++ b/distros/noetic/eigen-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eigen-conversions"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/noetic/eigen_conversions/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "e6d86b7c9644726e18547a077a21715f90186140f3b9fd6dd11bc1baa4e0656f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/noetic/eigen_conversions/1.13.2-1"; + sha256 = "sha256-y+VcjMNBeujPHPQyEIC9bYWlZjEwooFCuETTBloMwyE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/eigen-stl-containers/default.nix b/distros/noetic/eigen-stl-containers/default.nix index c246ed3ff6..93360d8e5b 100644 --- a/distros/noetic/eigen-stl-containers/default.nix +++ b/distros/noetic/eigen-stl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eigen-stl-containers"; version = "0.1.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/eigen_stl_containers-release/archive/release/noetic/eigen_stl_containers/0.1.8-1.tar.gz"; - name = "0.1.8-1.tar.gz"; - sha256 = "429b113a5389a4a38b94d79def3bb8acc51f9589fb97013adf9d3a716d026a18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "eigen_stl_containers-release"; + rev = "release/noetic/eigen_stl_containers/0.1.8-1"; + sha256 = "sha256-2TsWKbxVYO7Di2JWs/jt9UEM6wHbIQJNuk0Vn8xAg2E="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/eigenpy/default.nix b/distros/noetic/eigenpy/default.nix index eb382acb1c..f21443e184 100644 --- a/distros/noetic/eigenpy/default.nix +++ b/distros/noetic/eigenpy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cmake, doxygen, eigen, git, python3, python3Packages }: buildRosPackage { pname = "ros-noetic-eigenpy"; - version = "2.8.1-r1"; + version = "2.9.1-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/eigenpy-ros-release/archive/release/noetic/eigenpy/2.8.1-1.tar.gz"; - name = "2.8.1-1.tar.gz"; - sha256 = "cbb7dfd91f3547c084258489d96f85520b8c6dd89fd71a3c5ec9376ac93fc486"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "eigenpy-ros-release"; + rev = "release/noetic/eigenpy/2.9.1-1"; + sha256 = "sha256-2kbEvQjNSxspLn00KGPFkYXcn1y8bugXKmYPxYvq07Y="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/noetic/eiquadprog/default.nix b/distros/noetic/eiquadprog/default.nix index e4e8030cd5..58e2685e28 100644 --- a/distros/noetic/eiquadprog/default.nix +++ b/distros/noetic/eiquadprog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eiquadprog"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/eiquadprog-ros-release/archive/release/noetic/eiquadprog/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "345aec2ab0fb04454100d4d7a75b9e30b91355efe9b8796be2a584a61debae3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "eiquadprog-ros-release"; + rev = "release/noetic/eiquadprog/1.2.5-1"; + sha256 = "sha256-70Gnb9UgIVTLKdrPg8jJuHY+tS1xJTCfhNmQGXsAtZw="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/noetic/eml/default.nix b/distros/noetic/eml/default.nix index f373350f58..fc99b77b4c 100644 --- a/distros/noetic/eml/default.nix +++ b/distros/noetic/eml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eml"; version = "1.8.15-r7"; - src = fetchurl { - url = "https://github.com/ros-gbp/eml-release/archive/release/noetic/eml/1.8.15-7.tar.gz"; - name = "1.8.15-7.tar.gz"; - sha256 = "6144c6c41ee52929ac4063e0c79e33bae44f2ba3ea823299b8e383b0bc3b6f68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "eml-release"; + rev = "release/noetic/eml/1.8.15-7"; + sha256 = "sha256-HP3KESy54+mdSgrqcRtVaj7lqSUhMVVa9YB4ILizFwo="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/end-effector/default.nix b/distros/noetic/end-effector/default.nix index 00de79619b..83f36a579f 100644 --- a/distros/noetic/end-effector/default.nix +++ b/distros/noetic/end-effector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-end-effector"; version = "1.0.6-r2"; - src = fetchurl { - url = "https://github.com/ADVRHumanoids/ROSEndEffector-release/archive/release/noetic/end_effector/1.0.6-2.tar.gz"; - name = "1.0.6-2.tar.gz"; - sha256 = "c6716d446907ced796b669ebde7b12103cb5c532035c329b40d36f611d9c5edc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ADVRHumanoids"; + repo = "ROSEndEffector-release"; + rev = "release/noetic/end_effector/1.0.6-2"; + sha256 = "sha256-qNG84bFQrv2nJhG77gjKzIBSk4te/eT9PabjE6tA06c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/er-public-msgs/default.nix b/distros/noetic/er-public-msgs/default.nix index 5cdbb8e489..842c29d52f 100644 --- a/distros/noetic/er-public-msgs/default.nix +++ b/distros/noetic/er-public-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-er-public-msgs"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/enabled-robotics/er_public_msgs-release/archive/release/noetic/er_public_msgs/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "8b3a5ea6bd66d117c64698d536344509f4c399541dc22f7b55d967a407ad2c4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "enabled-robotics"; + repo = "er_public_msgs-release"; + rev = "release/noetic/er_public_msgs/1.4.0-1"; + sha256 = "sha256-i5RtfMdO7CyQSySWTit9z+oBmDbEHNTxst/L0qiVoDM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ergodic-exploration/default.nix b/distros/noetic/ergodic-exploration/default.nix index 3c1034e6a3..bc8e00a1e2 100644 --- a/distros/noetic/ergodic-exploration/default.nix +++ b/distros/noetic/ergodic-exploration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ergodic-exploration"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/bostoncleek/ergodic_exploration-release/archive/release/noetic/ergodic_exploration/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "d2e81bb6a8707add0d3ea8178e3e770dd865fdbdec36b515e477ce27d1e40ec5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "bostoncleek"; + repo = "ergodic_exploration-release"; + rev = "release/noetic/ergodic_exploration/1.0.0-2"; + sha256 = "sha256-/cUrh8AcZZZum43UDTN7yp6ULAY271aSygjagGJGITo="; + }; buildType = "catkin"; buildInputs = [ catkin geometry-msgs nav-msgs sensor-msgs tf2 visualization-msgs ]; diff --git a/distros/noetic/ess-imu-ros1-uart-driver/default.nix b/distros/noetic/ess-imu-ros1-uart-driver/default.nix index 0d2540359e..e5bd15c299 100644 --- a/distros/noetic/ess-imu-ros1-uart-driver/default.nix +++ b/distros/noetic/ess-imu-ros1-uart-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ess-imu-ros1-uart-driver"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/cubicleguy/ess_imu_ros1_uart_driver-release/archive/release/noetic/ess_imu_ros1_uart_driver/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "01905810b6dac9f0eb5d220c674f31ad5c95c0bf65bd7d056ab1b535d688ba69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cubicleguy"; + repo = "ess_imu_ros1_uart_driver-release"; + rev = "release/noetic/ess_imu_ros1_uart_driver/1.3.2-1"; + sha256 = "sha256-lKTY40ilPKvGfTF0wYF9q0Acp6eAdeqTOTsgNaPjRtA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ethercat-grant/default.nix b/distros/noetic/ethercat-grant/default.nix index 215f62e023..105b49ec9f 100644 --- a/distros/noetic/ethercat-grant/default.nix +++ b/distros/noetic/ethercat-grant/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ethercat-grant"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/shadow-robot/ethercat_grant-release/archive/release/noetic/ethercat_grant/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "4facbf12c0533551d600f3518b49560f9ddde5c9c9b2e30437765f197e4f419c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "shadow-robot"; + repo = "ethercat_grant-release"; + rev = "release/noetic/ethercat_grant/0.3.2-1"; + sha256 = "sha256-WZ2KN2JIGpwWrwplBHK0/NvGFR+8Qb76EJzPqkcErNw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ethercat-hardware/default.nix b/distros/noetic/ethercat-hardware/default.nix index b7b60fab86..a97fef2bf1 100644 --- a/distros/noetic/ethercat-hardware/default.nix +++ b/distros/noetic/ethercat-hardware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ethercat-hardware"; version = "1.9.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_ethercat_drivers-release/archive/release/noetic/ethercat_hardware/1.9.0-1.tar.gz"; - name = "1.9.0-1.tar.gz"; - sha256 = "3371eebcc2688f122467e861a6ca78f6a7c29d68013ee3e0f3ea8ebac7f9e879"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_ethercat_drivers-release"; + rev = "release/noetic/ethercat_hardware/1.9.0-1"; + sha256 = "sha256-Deicyoz7+HWA/XY/e/wyD22USZPmqfAkA4wK912Osi0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ethercat-trigger-controllers/default.nix b/distros/noetic/ethercat-trigger-controllers/default.nix index 30d652fc81..fc8c7a966e 100644 --- a/distros/noetic/ethercat-trigger-controllers/default.nix +++ b/distros/noetic/ethercat-trigger-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ethercat-trigger-controllers"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/ethercat_trigger_controllers/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "76eadb510379a0887d67d78299cadf476fd5f4c91465b696b132a551d06ff51d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/ethercat_trigger_controllers/1.10.18-1"; + sha256 = "sha256-YJMLlFQI+Ao5BlXb0czCy7Wb0S1tRsRbisEImyrvIHg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/eus-assimp/default.nix b/distros/noetic/eus-assimp/default.nix index 131853c130..c980ad7a85 100644 --- a/distros/noetic/eus-assimp/default.nix +++ b/distros/noetic/eus-assimp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eus-assimp"; version = "0.4.4-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_model_tools-release/archive/release/noetic/eus_assimp/0.4.4-2.tar.gz"; - name = "0.4.4-2.tar.gz"; - sha256 = "0fb75b49127281e801e04d76051da15d7a8c2eac4fbf4505d63b09a99850d865"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_model_tools-release"; + rev = "release/noetic/eus_assimp/0.4.4-2"; + sha256 = "sha256-CMHByMDzOib51C2dAVuQsUGaq2BxiaO9DrscI6qlhgo="; + }; buildType = "catkin"; buildInputs = [ catkin euslisp pkg-config ]; diff --git a/distros/noetic/eus-nlopt/default.nix b/distros/noetic/eus-nlopt/default.nix index a5f06e6f26..d9690760dd 100644 --- a/distros/noetic/eus-nlopt/default.nix +++ b/distros/noetic/eus-nlopt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eus-nlopt"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/eus_nlopt/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "5186b178134bff35d8064f7552afe8432908468bd21fb4183d9f87ba7d95a3dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/eus_nlopt/0.1.16-1"; + sha256 = "sha256-Jz08rmBtorxg68B90T8vak4XpnL2izQOYuf4/Pe+MWY="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/eus-qp/default.nix b/distros/noetic/eus-qp/default.nix index be22a6ca29..88a4a5ef0a 100644 --- a/distros/noetic/eus-qp/default.nix +++ b/distros/noetic/eus-qp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eus-qp"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/eus_qp/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "8a78331785cdceaceeff24a7f2eadff219ec60dd87f2c5ccadac5965e2114a69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/eus_qp/0.1.16-1"; + sha256 = "sha256-rkmWhz1+yp5vrD7NOzfB5KmIRD1HIv7MG2ZmKR6N3y8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules rostest ]; diff --git a/distros/noetic/eus-qpoases/default.nix b/distros/noetic/eus-qpoases/default.nix index 9b01663580..310c269f6e 100644 --- a/distros/noetic/eus-qpoases/default.nix +++ b/distros/noetic/eus-qpoases/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eus-qpoases"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/eus_qpoases/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "bd44cf3c675c6e7a99ba32de3ffe7c9f41750ec43b7ff6b2ee24550b9521f627"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/eus_qpoases/0.1.16-1"; + sha256 = "sha256-/6xrnKQ41J06L5LrKUh+c9qrOjMzXihJ4jwKpSfRUis="; + }; buildType = "catkin"; buildInputs = [ catkin subversion ]; diff --git a/distros/noetic/euscollada/default.nix b/distros/noetic/euscollada/default.nix index 71e0e0b784..e3aaac2fe6 100644 --- a/distros/noetic/euscollada/default.nix +++ b/distros/noetic/euscollada/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-euscollada"; version = "0.4.4-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_model_tools-release/archive/release/noetic/euscollada/0.4.4-2.tar.gz"; - name = "0.4.4-2.tar.gz"; - sha256 = "b5fa910e58ddba38c42ae3063d931e0d4c4793693522cb946e431708ac502dbb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_model_tools-release"; + rev = "release/noetic/euscollada/0.4.4-2"; + sha256 = "sha256-jKiYH0BKHFb5VQ++v8rEQvMJTClGOSTqbeoyXKLaqsw="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules mk rosboost-cfg rosbuild ]; diff --git a/distros/noetic/euslime/default.nix b/distros/noetic/euslime/default.nix index 49e8ca9214..0f6d579b3d 100644 --- a/distros/noetic/euslime/default.nix +++ b/distros/noetic/euslime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-euslime"; version = "1.1.4-r4"; - src = fetchurl { - url = "https://github.com/jsk-ros-pkg/euslime-release/archive/release/noetic/euslime/1.1.4-4.tar.gz"; - name = "1.1.4-4.tar.gz"; - sha256 = "9871d29d0c142d3923cd48c5a01919aebb2dfa7acf8b0c01192becde7f34bfee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "jsk-ros-pkg"; + repo = "euslime-release"; + rev = "release/noetic/euslime/1.1.4-4"; + sha256 = "sha256-THE3p1Yz+wOa5fYMaN+S4CZpjQFV/JtFrjXeX7A6jZk="; + }; buildType = "catkin"; buildInputs = [ catkin catkin-virtualenv ]; diff --git a/distros/noetic/euslisp/default.nix b/distros/noetic/euslisp/default.nix index 53bf1cc7c0..10fd7446b1 100644 --- a/distros/noetic/euslisp/default.nix +++ b/distros/noetic/euslisp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-euslisp"; version = "9.29.0-r1"; - src = fetchurl { - url = "https://github.com/tork-a/euslisp-release/archive/release/noetic/euslisp/9.29.0-1.tar.gz"; - name = "9.29.0-1.tar.gz"; - sha256 = "ecbf0b5ab05617eac190bb25eaf140fe576d01de47e779b5ad9c2a911d800693"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "euslisp-release"; + rev = "release/noetic/euslisp/9.29.0-1"; + sha256 = "sha256-7k/fAypjRjMND+c6MMIEjWyE5z0lTYJjtJESJne/WDg="; + }; buildType = "cmake"; buildInputs = [ catkin cmake-modules mk ]; diff --git a/distros/noetic/eusurdf/default.nix b/distros/noetic/eusurdf/default.nix index f27a74c78c..9541f0e592 100644 --- a/distros/noetic/eusurdf/default.nix +++ b/distros/noetic/eusurdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-eusurdf"; version = "0.4.4-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_model_tools-release/archive/release/noetic/eusurdf/0.4.4-2.tar.gz"; - name = "0.4.4-2.tar.gz"; - sha256 = "ddc05b743572e8dc8e9ac5ed0b1898030cd1603dcab5483db037d8074f728532"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_model_tools-release"; + rev = "release/noetic/eusurdf/0.4.4-2"; + sha256 = "sha256-RPIEw9htKgsXZ4hb6vjPYQeRWgJz5EZKxdbop97NaBM="; + }; buildType = "catkin"; buildInputs = [ catkin roseus ]; diff --git a/distros/noetic/executive-smach-visualization/default.nix b/distros/noetic/executive-smach-visualization/default.nix index a552948de4..313cedb708 100644 --- a/distros/noetic/executive-smach-visualization/default.nix +++ b/distros/noetic/executive-smach-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-executive-smach-visualization"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/jbohren/executive_smach_visualization-release/archive/release/noetic/executive_smach_visualization/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "937ce2d673fa25af3af7ef9f7200827bedbefac86e3e347519e4c405c408ebff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "jbohren"; + repo = "executive_smach_visualization-release"; + rev = "release/noetic/executive_smach_visualization/4.0.1-1"; + sha256 = "sha256-+AYysjmP/ZwZNvlVe2q+B8ObyGXp1JlyZbwGo3ccswY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/executive-smach/default.nix b/distros/noetic/executive-smach/default.nix index b3c5200e3b..594eac8789 100644 --- a/distros/noetic/executive-smach/default.nix +++ b/distros/noetic/executive-smach/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-executive-smach"; version = "2.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/executive_smach-release/archive/release/noetic/executive_smach/2.5.0-1.tar.gz"; - name = "2.5.0-1.tar.gz"; - sha256 = "bbdeca738f41610a184f7cab0168311cb7531661a75c9e1c5e143392a2959735"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "executive_smach-release"; + rev = "release/noetic/executive_smach/2.5.0-1"; + sha256 = "sha256-knkJaIO44Ue0XfLTUMdOHkGHk48mEn5HMd8D97wFL7E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-aico-solver/default.nix b/distros/noetic/exotica-aico-solver/default.nix index 0d1c240d7e..2688652bb8 100644 --- a/distros/noetic/exotica-aico-solver/default.nix +++ b/distros/noetic/exotica-aico-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-aico-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_aico_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "8c868d4729ae7b7d00eef65fd4f9ab60bf97e1321f39d0583dfaff92754e0e3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_aico_solver/6.2.0-1"; + sha256 = "sha256-XGMugHnBgoMkIp3U3Jn9dsn5l14AMAFBiigygbodZsQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-cartpole-dynamics-solver/default.nix b/distros/noetic/exotica-cartpole-dynamics-solver/default.nix index 4e1379cf94..18a4749566 100644 --- a/distros/noetic/exotica-cartpole-dynamics-solver/default.nix +++ b/distros/noetic/exotica-cartpole-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-cartpole-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_cartpole_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "baa1d842aa76a78e30f715e34ee6c7875ed6fbe1c303f7da57967671c6bef9bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_cartpole_dynamics_solver/6.2.0-1"; + sha256 = "sha256-46GX8+6hpXfuZFwnn2TnQy+Dq+eN0iPxfFnJ+uBjSm0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-collision-scene-fcl-latest/default.nix b/distros/noetic/exotica-collision-scene-fcl-latest/default.nix index 55ad033431..a1e3b31f7b 100644 --- a/distros/noetic/exotica-collision-scene-fcl-latest/default.nix +++ b/distros/noetic/exotica-collision-scene-fcl-latest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-collision-scene-fcl-latest"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_collision_scene_fcl_latest/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "4498a661edc5aaf4f04f356ad9a44b69a2e16b3767cf37a3b4bd605dbc8145d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_collision_scene_fcl_latest/6.2.0-1"; + sha256 = "sha256-U8N+5YjAsxmFGGGCXCyo8NByX7mRvwGxfna494d3Bh4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-core-task-maps/default.nix b/distros/noetic/exotica-core-task-maps/default.nix index 1aec5723d8..31812f0622 100644 --- a/distros/noetic/exotica-core-task-maps/default.nix +++ b/distros/noetic/exotica-core-task-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-core-task-maps"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_core_task_maps/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "0da5ac478efdaa7523c292c1332139d33b948a4df6297e4324ca9d142fbf45aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_core_task_maps/6.2.0-1"; + sha256 = "sha256-m8KH231s/FWOrD0gsM166x4VlyOxRPlIn7jCpYROvzY="; + }; buildType = "catkin"; buildInputs = [ catkin eigen-conversions ]; diff --git a/distros/noetic/exotica-core/default.nix b/distros/noetic/exotica-core/default.nix index 0e56c3b21f..6e221a4a82 100644 --- a/distros/noetic/exotica-core/default.nix +++ b/distros/noetic/exotica-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-core"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_core/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "e5a0d4c3011d40a110dacdbb595f0bc0cbfb55eab42da9d5bfdb644453aab6ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_core/6.2.0-1"; + sha256 = "sha256-bZkCdjLIfsm/yUwst5sQfNWLgUFscWWpth9oJpOMPDw="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/exotica-ddp-solver/default.nix b/distros/noetic/exotica-ddp-solver/default.nix index 98132e2500..6f53a7dd50 100644 --- a/distros/noetic/exotica-ddp-solver/default.nix +++ b/distros/noetic/exotica-ddp-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-ddp-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_ddp_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "a77f9751667bcd8e6acdb7b058fd64a05fbf34d02ede8af7076ddafb18a980cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_ddp_solver/6.2.0-1"; + sha256 = "sha256-BkUusXl/YxioP2YDdwN4gPBjfpcpAcnQSn7CrsurawQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-double-integrator-dynamics-solver/default.nix b/distros/noetic/exotica-double-integrator-dynamics-solver/default.nix index 3f1b0b1fc6..60df0cea7b 100644 --- a/distros/noetic/exotica-double-integrator-dynamics-solver/default.nix +++ b/distros/noetic/exotica-double-integrator-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-double-integrator-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_double_integrator_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "1f923cb14c5b1610f7496c4af3ca5d7d60aadef736263ab72e9859d0bfeb33d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_double_integrator_dynamics_solver/6.2.0-1"; + sha256 = "sha256-uBiD6XuDhv656o26eut036UXavYkAfxdUxneTK/KQ2Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-dynamics-solvers/default.nix b/distros/noetic/exotica-dynamics-solvers/default.nix index 7bec42bc5a..039f74e148 100644 --- a/distros/noetic/exotica-dynamics-solvers/default.nix +++ b/distros/noetic/exotica-dynamics-solvers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-dynamics-solvers"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_dynamics_solvers/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "91c483689f74df47d811b385156a14d06d7f984346f1d0b998e37265314b185b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_dynamics_solvers/6.2.0-1"; + sha256 = "sha256-GokAu3SM9Iwel7j6NTm90HArXxpFUU2dPG7QhEy8t30="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-examples/default.nix b/distros/noetic/exotica-examples/default.nix index a23179b09d..81b498dab2 100644 --- a/distros/noetic/exotica-examples/default.nix +++ b/distros/noetic/exotica-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-examples"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_examples/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "253c541a3cb1eb6215226dd062360c131ef478065abdcde75455d25b8213d262"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_examples/6.2.0-1"; + sha256 = "sha256-H/l9Zf9VWnl8LWdeQvS8o5r2td/JbFPQMwYXGTAGwsc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-ik-solver/default.nix b/distros/noetic/exotica-ik-solver/default.nix index 9273df9d0b..c2d98eeb49 100644 --- a/distros/noetic/exotica-ik-solver/default.nix +++ b/distros/noetic/exotica-ik-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-ik-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_ik_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "c6537d5896dac76ac90cd8db8de863cb719204259d3c363b40ecc54f978569b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_ik_solver/6.2.0-1"; + sha256 = "sha256-WVxw+U3AIKbxBWZqa6f6MxIArxvgHytg73F2QLsHPEA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-ilqg-solver/default.nix b/distros/noetic/exotica-ilqg-solver/default.nix index dd4d334115..ddbabb3827 100644 --- a/distros/noetic/exotica-ilqg-solver/default.nix +++ b/distros/noetic/exotica-ilqg-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-ilqg-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_ilqg_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "e3c7a828a6cf965a2f2c18c88b77aec879ca003460497d3be6ba712d8226830d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_ilqg_solver/6.2.0-1"; + sha256 = "sha256-UHz/UyAupE+yMN1vXsLt7eAgFfdP3KlxhNkA/dZ0728="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-ilqr-solver/default.nix b/distros/noetic/exotica-ilqr-solver/default.nix index bc8be6a080..670f82ed93 100644 --- a/distros/noetic/exotica-ilqr-solver/default.nix +++ b/distros/noetic/exotica-ilqr-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-ilqr-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_ilqr_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "a796cfef3920486d26caf201e22191c2663dd97f846c52c6344faf8649f5441a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_ilqr_solver/6.2.0-1"; + sha256 = "sha256-aTqXEZ+k42nRlgVmvLS1QB7t2mF/C7ZHKq1SHU46QUY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-levenberg-marquardt-solver/default.nix b/distros/noetic/exotica-levenberg-marquardt-solver/default.nix index 517c7844d0..8d977d121e 100644 --- a/distros/noetic/exotica-levenberg-marquardt-solver/default.nix +++ b/distros/noetic/exotica-levenberg-marquardt-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-levenberg-marquardt-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_levenberg_marquardt_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "135bb1e8166b3f10b61c15be56718dc1249b6555404e6026a61df817911e4ef3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_levenberg_marquardt_solver/6.2.0-1"; + sha256 = "sha256-MoKLbKXkYLJYuzK0y2S5k6MXb/ePEMTLQBfmecPE7YY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-ompl-control-solver/default.nix b/distros/noetic/exotica-ompl-control-solver/default.nix index 7b847a888e..b71484babe 100644 --- a/distros/noetic/exotica-ompl-control-solver/default.nix +++ b/distros/noetic/exotica-ompl-control-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-ompl-control-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_ompl_control_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "3192ddfc51623872b292eafbbc53cebe5be603e22f4b3101f9b448dd24b5263e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_ompl_control_solver/6.2.0-1"; + sha256 = "sha256-aFwrdhW9pG+Y4ooimbuqiC1Khf1Jraz2JBNAqURgvRQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-ompl-solver/default.nix b/distros/noetic/exotica-ompl-solver/default.nix index b9f14a3d31..b76831804d 100644 --- a/distros/noetic/exotica-ompl-solver/default.nix +++ b/distros/noetic/exotica-ompl-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-ompl-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_ompl_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "88d6418dd0dac08307b2e982c670a614b11bbd6a2b6a5fb2ccc57fcc8860d4e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_ompl_solver/6.2.0-1"; + sha256 = "sha256-BrN3uQZeM3poSMIHnyO8y4jytCNS+IedYq6umGmSV2o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-pendulum-dynamics-solver/default.nix b/distros/noetic/exotica-pendulum-dynamics-solver/default.nix index 755f53295e..3d383ac1a0 100644 --- a/distros/noetic/exotica-pendulum-dynamics-solver/default.nix +++ b/distros/noetic/exotica-pendulum-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-pendulum-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_pendulum_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "5b6d3e637a7df464ee506bdf7a47da647041035bc2686e0f12a8654764a8ac14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_pendulum_dynamics_solver/6.2.0-1"; + sha256 = "sha256-GgjRMUyY9F9oyhbigD8D+lWZXNHX0pZE1UHxaNqQDxA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-pinocchio-dynamics-solver/default.nix b/distros/noetic/exotica-pinocchio-dynamics-solver/default.nix index 1a619fad53..45308f9b2a 100644 --- a/distros/noetic/exotica-pinocchio-dynamics-solver/default.nix +++ b/distros/noetic/exotica-pinocchio-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-pinocchio-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_pinocchio_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "f4d67d2e53282319f64a1cafb9d9077180a7dec2c5e5b2dac253ff0b922456aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_pinocchio_dynamics_solver/6.2.0-1"; + sha256 = "sha256-jS0hrEhAiEYYKq6wJK2vg+HYbbC/iSoQJ+BpiPIdToI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-quadrotor-dynamics-solver/default.nix b/distros/noetic/exotica-quadrotor-dynamics-solver/default.nix index 7b5b6cf5e5..fb3612a986 100644 --- a/distros/noetic/exotica-quadrotor-dynamics-solver/default.nix +++ b/distros/noetic/exotica-quadrotor-dynamics-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-quadrotor-dynamics-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_quadrotor_dynamics_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "821f8955a1087becabaa394797ae9a9e28b27f1fa3f9f46a71863e2325fecb42"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_quadrotor_dynamics_solver/6.2.0-1"; + sha256 = "sha256-1MpruibjjwenRP6V9C1gx6x1lJiha07tm597tIiBTFw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-scipy-solver/default.nix b/distros/noetic/exotica-scipy-solver/default.nix index 1ba0aa659e..6d20cf922e 100644 --- a/distros/noetic/exotica-scipy-solver/default.nix +++ b/distros/noetic/exotica-scipy-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-scipy-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_scipy_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "46dae74a65ba823ea0ba88ab9bd99d21cd57b130064c1b30ac0a0b0b02ac0c26"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_scipy_solver/6.2.0-1"; + sha256 = "sha256-CggoxRV9IGNIxfQ7XQw7mz91JtbthH40E0SfUQ0XDOs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-time-indexed-rrt-connect-solver/default.nix b/distros/noetic/exotica-time-indexed-rrt-connect-solver/default.nix index 62b206ce1e..09e36ea472 100644 --- a/distros/noetic/exotica-time-indexed-rrt-connect-solver/default.nix +++ b/distros/noetic/exotica-time-indexed-rrt-connect-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-time-indexed-rrt-connect-solver"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica_time_indexed_rrt_connect_solver/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "5cc72e41ed448ea01febaf17af48dcffe19d498e3fda230c16b83263491069f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica_time_indexed_rrt_connect_solver/6.2.0-1"; + sha256 = "sha256-Z88gG1hdAR/R6WNgnu/lsFZ+ZKEAa7Y1jfvtJzpt6Wc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica-val-description/default.nix b/distros/noetic/exotica-val-description/default.nix index 1683f08ad9..cf362f581c 100644 --- a/distros/noetic/exotica-val-description/default.nix +++ b/distros/noetic/exotica-val-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica-val-description"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/wxmerkt/exotica_val_description-release/archive/release/noetic/exotica_val_description/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "bef122656f23a0a64ed34867b445ee7e3ce6cbfec5bec7472fd8823bf8f08a73"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wxmerkt"; + repo = "exotica_val_description-release"; + rev = "release/noetic/exotica_val_description/1.0.0-1"; + sha256 = "sha256-3tIPzhzHqVjh09fL/JcRv/CCVyzqgM5xiuOyAFYSYZg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/exotica/default.nix b/distros/noetic/exotica/default.nix index bef4e98b0a..d4ac755a33 100644 --- a/distros/noetic/exotica/default.nix +++ b/distros/noetic/exotica/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-exotica"; version = "6.2.0-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/exotica-release/archive/release/noetic/exotica/6.2.0-1.tar.gz"; - name = "6.2.0-1.tar.gz"; - sha256 = "c574f23e46c5d676c8ac7b41ea7a37ee616990700048b4047eead4b362aab87f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "exotica-release"; + rev = "release/noetic/exotica/6.2.0-1"; + sha256 = "sha256-EMvZOSauwNKhUlur+T3Bn7rDI0oFyhOhDPQGhd0TkUo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/explore-lite/default.nix b/distros/noetic/explore-lite/default.nix index 07d32491bc..f4d6184308 100644 --- a/distros/noetic/explore-lite/default.nix +++ b/distros/noetic/explore-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-explore-lite"; version = "2.1.4-r1"; - src = fetchurl { - url = "https://github.com/hrnr/m-explore-release/archive/release/noetic/explore_lite/2.1.4-1.tar.gz"; - name = "2.1.4-1.tar.gz"; - sha256 = "48ce6e2ae2ece1ead6f65af5845b7664712021c4e51db7330c97289a901bd782"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "hrnr"; + repo = "m-explore-release"; + rev = "release/noetic/explore_lite/2.1.4-1"; + sha256 = "sha256-G6WSRw39XxIsShtpEh9Bvu52YIuixuqNW4MFvpc+xAY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/face-detector/default.nix b/distros/noetic/face-detector/default.nix index 4c9559974c..90311d0ca9 100644 --- a/distros/noetic/face-detector/default.nix +++ b/distros/noetic/face-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-face-detector"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/noetic/face_detector/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "a9da7f39e98a7d7dd118827a9848b1f53ed7316e055e6962c9d7b9425a807c55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/noetic/face_detector/1.4.2-1"; + sha256 = "sha256-Wv1dDQlCIEwFWoyK61WLyLLTocAg1SWEYyCvZyWd1tk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/fadecandy-driver/default.nix b/distros/noetic/fadecandy-driver/default.nix index cbaf647390..35a7bff281 100644 --- a/distros/noetic/fadecandy-driver/default.nix +++ b/distros/noetic/fadecandy-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fadecandy-driver"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/iron-ox/fadecandy_ros-release/archive/release/noetic/fadecandy_driver/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "5c394c5199a5bbb0fc45a5229d0cd16629438feec207996af14d0c57a114f2f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "iron-ox"; + repo = "fadecandy_ros-release"; + rev = "release/noetic/fadecandy_driver/0.2.2-1"; + sha256 = "sha256-KjXoanwjRLMiPl78FpQ3TzhmW5ET2emuUs6IDKvYA+Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fadecandy-msgs/default.nix b/distros/noetic/fadecandy-msgs/default.nix index 6e4b4e243a..790f9f1c49 100644 --- a/distros/noetic/fadecandy-msgs/default.nix +++ b/distros/noetic/fadecandy-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fadecandy-msgs"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/iron-ox/fadecandy_ros-release/archive/release/noetic/fadecandy_msgs/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "ef803f4e2302e6802cc6b2ce57d53070487663411e95463452adfc986ec7f0ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "iron-ox"; + repo = "fadecandy_ros-release"; + rev = "release/noetic/fadecandy_msgs/0.2.2-1"; + sha256 = "sha256-T74dvtFooZaTz/RrBNbnnkYX6G4m3qBp40Y3zPu27Nw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/fake-localization/default.nix b/distros/noetic/fake-localization/default.nix index c24a74597b..07e6bafe15 100644 --- a/distros/noetic/fake-localization/default.nix +++ b/distros/noetic/fake-localization/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, catkin, geometry-msgs, message-filters, nav-msgs, rosconsole, roscpp, rospy, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-fake-localization"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/fake_localization/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "62fbd3a17ce0c0fa5dabc97dbbef09ae8f24315544d01a76910bb5a8f06b4ad4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/fake_localization/1.17.3-1"; + sha256 = "sha256-jSolDcCeocNoiUNRkqcylnTjyAyeOvTPBYAiOz+2bv4="; + }; buildType = "catkin"; buildInputs = [ angles catkin tf2-geometry-msgs ]; diff --git a/distros/noetic/fath-pivot-mount-description/default.nix b/distros/noetic/fath-pivot-mount-description/default.nix index 7c65bf3017..6e54cea3a5 100644 --- a/distros/noetic/fath-pivot-mount-description/default.nix +++ b/distros/noetic/fath-pivot-mount-description/default.nix @@ -7,11 +7,15 @@ 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "fath_pivot_mount_description-release"; + rev = "release/noetic/fath_pivot_mount_description/0.1.1-2"; + sha256 = "sha256-T330klYUS78AFQDqpq/GZy2o49n2tf/5iq7fI5nq8OE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fcl-catkin/default.nix b/distros/noetic/fcl-catkin/default.nix index f0cfbd8672..9a395ff476 100644 --- a/distros/noetic/fcl-catkin/default.nix +++ b/distros/noetic/fcl-catkin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fcl-catkin"; version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/wxmerkt/fcl_catkin-release/archive/release/noetic/fcl_catkin/0.6.1-1.tar.gz"; - name = "0.6.1-1.tar.gz"; - sha256 = "7c598aae4e97df1ac798a8966162a5a3dadf27e307ea4883d9c01ac0a15a4929"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wxmerkt"; + repo = "fcl_catkin-release"; + rev = "release/noetic/fcl_catkin/0.6.1-1"; + sha256 = "sha256-WcsDCNzbxl+69WQ6m1ctq7rgXfwPDQ88VqXiRPC8rpU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fcl/default.nix b/distros/noetic/fcl/default.nix index 1696ad394f..1e6e27901b 100644 --- a/distros/noetic/fcl/default.nix +++ b/distros/noetic/fcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fcl"; version = "0.6.1-r3"; - src = fetchurl { - url = "https://github.com/ros-gbp/fcl-release/archive/release/noetic/fcl/0.6.1-3.tar.gz"; - name = "0.6.1-3.tar.gz"; - sha256 = "d2c748d2b918ed3b3aeab5b8b9a840e4c0e5d0e1e6868cbf6a17201e72effb4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "fcl-release"; + rev = "release/noetic/fcl/0.6.1-3"; + sha256 = "sha256-WIcfbptmdDN7PqrUWVJkMrGrWnFEr582XlztZtcMKD8="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/fetch-auto-dock-msgs/default.nix b/distros/noetic/fetch-auto-dock-msgs/default.nix index c235e9be44..e04f1ada5a 100644 --- a/distros/noetic/fetch-auto-dock-msgs/default.nix +++ b/distros/noetic/fetch-auto-dock-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-auto-dock-msgs"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_msgs-release/archive/release/noetic/fetch_auto_dock_msgs/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "07d675e227e9e0a6143af6c101cfc62d0bb4b0907e07f8143bba2fa148a67cb2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_msgs-release"; + rev = "release/noetic/fetch_auto_dock_msgs/1.2.0-1"; + sha256 = "sha256-QAiBpSPEz1IwilgM9jt81x2YKV8T20Aax/C9ik4erec="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/fetch-bringup/default.nix b/distros/noetic/fetch-bringup/default.nix index 7f3da2c434..e9df2670b5 100644 --- a/distros/noetic/fetch-bringup/default.nix +++ b/distros/noetic/fetch-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-bringup"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_robots-release/archive/release/noetic/fetch_bringup/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "2aefed0cb404f41fd0729945bff58a05784f6ff4872faf781fd673933b7d9bb1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_robots-release"; + rev = "release/noetic/fetch_bringup/0.9.3-1"; + sha256 = "sha256-BSvlnvAdMWQMhpe34llcGL4rUfFJbZFKAqaMIze6Cc4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fetch-calibration/default.nix b/distros/noetic/fetch-calibration/default.nix index bad326868d..5755a84836 100644 --- a/distros/noetic/fetch-calibration/default.nix +++ b/distros/noetic/fetch-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-calibration"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_calibration/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "c11144a32a9706f74aec372cde05591232580d7d20824eeabd270f8d8c03b79b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_calibration/0.9.1-1"; + sha256 = "sha256-gJ07FB3Sd+igl7vg/QBDKCz1vSLrxJhR8EzeqRu46aE="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/fetch-depth-layer/default.nix b/distros/noetic/fetch-depth-layer/default.nix index b7c3cca0c5..9840c5cfac 100644 --- a/distros/noetic/fetch-depth-layer/default.nix +++ b/distros/noetic/fetch-depth-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-depth-layer"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_depth_layer/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "42b7005d4a31d5ef1c928f52c0dc93f8106833a1a5170cec4e7f10f9defec6be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_depth_layer/0.9.1-1"; + sha256 = "sha256-8S/AnxtezsLI7dDfrvPZCzix/8tOj1WBA4RVD3McCX0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fetch-description/default.nix b/distros/noetic/fetch-description/default.nix index 0b9736dbae..b4e08b16c9 100644 --- a/distros/noetic/fetch-description/default.nix +++ b/distros/noetic/fetch-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-description"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_description/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "e9b0b5bac52c230f416305f0cb8ff4cdb5a5567a3df8143795e6fda8e57f78d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_description/0.9.1-1"; + sha256 = "sha256-QdaHLnT9f/lFvTQNBJEeu4mN3DWI/RIpu17vwTmNllI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fetch-driver-msgs/default.nix b/distros/noetic/fetch-driver-msgs/default.nix index dfcd5f17fc..fd2e12b9db 100644 --- a/distros/noetic/fetch-driver-msgs/default.nix +++ b/distros/noetic/fetch-driver-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-driver-msgs"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_msgs-release/archive/release/noetic/fetch_driver_msgs/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "83afff86291e1c3b3ffd1b96b10da679dea0bb2f4f127e456aaf7e7876bea27c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_msgs-release"; + rev = "release/noetic/fetch_driver_msgs/1.2.0-1"; + sha256 = "sha256-Bywd1FNC5RTLA0vs5Mu5b3WjkfDGqNscgTWnLltxzqI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/fetch-drivers/default.nix b/distros/noetic/fetch-drivers/default.nix index 3f49da0df6..70a9e8c978 100644 --- a/distros/noetic/fetch-drivers/default.nix +++ b/distros/noetic/fetch-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-drivers"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_robots-release/archive/release/noetic/fetch_drivers/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "0c76111986c9801ed8e104c00cfc952a7891b156355347ec00b86b36e0e3822c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_robots-release"; + rev = "release/noetic/fetch_drivers/0.9.3-1"; + sha256 = "sha256-I1PZvdYdVACu6nBOJgDzY2jiHA4d7Q0ESClFTeR3WwM="; + }; buildType = "catkin"; buildInputs = [ catkin mk rospack ]; diff --git a/distros/noetic/fetch-ikfast-plugin/default.nix b/distros/noetic/fetch-ikfast-plugin/default.nix index 2d7d395f25..ce60e9b687 100644 --- a/distros/noetic/fetch-ikfast-plugin/default.nix +++ b/distros/noetic/fetch-ikfast-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-ikfast-plugin"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_ikfast_plugin/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "dd967690c06c97e3cb82db0bdd22bd8ef9d29e653308b324bf9904e964d32d48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_ikfast_plugin/0.9.1-1"; + sha256 = "sha256-GixA1WChN6MD05RJ+HialWmiDv1glyj/YG03WgaaQC4="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen tf2-kdl ]; diff --git a/distros/noetic/fetch-maps/default.nix b/distros/noetic/fetch-maps/default.nix index b19c108c48..984a3f4138 100644 --- a/distros/noetic/fetch-maps/default.nix +++ b/distros/noetic/fetch-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-maps"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_maps/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "4679e269f796a687cef2c846602aec7a1de7873f1c0fcaa624b87f14a1efa265"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_maps/0.9.1-1"; + sha256 = "sha256-Vz/V1nh53BKPB/EWB3sjHFp+tc7XVHdd1V1M+eYAbzA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fetch-moveit-config/default.nix b/distros/noetic/fetch-moveit-config/default.nix index b110b64f66..ed8e1e27d3 100644 --- a/distros/noetic/fetch-moveit-config/default.nix +++ b/distros/noetic/fetch-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-moveit-config"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_moveit_config/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "9dc3b097e595365fa0262b98d1c77dbd4cd3c592e23a2bad6da000f1940ce8dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_moveit_config/0.9.1-1"; + sha256 = "sha256-oX1eF+OwQpu6ju9N9kH0oASegqesALkuwUs355Wr3Mk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fetch-navigation/default.nix b/distros/noetic/fetch-navigation/default.nix index 92d439410d..bd80d73fb9 100644 --- a/distros/noetic/fetch-navigation/default.nix +++ b/distros/noetic/fetch-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-navigation"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_navigation/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "9e4ea90921f157347f53637387de35f39d9143820a8ceb15436cc51397513906"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_navigation/0.9.1-1"; + sha256 = "sha256-DitF4yuoFStq+ol9Sawm+i0rpbFgr3wycfwd05xHi8E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fetch-open-auto-dock/default.nix b/distros/noetic/fetch-open-auto-dock/default.nix index 44c143c1ae..c9499032b2 100644 --- a/distros/noetic/fetch-open-auto-dock/default.nix +++ b/distros/noetic/fetch-open-auto-dock/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-open-auto-dock"; version = "0.1.3-r2"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_open_auto_dock-gbp/archive/release/noetic/fetch_open_auto_dock/0.1.3-2.tar.gz"; - name = "0.1.3-2.tar.gz"; - sha256 = "ec396187a30b9ef904c934d7f3bdbf625980138227e511927ada69c8b61fbd6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_open_auto_dock-gbp"; + rev = "release/noetic/fetch_open_auto_dock/0.1.3-2"; + sha256 = "sha256-1Rpt2gONlcKAuEP+0QpBHsUdnoI3fCAGrBzbt+u5t6o="; + }; buildType = "catkin"; buildInputs = [ angles catkin ]; diff --git a/distros/noetic/fetch-ros/default.nix b/distros/noetic/fetch-ros/default.nix index ddad6bb695..a4cb584b4e 100644 --- a/distros/noetic/fetch-ros/default.nix +++ b/distros/noetic/fetch-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-ros"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_ros/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "a66c52e9776e1a30f4b2c0b9c51cf615a3bc68f227add45537d970f9c82c6464"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_ros/0.9.1-1"; + sha256 = "sha256-ZioIN7LurAdiKv+JNH5gM/1KFDx3gCbp+VFAyshH7N4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fetch-teleop/default.nix b/distros/noetic/fetch-teleop/default.nix index 754c3803db..40190fcf38 100644 --- a/distros/noetic/fetch-teleop/default.nix +++ b/distros/noetic/fetch-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fetch-teleop"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_ros-release/archive/release/noetic/fetch_teleop/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "dc4741dbb66f037b5e75769730a6b35dc40dd5b53a8b5a456f053b23e9e62a0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_ros-release"; + rev = "release/noetic/fetch_teleop/0.9.1-1"; + sha256 = "sha256-pHIDLwZOnf7g5z+sJ3gIG26YfJoEnwDvnJOb1a3n6AE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ff/default.nix b/distros/noetic/ff/default.nix index 5d0a1c8230..fef47d0e1b 100644 --- a/distros/noetic/ff/default.nix +++ b/distros/noetic/ff/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ff"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/ff/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "957f20eed64325d0864b8a499672f657412f9c10ce6d6718c7157c4e7cda1d53"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/ff/2.1.21-2"; + sha256 = "sha256-R2OV7z6N+hgYmErtLFOKzBDCGVdNUzLf2IeEcyCCm5E="; + }; buildType = "catkin"; buildInputs = [ bison cacert catkin flex mk openssl rosbash rosbuild roslib rospack unzip ]; diff --git a/distros/noetic/ffha/default.nix b/distros/noetic/ffha/default.nix index fb8e40a3dc..23846185b6 100644 --- a/distros/noetic/ffha/default.nix +++ b/distros/noetic/ffha/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ffha"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/ffha/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "91b8e796e658087b953fff80f18b4391d53c7a86a4024d3b9eab3cc4e68b4c48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/ffha/2.1.21-2"; + sha256 = "sha256-UjD+r090eY/WRxCqgNpAc4bgO662qpi60W1fOh6KwvI="; + }; buildType = "catkin"; buildInputs = [ bison catkin flex gawk mk rosbuild roslib rospack ]; diff --git a/distros/noetic/fiducial-msgs/default.nix b/distros/noetic/fiducial-msgs/default.nix index 2924e59c87..2eaf939d41 100644 --- a/distros/noetic/fiducial-msgs/default.nix +++ b/distros/noetic/fiducial-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fiducial-msgs"; version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/fiducials-release/archive/release/noetic/fiducial_msgs/0.12.0-1.tar.gz"; - name = "0.12.0-1.tar.gz"; - sha256 = "76793444bb22e7b5ccf9e3bef011af4da9cf7174c3abc800057c556090e578bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "fiducials-release"; + rev = "release/noetic/fiducial_msgs/0.12.0-1"; + sha256 = "sha256-rAPrs5QWoxnN38TLnBlLSTYgJ9LHHX3LNI9KW1doq0U="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/fiducial-slam/default.nix b/distros/noetic/fiducial-slam/default.nix index 19fcee4471..37c7268817 100644 --- a/distros/noetic/fiducial-slam/default.nix +++ b/distros/noetic/fiducial-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fiducial-slam"; version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/fiducials-release/archive/release/noetic/fiducial_slam/0.12.0-1.tar.gz"; - name = "0.12.0-1.tar.gz"; - sha256 = "347a536eff2ea1deff50491ee500368aebc70783148a2c3204a43da6e1ce0986"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "fiducials-release"; + rev = "release/noetic/fiducial_slam/0.12.0-1"; + sha256 = "sha256-9C4ICtV18Xo9cHmud2Bq1k+2GmL1EjIArJtva1fH1ss="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fiducials/default.nix b/distros/noetic/fiducials/default.nix index 68efa04373..7b3dd998a5 100644 --- a/distros/noetic/fiducials/default.nix +++ b/distros/noetic/fiducials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fiducials"; version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/fiducials-release/archive/release/noetic/fiducials/0.12.0-1.tar.gz"; - name = "0.12.0-1.tar.gz"; - sha256 = "d9836b134f19867e917a042e35177206a6e63cb4563605ef11dcaa3410714cc9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "fiducials-release"; + rev = "release/noetic/fiducials/0.12.0-1"; + sha256 = "sha256-lygkBaUnpPKgoopTvLGqUxvlbUig3MTi9MOoSTTs38o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/filters/default.nix b/distros/noetic/filters/default.nix index 7c7b55d8a0..d51c329045 100644 --- a/distros/noetic/filters/default.nix +++ b/distros/noetic/filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-filters"; version = "1.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/filters-release/archive/release/noetic/filters/1.9.2-1.tar.gz"; - name = "1.9.2-1.tar.gz"; - sha256 = "7cfca50e56f78921bf185fd6dd7d3fe614b2daee6e326a96307776ad3aad8fe6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "filters-release"; + rev = "release/noetic/filters/1.9.2-1"; + sha256 = "sha256-VeBzKH1IEMI7HcnoThJV7w/WZgJ91vwdSF3JP3HLrBI="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/find-object-2d/default.nix b/distros/noetic/find-object-2d/default.nix index 71242f1bbb..ecd53d65e9 100644 --- a/distros/noetic/find-object-2d/default.nix +++ b/distros/noetic/find-object-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-find-object-2d"; version = "0.7.0-r2"; - src = fetchurl { - url = "https://github.com/introlab/find_object_2d-release/archive/release/noetic/find_object_2d/0.7.0-2.tar.gz"; - name = "0.7.0-2.tar.gz"; - sha256 = "704099801e897cec9bb812ca9e1ec89ab4d586ee8adb8427a07caa4a318be6b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "find_object_2d-release"; + rev = "release/noetic/find_object_2d/0.7.0-2"; + sha256 = "sha256-SaO74TFbaUB9XOb29ldwM0tRjIS2S+otZ3fsB2mO++s="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/fingertip-pressure/default.nix b/distros/noetic/fingertip-pressure/default.nix index ab1f5789b4..8eb5c8efe9 100644 --- a/distros/noetic/fingertip-pressure/default.nix +++ b/distros/noetic/fingertip-pressure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fingertip-pressure"; version = "1.9.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_ethercat_drivers-release/archive/release/noetic/fingertip_pressure/1.9.0-1.tar.gz"; - name = "1.9.0-1.tar.gz"; - sha256 = "b381fcb28a88b68e16de43e618c341be01483c918815793cbf81e98b392fbe73"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_ethercat_drivers-release"; + rev = "release/noetic/fingertip_pressure/1.9.0-1"; + sha256 = "sha256-/8O7K/ErNQM3nz0bY2oDzmTd/qLk/zp2j0V6RpVF6mw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/noetic/fkie-master-discovery/default.nix b/distros/noetic/fkie-master-discovery/default.nix index dc614aac20..a99f0cd342 100644 --- a/distros/noetic/fkie-master-discovery/default.nix +++ b/distros/noetic/fkie-master-discovery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fkie-master-discovery"; version = "1.3.2-r2"; - src = fetchurl { - url = "https://github.com/fkie-release/multimaster_fkie-release/archive/release/noetic/fkie_master_discovery/1.3.2-2.tar.gz"; - name = "1.3.2-2.tar.gz"; - sha256 = "de46fc8e8fd45b41af42317ce3c5e2f483b5c774549edd31036e4c21904a2866"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "multimaster_fkie-release"; + rev = "release/noetic/fkie_master_discovery/1.3.2-2"; + sha256 = "sha256-FY+KufbEYAUo4HNCPu61sxYOH4bc77sWkaHLiXIZNJo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fkie-master-sync/default.nix b/distros/noetic/fkie-master-sync/default.nix index 90f94229b9..ea9a176b76 100644 --- a/distros/noetic/fkie-master-sync/default.nix +++ b/distros/noetic/fkie-master-sync/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fkie-master-sync"; version = "1.3.2-r2"; - src = fetchurl { - url = "https://github.com/fkie-release/multimaster_fkie-release/archive/release/noetic/fkie_master_sync/1.3.2-2.tar.gz"; - name = "1.3.2-2.tar.gz"; - sha256 = "0986d615fc344af3fa7fbf4107ee5c1809f647c82754cae34cdcea4e53d07933"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "multimaster_fkie-release"; + rev = "release/noetic/fkie_master_sync/1.3.2-2"; + sha256 = "sha256-ETFhGHpn503BLHiZkj11BVXIRjHB9zraUOCYxwScXSk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fkie-message-filters/default.nix b/distros/noetic/fkie-message-filters/default.nix index e7cc6ad9c8..bfa142885a 100644 --- a/distros/noetic/fkie-message-filters/default.nix +++ b/distros/noetic/fkie-message-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fkie-message-filters"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/fkie-release/message_filters-release/archive/release/noetic/fkie_message_filters/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "f7194d5a315919732f324189314e4a52193f46b24e99a6e4c584c262a084ba33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fkie-release"; + repo = "message_filters-release"; + rev = "release/noetic/fkie_message_filters/1.1.2-1"; + sha256 = "f7194d5a315919732f324189314e4a52193f46b24e99a6e4c584c262a084ba33"; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/flir-camera-driver/default.nix b/distros/noetic/flir-camera-driver/default.nix index 14c602efd5..426aa36d30 100644 --- a/distros/noetic/flir-camera-driver/default.nix +++ b/distros/noetic/flir-camera-driver/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, flir-camera-description, spinnaker-camera-driver }: buildRosPackage { pname = "ros-noetic-flir-camera-driver"; - version = "0.2.3-r1"; + version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/flir_camera_driver-release/archive/release/noetic/flir_camera_driver/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "327f8ef92766d5cd10aa75ec9a05549509a7d5ef1ca1514f756dd72200c10229"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "flir_camera_driver-release"; + rev = "release/noetic/flir_camera_driver/0.2.5-1"; + sha256 = "sha256-JxRnIsKLEav39mi/TToTHRmZcuzBq1XqdH0EuxOPW2Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/floam/default.nix b/distros/noetic/floam/default.nix index 65974b303f..fc6cb34df3 100644 --- a/distros/noetic/floam/default.nix +++ b/distros/noetic/floam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-floam"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/flynneva/floam-release/archive/release/noetic/floam/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "305b0761f138eba420f2f8c1c028fc3146099954a1a7d2854bf59437cd6784b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "floam-release"; + rev = "release/noetic/floam/0.1.0-1"; + sha256 = "sha256-SA+takXbqkSJibyAiw43/eYnsDSb2bN9Lid7Wn87OtU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fmi-adapter-examples/default.nix b/distros/noetic/fmi-adapter-examples/default.nix index d53eaf2744..221ad1d31e 100644 --- a/distros/noetic/fmi-adapter-examples/default.nix +++ b/distros/noetic/fmi-adapter-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fmi-adapter-examples"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/boschresearch/fmi_adapter-release/archive/release/noetic/fmi_adapter_examples/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "e53713fb0614975272e12580508a1187b529ca80057a5cb166a56d95130c2ebb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "boschresearch"; + repo = "fmi_adapter-release"; + rev = "release/noetic/fmi_adapter_examples/1.0.4-1"; + sha256 = "sha256-vMeNdWmjucn8ZM2ReMjUR9P3TI7KODdr0GgeJOYNQvg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fmi-adapter/default.nix b/distros/noetic/fmi-adapter/default.nix index ad03e65542..2617af9936 100644 --- a/distros/noetic/fmi-adapter/default.nix +++ b/distros/noetic/fmi-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fmi-adapter"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/boschresearch/fmi_adapter-release/archive/release/noetic/fmi_adapter/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "9f1742c1df329d7633f85b260e8be629c56f99e70736039077c6f0103abc73bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "boschresearch"; + repo = "fmi_adapter-release"; + rev = "release/noetic/fmi_adapter/1.0.4-1"; + sha256 = "sha256-T/tOGSBZxproguefC+sHfBgs3Zl7GOieHXdo5n8jigM="; + }; buildType = "catkin"; buildInputs = [ catkin git ]; diff --git a/distros/noetic/force-torque-sensor-controller/default.nix b/distros/noetic/force-torque-sensor-controller/default.nix index 7043c1c56e..376fc91888 100644 --- a/distros/noetic/force-torque-sensor-controller/default.nix +++ b/distros/noetic/force-torque-sensor-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-interface, controller-manager, geometry-msgs, hardware-interface, pluginlib, realtime-tools, roscpp }: buildRosPackage { pname = "ros-noetic-force-torque-sensor-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/force_torque_sensor_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "32b266e7c3060f15c4c905f845dc61e3001a1088ffe0a0d74d3f5e8a0332dcd8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/force_torque_sensor_controller/0.21.1-1"; + sha256 = "sha256-dfBA44itOrl9MMlF9bYSf8kRAqLKCDyadH0U71RH0lU="; + }; buildType = "catkin"; buildInputs = [ catkin pluginlib ]; diff --git a/distros/noetic/forward-command-controller/default.nix b/distros/noetic/forward-command-controller/default.nix index 4ee011ea6a..57a116f6c5 100644 --- a/distros/noetic/forward-command-controller/default.nix +++ b/distros/noetic/forward-command-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-interface, hardware-interface, realtime-tools, roscpp, std-msgs }: buildRosPackage { pname = "ros-noetic-forward-command-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/forward_command_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "316d39e6cd77b1339a38c0f434903f991a6c08c5a56ba757785518de041605a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/forward_command_controller/0.21.1-1"; + sha256 = "sha256-khzaJCitZHyQAQQKFDTES6HESNvLEnP4R4xkbyJ0QHg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/four-wheel-steering-controller/default.nix b/distros/noetic/four-wheel-steering-controller/default.nix index 4433f86b71..5990ec4ffa 100644 --- a/distros/noetic/four-wheel-steering-controller/default.nix +++ b/distros/noetic/four-wheel-steering-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, controller-interface, controller-manager, four-wheel-steering-msgs, geometry-msgs, hardware-interface, nav-msgs, pluginlib, realtime-tools, roscpp, rosgraph-msgs, rostest, std-msgs, std-srvs, tf, urdf-geometry-parser, xacro }: buildRosPackage { pname = "ros-noetic-four-wheel-steering-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/four_wheel_steering_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "381358d31a514ee95b0aca60a51ec7f9a4bd0cf6900281448aa29895846bf4b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/four_wheel_steering_controller/0.21.1-1"; + sha256 = "sha256-1kTA6mxRNwjF5lfv1FIAaiTSi9+nJhGod2YXPdpcUzg="; + }; buildType = "catkin"; buildInputs = [ catkin pluginlib urdf-geometry-parser ]; diff --git a/distros/noetic/four-wheel-steering-msgs/default.nix b/distros/noetic/four-wheel-steering-msgs/default.nix index f553ae71c7..2960c597a9 100644 --- a/distros/noetic/four-wheel-steering-msgs/default.nix +++ b/distros/noetic/four-wheel-steering-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-four-wheel-steering-msgs"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/four_wheel_steering_msgs-release/archive/release/noetic/four_wheel_steering_msgs/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "a58c4e1c6823ba417ca59a49b39630d83dca194e80a6be06af3763272e199218"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "four_wheel_steering_msgs-release"; + rev = "release/noetic/four_wheel_steering_msgs/1.1.1-2"; + sha256 = "sha256-YtxzuGV4ff4RH9w537lLnbwkAQAnP590qkImf2JzL6k="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/foxglove-bridge/default.nix b/distros/noetic/foxglove-bridge/default.nix index 896372cec6..477104e012 100644 --- a/distros/noetic/foxglove-bridge/default.nix +++ b/distros/noetic/foxglove-bridge/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, asio, catkin, gtest, nlohmann_json, nodelet, openssl, ros-babel-fish, ros-environment, roscpp, rosgraph-msgs, roslib, rostest, rosunit, std-msgs, websocketpp }: buildRosPackage { pname = "ros-noetic-foxglove-bridge"; - version = "0.2.2-r1"; + version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/foxglove/ros_foxglove_bridge-release/archive/release/noetic/foxglove_bridge/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "abf7487e53c5a0e4d2c07b0bb38bfdd641c02fc87fb69e0123eca0e4939d2733"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "foxglove"; + repo = "ros_foxglove_bridge-release"; + rev = "release/noetic/foxglove_bridge/0.3.0-1"; + sha256 = "sha256-wRnMOoLOn6E7TrYny2wfwmQuOqnYt2T/ru+L/9ua1Tk="; + }; buildType = "catkin"; buildInputs = [ asio catkin nlohmann_json ros-environment websocketpp ]; diff --git a/distros/noetic/foxglove-msgs/default.nix b/distros/noetic/foxglove-msgs/default.nix index 331199120d..f82f0341a3 100644 --- a/distros/noetic/foxglove-msgs/default.nix +++ b/distros/noetic/foxglove-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-foxglove-msgs"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/foxglove/ros_foxglove_msgs-release/archive/release/noetic/foxglove_msgs/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "bc1f40409bf7589dc2d894001df400ffd1d12f40e7b6df34491f711719a4eecd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "foxglove"; + repo = "ros_foxglove_msgs-release"; + rev = "release/noetic/foxglove_msgs/2.1.1-1"; + sha256 = "sha256-WVd87BSDwF+o7s/HMSXhpwvIBHYpp6J263sCn635ILE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/frame-editor/default.nix b/distros/noetic/frame-editor/default.nix index e5356c776f..56b98d8c91 100644 --- a/distros/noetic/frame-editor/default.nix +++ b/distros/noetic/frame-editor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-frame-editor"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/ipa320/rqt_frame_editor_plugin-release/archive/release/noetic/frame_editor/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "9249d5507922cf413468a64e5aad459c61ca85549c02cd5142224a5484031f03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "rqt_frame_editor_plugin-release"; + rev = "release/noetic/frame_editor/1.1.1-1"; + sha256 = "sha256-MjBvlL4aX4lEJuRGkwsH9f/OzkvduiSF8ye2Dv0i/Xk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/franka-control/default.nix b/distros/noetic/franka-control/default.nix index ce388370d5..1c4109480a 100644 --- a/distros/noetic/franka-control/default.nix +++ b/distros/noetic/franka-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-control"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_control/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "4954c523191d8507e67f2957ac8e77b51bba3ed3ebea34bc78afe864befcd3d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_control/0.10.1-1"; + sha256 = "sha256-AyswjHrlwGomK37rSJ96UTA+WqlzjA2X52i+/UPSl4A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/franka-description/default.nix b/distros/noetic/franka-description/default.nix index 8e0e0f21b4..ab68a5dc18 100644 --- a/distros/noetic/franka-description/default.nix +++ b/distros/noetic/franka-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-description"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_description/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "0d2b8db69f7935f8bcbfeed662981c4542780106ba24121b13bc07702dd30a59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_description/0.10.1-1"; + sha256 = "sha256-p8nbJN7KGlNFLGcvUeZo/ldjsPGAfgOiOEdIQ/qjH64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/franka-example-controllers/default.nix b/distros/noetic/franka-example-controllers/default.nix index 94f4f330ad..f1bbb7f9b1 100644 --- a/distros/noetic/franka-example-controllers/default.nix +++ b/distros/noetic/franka-example-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-example-controllers"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_example_controllers/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "ca63d40f8f721813885825c3f2d0942ccdd4ed1aaacb635c5e30c722f515ae51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_example_controllers/0.10.1-1"; + sha256 = "sha256-8p7Gw20DddL8YvDbOFecVs3VYEhU+2mALEOjNJY3pdA="; + }; buildType = "catkin"; buildInputs = [ catkin eigen message-generation ]; diff --git a/distros/noetic/franka-gazebo/default.nix b/distros/noetic/franka-gazebo/default.nix index 90a61ea8a3..74c6df90bc 100644 --- a/distros/noetic/franka-gazebo/default.nix +++ b/distros/noetic/franka-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-gazebo"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_gazebo/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "fd370f8b9b212873bf0ed4af20377dad6e8a67959d447ff19d00c97d219f1274"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_gazebo/0.10.1-1"; + sha256 = "sha256-k+tSmXZZuPT/sdvNLNfR3TPRUgf7LXFvjHsZpz8Ktm4="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-dev ]; diff --git a/distros/noetic/franka-gripper/default.nix b/distros/noetic/franka-gripper/default.nix index bdd708196a..66ee05faef 100644 --- a/distros/noetic/franka-gripper/default.nix +++ b/distros/noetic/franka-gripper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-gripper"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_gripper/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "4cb65f2e329b50330bb153df7189470c0a476e1a741fefc72e6d5b5282b56fc5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_gripper/0.10.1-1"; + sha256 = "sha256-0+LWjt71ty6lIcgby7jtYDAGWWyxV5w68nV4+9xxaIg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/franka-hw/default.nix b/distros/noetic/franka-hw/default.nix index 53d036cdb4..b07803092f 100644 --- a/distros/noetic/franka-hw/default.nix +++ b/distros/noetic/franka-hw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-hw"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_hw/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "af9907ad5f1ce890a3efa658829355be9e19aefc8e9bf936d922250d5bfefce6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_hw/0.10.1-1"; + sha256 = "sha256-qON6CwF05nRmOdaG62Spaz/+473wsMyLDhz8SaHDCJs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/franka-msgs/default.nix b/distros/noetic/franka-msgs/default.nix index 38f6885fb6..15dfee8fc0 100644 --- a/distros/noetic/franka-msgs/default.nix +++ b/distros/noetic/franka-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-msgs"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_msgs/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "037d5ca970909516aee5a813e7d5876137174c16b88af48696fb2e4917923231"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_msgs/0.10.1-1"; + sha256 = "sha256-rYMpm72ymxQ8x9fJCmMULdHdVB9C1G10ZyqN4C3PAHI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/franka-ros/default.nix b/distros/noetic/franka-ros/default.nix index 39328a51c4..67d8b70272 100644 --- a/distros/noetic/franka-ros/default.nix +++ b/distros/noetic/franka-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-ros"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_ros/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "780fd87f5943f2c93b668cfd4d98ec33ea22cc64b812a0afbea758c859a22c3f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_ros/0.10.1-1"; + sha256 = "sha256-s0tJdQWTFKOVc0iTFu4iNLBkczyooC+JgTM0YFm8Weo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/franka-visualization/default.nix b/distros/noetic/franka-visualization/default.nix index cc49c9b137..91928532b7 100644 --- a/distros/noetic/franka-visualization/default.nix +++ b/distros/noetic/franka-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-franka-visualization"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/franka_ros-release/archive/release/noetic/franka_visualization/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "228790af3299b7d41cdf6d22098e29baccdd8615157ba36a8b223e0d99b96bf8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "franka_ros-release"; + rev = "release/noetic/franka_visualization/0.10.1-1"; + sha256 = "sha256-sr9NeGx2mzy79LTkzszTHIdYAOPl/9mMKEMAo1laTIM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/freight-bringup/default.nix b/distros/noetic/freight-bringup/default.nix index 547b6969e0..7e5e0098ae 100644 --- a/distros/noetic/freight-bringup/default.nix +++ b/distros/noetic/freight-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-freight-bringup"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/fetch_robots-release/archive/release/noetic/freight_bringup/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "430799bc6412c9f30e6c53f1ae003e6469930241bf846d5a901f520873db2ff8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "fetch_robots-release"; + rev = "release/noetic/freight_bringup/0.9.3-1"; + sha256 = "sha256-xUayLv00UE8LUWC2O+Odmvd39WZyNsLluj5DnnW+xbk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fuse-constraints/default.nix b/distros/noetic/fuse-constraints/default.nix index a392b96199..ddbcdef536 100644 --- a/distros/noetic/fuse-constraints/default.nix +++ b/distros/noetic/fuse-constraints/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-constraints"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_constraints/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "d4af66202bd652c3d3bfc0366d6dd3610b080dfc4618e6a68a8469395d0d947e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_constraints/0.4.2-1"; + sha256 = "sha256-HSYCPaQbLzg/fB/PQJ0qnN03lQIP0NKF9kdM78d+blU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fuse-core/default.nix b/distros/noetic/fuse-core/default.nix index cf76665dea..7417196a1d 100644 --- a/distros/noetic/fuse-core/default.nix +++ b/distros/noetic/fuse-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-core"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_core/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "e3028de21273ab389dbb85c93b28c01ab7a24009d44ea407bb30b2b9ea04d36f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_core/0.4.2-1"; + sha256 = "sha256-drX6XfrXcl+tOUKRIRxs2H6r2H2bEOVoSG5hT58KIPo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fuse-doc/default.nix b/distros/noetic/fuse-doc/default.nix index 57475f52a6..68886c0d11 100644 --- a/distros/noetic/fuse-doc/default.nix +++ b/distros/noetic/fuse-doc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-doc"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_doc/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "f4bffab22c2f7c9098058c2edf9b44482885aa8dced53a4e6c625dc8107eb699"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_doc/0.4.2-1"; + sha256 = "sha256-26c5pwUd0+LEqoA5ZszgfKebfM7piQ4PZ2VHmP9lhG8="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.catkin-pkg ]; diff --git a/distros/noetic/fuse-graphs/default.nix b/distros/noetic/fuse-graphs/default.nix index 0a69e3bedc..11837f12e4 100644 --- a/distros/noetic/fuse-graphs/default.nix +++ b/distros/noetic/fuse-graphs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-graphs"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_graphs/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "a564f0d36acc87d70950394812a317521f5e06553db46032203a087179709fd3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_graphs/0.4.2-1"; + sha256 = "sha256-cvugc+QoTfpkErB/+qD3bGi0xT24rzvDPzbZT432F3k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fuse-loss/default.nix b/distros/noetic/fuse-loss/default.nix index 1ca54c6154..c6a0e4c7a8 100644 --- a/distros/noetic/fuse-loss/default.nix +++ b/distros/noetic/fuse-loss/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-loss"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_loss/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "ad517f3b405c32d529e1c487d3ee77cf556386ac519de01a929b792ff227375c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_loss/0.4.2-1"; + sha256 = "sha256-tE+1qXZugUfiPNEUYhwJ9beyqP0ZcSc2fCHB8C3+xU0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fuse-models/default.nix b/distros/noetic/fuse-models/default.nix index 006baacbea..06c9aafdca 100644 --- a/distros/noetic/fuse-models/default.nix +++ b/distros/noetic/fuse-models/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-models"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_models/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "e44698977ad88553aa308b36d12d9a4031eaa870a8f389833ad92e0eed2363fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_models/0.4.2-1"; + sha256 = "sha256-XxiZYv0muI50mZkHc0ruzrfsdiAUXM4fh0GQxngf224="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/noetic/fuse-msgs/default.nix b/distros/noetic/fuse-msgs/default.nix index de8ee9e05e..2aaa006f18 100644 --- a/distros/noetic/fuse-msgs/default.nix +++ b/distros/noetic/fuse-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-msgs"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_msgs/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "0b575230410d4bc65a862f7b7d99aa324a5f9d1e7d804ab5ec945af88bf38efd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_msgs/0.4.2-1"; + sha256 = "sha256-kpAxD9WBkmHZ5rWPvPtgjcvs0J12pfqF9onpMebQYNc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/fuse-optimizers/default.nix b/distros/noetic/fuse-optimizers/default.nix index 93152dfbd0..7f544de70e 100644 --- a/distros/noetic/fuse-optimizers/default.nix +++ b/distros/noetic/fuse-optimizers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-optimizers"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_optimizers/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "7327fd3bd1de8a049b782e839bf4c0878467ed38693e249c845a9d004e6bb5a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_optimizers/0.4.2-1"; + sha256 = "sha256-sfdo5rzV2QTNUShw+q/DusxeUu0W+1AEHGZtEhPuFuU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fuse-publishers/default.nix b/distros/noetic/fuse-publishers/default.nix index f6d695ad9d..606ecad9e5 100644 --- a/distros/noetic/fuse-publishers/default.nix +++ b/distros/noetic/fuse-publishers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-publishers"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_publishers/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "1939abba76b170966680595857a504b304f86b0ed514fa8416f1b920b9366b8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_publishers/0.4.2-1"; + sha256 = "sha256-VXMzYTYgXUqhkAVxkw5tmV8Zvfp38oZxyLfEAmmFj+Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fuse-variables/default.nix b/distros/noetic/fuse-variables/default.nix index d9a201cfc7..0dbfd85d65 100644 --- a/distros/noetic/fuse-variables/default.nix +++ b/distros/noetic/fuse-variables/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-variables"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_variables/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "28e692927f5dabf2818df89960abefa75669bf8ec16de14cf3626a581d77308b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_variables/0.4.2-1"; + sha256 = "sha256-kjU7t41ZU92TGpGUx9YQeRed1YH90trjYgWlnydKLww="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/fuse-viz/default.nix b/distros/noetic/fuse-viz/default.nix index 3cd6ac2829..8918f505a9 100644 --- a/distros/noetic/fuse-viz/default.nix +++ b/distros/noetic/fuse-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse-viz"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse_viz/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "579487efe209c56eb45f26119de0668e07254377b28bca28cae46660decba942"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse_viz/0.4.2-1"; + sha256 = "sha256-xEwnt5HUd7AakfWEBitDW41HU5Dr6pxp2juUzfoyPiw="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/noetic/fuse/default.nix b/distros/noetic/fuse/default.nix index 94465f5dce..5834eefdc4 100644 --- a/distros/noetic/fuse/default.nix +++ b/distros/noetic/fuse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-fuse"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/fuse-release/archive/release/noetic/fuse/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "00717f86ddb50dde32843f9907ada284b9f55a9cb250a5e509a26f67bd68614e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "fuse-release"; + rev = "release/noetic/fuse/0.4.2-1"; + sha256 = "sha256-fNIeOlL9jLL3OzEUoCbxsQw5E7Cda+T8uGkNJFWBnAc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gazebo-dev/default.nix b/distros/noetic/gazebo-dev/default.nix index 0cb1ce3838..82ed69a29a 100644 --- a/distros/noetic/gazebo-dev/default.nix +++ b/distros/noetic/gazebo-dev/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-dev"; version = "2.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/noetic/gazebo_dev/2.9.2-1.tar.gz"; - name = "2.9.2-1.tar.gz"; - sha256 = "a594abb4b5f4da4c29c18f676ea9ade011da49794613788f1ddbe5c4273689bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/noetic/gazebo_dev/2.9.2-1"; + sha256 = "sha256-+7bPxrlQO8YJc54esvZD1EOcR2OWjxRuP2kESuopaoI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gazebo-msgs/default.nix b/distros/noetic/gazebo-msgs/default.nix index 7e50c980fd..2216095a4d 100644 --- a/distros/noetic/gazebo-msgs/default.nix +++ b/distros/noetic/gazebo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-msgs"; version = "2.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/noetic/gazebo_msgs/2.9.2-1.tar.gz"; - name = "2.9.2-1.tar.gz"; - sha256 = "45114343951b0c49c73cc33840dc3c8a1d83e169d4c6e7798da9dfaa048a079b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/noetic/gazebo_msgs/2.9.2-1"; + sha256 = "sha256-LCmtwOf9TTE3qW/YmPaW5SPYetcoKHe8d6n0/wyxlLg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/gazebo-plugins/default.nix b/distros/noetic/gazebo-plugins/default.nix index ef8e8835cb..976160465a 100644 --- a/distros/noetic/gazebo-plugins/default.nix +++ b/distros/noetic/gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-plugins"; version = "2.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/noetic/gazebo_plugins/2.9.2-1.tar.gz"; - name = "2.9.2-1.tar.gz"; - sha256 = "0c7aba61f1e6f811387bc63b6d5a1679758754af6784d93a7efd3045fe6a7a43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/noetic/gazebo_plugins/2.9.2-1"; + sha256 = "sha256-V5+2Nqf3xgyWD2Y9cA/5+21RKSyPF7PcVtO1++OKKpc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/gazebo-ros-control-select-joints/default.nix b/distros/noetic/gazebo-ros-control-select-joints/default.nix index 3de2ad9234..336dec5c03 100644 --- a/distros/noetic/gazebo-ros-control-select-joints/default.nix +++ b/distros/noetic/gazebo-ros-control-select-joints/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-ros-control-select-joints"; version = "2.5.7-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/gazebo_ros_control_select_joints-release/archive/release/noetic/gazebo_ros_control_select_joints/2.5.7-1.tar.gz"; - name = "2.5.7-1.tar.gz"; - sha256 = "49ee976c4565b47588ca0ac9acabd261902629be396bf77020a26bb5b0572a00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "gazebo_ros_control_select_joints-release"; + rev = "release/noetic/gazebo_ros_control_select_joints/2.5.7-1"; + sha256 = "sha256-xthWwWVwN+s8gxV1J1wk6eQVQ2OQZ+dZNoWLarqgm5M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gazebo-ros-control/default.nix b/distros/noetic/gazebo-ros-control/default.nix index 41b7ad5c8c..a47e14ec05 100644 --- a/distros/noetic/gazebo-ros-control/default.nix +++ b/distros/noetic/gazebo-ros-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-ros-control"; version = "2.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/noetic/gazebo_ros_control/2.9.2-1.tar.gz"; - name = "2.9.2-1.tar.gz"; - sha256 = "0e862d58508c1bf22aaf47c26aae4f7233863ea8da4e6d1e9ac1e21bb527501d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/noetic/gazebo_ros_control/2.9.2-1"; + sha256 = "sha256-qmY04iT4FIn70ffi/cSsdrQICl0ybxVZyr0VQL2cU3w="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-dev ]; diff --git a/distros/noetic/gazebo-ros-pkgs/default.nix b/distros/noetic/gazebo-ros-pkgs/default.nix index 2f7e4c579a..31ba6a6d62 100644 --- a/distros/noetic/gazebo-ros-pkgs/default.nix +++ b/distros/noetic/gazebo-ros-pkgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-ros-pkgs"; version = "2.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/noetic/gazebo_ros_pkgs/2.9.2-1.tar.gz"; - name = "2.9.2-1.tar.gz"; - sha256 = "b76529d93b6990c44f07168651fa5c355b3e1377fec10ba07189f387dfd3dff4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/noetic/gazebo_ros_pkgs/2.9.2-1"; + sha256 = "sha256-PUvDhdhCc+pKtBnS8Z3WuN8lJvPawIvtPY9OaSBFw50="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gazebo-ros/default.nix b/distros/noetic/gazebo-ros/default.nix index 3e7676d71c..003b02fb7b 100644 --- a/distros/noetic/gazebo-ros/default.nix +++ b/distros/noetic/gazebo-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-ros"; version = "2.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/noetic/gazebo_ros/2.9.2-1.tar.gz"; - name = "2.9.2-1.tar.gz"; - sha256 = "24232fe990ef4d5802f18b33b0a0dcf527595adfa9ed5fe16f4b4e55d73be5b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/noetic/gazebo_ros/2.9.2-1"; + sha256 = "sha256-EuIcMHRNE3nhACpg/LCqkXWLfJOjUf8Jwb1BTT964bs="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/gazebo-video-monitor-msgs/default.nix b/distros/noetic/gazebo-video-monitor-msgs/default.nix index 94e708fc54..047b2e3fc1 100644 --- a/distros/noetic/gazebo-video-monitor-msgs/default.nix +++ b/distros/noetic/gazebo-video-monitor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-video-monitor-msgs"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/nlamprian/gazebo_video_monitors-release/archive/release/noetic/gazebo_video_monitor_msgs/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "fb83f6679b5bca82292f7f0795c1d10487b89f50aa1512b00265b6850b118a7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nlamprian"; + repo = "gazebo_video_monitors-release"; + rev = "release/noetic/gazebo_video_monitor_msgs/0.7.0-1"; + sha256 = "sha256-LR7JnPgJWnIWZRsoxeo5cw6eixleOfrbmSN4zwl4AqE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/gazebo-video-monitor-plugins/default.nix b/distros/noetic/gazebo-video-monitor-plugins/default.nix index ff0ffd270c..465554e6cf 100644 --- a/distros/noetic/gazebo-video-monitor-plugins/default.nix +++ b/distros/noetic/gazebo-video-monitor-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-video-monitor-plugins"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/nlamprian/gazebo_video_monitors-release/archive/release/noetic/gazebo_video_monitor_plugins/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "75f65f76f92d6da2545a63a2fa23d93e55923cc576c973f11efdb2a5480a71ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nlamprian"; + repo = "gazebo_video_monitors-release"; + rev = "release/noetic/gazebo_video_monitor_plugins/0.7.0-1"; + sha256 = "sha256-zDo0iRuQwCn4ps9KjXOCb4wkBFPHWd8ZyAtfTtvCA9o="; + }; buildType = "catkin"; buildInputs = [ catkin libyamlcpp ]; diff --git a/distros/noetic/gazebo-video-monitor-utils/default.nix b/distros/noetic/gazebo-video-monitor-utils/default.nix index ba52b96988..1ca776bc32 100644 --- a/distros/noetic/gazebo-video-monitor-utils/default.nix +++ b/distros/noetic/gazebo-video-monitor-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-video-monitor-utils"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/nlamprian/gazebo_video_monitors-release/archive/release/noetic/gazebo_video_monitor_utils/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "6bde91c72bbd0a92a53a00ca2108ea313523e78789c0b989e35a1709dfbcf604"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nlamprian"; + repo = "gazebo_video_monitors-release"; + rev = "release/noetic/gazebo_video_monitor_utils/0.7.0-1"; + sha256 = "sha256-J9W2dP1gGkvTYbmGm4EpQGVjggSKfZL/ove1tBiPWt4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gazebo-video-monitors/default.nix b/distros/noetic/gazebo-video-monitors/default.nix index ef13f0f3d6..c65d99017b 100644 --- a/distros/noetic/gazebo-video-monitors/default.nix +++ b/distros/noetic/gazebo-video-monitors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gazebo-video-monitors"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/nlamprian/gazebo_video_monitors-release/archive/release/noetic/gazebo_video_monitors/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "3f826e78f7e83116edc3d110bd2df6ab8f2109e9447590e59d13325259a448a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nlamprian"; + repo = "gazebo_video_monitors-release"; + rev = "release/noetic/gazebo_video_monitors/0.7.0-1"; + sha256 = "sha256-ebSD+BLz4Z/jY1K01GbpULZQ3wNwP1X4AUii7q/IH1I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gencpp/default.nix b/distros/noetic/gencpp/default.nix index 21e5f9909c..d3159deec2 100644 --- a/distros/noetic/gencpp/default.nix +++ b/distros/noetic/gencpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gencpp"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gencpp-release/archive/release/noetic/gencpp/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "3cd1676629c01895c386837a4c0ed2a3fec51386f96749a8f8a160cb8493f82d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gencpp-release"; + rev = "release/noetic/gencpp/0.7.0-1"; + sha256 = "sha256-zV6wYMF2JBoJ2x8k10xNC6qZbouVzona5/HPuvhxtGI="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/generated.nix b/distros/noetic/generated.nix index 1185b99108..a40fa1be18 100644 --- a/distros/noetic/generated.nix +++ b/distros/noetic/generated.nix @@ -142,16 +142,6 @@ self: super: { bosch-locator-bridge = self.callPackage ./bosch-locator-bridge {}; - bota-driver = self.callPackage ./bota-driver {}; - - bota-driver-testing = self.callPackage ./bota-driver-testing {}; - - bota-node = self.callPackage ./bota-node {}; - - bota-signal-handler = self.callPackage ./bota-signal-handler {}; - - bota-worker = self.callPackage ./bota-worker {}; - calibration = self.callPackage ./calibration {}; calibration-estimation = self.callPackage ./calibration-estimation {}; @@ -592,6 +582,8 @@ self: super: { depthai-examples = self.callPackage ./depthai-examples {}; + depthai-ros-driver = self.callPackage ./depthai-ros-driver {}; + depthai-ros-msgs = self.callPackage ./depthai-ros-msgs {}; depthimage-to-laserscan = self.callPackage ./depthimage-to-laserscan {}; @@ -944,36 +936,6 @@ self: super: { fkie-message-filters = self.callPackage ./fkie-message-filters {}; - fkie-multimaster = self.callPackage ./fkie-multimaster {}; - - fkie-multimaster-msgs = self.callPackage ./fkie-multimaster-msgs {}; - - fkie-node-manager = self.callPackage ./fkie-node-manager {}; - - fkie-node-manager-daemon = self.callPackage ./fkie-node-manager-daemon {}; - - fkie-potree-rviz-plugin = self.callPackage ./fkie-potree-rviz-plugin {}; - - flexbe-behavior-engine = self.callPackage ./flexbe-behavior-engine {}; - - flexbe-core = self.callPackage ./flexbe-core {}; - - flexbe-input = self.callPackage ./flexbe-input {}; - - flexbe-mirror = self.callPackage ./flexbe-mirror {}; - - flexbe-msgs = self.callPackage ./flexbe-msgs {}; - - flexbe-onboard = self.callPackage ./flexbe-onboard {}; - - flexbe-states = self.callPackage ./flexbe-states {}; - - flexbe-testing = self.callPackage ./flexbe-testing {}; - - 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 {}; @@ -1540,6 +1502,8 @@ self: super: { lanelet2-maps = self.callPackage ./lanelet2-maps {}; + lanelet2-matching = self.callPackage ./lanelet2-matching {}; + lanelet2-projection = self.callPackage ./lanelet2-projection {}; lanelet2-python = self.callPackage ./lanelet2-python {}; @@ -1857,6 +1821,8 @@ self: super: { move-slow-and-clear = self.callPackage ./move-slow-and-clear {}; moveit = self.callPackage ./moveit {}; + + moveit-commander = self.callPackage ./moveit-commander {}; moveit-calibration-gui = self.callPackage ./moveit-calibration-gui {}; @@ -2194,10 +2160,6 @@ 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 {}; @@ -2712,18 +2674,6 @@ self: super: { robotraconteur = self.callPackage ./robotraconteur {}; - rokubimini = self.callPackage ./rokubimini {}; - - rokubimini-bus-manager = self.callPackage ./rokubimini-bus-manager {}; - - rokubimini-description = self.callPackage ./rokubimini-description {}; - - rokubimini-ethercat = self.callPackage ./rokubimini-ethercat {}; - - rokubimini-msgs = self.callPackage ./rokubimini-msgs {}; - - rokubimini-serial = self.callPackage ./rokubimini-serial {}; - ros = self.callPackage ./ros {}; ros-babel-fish = self.callPackage ./ros-babel-fish {}; @@ -3068,6 +3018,10 @@ self: super: { rviz-satellite = self.callPackage ./rviz-satellite {}; + rviz-tool-cursor = self.callPackage ./rviz-tool-cursor {}; + + rviz-tool-path-display = self.callPackage ./rviz-tool-path-display {}; + rviz-visual-tools = self.callPackage ./rviz-visual-tools {}; rwt-app-chooser = self.callPackage ./rwt-app-chooser {}; @@ -3398,26 +3352,6 @@ self: super: { topic-tools = self.callPackage ./topic-tools {}; - toposens = self.callPackage ./toposens {}; - - toposens-sensor-library = self.callPackage ./toposens-sensor-library {}; - - 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 {}; @@ -3532,14 +3466,20 @@ self: super: { ur5e-moveit-config = self.callPackage ./ur5e-moveit-config {}; + ur-calibration = self.callPackage ./ur-calibration {}; + ur-client-library = self.callPackage ./ur-client-library {}; + ur-dashboard-msgs = self.callPackage ./ur-dashboard-msgs {}; + ur-description = self.callPackage ./ur-description {}; ur-gazebo = self.callPackage ./ur-gazebo {}; ur-msgs = self.callPackage ./ur-msgs {}; + ur-robot-driver = self.callPackage ./ur-robot-driver {}; + urdf = self.callPackage ./urdf {}; urdf-geometry-parser = self.callPackage ./urdf-geometry-parser {}; diff --git a/distros/noetic/generic-throttle/default.nix b/distros/noetic/generic-throttle/default.nix index a17e88ae35..3af793647c 100644 --- a/distros/noetic/generic-throttle/default.nix +++ b/distros/noetic/generic-throttle/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cv-bridge, python3Packages, rospy, rostopic }: buildRosPackage { pname = "ros-noetic-generic-throttle"; - version = "0.6.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/generic_throttle/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "e1d9831a6935d4114245b8c6ea3f3c08ef6c2467bc9563e01e4544a790af8109"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/generic_throttle/0.6.31-1"; + sha256 = "sha256-9I5F2bac6HLI3pkC+EtmKznywR+XcBc8ofUJrWP9fhs="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/geneus/default.nix b/distros/noetic/geneus/default.nix index c4bf149c59..ac66a0788d 100644 --- a/distros/noetic/geneus/default.nix +++ b/distros/noetic/geneus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geneus"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/tork-a/geneus-release/archive/release/noetic/geneus/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "ff5b138e338c71c9be13e2a426b76e274bf9eb28b3a7f9c3e48d1019816b6ba8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "geneus-release"; + rev = "release/noetic/geneus/3.0.0-1"; + sha256 = "sha256-p/HgY3tR98Dq1bbT6ipQdZJgUhXQcfVAlDLp3QxHUko="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/genlisp/default.nix b/distros/noetic/genlisp/default.nix index c4a34b8cf1..cf5bbef777 100644 --- a/distros/noetic/genlisp/default.nix +++ b/distros/noetic/genlisp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-genlisp"; version = "0.4.18-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/genlisp-release/archive/release/noetic/genlisp/0.4.18-1.tar.gz"; - name = "0.4.18-1.tar.gz"; - sha256 = "a2a0af65d9e93227ac21bbf58e2ee27b02f3172523787e10165c1351ab4966c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "genlisp-release"; + rev = "release/noetic/genlisp/0.4.18-1"; + sha256 = "sha256-UgWHIS/LzbhADIgpPqQfEp3puhfuFJReDMWgvaUywd4="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/genmsg/default.nix b/distros/noetic/genmsg/default.nix index 5192ca5295..839c9016dd 100644 --- a/distros/noetic/genmsg/default.nix +++ b/distros/noetic/genmsg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-genmsg"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/genmsg-release/archive/release/noetic/genmsg/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "64ea7374aff61084f36ed781a20e44dbccecbf5ff24a3d6c6f9218e57fbfaa9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "genmsg-release"; + rev = "release/noetic/genmsg/0.6.0-1"; + sha256 = "sha256-mTvQyZAidGA8Nyu95CH1H9HozsLRyiREfMFDBkVcDow="; + }; buildType = "catkin"; buildInputs = [ python3Packages.setuptools ]; diff --git a/distros/noetic/genmypy/default.nix b/distros/noetic/genmypy/default.nix index 5525acf2b7..db83adcba2 100644 --- a/distros/noetic/genmypy/default.nix +++ b/distros/noetic/genmypy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-genmypy"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/rospypi/genmypy-release/archive/release/noetic/genmypy/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "65630a5fe0762662abedd95c8193d9a0141e61511149f780b3d9bbfd69ef3aed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rospypi"; + repo = "genmypy-release"; + rev = "release/noetic/genmypy/0.3.1-1"; + sha256 = "sha256-hf/egLXmmmwG/ST3AlI7ljjfjFcVTtTcGeRP2FiLBQA="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/gennodejs/default.nix b/distros/noetic/gennodejs/default.nix index 3b357766e8..6fa63d6afc 100644 --- a/distros/noetic/gennodejs/default.nix +++ b/distros/noetic/gennodejs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gennodejs"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/sloretz/gennodejs-release/archive/release/noetic/gennodejs/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "a4f42f9e0ea4aa5390032c98a0702ed33d62069ade18ee942002524b2a22e77d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "sloretz"; + repo = "gennodejs-release"; + rev = "release/noetic/gennodejs/2.0.2-1"; + sha256 = "sha256-GruN1IMK5gqVHbDMgXoCNMrrKJAPv55bLZddaelP7o4="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/genpy/default.nix b/distros/noetic/genpy/default.nix index 971fae2463..5e88c3089e 100644 --- a/distros/noetic/genpy/default.nix +++ b/distros/noetic/genpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-genpy"; version = "0.6.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/genpy-release/archive/release/noetic/genpy/0.6.15-1.tar.gz"; - name = "0.6.15-1.tar.gz"; - sha256 = "6ff427b4dba67d28eb6c39e3c43c3ab5a011e9fc0d3b5c4c39828476f5ea2746"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "genpy-release"; + rev = "release/noetic/genpy/0.6.15-1"; + sha256 = "sha256-dcNcHPvjQ+sZ1MM16gv+yLVWf0Cv70TarjipFtTrdnw="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/geodesy/default.nix b/distros/noetic/geodesy/default.nix index 313d0737fd..9b40bd731a 100644 --- a/distros/noetic/geodesy/default.nix +++ b/distros/noetic/geodesy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geodesy"; version = "0.5.6-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/noetic/geodesy/0.5.6-1.tar.gz"; - name = "0.5.6-1.tar.gz"; - sha256 = "69da32daf80a20fd6bdf586d440a31a17afcadd46eb6999cacbcf4ce63bf3542"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/noetic/geodesy/0.5.6-1"; + sha256 = "sha256-3NDENuO56mgQho0Y3nLmEuL/tz7pCcW159ZAQoeDpBE="; + }; buildType = "catkin"; buildInputs = [ angles catkin python3Packages.catkin-pkg python3Packages.setuptools ]; diff --git a/distros/noetic/geographic-info/default.nix b/distros/noetic/geographic-info/default.nix index c1b946c781..3081485c9b 100644 --- a/distros/noetic/geographic-info/default.nix +++ b/distros/noetic/geographic-info/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geographic-info"; version = "0.5.6-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/noetic/geographic_info/0.5.6-1.tar.gz"; - name = "0.5.6-1.tar.gz"; - sha256 = "be539a05f207583008d37725779e71984db5d3a5991dbbd19f6e158cd3c90272"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/noetic/geographic_info/0.5.6-1"; + sha256 = "sha256-/VdTo/eyAglZJcxZa2Jpv5OQhJaQ2rSUncgTx0HcHJY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/geographic-msgs/default.nix b/distros/noetic/geographic-msgs/default.nix index 3bd7d98ee4..b3de11f0cd 100644 --- a/distros/noetic/geographic-msgs/default.nix +++ b/distros/noetic/geographic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geographic-msgs"; version = "0.5.6-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/geographic_info-release/archive/release/noetic/geographic_msgs/0.5.6-1.tar.gz"; - name = "0.5.6-1.tar.gz"; - sha256 = "0c19562199a4f9f813362ad87d4345bb8ae77c77c41f7fe332eb672ad19d2d79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "geographic_info-release"; + rev = "release/noetic/geographic_msgs/0.5.6-1"; + sha256 = "sha256-Rc1JujJAKJ6ya7NCZufQxFBrzYmIs66tMSL22/fDWTw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/geometric-shapes/default.nix b/distros/noetic/geometric-shapes/default.nix index 392fc6dbbb..0b6239c424 100644 --- a/distros/noetic/geometric-shapes/default.nix +++ b/distros/noetic/geometric-shapes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geometric-shapes"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometric_shapes-release/archive/release/noetic/geometric_shapes/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "6f105fb610c996aabe52df57a2bed75ee9337a01f079495b78a1fa182ed66d63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometric_shapes-release"; + rev = "release/noetic/geometric_shapes/0.7.3-1"; + sha256 = "sha256-JgnwXaLnJWc3+zFFDSHiahiKGZ2XtaZhhLZKo5YDY5o="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/geometry-msgs/default.nix b/distros/noetic/geometry-msgs/default.nix index 16bb32d979..6f132a4805 100644 --- a/distros/noetic/geometry-msgs/default.nix +++ b/distros/noetic/geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geometry-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/geometry_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "0d767550c3e03e287d9606ddac92657c11bb93bf91ec4f3157e3a73e3e2c76dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/geometry_msgs/1.13.1-1"; + sha256 = "sha256-HAvscctyubs9JETUZg8Wn/OGg2zW0xou4EXiiPpUCYw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/geometry-tutorials/default.nix b/distros/noetic/geometry-tutorials/default.nix index de914d4514..322aad0fd6 100644 --- a/distros/noetic/geometry-tutorials/default.nix +++ b/distros/noetic/geometry-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geometry-tutorials"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry_tutorials-release/archive/release/noetic/geometry_tutorials/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "58b0ecb64acf567e9bc62efb6252452443c399d98701edc9bbbb295d9999ecb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/noetic/geometry_tutorials/0.2.3-1"; + sha256 = "sha256-Md8QxkwXqo4SDF8pHOfVGXLe+6MbjaINZvcBMs8AEJ8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/geometry/default.nix b/distros/noetic/geometry/default.nix index 04464b0e3a..67ecbb0992 100644 --- a/distros/noetic/geometry/default.nix +++ b/distros/noetic/geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geometry"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/noetic/geometry/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "45d3dd1724ca4416f16efbc51f6bb9e8fd1eb72db66cd0b7392b83d7d6eb9e1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/noetic/geometry/1.13.2-1"; + sha256 = "sha256-2PW4Lp75Fah0yzlRAtnUgfi9TiJzl7Y+AEB9l9ew3sY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/geometry2/default.nix b/distros/noetic/geometry2/default.nix index 3978d92c50..6e7e80f340 100644 --- a/distros/noetic/geometry2/default.nix +++ b/distros/noetic/geometry2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-geometry2"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/geometry2/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "8d0c817505a906abd6433ad2aca5f252371bbc6cd52ecf504dff680fd45dcc21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/geometry2/0.7.6-1"; + sha256 = "sha256-ZfRbH+nh51KJIpHdp6zX+I4d9DBMTk92uFaeNAKzGN4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gl-dependency/default.nix b/distros/noetic/gl-dependency/default.nix index 718f432220..861dfa1207 100644 --- a/distros/noetic/gl-dependency/default.nix +++ b/distros/noetic/gl-dependency/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gl-dependency"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/gl_dependency-release/archive/release/noetic/gl_dependency/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "0dd1355fce88a9e67f0ee0f2c223511f7686e5a07bbabaecb7663a732452daf3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "gl_dependency-release"; + rev = "release/noetic/gl_dependency/1.1.2-1"; + sha256 = "sha256-IRkMw9PbtUBNEmRH9dee9tMoGB4wmnpdx05DOBlsCq4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/global-planner-tests/default.nix b/distros/noetic/global-planner-tests/default.nix index f39a3d7cf7..9f418e654f 100644 --- a/distros/noetic/global-planner-tests/default.nix +++ b/distros/noetic/global-planner-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-global-planner-tests"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/global_planner_tests/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "8f6ec1166452f3886e8ea39c541347398e1e7f97afb218cb01271e19bea16ee8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/global_planner_tests/0.3.0-2"; + sha256 = "sha256-bu8nN916bT4jt2TZVoILR2c/qG4MLmKv99f/7ClgbzI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/global-planner/default.nix b/distros/noetic/global-planner/default.nix index 3b6dfc6843..53e2c88342 100644 --- a/distros/noetic/global-planner/default.nix +++ b/distros/noetic/global-planner/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, catkin, costmap-2d, dynamic-reconfigure, geometry-msgs, nav-core, nav-msgs, navfn, pluginlib, roscpp, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-global-planner"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/global_planner/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "feb8a04bb141d5f90d4e2e0985845b15fcbbe9c66c122c85deeb07a1535f827e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/global_planner/1.17.3-1"; + sha256 = "sha256-pPCY1GQPozsPoRdRXrCwJEyKeixFJqs3/egU1JIbJzg="; + }; buildType = "catkin"; buildInputs = [ angles catkin tf2-geometry-msgs ]; diff --git a/distros/noetic/gmapping/default.nix b/distros/noetic/gmapping/default.nix index ff97ebb6ef..6c4b87651c 100644 --- a/distros/noetic/gmapping/default.nix +++ b/distros/noetic/gmapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gmapping"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/slam_gmapping-release/archive/release/noetic/gmapping/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "9b31604092fbb4547f6fbc6359d83fa1f43a5038348955fe24b48245fb7506df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "slam_gmapping-release"; + rev = "release/noetic/gmapping/1.4.2-1"; + sha256 = "sha256-FV38OklHuphVWZz1xC4E6QVXr5EIgEC8PAO6qH8mUuE="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/gmcl/default.nix b/distros/noetic/gmcl/default.nix index 330ea3cc56..04ed99cd12 100644 --- a/distros/noetic/gmcl/default.nix +++ b/distros/noetic/gmcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gmcl"; version = "1.0.1-r3"; - src = fetchurl { - url = "https://github.com/adler-1994/gmcl-release/archive/release/noetic/gmcl/1.0.1-3.tar.gz"; - name = "1.0.1-3.tar.gz"; - sha256 = "46c797852514b8f68fdfed022818e139bc7384323891013e3fee1deb9c7428c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "adler-1994"; + repo = "gmcl-release"; + rev = "release/noetic/gmcl/1.0.1-3"; + sha256 = "sha256-0eHw0NHier7DtVx54FH6itFQQVW1/uZmWmwXU/b6/JQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-filters tf2-geometry-msgs ]; diff --git a/distros/noetic/goal-passer/default.nix b/distros/noetic/goal-passer/default.nix index 3000269ab1..2b93dff49c 100644 --- a/distros/noetic/goal-passer/default.nix +++ b/distros/noetic/goal-passer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-goal-passer"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/noetic/goal_passer/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "3eaf495a78b86279c105d8bef4dd6af74ae3878289f2cc025762acc02444149d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/noetic/goal_passer/0.4.1-1"; + sha256 = "sha256-evibOOF6KTpqotCFoiFS98P+Bu1HrkNUJVI/CF7tEYw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gpio-controller/default.nix b/distros/noetic/gpio-controller/default.nix index 9a26c8098e..8635f4eda3 100644 --- a/distros/noetic/gpio-controller/default.nix +++ b/distros/noetic/gpio-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gpio-controller"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/gpio_controller/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "975510a3a726dcfdc2671a805327a54837451999c9826d5e6490ba352430fff8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/gpio_controller/0.1.7-1"; + sha256 = "sha256-gipeU1X7C7ldshZqyontdWjndgn1EOPEmwidPGzIp4U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gpp-interface/default.nix b/distros/noetic/gpp-interface/default.nix index 77d3e79415..9b0406a0e0 100644 --- a/distros/noetic/gpp-interface/default.nix +++ b/distros/noetic/gpp-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gpp-interface"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/dorezyuk/gpp-release/archive/release/noetic/gpp_interface/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "9c4f61513b1a2712e2fa2ba302cb4b62147b0c3547a728fd39032fbdd368fdaf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dorezyuk"; + repo = "gpp-release"; + rev = "release/noetic/gpp_interface/0.1.0-1"; + sha256 = "sha256-e5mF0Lz/FBR78HTAmtqT3LApj3O+V1szSQMVsH2VtEc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gpp-plugin/default.nix b/distros/noetic/gpp-plugin/default.nix index 072a14b488..1978909731 100644 --- a/distros/noetic/gpp-plugin/default.nix +++ b/distros/noetic/gpp-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gpp-plugin"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/dorezyuk/gpp-release/archive/release/noetic/gpp_plugin/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "ec040bfbdd8955f355f878cff68978ad94b5766920013b34f34e5449b07b61b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dorezyuk"; + repo = "gpp-release"; + rev = "release/noetic/gpp_plugin/0.1.0-1"; + sha256 = "sha256-shjIZJpXhUIKXeaiMt84kSWzQmDAFdEB022vQxVAoeo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gpp-prune-path/default.nix b/distros/noetic/gpp-prune-path/default.nix index 9eb4e34757..f0ebf96049 100644 --- a/distros/noetic/gpp-prune-path/default.nix +++ b/distros/noetic/gpp-prune-path/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gpp-prune-path"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/dorezyuk/gpp-release/archive/release/noetic/gpp_prune_path/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "0b3763073ad4c87a271cdc52bf8e10d0b10210512cd6b073f093afab74fbc390"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dorezyuk"; + repo = "gpp-release"; + rev = "release/noetic/gpp_prune_path/0.1.0-1"; + sha256 = "sha256-bti9wqUY0hejSF4my61lcZzeZYX0tPOci2C3ONqQlms="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gpp-update-map/default.nix b/distros/noetic/gpp-update-map/default.nix index 0e62a9e3af..dee1834dd6 100644 --- a/distros/noetic/gpp-update-map/default.nix +++ b/distros/noetic/gpp-update-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gpp-update-map"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/dorezyuk/gpp-release/archive/release/noetic/gpp_update_map/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "a9bd9719af1b91957ad5dad8e531e18326e1f922d195c8be9795ad8c96d416c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dorezyuk"; + repo = "gpp-release"; + rev = "release/noetic/gpp_update_map/0.1.0-1"; + sha256 = "sha256-0Ws09TZEAJLyIKvIkwiHV3FvR3jBfPhkCSfILbFyGJ8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gps-common/default.nix b/distros/noetic/gps-common/default.nix index b5447f2cd0..8a5ac665c7 100644 --- a/distros/noetic/gps-common/default.nix +++ b/distros/noetic/gps-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gps-common"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/noetic/gps_common/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "9f1698a8af546ffc0e466dfda956ef9e0ce7d733eeb2aa7fc17790472e644854"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/noetic/gps_common/0.3.3-1"; + sha256 = "sha256-QVIxTt/bEqxclSU4eZ+rqX2jKWcf/jZd1CMUKHxfTZQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/gps-umd/default.nix b/distros/noetic/gps-umd/default.nix index 6d36d112a0..e8dc98f36d 100644 --- a/distros/noetic/gps-umd/default.nix +++ b/distros/noetic/gps-umd/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gps-umd"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/noetic/gps_umd/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "d558c65ce8b83fb5235b7165b3662eefba2126b23685b623b087d44a4a00fed1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/noetic/gps_umd/0.3.3-1"; + sha256 = "sha256-RfpgXAfHt3iFHFy6QLBMHkXpkysWJnkJ3v1Xj/GB9bM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gpsd-client/default.nix b/distros/noetic/gpsd-client/default.nix index 8ea2c968d4..2b6c46c643 100644 --- a/distros/noetic/gpsd-client/default.nix +++ b/distros/noetic/gpsd-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-gpsd-client"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/gps_umd-release/archive/release/noetic/gpsd_client/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "dc8b37e6b30d5983609a9ca86c0dea4febbd2c8b9830a5d7ce698ac2d440b5a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "gps_umd-release"; + rev = "release/noetic/gpsd_client/0.3.3-1"; + sha256 = "sha256-MiUnHvwdIX+rvfcj2Uaok4Jud6lyIakUHJBnMsr9Z1g="; + }; buildType = "catkin"; buildInputs = [ catkin gps-common gpsd pkg-config roscpp sensor-msgs ]; diff --git a/distros/noetic/graceful-controller-ros/default.nix b/distros/noetic/graceful-controller-ros/default.nix index 19fdeac19b..826ab008b8 100644 --- a/distros/noetic/graceful-controller-ros/default.nix +++ b/distros/noetic/graceful-controller-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-graceful-controller-ros"; version = "0.4.5-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/noetic/graceful_controller_ros/0.4.5-1.tar.gz"; - name = "0.4.5-1.tar.gz"; - sha256 = "fe02ebd9384d28a1c4ca5579096a1b05c43bcd7975e61413cfbf453007a31caa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "graceful_controller-gbp"; + rev = "release/noetic/graceful_controller_ros/0.4.5-1"; + sha256 = "sha256-l1iTel1PccKaj2fzdWW4ZiQf/PWcU1TmB+G2VmJRTPc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/graceful-controller/default.nix b/distros/noetic/graceful-controller/default.nix index af3a70e8c7..330675b61f 100644 --- a/distros/noetic/graceful-controller/default.nix +++ b/distros/noetic/graceful-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-graceful-controller"; version = "0.4.5-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/noetic/graceful_controller/0.4.5-1.tar.gz"; - name = "0.4.5-1.tar.gz"; - sha256 = "053d07fcc27c9d2f24507d01336d85947c46cd87a685b886a913a11726891d75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "graceful_controller-gbp"; + rev = "release/noetic/graceful_controller/0.4.5-1"; + sha256 = "sha256-exxlqw+4aBd75Tp9vtNvqCs8P+97KEAMex94M8R1gzQ="; + }; buildType = "catkin"; buildInputs = [ angles catkin ]; diff --git a/distros/noetic/graft/default.nix b/distros/noetic/graft/default.nix index e3e12ac11f..4fee75fb94 100644 --- a/distros/noetic/graft/default.nix +++ b/distros/noetic/graft/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-graft"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/graft-release/archive/release/noetic/graft/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "306d1bcdbac73fa4e78052f131880f6529ac561e50887f88a883e9575d804189"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "graft-release"; + rev = "release/noetic/graft/0.2.3-1"; + sha256 = "sha256-iptW0ogmMJY4rrW2fbaDEO+ZC/+ZS4Nx1KvnUlQADaE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen message-generation ]; diff --git a/distros/noetic/graph-msgs/default.nix b/distros/noetic/graph-msgs/default.nix index 4cad1914b6..9fb201fb44 100644 --- a/distros/noetic/graph-msgs/default.nix +++ b/distros/noetic/graph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-graph-msgs"; version = "0.1.0-r2"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/graph_msgs-release/archive/release/noetic/graph_msgs/0.1.0-2.tar.gz"; - name = "0.1.0-2.tar.gz"; - sha256 = "ce7125a86592674cfafa8ae3ba856c85fdf5359b0207a7537841f532679f0b25"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "graph_msgs-release"; + rev = "release/noetic/graph_msgs/0.1.0-2"; + sha256 = "sha256-t7ggPFTWsw+cJsxTPHhEsAqpkSTa1ruf06UeSuI2Yhg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/grasping-msgs/default.nix b/distros/noetic/grasping-msgs/default.nix index f9135337fd..d6ba470dca 100644 --- a/distros/noetic/grasping-msgs/default.nix +++ b/distros/noetic/grasping-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grasping-msgs"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/mikeferguson/grasping_msgs-gbp/archive/release/noetic/grasping_msgs/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "87a1982676f3578bf4799db82e984990dec14eab6d9df3a98ab13b4d4a2d6c33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mikeferguson"; + repo = "grasping_msgs-gbp"; + rev = "release/noetic/grasping_msgs/0.3.1-1"; + sha256 = "sha256-6k890ogz0VZKvtTMcT8QQCf3sTND96p4bV7L9WA6AaM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/grepros/default.nix b/distros/noetic/grepros/default.nix index 516eb911f1..3810a49204 100644 --- a/distros/noetic/grepros/default.nix +++ b/distros/noetic/grepros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grepros"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/suurjaak/grepros-release/archive/release/noetic/grepros/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "1bfab99d92cabcf9cc7d650bb305af8b359317e980b04d500e27f45b3c15d093"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "suurjaak"; + repo = "grepros-release"; + rev = "release/noetic/grepros/0.5.0-1"; + sha256 = "sha256-xNIkYkH5iGMMZWXABQF8VH5UPVyLZIyYW7MsG1MZG4E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-core/default.nix b/distros/noetic/grid-map-core/default.nix index b8b3d0c17a..44960cb1bb 100644 --- a/distros/noetic/grid-map-core/default.nix +++ b/distros/noetic/grid-map-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-core"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_core/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "9ea3e29d3f8c12c9af66a00d2c31446016dd0f627ee38fdb1ce16d5743143ee1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_core/1.6.4-1"; + sha256 = "sha256-B3WTIP2KVYfvVTAlIUnr6WCzF0AMUudurpbdegjmlXA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-costmap-2d/default.nix b/distros/noetic/grid-map-costmap-2d/default.nix index db348f3db8..b295271edb 100644 --- a/distros/noetic/grid-map-costmap-2d/default.nix +++ b/distros/noetic/grid-map-costmap-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-costmap-2d"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_costmap_2d/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "836ad71ca7a5188ccc6295889cd1a391c8e9e55254b705215c6f7eb579489e36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_costmap_2d/1.6.4-1"; + sha256 = "sha256-lZ7JC33LIskMQOq9xIZqHjuhpakmHF15cCi0eN+uyIg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-cv/default.nix b/distros/noetic/grid-map-cv/default.nix index 7eb0533152..2807c598ff 100644 --- a/distros/noetic/grid-map-cv/default.nix +++ b/distros/noetic/grid-map-cv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-cv"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_cv/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "5e8ab047e2a10d98590a7832e330a61ee143f46f9cc8775227159f5c3c53238c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_cv/1.6.4-1"; + sha256 = "sha256-NgGfnWGegzwTwUZXew8KsV7uZzFcDdyJw7dqQkxhTrg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-demos/default.nix b/distros/noetic/grid-map-demos/default.nix index ca53299d47..1d3d7437c7 100644 --- a/distros/noetic/grid-map-demos/default.nix +++ b/distros/noetic/grid-map-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-demos"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_demos/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "9a0b3d43e260472efca22d3765271ebea46d797ff1436d41a671c2fbdc96cf3c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_demos/1.6.4-1"; + sha256 = "sha256-pXxMq6Xq9B06OjQ2OuwhOm65udzVrutP4DEhgaX4pU4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-filters/default.nix b/distros/noetic/grid-map-filters/default.nix index 29649584bb..20bcf44e75 100644 --- a/distros/noetic/grid-map-filters/default.nix +++ b/distros/noetic/grid-map-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-filters"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_filters/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "b4c5e3a49f7cfe5dbf2a919a316925ea3639e0d6a6eda175663182e0b3538210"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_filters/1.6.4-1"; + sha256 = "sha256-t00WIN/CLS+qjHIEn22SFDBvc/fi6itSHZyGkf+7Xh0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-loader/default.nix b/distros/noetic/grid-map-loader/default.nix index dfc7360b8e..476eb5c59a 100644 --- a/distros/noetic/grid-map-loader/default.nix +++ b/distros/noetic/grid-map-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-loader"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_loader/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "b077be707e5fb790acce59ef081b7eadd1a4342dccdd10fc54637906b97b39b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_loader/1.6.4-1"; + sha256 = "sha256-XtluSHAsXqk0NwvtosRl66LXHwGemJzwdUx9l/MrNpo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-msgs/default.nix b/distros/noetic/grid-map-msgs/default.nix index 06a6be35a8..3a692c952d 100644 --- a/distros/noetic/grid-map-msgs/default.nix +++ b/distros/noetic/grid-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-msgs"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_msgs/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "7cd126d7b28260046aa643c6717da989cb65cd1d99f980235fc9311e946886dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_msgs/1.6.4-1"; + sha256 = "sha256-o893zF0pnmxAh2KENP8czB8zoFeOVERo30Yo1iJMEw4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-octomap/default.nix b/distros/noetic/grid-map-octomap/default.nix index 70651c0132..b64e66f41e 100644 --- a/distros/noetic/grid-map-octomap/default.nix +++ b/distros/noetic/grid-map-octomap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-octomap"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_octomap/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "ef4c82f71e9df5269c9a953bc59d9f805bc57ad8d7f3601dc721ff5ad79e7f01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_octomap/1.6.4-1"; + sha256 = "sha256-1s3r1WyxwF5UmxWm2rbNzhehG9TDGnpQtP4k86j9xDE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-pcl/default.nix b/distros/noetic/grid-map-pcl/default.nix index 8a26c1f090..8845efbabb 100644 --- a/distros/noetic/grid-map-pcl/default.nix +++ b/distros/noetic/grid-map-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-pcl"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_pcl/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "450b6691fec88882a64528d24fa91d9108e628448bccc5ec570cb092a1fd47d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_pcl/1.6.4-1"; + sha256 = "sha256-eayKnOGauHu5czEyFKNz0kUj8FrU0MlMEnMTYgNT8h4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-ros/default.nix b/distros/noetic/grid-map-ros/default.nix index 650af438ef..e09c7e446a 100644 --- a/distros/noetic/grid-map-ros/default.nix +++ b/distros/noetic/grid-map-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-ros"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_ros/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "eb2d7ae8b21009c1059fb51ee387d053fa5e9be3b336f8d6f5d1805380113978"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_ros/1.6.4-1"; + sha256 = "sha256-aSYRr866BBxYhDK+2NSG7GeqCRLOZtAdOg9aWY9mm4s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-rviz-plugin/default.nix b/distros/noetic/grid-map-rviz-plugin/default.nix index f2c9f12de9..f70809bb33 100644 --- a/distros/noetic/grid-map-rviz-plugin/default.nix +++ b/distros/noetic/grid-map-rviz-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-rviz-plugin"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_rviz_plugin/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "e6acae54f714d37e2ca01e17de101711ee602ddb8389cdd449692de142471f65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_rviz_plugin/1.6.4-1"; + sha256 = "sha256-qkqH5aUWlSvVepOidlz6yY+8sUudmC/bNxbUjoJGTPE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-sdf/default.nix b/distros/noetic/grid-map-sdf/default.nix index 1f3cca7abd..12f64f5611 100644 --- a/distros/noetic/grid-map-sdf/default.nix +++ b/distros/noetic/grid-map-sdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-sdf"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_sdf/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "bc3afab7b443f041d998cba4dd624b6600f330c153647964c00d63ff70d9c3fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_sdf/1.6.4-1"; + sha256 = "sha256-bYaVjHvW0jqJ1BocdFcw+h15heGsQKMLbRg65eHHQew="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map-visualization/default.nix b/distros/noetic/grid-map-visualization/default.nix index dee62174eb..ce3171934d 100644 --- a/distros/noetic/grid-map-visualization/default.nix +++ b/distros/noetic/grid-map-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map-visualization"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map_visualization/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "8c10616dc010c86af00302c0301d01d3b90d7f3207d06bb710f35ff63e2fd79b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map_visualization/1.6.4-1"; + sha256 = "sha256-t8Fme0mbDCSk+cvB9kgQDk2yl8p0Zh8AeGSegyIxq/A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/grid-map/default.nix b/distros/noetic/grid-map/default.nix index bf65b05d3a..9714906b8e 100644 --- a/distros/noetic/grid-map/default.nix +++ b/distros/noetic/grid-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grid-map"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/anybotics/grid_map-release/archive/release/noetic/grid_map/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "02600ba8a898cef1635dccbe7e10c61fe2bf8522bbbe62c94f3884b7d64d5992"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "grid_map-release"; + rev = "release/noetic/grid_map/1.6.4-1"; + sha256 = "sha256-rrfUsMhqdhUx8AqDkPK9fW4PtjKfcBmCYMIDUp+cChw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/gripper-action-controller/default.nix b/distros/noetic/gripper-action-controller/default.nix index 4000dc467e..9569f6b5af 100644 --- a/distros/noetic/gripper-action-controller/default.nix +++ b/distros/noetic/gripper-action-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, control-msgs, control-toolbox, controller-interface, hardware-interface, pluginlib, realtime-tools, roscpp, urdf }: buildRosPackage { pname = "ros-noetic-gripper-action-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/gripper_action_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "873785fdc6e4508817f5c0714825e0be2a10d09d76fb0c3f49e39dcc78978f8d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/gripper_action_controller/0.21.1-1"; + sha256 = "sha256-MO3h4D93518WKKFDsUzVosOjYzAfgQUtxSycsaiairo="; + }; buildType = "catkin"; buildInputs = [ catkin pluginlib ]; diff --git a/distros/noetic/grpc/default.nix b/distros/noetic/grpc/default.nix index 249df9fcc6..26ca855736 100644 --- a/distros/noetic/grpc/default.nix +++ b/distros/noetic/grpc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-grpc"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/CogRobRelease/catkin_grpc-release/archive/release/noetic/grpc/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "5afcb6a7099876e45af084052b7aa7383f80bdc407d82fb15da46124a7e39c43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CogRobRelease"; + repo = "catkin_grpc-release"; + rev = "release/noetic/grpc/0.0.11-1"; + sha256 = "sha256-h4npK4/Op3K2aEDjjThObTIozwcIh9htvPBS+IsrRWM="; + }; buildType = "catkin"; buildInputs = [ autoconf catkin git libtool zlib ]; diff --git a/distros/noetic/handeye/default.nix b/distros/noetic/handeye/default.nix index bb08cd5e0f..19cfd7f7d3 100644 --- a/distros/noetic/handeye/default.nix +++ b/distros/noetic/handeye/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-handeye"; version = "0.1.2-r2"; - src = fetchurl { - url = "https://github.com/crigroup/handeye-release/archive/release/noetic/handeye/0.1.2-2.tar.gz"; - name = "0.1.2-2.tar.gz"; - sha256 = "aea294493fd622b577da646e8dbfc3ff835cf47d2e086f20d51eb4bf85cae4a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "crigroup"; + repo = "handeye-release"; + rev = "release/noetic/handeye/0.1.2-2"; + sha256 = "sha256-BeUw1PPgnxelwZZNnY8zjJjAj5q2htQKDCQa2h44NnA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/hardware-interface/default.nix b/distros/noetic/hardware-interface/default.nix index be1e8f7cfe..433080c3e0 100644 --- a/distros/noetic/hardware-interface/default.nix +++ b/distros/noetic/hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hardware-interface"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/hardware_interface/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "51b5289fa25d6acc0f913e683bacb910120071dd6561b540ff90173bf2751519"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/hardware_interface/0.19.6-1"; + sha256 = "sha256-+bwtqDHm2umvi79Xrv9Sn2yTXeT40/i62Xv7rTgwfO4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hdf5-map-io/default.nix b/distros/noetic/hdf5-map-io/default.nix index e75049c635..2eed5b4e5c 100644 --- a/distros/noetic/hdf5-map-io/default.nix +++ b/distros/noetic/hdf5-map-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hdf5-map-io"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/noetic/hdf5_map_io/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "31ca04db6683ffac320887907022e7d8ae3bf6965eb11252d0bf1f6836f4b571"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/noetic/hdf5_map_io/1.1.0-1"; + sha256 = "sha256-uGfz9W97JDomrPLt7PKwlP4UGNdee8XJwzovBpzyra8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hebi-cpp-api/default.nix b/distros/noetic/hebi-cpp-api/default.nix index e190546c48..cb9a70c328 100644 --- a/distros/noetic/hebi-cpp-api/default.nix +++ b/distros/noetic/hebi-cpp-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hebi-cpp-api"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/HebiRobotics/hebi_cpp_api_ros-release/archive/release/noetic/hebi_cpp_api/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "2979c3467c126931c36aa7a0a662ccddc15447159eed6e568a4cbf446e2f1d55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "HebiRobotics"; + repo = "hebi_cpp_api_ros-release"; + rev = "release/noetic/hebi_cpp_api/3.2.0-1"; + sha256 = "sha256-QSAEabtAQlkrQTpDECGciMGUtGZzgFgFzK5D+IHf/O8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen ]; diff --git a/distros/noetic/hector-components-description/default.nix b/distros/noetic/hector-components-description/default.nix index 3d5c507d02..366db9428b 100644 --- a/distros/noetic/hector-components-description/default.nix +++ b/distros/noetic/hector-components-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-components-description"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_models-release/archive/release/noetic/hector_components_description/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "c836e041158b1bac298c05bc1d4de83dfe722c2c7fa20daf6dec282e2a336db8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_models-release"; + rev = "release/noetic/hector_components_description/0.5.2-1"; + sha256 = "sha256-J7E5/f4NXbZum/tO5MIptiAECBdHVW1sWFONLjzI/NM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-compressed-map-transport/default.nix b/distros/noetic/hector-compressed-map-transport/default.nix index 06852c75c6..da42541e17 100644 --- a/distros/noetic/hector-compressed-map-transport/default.nix +++ b/distros/noetic/hector-compressed-map-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-compressed-map-transport"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_compressed_map_transport/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "13434ed757d7aa27414ba2495d0a296b6c4100cd21c4f513be3d6ca93cbbad9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_compressed_map_transport/0.5.2-4"; + sha256 = "sha256-mrIO22M/bPwDW/opU8KKXPq+TR5/+o9nBGNFFxUqI6A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-gazebo-plugins/default.nix b/distros/noetic/hector-gazebo-plugins/default.nix index a54b3e789c..82960f68fb 100644 --- a/distros/noetic/hector-gazebo-plugins/default.nix +++ b/distros/noetic/hector-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-gazebo-plugins"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/noetic/hector_gazebo_plugins/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "69f1b1d7f5c99497a402a1ac263605e80f820f1c9fc166c61ea4c7dca9af8da6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/noetic/hector_gazebo_plugins/0.5.4-1"; + sha256 = "sha256-4c+jJP00hi1Xmns+loZX4THAkQ48w1x2ZanWxd22pIE="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-dev message-generation ]; diff --git a/distros/noetic/hector-gazebo-thermal-camera/default.nix b/distros/noetic/hector-gazebo-thermal-camera/default.nix index b93f8aa99a..28f35199c3 100644 --- a/distros/noetic/hector-gazebo-thermal-camera/default.nix +++ b/distros/noetic/hector-gazebo-thermal-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-gazebo-thermal-camera"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/noetic/hector_gazebo_thermal_camera/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "64ac64b5360fd91f91890f06fe200f1c05e509a49bb8614dcb43f8cf4375f01b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/noetic/hector_gazebo_thermal_camera/0.5.4-1"; + sha256 = "sha256-6h4wPMO/Rda03LKTTNKb35YD/xj0BKpHeKTj+F/tG74="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-gazebo-worlds/default.nix b/distros/noetic/hector-gazebo-worlds/default.nix index 2c08f99183..fcffbc1087 100644 --- a/distros/noetic/hector-gazebo-worlds/default.nix +++ b/distros/noetic/hector-gazebo-worlds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-gazebo-worlds"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/noetic/hector_gazebo_worlds/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "9f031c0dc2cdc17c197b11771da7a0d8afa8b9063ec206af2ff3825b339573e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/noetic/hector_gazebo_worlds/0.5.4-1"; + sha256 = "sha256-DMc4PnfYFalcJ8tf4UDRrf68rGq90JQeC6ASpbRNmdc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-gazebo/default.nix b/distros/noetic/hector-gazebo/default.nix index 0be3e1c753..001c0e75db 100644 --- a/distros/noetic/hector-gazebo/default.nix +++ b/distros/noetic/hector-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-gazebo"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/noetic/hector_gazebo/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "f1627f9c2f509743aab146bd88f51e3fb8407acdc79613d9e39844c212e53cd8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/noetic/hector_gazebo/0.5.4-1"; + sha256 = "sha256-OdXPnPHs+zVN/Rc/2V7meTUXXJJHR/xkM4UPT9QOShM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-geotiff-launch/default.nix b/distros/noetic/hector-geotiff-launch/default.nix index 11ac49ce5e..c893d6bd69 100644 --- a/distros/noetic/hector-geotiff-launch/default.nix +++ b/distros/noetic/hector-geotiff-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-geotiff-launch"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_geotiff_launch/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "3e8f605d905a45743d07dfc38895f2e5e8163be71dfb3856ac4332c581cf1821"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_geotiff_launch/0.5.2-4"; + sha256 = "sha256-VssSobVIbY4BnIYyq5RU+MsLy8dBMOuR+KYhItdsBEw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-geotiff-plugins/default.nix b/distros/noetic/hector-geotiff-plugins/default.nix index 0414293d86..639622d9f0 100644 --- a/distros/noetic/hector-geotiff-plugins/default.nix +++ b/distros/noetic/hector-geotiff-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-geotiff-plugins"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_geotiff_plugins/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "a262122d12d80b717963890bb8ab61813e503c46152d9c170c665af49e230f1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_geotiff_plugins/0.5.2-4"; + sha256 = "sha256-XF1QBO/1yLGNIcYlNJtDP2x5U93r70va2tnd012wpHc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-geotiff/default.nix b/distros/noetic/hector-geotiff/default.nix index 026f775301..b7c3db8720 100644 --- a/distros/noetic/hector-geotiff/default.nix +++ b/distros/noetic/hector-geotiff/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-geotiff"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_geotiff/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "000385fc14d0a1f11099f71934902f311881bacf2c53aeb50a7f9c9042d69753"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_geotiff/0.5.2-4"; + sha256 = "sha256-olJHS7ncyaE0kdR4b/E3yAZVIUGBLv5rExcVrAXhKMQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-imu-attitude-to-tf/default.nix b/distros/noetic/hector-imu-attitude-to-tf/default.nix index 761b49606c..12f31f2bdd 100644 --- a/distros/noetic/hector-imu-attitude-to-tf/default.nix +++ b/distros/noetic/hector-imu-attitude-to-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-imu-attitude-to-tf"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_imu_attitude_to_tf/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "10731ab0d6e13ee76b8dca754ed32049e2a7ea518a9474d119996ea8c87373ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_imu_attitude_to_tf/0.5.2-4"; + sha256 = "sha256-KpUpSqxix5PktXCW5nb7FSW4+PVD4WWmB1a8FxDglM0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-imu-tools/default.nix b/distros/noetic/hector-imu-tools/default.nix index 3580caebb3..9334d8acec 100644 --- a/distros/noetic/hector-imu-tools/default.nix +++ b/distros/noetic/hector-imu-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-imu-tools"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_imu_tools/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "a4e67b8a5f662733075aa076acc1fc18f5eed4b34e7c87f611524207efb65326"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_imu_tools/0.5.2-4"; + sha256 = "sha256-IqBKZ3ufiPbJRP6p3Zg3e+7xvw+M3DYUrqsP2WgFqWk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-localization/default.nix b/distros/noetic/hector-localization/default.nix index 6f603f281b..5acedc9077 100644 --- a/distros/noetic/hector-localization/default.nix +++ b/distros/noetic/hector-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-localization"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_localization-release/archive/release/noetic/hector_localization/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "52d0f3a992929764e42fdd81bbe55db731b3df7d6ee55e15a516fd2d764fb31c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_localization-release"; + rev = "release/noetic/hector_localization/0.4.0-1"; + sha256 = "sha256-pQgRqbuueJFftxCoKzMuRaskbVqXjNafC31a7fMooeI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-map-server/default.nix b/distros/noetic/hector-map-server/default.nix index 8ce300a31c..73a15df464 100644 --- a/distros/noetic/hector-map-server/default.nix +++ b/distros/noetic/hector-map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-map-server"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_map_server/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "0fc4cf934248651db1cda8878bffde6608a9c65d2d890cad44855ee753346fec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_map_server/0.5.2-4"; + sha256 = "sha256-enKeqBBc6fo7xxbTm5ZQHQSkj3E2pj6yr4yFkoxcnYA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-map-tools/default.nix b/distros/noetic/hector-map-tools/default.nix index aa7a3630a3..83df877b96 100644 --- a/distros/noetic/hector-map-tools/default.nix +++ b/distros/noetic/hector-map-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-map-tools"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_map_tools/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "2d6643594c4f64a75becf83dde3da61f65cc34cbbdfe0e1153ca9436f6764cc3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_map_tools/0.5.2-4"; + sha256 = "sha256-ADc3aWzWWiZ23uscQp56GfTYQBBAkFkj8dOAAY3Hu5U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-mapping/default.nix b/distros/noetic/hector-mapping/default.nix index 732f35d6a3..3e71604eeb 100644 --- a/distros/noetic/hector-mapping/default.nix +++ b/distros/noetic/hector-mapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-mapping"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_mapping/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "ecceebe2a85de049572d9362d99760a92a22acbfedf55e27f219fb590c3b5a75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_mapping/0.5.2-4"; + sha256 = "sha256-iuqiN01q6U2ha2SbSY7vOF6HyiQQ8XrAIp0riqCJJa8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/hector-marker-drawing/default.nix b/distros/noetic/hector-marker-drawing/default.nix index 3f4eb42fc1..9545e4a036 100644 --- a/distros/noetic/hector-marker-drawing/default.nix +++ b/distros/noetic/hector-marker-drawing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-marker-drawing"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_marker_drawing/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "3859c57d91000a3fe44b89821cabcec52857a70a72639c0d6f94dc216b764d55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_marker_drawing/0.5.2-4"; + sha256 = "sha256-358M5wUeJRjtRHaustqueuFFSFjmPHBQYIlOteoaq+Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-models/default.nix b/distros/noetic/hector-models/default.nix index 8c20259ebb..a64ccc6658 100644 --- a/distros/noetic/hector-models/default.nix +++ b/distros/noetic/hector-models/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-models"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_models-release/archive/release/noetic/hector_models/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "15db88e81f3da4f437d122add03fd519b2d123dce26277dac4eab14b2144d4cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_models-release"; + rev = "release/noetic/hector_models/0.5.2-1"; + sha256 = "sha256-Y29P8PV8gTYk3TMNBFMTcjjQdXpK6rpyxKGQinPBYxQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-nav-msgs/default.nix b/distros/noetic/hector-nav-msgs/default.nix index 3d5965aab5..7782d74dfe 100644 --- a/distros/noetic/hector-nav-msgs/default.nix +++ b/distros/noetic/hector-nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-nav-msgs"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_nav_msgs/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "e4d5333e218e78929a4f1da4e468c2876507dd9a3e0fd51bec0a1a544874f45b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_nav_msgs/0.5.2-4"; + sha256 = "sha256-vc5uhc6FhQv28vU5PQM4IsUNXV5S44J0y7KLVVvZ1p8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/hector-pose-estimation-core/default.nix b/distros/noetic/hector-pose-estimation-core/default.nix index d93fedc210..d168db5629 100644 --- a/distros/noetic/hector-pose-estimation-core/default.nix +++ b/distros/noetic/hector-pose-estimation-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-pose-estimation-core"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_localization-release/archive/release/noetic/hector_pose_estimation_core/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "82bcb640addfa021a8bd61913060f27e9e2827ddef0f6c9d41fe6664c1ce96ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_localization-release"; + rev = "release/noetic/hector_pose_estimation_core/0.4.0-1"; + sha256 = "sha256-W/OBbXGfv1m1uztpze9o825cWzTp1vrui2B8sQ8RXCA="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/hector-pose-estimation/default.nix b/distros/noetic/hector-pose-estimation/default.nix index 2982b252d8..baabbaef98 100644 --- a/distros/noetic/hector-pose-estimation/default.nix +++ b/distros/noetic/hector-pose-estimation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-pose-estimation"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_localization-release/archive/release/noetic/hector_pose_estimation/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "063f74d15fd503381172f8811622a54def961b5372b423807a181f7c012d9edf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_localization-release"; + rev = "release/noetic/hector_pose_estimation/0.4.0-1"; + sha256 = "sha256-pw8PPnGzACmgrtfBmYPTE5hI0dRX9+g0TWlaDWsPQ/o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-sensors-description/default.nix b/distros/noetic/hector-sensors-description/default.nix index bbff060675..c0aab14a7a 100644 --- a/distros/noetic/hector-sensors-description/default.nix +++ b/distros/noetic/hector-sensors-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-sensors-description"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_models-release/archive/release/noetic/hector_sensors_description/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "df26c218168a217bee936dc0f3b18bede77d28963cce86a8aadfdaeb0681424d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_models-release"; + rev = "release/noetic/hector_sensors_description/0.5.2-1"; + sha256 = "sha256-2t8SsE9+KS6arTqx3g7Rcz25jvAkSSTxPEE3g7ti4/g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-sensors-gazebo/default.nix b/distros/noetic/hector-sensors-gazebo/default.nix index e1a8fcce13..0eaf44f65e 100644 --- a/distros/noetic/hector-sensors-gazebo/default.nix +++ b/distros/noetic/hector-sensors-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-sensors-gazebo"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_gazebo-release/archive/release/noetic/hector_sensors_gazebo/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "bc0da9a58e2e5cb58449c13458bbe9863b1fbe1eb0a1f34f31c336c5fbb9c186"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_gazebo-release"; + rev = "release/noetic/hector_sensors_gazebo/0.5.4-1"; + sha256 = "sha256-kaMZztq+MoNUHRHp0FdIDD1V7jfDUa7dDBRrknkyNX0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-slam-launch/default.nix b/distros/noetic/hector-slam-launch/default.nix index 992bd5ed30..2af7b5746f 100644 --- a/distros/noetic/hector-slam-launch/default.nix +++ b/distros/noetic/hector-slam-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-slam-launch"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_slam_launch/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "7942ad6c108ead0b1146131ae0b039a8512c229e45fb40bec6620acf2e1a3105"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_slam_launch/0.5.2-4"; + sha256 = "sha256-lf95pax61Wbe7ju2yV21uNp5MeBOuXqhiuT38UmhLuo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-slam/default.nix b/distros/noetic/hector-slam/default.nix index 6e7c642775..c985004c89 100644 --- a/distros/noetic/hector-slam/default.nix +++ b/distros/noetic/hector-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-slam"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_slam/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "d2d894897f630824f2ea1638608e99badafff6aa0a4b1940c1fc59b6b0e5eb64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_slam/0.5.2-4"; + sha256 = "sha256-2swqvyx4/AmmzdAbLPfLXHtmBTvSfpMddjerK+y+1NE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-trajectory-server/default.nix b/distros/noetic/hector-trajectory-server/default.nix index 33817ded5b..ab0e0475cb 100644 --- a/distros/noetic/hector-trajectory-server/default.nix +++ b/distros/noetic/hector-trajectory-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-trajectory-server"; version = "0.5.2-r4"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_slam-release/archive/release/noetic/hector_trajectory_server/0.5.2-4.tar.gz"; - name = "0.5.2-4.tar.gz"; - sha256 = "44921895097d9e11f05cc3055f6574fab40062b082c9e9db6f4b7d30936b3430"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_slam-release"; + rev = "release/noetic/hector_trajectory_server/0.5.2-4"; + sha256 = "sha256-rRM5FTWC+OC7MdOC/FYeaf82IajgSle/AiDHzzCE9Xk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hector-xacro-tools/default.nix b/distros/noetic/hector-xacro-tools/default.nix index 343776a275..cefc7ed971 100644 --- a/distros/noetic/hector-xacro-tools/default.nix +++ b/distros/noetic/hector-xacro-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hector-xacro-tools"; version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_models-release/archive/release/noetic/hector_xacro_tools/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "eca907694e740473c669aa65de10cd392a397190dcbb115d0851f2e8258f03ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_models-release"; + rev = "release/noetic/hector_xacro_tools/0.5.2-1"; + sha256 = "sha256-dDTq37HzIe8pUwV1uvbs1R/mCGQA45cUVPkNC7Pyi3o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hfl-driver/default.nix b/distros/noetic/hfl-driver/default.nix index 9b8b603f95..c098cc17b1 100644 --- a/distros/noetic/hfl-driver/default.nix +++ b/distros/noetic/hfl-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hfl-driver"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/flynneva/hfl_driver-release/archive/release/noetic/hfl_driver/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "5d6effed58de83e6d5301c53bdf49d4ffbf926f5d0553b3e3e3a6e0fba73ff18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "hfl_driver-release"; + rev = "release/noetic/hfl_driver/0.1.0-1"; + sha256 = "sha256-8dygZmk/hyGSEKHvlXVMM511HxluBHQZz14zSoFNhkE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hls-lfcd-lds-driver/default.nix b/distros/noetic/hls-lfcd-lds-driver/default.nix index f60fe79ec3..e951964237 100644 --- a/distros/noetic/hls-lfcd-lds-driver/default.nix +++ b/distros/noetic/hls-lfcd-lds-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hls-lfcd-lds-driver"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/hls-lfcd-lds-driver-release/archive/release/noetic/hls_lfcd_lds_driver/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "220169c149322ff80704155057c73c31d36bd80a9ffc98a75040061c1c4e5b1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "hls-lfcd-lds-driver-release"; + rev = "release/noetic/hls_lfcd_lds_driver/1.1.2-1"; + sha256 = "sha256-qFZn3c0vWo+U036jfgy8NlQFsGt1Vbf2dD8o5ke22uE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hokuyo3d/default.nix b/distros/noetic/hokuyo3d/default.nix index 2c721433b9..b70394a5f8 100644 --- a/distros/noetic/hokuyo3d/default.nix +++ b/distros/noetic/hokuyo3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hokuyo3d"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/at-wat/hokuyo3d-release/archive/release/noetic/hokuyo3d/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "54ea4d34ed4d3913af28037b4bab6eac729a6d9bdac82aac9143c00e4c448855"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "hokuyo3d-release"; + rev = "release/noetic/hokuyo3d/0.2.1-1"; + sha256 = "sha256-t+5kRJKbUQzoRqYHAh4k+jbBqOcuy0m+se8tSXCtpNM="; + }; buildType = "catkin"; buildInputs = [ catkin roslint rostest ]; diff --git a/distros/noetic/hpp-fcl/default.nix b/distros/noetic/hpp-fcl/default.nix index 697c92ebcf..c360cba145 100644 --- a/distros/noetic/hpp-fcl/default.nix +++ b/distros/noetic/hpp-fcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hpp-fcl"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/humanoid-path-planner/hpp-fcl-ros-release/archive/release/noetic/hpp-fcl/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "66aaa2fb542f7619cfa86943f41c932deb3bd479d956ef877313411c4a71b1c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "humanoid-path-planner"; + repo = "hpp-fcl-ros-release"; + rev = "release/noetic/hpp-fcl/2.2.0-1"; + sha256 = "sha256-Jg/himo9KLlbAM9hVexTrYyJ/m9rxp3+R5fhfXgRbJM="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git python3Packages.lxml ]; diff --git a/distros/noetic/hri-msgs/default.nix b/distros/noetic/hri-msgs/default.nix index d45c3146fe..322286e086 100644 --- a/distros/noetic/hri-msgs/default.nix +++ b/distros/noetic/hri-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hri-msgs"; version = "0.8.0-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/hri_msgs-release/archive/release/noetic/hri_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "fb8abe9538673adf4cb4cd01ef5e85e3403a6dbfbc6104987aef0c3c1ce5eb2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "hri_msgs-release"; + rev = "release/noetic/hri_msgs/0.8.0-1"; + sha256 = "sha256-M3qb+B/8NzY3NHEaMj8YBAdBO4tkog1j4m1brr5eMc4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/hri-rviz/default.nix b/distros/noetic/hri-rviz/default.nix index 44938444c4..1238a079a8 100644 --- a/distros/noetic/hri-rviz/default.nix +++ b/distros/noetic/hri-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-hri-rviz"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/hri_rviz-release/archive/release/noetic/hri_rviz/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "cd6d26e6326015a4f93aed18262afbefd5f25c4dbae23ad3b2d1c4dd2659f9b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "hri_rviz-release"; + rev = "release/noetic/hri_rviz/0.3.1-1"; + sha256 = "sha256-R8LgCzW4vePO4iQl9rLbJaGBor95k+jNo7gxbIW66B8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/hri/default.nix b/distros/noetic/hri/default.nix index f9f0ba7711..1595af3160 100644 --- a/distros/noetic/hri/default.nix +++ b/distros/noetic/hri/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, cv-bridge, geometry-msgs, hri-msgs, rosconsole, roscpp, sensor-msgs, std-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-noetic-hri"; - version = "0.5.3-r1"; + version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/libhri-release/archive/release/noetic/hri/0.5.3-1.tar.gz"; - name = "0.5.3-1.tar.gz"; - sha256 = "ccef099e06f279a1db1b99e535aa00bfafaa5dc5f444e8c999a41ff38c6c4ba2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "libhri-release"; + rev = "release/noetic/hri/0.6.0-1"; + sha256 = "sha256-807gfglQNhis5UM7Aaj7O9sR9An8jaTUNb3ghAgv/Wk="; + }; buildType = "catkin"; buildInputs = [ boost catkin ]; diff --git a/distros/noetic/human-description/default.nix b/distros/noetic/human-description/default.nix index 9952e8a960..0730e2e082 100644 --- a/distros/noetic/human-description/default.nix +++ b/distros/noetic/human-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-human-description"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/human_description-release/archive/release/noetic/human_description/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "53c4b36c314d3d1e70e075cfae012ebc4aa69474ae724b87eb138f1c31e4046a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "human_description-release"; + rev = "release/noetic/human_description/1.0.0-1"; + sha256 = "sha256-IOiqvPIAOordrjzw3G+CeOGXowXXGRNwkrC3RNIKHvI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/husky-control/default.nix b/distros/noetic/husky-control/default.nix index 4f2d10ad6d..98575c21f1 100644 --- a/distros/noetic/husky-control/default.nix +++ b/distros/noetic/husky-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-manager, diff-drive-controller, husky-description, interactive-marker-twist-server, joint-state-controller, joint-trajectory-controller, joy, robot-localization, robot-state-publisher, roslaunch, rostopic, teleop-twist-joy, teleop-twist-keyboard, twist-mux }: buildRosPackage { pname = "ros-noetic-husky-control"; - version = "0.6.5-r1"; + version = "0.6.6-r3"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/noetic/husky_control/0.6.5-1.tar.gz"; - name = "0.6.5-1.tar.gz"; - sha256 = "c50dc9187426bf482b9116939ebd3164615eacd56a236ef74fb6031a72c92924"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/noetic/husky_control/0.6.6-3"; + sha256 = "sha256-depJ7RaoF53VR+TF6SYkM1LI8+LeykeFOOKCJ5q9U8I="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/husky-description/default.nix b/distros/noetic/husky-description/default.nix index bda3497aff..df0309b0f9 100644 --- a/distros/noetic/husky-description/default.nix +++ b/distros/noetic/husky-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, fath-pivot-mount-description, flir-camera-description, lms1xx, realsense2-description, roslaunch, urdf, velodyne-description, xacro }: buildRosPackage { pname = "ros-noetic-husky-description"; - version = "0.6.5-r1"; + version = "0.6.6-r3"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/noetic/husky_description/0.6.5-1.tar.gz"; - name = "0.6.5-1.tar.gz"; - sha256 = "733c1173dea098f71749c6619798e6d41479e030431f31953a90a0007f100244"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/noetic/husky_description/0.6.6-3"; + sha256 = "sha256-bFojA+xIMy7wxTACL7BB5kEJNitr4QsQpmpaCwExKrc="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/husky-desktop/default.nix b/distros/noetic/husky-desktop/default.nix index 34eb4d6eb6..36a757873d 100644 --- a/distros/noetic/husky-desktop/default.nix +++ b/distros/noetic/husky-desktop/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, husky-msgs, husky-viz }: buildRosPackage { pname = "ros-noetic-husky-desktop"; - version = "0.6.5-r1"; + version = "0.6.6-r3"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/noetic/husky_desktop/0.6.5-1.tar.gz"; - name = "0.6.5-1.tar.gz"; - sha256 = "83b14b55f8ff40a2b978ceb94e938576e8bfc9178b336dca33ccb6f7e123f512"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/noetic/husky_desktop/0.6.6-3"; + sha256 = "sha256-YBZ0p5bYjRGgPKvPFBAN71zpVOIrFY2XwjhlYABn4vY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/husky-gazebo/default.nix b/distros/noetic/husky-gazebo/default.nix index 06afeec209..730029634b 100644 --- a/distros/noetic/husky-gazebo/default.nix +++ b/distros/noetic/husky-gazebo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-manager, gazebo-plugins, gazebo-ros, gazebo-ros-control, hector-gazebo-plugins, husky-control, husky-description, pointcloud-to-laserscan, roslaunch, rostopic, velodyne-gazebo-plugins }: buildRosPackage { pname = "ros-noetic-husky-gazebo"; - version = "0.6.5-r1"; + version = "0.6.6-r3"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/noetic/husky_gazebo/0.6.5-1.tar.gz"; - name = "0.6.5-1.tar.gz"; - sha256 = "9449197ea022c50eaaca112792d1742fd955236f2b56c83abfb3929c1a174f58"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/noetic/husky_gazebo/0.6.6-3"; + sha256 = "sha256-s2imueiJjlalE2OzQe6bvAk5rd0Njg4z+ZnZm8rUM5c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/husky-msgs/default.nix b/distros/noetic/husky-msgs/default.nix index e2ab884ec7..493e7451bc 100644 --- a/distros/noetic/husky-msgs/default.nix +++ b/distros/noetic/husky-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-husky-msgs"; - version = "0.6.5-r1"; + version = "0.6.6-r3"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/noetic/husky_msgs/0.6.5-1.tar.gz"; - name = "0.6.5-1.tar.gz"; - sha256 = "2338dd5bdab729f9faeba52e951e1bbe227c598f74703ca779d0a858e2c348c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/noetic/husky_msgs/0.6.6-3"; + sha256 = "sha256-Mazb1MTdWwkSa98ehuff/em4RmHsmB/Mn34BSJ585eE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/husky-navigation/default.nix b/distros/noetic/husky-navigation/default.nix index bf042a4a94..48f574b9e3 100644 --- a/distros/noetic/husky-navigation/default.nix +++ b/distros/noetic/husky-navigation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, amcl, base-local-planner, catkin, dwa-local-planner, gmapping, map-server, move-base, navfn, roslaunch }: buildRosPackage { pname = "ros-noetic-husky-navigation"; - version = "0.6.5-r1"; + version = "0.6.6-r3"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/noetic/husky_navigation/0.6.5-1.tar.gz"; - name = "0.6.5-1.tar.gz"; - sha256 = "3d3e0f2084d6bf69c8764023aa23e95d1024dba29426f6b81926a1cfaef76a92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/noetic/husky_navigation/0.6.6-3"; + sha256 = "sha256-olsQ0tD06dmO1Obwwbk524XSMJi7In/VknrNIiiPDrQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/husky-simulator/default.nix b/distros/noetic/husky-simulator/default.nix index 0a5c72c6f4..58f7c350b4 100644 --- a/distros/noetic/husky-simulator/default.nix +++ b/distros/noetic/husky-simulator/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, husky-gazebo }: buildRosPackage { pname = "ros-noetic-husky-simulator"; - version = "0.6.5-r1"; + version = "0.6.6-r3"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/noetic/husky_simulator/0.6.5-1.tar.gz"; - name = "0.6.5-1.tar.gz"; - sha256 = "d7c6497b13a945d59087f3fdc4827e31ab96e302df3482f160b336d1bfae5983"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/noetic/husky_simulator/0.6.6-3"; + sha256 = "sha256-5/RxvOqnfTh2ov3J73XUA3Q5ycbAmdGlSuN6d++B01w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/husky-viz/default.nix b/distros/noetic/husky-viz/default.nix index ee95f7aea4..a3180f8de6 100644 --- a/distros/noetic/husky-viz/default.nix +++ b/distros/noetic/husky-viz/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, husky-description, joint-state-publisher, joint-state-publisher-gui, robot-state-publisher, roslaunch, rqt-console, rqt-gui, rqt-robot-monitor, rviz, rviz-imu-plugin }: buildRosPackage { pname = "ros-noetic-husky-viz"; - version = "0.6.5-r1"; + version = "0.6.6-r3"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/husky-release/archive/release/noetic/husky_viz/0.6.5-1.tar.gz"; - name = "0.6.5-1.tar.gz"; - sha256 = "b25b681e96fa3ea7569c3f161e4d93786f06059e343244f277f48803687d4894"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "husky-release"; + rev = "release/noetic/husky_viz/0.6.6-3"; + sha256 = "sha256-7k9xsJTFCHmbKmBrOAfTBega2R2aNd8b15h9vWVJIJI="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/ibeo-msgs/default.nix b/distros/noetic/ibeo-msgs/default.nix index 88a469b8d0..f64764d315 100644 --- a/distros/noetic/ibeo-msgs/default.nix +++ b/distros/noetic/ibeo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ibeo-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/ibeo_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "f0e57dc58d1148f5c8bb9dc5723f9c5b5cc3a4e86d02ab110b5e03f595c659e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/ibeo_msgs/3.3.0-1"; + sha256 = "sha256-uCL2CzOlSDnmJDihLQbhy1TSONVmymbokGVMOp92si0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/ifm3d-core/default.nix b/distros/noetic/ifm3d-core/default.nix index 5b98b24d9e..1e4ed5222b 100644 --- a/distros/noetic/ifm3d-core/default.nix +++ b/distros/noetic/ifm3d-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ifm3d-core"; version = "0.18.0-r5"; - src = fetchurl { - url = "https://github.com/ifm/ifm3d-release/archive/release/noetic/ifm3d_core/0.18.0-5.tar.gz"; - name = "0.18.0-5.tar.gz"; - sha256 = "f47b95f7f05e7bf5ffb163f50200112b0cf3f13a2c270bf3895e034252c1a4cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ifm"; + repo = "ifm3d-release"; + rev = "release/noetic/ifm3d_core/0.18.0-5"; + sha256 = "sha256-N47JbOLEUxLYyLW3neBeDPGPyzXxyfrtCk3ZWiC0l28="; + }; buildType = "cmake"; buildInputs = [ boost cmake ]; diff --git a/distros/noetic/ifm3d/default.nix b/distros/noetic/ifm3d/default.nix index a851e984cd..faa7d39ad3 100644 --- a/distros/noetic/ifm3d/default.nix +++ b/distros/noetic/ifm3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ifm3d"; version = "0.6.2-r3"; - src = fetchurl { - url = "https://github.com/ifm/ifm3d-ros-release/archive/release/noetic/ifm3d/0.6.2-3.tar.gz"; - name = "0.6.2-3.tar.gz"; - sha256 = "491b816559556b3274cd25f3c926ca00335f646f9016cd39c1950f62a3ed9984"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ifm"; + repo = "ifm3d-ros-release"; + rev = "release/noetic/ifm3d/0.6.2-3"; + sha256 = "sha256-hCfT4PKk3DEEntLQeolnlvCKzWLY68gfE/TaSz64R7M="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/ign-ros-control-demos/default.nix b/distros/noetic/ign-ros-control-demos/default.nix index 7d6253a78b..ff6fd0aeee 100644 --- a/distros/noetic/ign-ros-control-demos/default.nix +++ b/distros/noetic/ign-ros-control-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ign-ros-control-demos"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ign_ros_control-release/archive/release/noetic/ign_ros_control_demos/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "34e65328c8fd74ad40ba8e29b8ce4a4c0ba91a40b8768707f479b95aec5fe3fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ign_ros_control-release"; + rev = "release/noetic/ign_ros_control_demos/0.0.1-1"; + sha256 = "sha256-27lDC8Xd9aMHtWckQlYwgWYwyyQQ9MBvOo2pnhiBcFQ="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/image-cb-detector/default.nix b/distros/noetic/image-cb-detector/default.nix index d5afaaa56b..8f96176255 100644 --- a/distros/noetic/image-cb-detector/default.nix +++ b/distros/noetic/image-cb-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-cb-detector"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/image_cb_detector/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "ddf60b84fea198d5ef6ba102e7e5464a70ee9cb155a0ba9539b64b92d189ff10"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/image_cb_detector/0.10.15-1"; + sha256 = "sha256-i4Hw5MQPvJUmDKC+Hl66pTNdFkCpXPzHGZMQPiSHcfs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/image-common/default.nix b/distros/noetic/image-common/default.nix index 7829445bc7..8f1b89d922 100644 --- a/distros/noetic/image-common/default.nix +++ b/distros/noetic/image-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-common"; version = "1.12.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/noetic/image_common/1.12.0-1.tar.gz"; - name = "1.12.0-1.tar.gz"; - sha256 = "697fe0a393f7b4d08c2dc1168a7479344b4997a1920d233138c07232d90f5d7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/noetic/image_common/1.12.0-1"; + sha256 = "sha256-vhV5MHDhoV50CBbBYs8EYfpEhi6dR7RMQMRiaCKuyKE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/image-exposure-msgs/default.nix b/distros/noetic/image-exposure-msgs/default.nix index 62e9113197..9410d1186f 100644 --- a/distros/noetic/image-exposure-msgs/default.nix +++ b/distros/noetic/image-exposure-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-exposure-msgs"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/noetic/image_exposure_msgs/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "405ecd3bffa5c8de1417d2e287cc1eea655c443e0e1e339a246e5dc59868cb84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/noetic/image_exposure_msgs/0.15.1-1"; + sha256 = "sha256-LuMFSgvVSnqKz0KsfJAIOTBtvyv1+RQxwwdxx7Z3ylQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/image-geometry/default.nix b/distros/noetic/image-geometry/default.nix index 2b5991bbf3..e5a25281ee 100644 --- a/distros/noetic/image-geometry/default.nix +++ b/distros/noetic/image-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-geometry"; version = "1.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vision_opencv-release/archive/release/noetic/image_geometry/1.16.2-1.tar.gz"; - name = "1.16.2-1.tar.gz"; - sha256 = "634b35652d7dd4664d03b4e095502946350a1038b2171be6e739d1efdc1e22d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vision_opencv-release"; + rev = "release/noetic/image_geometry/1.16.2-1"; + sha256 = "sha256-UzDpks0afc5sRLJDSiVmTo+pNTWZ6OKawChid5Z8wV4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/image-pipeline/default.nix b/distros/noetic/image-pipeline/default.nix index 98a84a7b3c..46fc56ef77 100644 --- a/distros/noetic/image-pipeline/default.nix +++ b/distros/noetic/image-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-pipeline"; version = "1.17.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/noetic/image_pipeline/1.17.0-1.tar.gz"; - name = "1.17.0-1.tar.gz"; - sha256 = "b2b606f359aa7e15aec07a9fab389f5db7307f42ecbc2961e0a3a415f614bc39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/noetic/image_pipeline/1.17.0-1"; + sha256 = "sha256-0Ej5ZfvjnIsSqtdLxaX1D+ft/3mhRc+qxSUo9gLOON0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/image-proc/default.nix b/distros/noetic/image-proc/default.nix index c86a3e90e5..f06654a48a 100644 --- a/distros/noetic/image-proc/default.nix +++ b/distros/noetic/image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-proc"; version = "1.17.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/noetic/image_proc/1.17.0-1.tar.gz"; - name = "1.17.0-1.tar.gz"; - sha256 = "0bc7a81cc77ecef2be8605ee6d9b064015e01d8c050f4cc90b7d1c8333725d07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/noetic/image_proc/1.17.0-1"; + sha256 = "sha256-bAfDVCk+o/IKITQ2GVF4eeAtMoi3Ar42JCe/T9Jk3Nc="; + }; buildType = "catkin"; buildInputs = [ boost catkin ]; diff --git a/distros/noetic/image-publisher/default.nix b/distros/noetic/image-publisher/default.nix index 3c4e039b73..2826234176 100644 --- a/distros/noetic/image-publisher/default.nix +++ b/distros/noetic/image-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-publisher"; version = "1.17.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/noetic/image_publisher/1.17.0-1.tar.gz"; - name = "1.17.0-1.tar.gz"; - sha256 = "15be9b1351cefc1273f612e713fb90710162aacf49e78d6afe61c9cc6bcf9877"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/noetic/image_publisher/1.17.0-1"; + sha256 = "sha256-Pbck104gZImhzQgU8scOwuRNIKyeJVVBbojzdgga7uk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/image-rotate/default.nix b/distros/noetic/image-rotate/default.nix index d279627360..09ac07c597 100644 --- a/distros/noetic/image-rotate/default.nix +++ b/distros/noetic/image-rotate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-rotate"; version = "1.17.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/noetic/image_rotate/1.17.0-1.tar.gz"; - name = "1.17.0-1.tar.gz"; - sha256 = "6658413973c5bf391d66686d494df72d704a1db634beae1f5546e703e78cd586"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/noetic/image_rotate/1.17.0-1"; + sha256 = "sha256-yLS6yWvx+eB0bjxdUxGGJxBXYOyFzGjC274yfy3E6d0="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules geometry-msgs ]; diff --git a/distros/noetic/image-transport-plugins/default.nix b/distros/noetic/image-transport-plugins/default.nix index 6805e33b64..d0766041ba 100644 --- a/distros/noetic/image-transport-plugins/default.nix +++ b/distros/noetic/image-transport-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-transport-plugins"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_transport_plugins-release/archive/release/noetic/image_transport_plugins/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "ee12b60b2c6244a1af9754990a3e6ac315f8c28afdfdd186df47f0927ae36719"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/noetic/image_transport_plugins/1.14.0-1"; + sha256 = "sha256-GGn3UGcTxSF0pdVG2PXJ/coq8niSaQ018td9dmx+gxI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/image-transport/default.nix b/distros/noetic/image-transport/default.nix index ef4a160685..5bdea2f54a 100644 --- a/distros/noetic/image-transport/default.nix +++ b/distros/noetic/image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-transport"; version = "1.12.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/noetic/image_transport/1.12.0-1.tar.gz"; - name = "1.12.0-1.tar.gz"; - sha256 = "22806dd3683201412ecd38f44e40255a7736221fe13f1bc06c660c83eddf3692"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/noetic/image_transport/1.12.0-1"; + sha256 = "sha256-0MoEpnPELHrepZ2Q8d/rqAweME89Ywu7zzn9ElEUqeg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/image-view/default.nix b/distros/noetic/image-view/default.nix index cfd4f30f0b..f0d7a63097 100644 --- a/distros/noetic/image-view/default.nix +++ b/distros/noetic/image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-view"; version = "1.17.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/noetic/image_view/1.17.0-1.tar.gz"; - name = "1.17.0-1.tar.gz"; - sha256 = "43a0a51e8b31a0596545832a56a0dd8c2cb7db0504a9077d19a6f5b468d249b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/noetic/image_view/1.17.0-1"; + sha256 = "sha256-SSfhAZiPUhpOUKEz5Hiyg/2vxc0Y+eLyXlGDDiKVCCY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation sensor-msgs stereo-msgs ]; diff --git a/distros/noetic/image-view2/default.nix b/distros/noetic/image-view2/default.nix index c8dd1aca9e..7c8949f5f7 100644 --- a/distros/noetic/image-view2/default.nix +++ b/distros/noetic/image-view2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-image-view2"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/image_view2/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "342ebba57f329112be80d432c5f1eca5aeb7b00d44c4e5171e021a74feb52209"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/image_view2/2.2.12-1"; + sha256 = "sha256-coBA7xwyBUpFLf9FYkCRDdSMtbsT3Mwf2h/x6cjrFK8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/noetic/imagesift/default.nix b/distros/noetic/imagesift/default.nix index 729ef5345c..671e4546c3 100644 --- a/distros/noetic/imagesift/default.nix +++ b/distros/noetic/imagesift/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imagesift"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/noetic/imagesift/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "06cf6f1d7b56163b99a2de23e98a0fd897d8a8891fd2773ed98abee91be74a71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/noetic/imagesift/1.2.15-1"; + sha256 = "sha256-r9uhAIkmQer5PvqENwrrsezi1M+tIToO+CW4RBFPA8g="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules python3Packages.setuptools ]; diff --git a/distros/noetic/imagezero-image-transport/default.nix b/distros/noetic/imagezero-image-transport/default.nix index da030d69e8..ce9b3d90e8 100644 --- a/distros/noetic/imagezero-image-transport/default.nix +++ b/distros/noetic/imagezero-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imagezero-image-transport"; version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/imagezero_transport-release/archive/release/noetic/imagezero_image_transport/0.2.5-1.tar.gz"; - name = "0.2.5-1.tar.gz"; - sha256 = "cb5d9bc2228f6cf412da2aa371a0b5bf02c4f9b0ecc4ba4bb69f7a8e644a820a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "imagezero_transport-release"; + rev = "release/noetic/imagezero_image_transport/0.2.5-1"; + sha256 = "sha256-a4BovGUmbIymckl2H0m2ZjNqd4xfEKbTpQ1Yl8ofOgk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/imagezero-ros/default.nix b/distros/noetic/imagezero-ros/default.nix index 7e5a4c45f2..9fc84e1770 100644 --- a/distros/noetic/imagezero-ros/default.nix +++ b/distros/noetic/imagezero-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imagezero-ros"; version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/imagezero_transport-release/archive/release/noetic/imagezero_ros/0.2.5-1.tar.gz"; - name = "0.2.5-1.tar.gz"; - sha256 = "f444b3f9924c449d45bbb3a97ef2ece1bebc24b785991f1c80e122d66853aaaa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "imagezero_transport-release"; + rev = "release/noetic/imagezero_ros/0.2.5-1"; + sha256 = "sha256-paL6aYGMKaqbwT0XFygQRPTzp4Fs/po2kcZVTF3rXY4="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp ]; diff --git a/distros/noetic/imagezero/default.nix b/distros/noetic/imagezero/default.nix index d288c3e08d..fde9f08b3f 100644 --- a/distros/noetic/imagezero/default.nix +++ b/distros/noetic/imagezero/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imagezero"; version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/imagezero_transport-release/archive/release/noetic/imagezero/0.2.5-1.tar.gz"; - name = "0.2.5-1.tar.gz"; - sha256 = "5f8470c0ef6bae0b59e3b0f72391ef9d19cf906ebf12bcf95629966c43fc93ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "imagezero_transport-release"; + rev = "release/noetic/imagezero/0.2.5-1"; + sha256 = "sha256-T8GFE04y7256LwGzgJLjEOan1XWMPWKgYux3qUy83/A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/imu-complementary-filter/default.nix b/distros/noetic/imu-complementary-filter/default.nix index cbf88ffebb..dab7d83ba3 100644 --- a/distros/noetic/imu-complementary-filter/default.nix +++ b/distros/noetic/imu-complementary-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imu-complementary-filter"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/imu_tools-release/archive/release/noetic/imu_complementary_filter/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "a97788fe8767198ec5d00ca5d110ae90f43efa644f4fea5d70b20f6f27a265f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "imu_tools-release"; + rev = "release/noetic/imu_complementary_filter/1.2.5-1"; + sha256 = "sha256-ZPGg9wHoe+X6Yn0HUz7py7u+iuTQ4DZvSFbnLddrgr4="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/imu-filter-madgwick/default.nix b/distros/noetic/imu-filter-madgwick/default.nix index 9bdb9e5f87..8b3eb7b489 100644 --- a/distros/noetic/imu-filter-madgwick/default.nix +++ b/distros/noetic/imu-filter-madgwick/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imu-filter-madgwick"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/imu_tools-release/archive/release/noetic/imu_filter_madgwick/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "86a14bd1e8b9ef044f491442f3f79eb2cc07fe7421fb1128862a9da19b2926e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "imu_tools-release"; + rev = "release/noetic/imu_filter_madgwick/1.2.5-1"; + sha256 = "sha256-KY7fVs0auCxZHMRGsxz151p8GUzlF6SoYRuArEN9UiQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/imu-from-ios-sensorlog/default.nix b/distros/noetic/imu-from-ios-sensorlog/default.nix index b45fca438d..d0023fd88c 100644 --- a/distros/noetic/imu-from-ios-sensorlog/default.nix +++ b/distros/noetic/imu-from-ios-sensorlog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imu-from-ios-sensorlog"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/pietrocolombo/imu_from_ios_sensorlog-release/archive/release/noetic/imu_from_ios_sensorlog/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "de580184eeb098f142326b78523af1340057916f3989a42a7c05a607674ae44d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pietrocolombo"; + repo = "imu_from_ios_sensorlog-release"; + rev = "release/noetic/imu_from_ios_sensorlog/0.0.1-1"; + sha256 = "sha256-9+0XLcQgSlBt1EnH4uVwbj9+ytuYkKqxjAsgWgWXTQg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/imu-monitor/default.nix b/distros/noetic/imu-monitor/default.nix index deb6cdbffc..62be43fe10 100644 --- a/distros/noetic/imu-monitor/default.nix +++ b/distros/noetic/imu-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imu-monitor"; version = "1.6.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/noetic/imu_monitor/1.6.32-1.tar.gz"; - name = "1.6.32-1.tar.gz"; - sha256 = "af19afccafb7bc0c0517427a39b495828e0c9dc8df3dcf6661768030a53b4cc3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/noetic/imu_monitor/1.6.32-1"; + sha256 = "sha256-ExZgSrZ1hoFwWfnra/HXhFZVuEY8se23LJf7YZsTs2U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/imu-pipeline/default.nix b/distros/noetic/imu-pipeline/default.nix index 29c413e111..40556a4ce6 100644 --- a/distros/noetic/imu-pipeline/default.nix +++ b/distros/noetic/imu-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imu-pipeline"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/imu_pipeline-release/archive/release/noetic/imu_pipeline/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "3a8f6074735f46cdd3d4953a6673b3351e998a88b63b642433429ae4f24560a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "imu_pipeline-release"; + rev = "release/noetic/imu_pipeline/0.3.1-1"; + sha256 = "sha256-5o0hwbxZYMzjESvRHbi3/xvc7poAWXWbK9TJNGYsBzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/imu-processors/default.nix b/distros/noetic/imu-processors/default.nix index 52bd2312c8..dac538e9c3 100644 --- a/distros/noetic/imu-processors/default.nix +++ b/distros/noetic/imu-processors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imu-processors"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/imu_pipeline-release/archive/release/noetic/imu_processors/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "4704e54be92f4d86e9a024e96ac88d333a57636b4187f9f7f65f0af4ea045cf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "imu_pipeline-release"; + rev = "release/noetic/imu_processors/0.3.1-1"; + sha256 = "sha256-UYsLNrSgn6Z0UWLj9polMGR8adYZWWAePCcza9sBGq8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/imu-sensor-controller/default.nix b/distros/noetic/imu-sensor-controller/default.nix index 23228b1439..fb45a8c392 100644 --- a/distros/noetic/imu-sensor-controller/default.nix +++ b/distros/noetic/imu-sensor-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-interface, controller-manager, hardware-interface, pluginlib, realtime-tools, roscpp, sensor-msgs }: buildRosPackage { pname = "ros-noetic-imu-sensor-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/imu_sensor_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "21d541fed9acd9edff448e77232612f5f0e961f8bb0290fbb7c88517f863223b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/imu_sensor_controller/0.21.1-1"; + sha256 = "sha256-KU8j70xjlakBd6SqJ9y53QOBLVP2bv2w1tqB5hVHoS0="; + }; buildType = "catkin"; buildInputs = [ catkin pluginlib ]; diff --git a/distros/noetic/imu-tools/default.nix b/distros/noetic/imu-tools/default.nix index bdc3bc276e..ba51c8e2c0 100644 --- a/distros/noetic/imu-tools/default.nix +++ b/distros/noetic/imu-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imu-tools"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/imu_tools-release/archive/release/noetic/imu_tools/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "a8d6e0aa0c837e2d4da2f0285c0ffc59b31e28d89947cc196bba7464eac7077f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "imu_tools-release"; + rev = "release/noetic/imu_tools/1.2.5-1"; + sha256 = "sha256-TwnbHGZAeAzQkvQQPsiJom3etXNheKfJs6JmzqUn+6c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/imu-transformer/default.nix b/distros/noetic/imu-transformer/default.nix index 1d16c034a8..b7ba9849a3 100644 --- a/distros/noetic/imu-transformer/default.nix +++ b/distros/noetic/imu-transformer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-imu-transformer"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/imu_pipeline-release/archive/release/noetic/imu_transformer/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "94ea4bd7deb0785b32b676a1acfa9d5c6b962c3f4ced0f6018d4c21e7ec10a8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "imu_pipeline-release"; + rev = "release/noetic/imu_transformer/0.3.1-1"; + sha256 = "sha256-SWq4eCsn7El3e7rXdey3ueLXL2R7FHkkyedw5JwhbsI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/industrial-core/default.nix b/distros/noetic/industrial-core/default.nix index 3697cfe46f..a7715ec3cb 100644 --- a/distros/noetic/industrial-core/default.nix +++ b/distros/noetic/industrial-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-core"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/noetic/industrial_core/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "60aab3d3952f68fddc9185ae536eda925de829d5d996ee40c5a3c7f84f059979"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/noetic/industrial_core/0.7.3-1"; + sha256 = "sha256-ZaZnIom8Fvoem61kUwEJL/xy/b8U8ZAxJoZV6J+zOkE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/industrial-deprecated/default.nix b/distros/noetic/industrial-deprecated/default.nix index d97b6e5728..8dcf22e49a 100644 --- a/distros/noetic/industrial-deprecated/default.nix +++ b/distros/noetic/industrial-deprecated/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-deprecated"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/noetic/industrial_deprecated/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "4345c60f457f58884c90b82ea6c79c4b3995e4ae38f45dad45cf7a6b3b3ad754"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/noetic/industrial_deprecated/0.7.3-1"; + sha256 = "sha256-d1F0ETLuUe19WcayhUlqx7BOyHaQ9K8rhT2itWO6pYk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/industrial-msgs/default.nix b/distros/noetic/industrial-msgs/default.nix index c54f6f8d13..1c65a40b1e 100644 --- a/distros/noetic/industrial-msgs/default.nix +++ b/distros/noetic/industrial-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-msgs"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/noetic/industrial_msgs/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "ea5238ae8b97af27a59353ae3686a1a4c6192ac816d07a1e789817b0a62e9c37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/noetic/industrial_msgs/0.7.3-1"; + sha256 = "sha256-tYfr1AQOZgUBX7+un6HBIe2YqG+SkpI4U0/lkeXZloM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/industrial-robot-client/default.nix b/distros/noetic/industrial-robot-client/default.nix index d13162d769..aeabe40e1d 100644 --- a/distros/noetic/industrial-robot-client/default.nix +++ b/distros/noetic/industrial-robot-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-robot-client"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/noetic/industrial_robot_client/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "92cd1be0741c338c15d72fa151dfc868dcd477efa6e3fd85dece98d1d726f4e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/noetic/industrial_robot_client/0.7.3-1"; + sha256 = "sha256-LgvtZfdDxAZjIa9OvxJbl+lOHxfAiz5mJiMScB1qf2k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/industrial-robot-simulator/default.nix b/distros/noetic/industrial-robot-simulator/default.nix index 05530be071..75b317b6c2 100644 --- a/distros/noetic/industrial-robot-simulator/default.nix +++ b/distros/noetic/industrial-robot-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-robot-simulator"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/noetic/industrial_robot_simulator/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "daf1437c8dce7a3064c9ac78c7a29b89e0ba36623b2c1105743305029244545c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/noetic/industrial_robot_simulator/0.7.3-1"; + sha256 = "sha256-oYT+ady9spoNwZ6DmC3djlPcdjo8n/W6uxh/mn0VMeE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/industrial-robot-status-controller/default.nix b/distros/noetic/industrial-robot-status-controller/default.nix index e4ed87ad6f..92e4248c2c 100644 --- a/distros/noetic/industrial-robot-status-controller/default.nix +++ b/distros/noetic/industrial-robot-status-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-robot-status-controller"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/gavanderhoorn/industrial_robot_status_controller-release/archive/release/noetic/industrial_robot_status_controller/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "6f9dcec5e3bff7ae4470fc249277610e11b04451cdb06c053d663ffab0bf1bc0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gavanderhoorn"; + repo = "industrial_robot_status_controller-release"; + rev = "release/noetic/industrial_robot_status_controller/0.1.2-1"; + sha256 = "sha256-p022V+EEm9prUjYhRXN1E0niuxHHS6W0+aHw3/5q+Dg="; + }; buildType = "catkin"; buildInputs = [ catkin industrial-robot-status-interface ]; diff --git a/distros/noetic/industrial-robot-status-interface/default.nix b/distros/noetic/industrial-robot-status-interface/default.nix index e2006587e2..aac00d1241 100644 --- a/distros/noetic/industrial-robot-status-interface/default.nix +++ b/distros/noetic/industrial-robot-status-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-robot-status-interface"; version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/gavanderhoorn/industrial_robot_status_controller-release/archive/release/noetic/industrial_robot_status_interface/0.1.2-1.tar.gz"; - name = "0.1.2-1.tar.gz"; - sha256 = "c1b73b8150bcb01b2bee3263026aa99571d1dcbdd4237e30ec9bafbed2938bcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gavanderhoorn"; + repo = "industrial_robot_status_controller-release"; + rev = "release/noetic/industrial_robot_status_interface/0.1.2-1"; + sha256 = "sha256-J1PiBH1lTC2sKh1Dc3IxXux9JyByOJNeXzxjdVkbU5c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/industrial-trajectory-filters/default.nix b/distros/noetic/industrial-trajectory-filters/default.nix index 475fce27f9..826ec081b1 100644 --- a/distros/noetic/industrial-trajectory-filters/default.nix +++ b/distros/noetic/industrial-trajectory-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-trajectory-filters"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/noetic/industrial_trajectory_filters/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "d467861e4366fab2ca889080d9d33a88f28ea204efad5f4d20b19f523df92c11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/noetic/industrial_trajectory_filters/0.7.3-1"; + sha256 = "sha256-mYFmwuST9s4knzmD3KiLBzZ+Y6yRtozbXtsDY0NqcSU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/industrial-utils/default.nix b/distros/noetic/industrial-utils/default.nix index 1c58eaf949..a3fc78ded4 100644 --- a/distros/noetic/industrial-utils/default.nix +++ b/distros/noetic/industrial-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-industrial-utils"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/noetic/industrial_utils/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "2925a8dd626167ea1bbefa502065157afffebebf3cb9a8cd4ff59de477537f8a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/noetic/industrial_utils/0.7.3-1"; + sha256 = "sha256-xFWcAajLIgu+PEjw414AY+4VJXsiSKqr6KieVZLBQSk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/inorbit-republisher/default.nix b/distros/noetic/inorbit-republisher/default.nix index 7b2b669bcc..2f4147d402 100644 --- a/distros/noetic/inorbit-republisher/default.nix +++ b/distros/noetic/inorbit-republisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-inorbit-republisher"; version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/inorbit-ai/ros_inorbit_samples-release/archive/release/noetic/inorbit_republisher/0.2.5-1.tar.gz"; - name = "0.2.5-1.tar.gz"; - sha256 = "ab97b01aeeb56aeb52012f4a293f300fe793e250a9355ce211e50ec94312ed7f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "inorbit-ai"; + repo = "ros_inorbit_samples-release"; + rev = "release/noetic/inorbit_republisher/0.2.5-1"; + sha256 = "sha256-Bv0QQ3O6DuPCm+5E4cCDRiU+Wc4GuVMtS/BCP879aYk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/interactive-marker-tutorials/default.nix b/distros/noetic/interactive-marker-tutorials/default.nix index eb15e055ef..6bccbfdeb2 100644 --- a/distros/noetic/interactive-marker-tutorials/default.nix +++ b/distros/noetic/interactive-marker-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-interactive-marker-tutorials"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/noetic/interactive_marker_tutorials/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "aeb1dd43c1cc86c20755d73500ee277b9bbe9355d6a5cae09427bbbbc47f5dcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/noetic/interactive_marker_tutorials/0.11.0-1"; + sha256 = "sha256-bi/qAOq07zSTf3W+JoQEozv0o2S+54fPw/HLhJ/Vvs8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/interactive-marker-twist-server/default.nix b/distros/noetic/interactive-marker-twist-server/default.nix index 9209380916..c8fe8d98ca 100644 --- a/distros/noetic/interactive-marker-twist-server/default.nix +++ b/distros/noetic/interactive-marker-twist-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-interactive-marker-twist-server"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/interactive_marker_twist_server-release/archive/release/noetic/interactive_marker_twist_server/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "58d695193fe358cddaabae164f677da27b3908503207c3ca1fcdedbbae922a0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "interactive_marker_twist_server-release"; + rev = "release/noetic/interactive_marker_twist_server/1.2.2-1"; + sha256 = "sha256-JncKemRQ5Bt6lURZB0oSoC57We2g9/ciwhx/PeIXq/U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/interactive-markers/default.nix b/distros/noetic/interactive-markers/default.nix index ef0bd8b847..16a1890db4 100644 --- a/distros/noetic/interactive-markers/default.nix +++ b/distros/noetic/interactive-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-interactive-markers"; version = "1.12.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/interactive_markers-release/archive/release/noetic/interactive_markers/1.12.0-1.tar.gz"; - name = "1.12.0-1.tar.gz"; - sha256 = "d4a8ca9eb762c228712bd9479147db3a73b0cafcf526c926fb406a2bc523ce87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "interactive_markers-release"; + rev = "release/noetic/interactive_markers/1.12.0-1"; + sha256 = "sha256-fwvDx9PFYDGMirWTtn0GR+M0bTOdLjikirUO04KFza4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/interval-intersection/default.nix b/distros/noetic/interval-intersection/default.nix index ea6eca270f..65a8fe0024 100644 --- a/distros/noetic/interval-intersection/default.nix +++ b/distros/noetic/interval-intersection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-interval-intersection"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/interval_intersection/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "4f89e1d18704edfe0222cc81b58b40ed3ea8edfc49c342c14499f6de0fef4387"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/interval_intersection/0.10.15-1"; + sha256 = "sha256-rkLBelaRrHWD0oIoMeggODEwtaw4OKZJK0FaqsYs7Lc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ipa-3d-fov-visualization/default.nix b/distros/noetic/ipa-3d-fov-visualization/default.nix index 6b048a2649..065503e521 100644 --- a/distros/noetic/ipa-3d-fov-visualization/default.nix +++ b/distros/noetic/ipa-3d-fov-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ipa-3d-fov-visualization"; version = "0.6.19-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_perception_common-release/archive/release/noetic/ipa_3d_fov_visualization/0.6.19-1.tar.gz"; - name = "0.6.19-1.tar.gz"; - sha256 = "e4baf608248141a7a93ec5f72b1316a6e2a37ab884126be6754b1c425c060136"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_perception_common-release"; + rev = "release/noetic/ipa_3d_fov_visualization/0.6.19-1"; + sha256 = "sha256-eA7qNPdeLPQ+4DlsfiJqDMztlpyM0SwglBmTiTU2sCw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ipa-differential-docking/default.nix b/distros/noetic/ipa-differential-docking/default.nix index db963fec1c..24ca005689 100644 --- a/distros/noetic/ipa-differential-docking/default.nix +++ b/distros/noetic/ipa-differential-docking/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ipa-differential-docking"; version = "0.6.12-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_substitute-release/archive/release/noetic/ipa_differential_docking/0.6.12-1.tar.gz"; - name = "0.6.12-1.tar.gz"; - sha256 = "1702147d1a9b120c18f7c2ee3a821566be140039abbe5013ed217d8383e8e0b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_substitute-release"; + rev = "release/noetic/ipa_differential_docking/0.6.12-1"; + sha256 = "sha256-TqmliUUeFMSe5CuXxxBCnX2nhJJltPS2v1tzmA+P/HE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ipcamera-driver/default.nix b/distros/noetic/ipcamera-driver/default.nix index c396e7f615..6a7482516b 100644 --- a/distros/noetic/ipcamera-driver/default.nix +++ b/distros/noetic/ipcamera-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ipcamera-driver"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/alireza-hosseini/ipcamera_driver-release/archive/release/noetic/ipcamera_driver/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "a1b25abd5b024972c806f46fa24f8abad5f3ec0e072baa282277ef354fb9fb57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "alireza-hosseini"; + repo = "ipcamera_driver-release"; + rev = "release/noetic/ipcamera_driver/0.1.1-1"; + sha256 = "sha256-ivR9wNM/QGVEMrcRR4wv52fRANuXyRpFrdwOBa11HyM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ira-laser-tools/default.nix b/distros/noetic/ira-laser-tools/default.nix index 4536f1517d..380733a427 100644 --- a/distros/noetic/ira-laser-tools/default.nix +++ b/distros/noetic/ira-laser-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ira-laser-tools"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/iralabdisco/ira_laser_tools-release/archive/release/noetic/ira_laser_tools/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "34d9452ea7b8c7e04c9792f76d8dcd0aa77c5e51191dfec18732d8510d6aa96b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "iralabdisco"; + repo = "ira_laser_tools-release"; + rev = "release/noetic/ira_laser_tools/1.0.7-1"; + sha256 = "sha256-gCrYhlVL1oo/v9DpUW25s+TllnpFFbWZoNCMpLE58lQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/iris-lama-ros/default.nix b/distros/noetic/iris-lama-ros/default.nix index a20fa1011c..52f054c588 100644 --- a/distros/noetic/iris-lama-ros/default.nix +++ b/distros/noetic/iris-lama-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-iris-lama-ros"; version = "1.3.3-r1"; - src = fetchurl { - url = "https://github.com/eupedrosa/iris_lama_ros-release/archive/release/noetic/iris_lama_ros/1.3.3-1.tar.gz"; - name = "1.3.3-1.tar.gz"; - sha256 = "e99e79b003e294db1eaf51b0eb338e760f3138c031eab1dc1ab480afded49ea2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "eupedrosa"; + repo = "iris_lama_ros-release"; + rev = "release/noetic/iris_lama_ros/1.3.3-1"; + sha256 = "sha256-/2dF1s3byKL3ZlmRdRiLPIP1tM3LAgutMeMNKu4pvzI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/iris-lama/default.nix b/distros/noetic/iris-lama/default.nix index ec732bc768..884daa547f 100644 --- a/distros/noetic/iris-lama/default.nix +++ b/distros/noetic/iris-lama/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-iris-lama"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/eupedrosa/iris_lama-release/archive/release/noetic/iris_lama/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "470baf458114fc416eb0ac0462b223845394c2557408dcd75aa82105625da860"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "eupedrosa"; + repo = "iris_lama-release"; + rev = "release/noetic/iris_lama/1.3.1-1"; + sha256 = "sha256-rh2X52BSuZRDWhl5F7cOV0d/uMJ6O8KCHHSrhjl8+w0="; + }; buildType = "cmake"; buildInputs = [ cmake eigen ]; diff --git a/distros/noetic/ivcon/default.nix b/distros/noetic/ivcon/default.nix index e8b5e033e3..6a75ed363d 100644 --- a/distros/noetic/ivcon/default.nix +++ b/distros/noetic/ivcon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ivcon"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ivcon-release/archive/release/noetic/ivcon/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "5d5b97eb47311712f506d691bb1b15040782d752d70d8f022220731ffabd9aab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ivcon-release"; + rev = "release/noetic/ivcon/0.1.7-1"; + sha256 = "sha256-/AREyVRZcOgZ6unXhnDRXXjgs270+ZhbsaVnzE7IBtQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ixblue-ins-driver/default.nix b/distros/noetic/ixblue-ins-driver/default.nix index 7623176652..2889184a37 100644 --- a/distros/noetic/ixblue-ins-driver/default.nix +++ b/distros/noetic/ixblue-ins-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ixblue-ins-driver"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/ixblue/ixblue_ins_stdbin_driver-release/archive/release/noetic/ixblue_ins_driver/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "e01d4b7c09ead8bde1bf548923c5a2c39991dd8a04dfba6c152b541cb0cd12d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ixblue"; + repo = "ixblue_ins_stdbin_driver-release"; + rev = "release/noetic/ixblue_ins_driver/0.1.5-1"; + sha256 = "sha256-NtYgVa3xwzyAPkZyJUJApX8wlF6tynzpQ7HprRa2JrA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ixblue-ins-msgs/default.nix b/distros/noetic/ixblue-ins-msgs/default.nix index 336b3ef509..869b5da6fd 100644 --- a/distros/noetic/ixblue-ins-msgs/default.nix +++ b/distros/noetic/ixblue-ins-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ixblue-ins-msgs"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/ixblue/ixblue_ins_stdbin_driver-release/archive/release/noetic/ixblue_ins_msgs/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "7a178cbeec8c97cd1404323c1d1dad1b65074bd87ab0b521ea7760582d87f191"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ixblue"; + repo = "ixblue_ins_stdbin_driver-release"; + rev = "release/noetic/ixblue_ins_msgs/0.1.5-1"; + sha256 = "sha256-mGmykbgOqH5j2XSi0VVw6+MdufbCFUtLo5vYaMvbzJk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ixblue-ins/default.nix b/distros/noetic/ixblue-ins/default.nix index ce53bb8f04..de70935336 100644 --- a/distros/noetic/ixblue-ins/default.nix +++ b/distros/noetic/ixblue-ins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ixblue-ins"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/ixblue/ixblue_ins_stdbin_driver-release/archive/release/noetic/ixblue_ins/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "c51da63e62ceef41233cce304af30cb19d8499fec4af310f3a0c64b29f398263"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ixblue"; + repo = "ixblue_ins_stdbin_driver-release"; + rev = "release/noetic/ixblue_ins/0.1.5-1"; + sha256 = "sha256-KRogPGGUVYeQP7RODBj5CTtl4IzJAPFwot2MxP9q0ck="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ixblue-stdbin-decoder/default.nix b/distros/noetic/ixblue-stdbin-decoder/default.nix index 644c642605..6f682074b8 100644 --- a/distros/noetic/ixblue-stdbin-decoder/default.nix +++ b/distros/noetic/ixblue-stdbin-decoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ixblue-stdbin-decoder"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ixblue/ixblue_stdbin_decoder-release/archive/release/noetic/ixblue_stdbin_decoder/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "9a2b8c3102a0a1dd9ad85cb3788c80c91dfb6ddbc702b30a8091bd487400d16b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ixblue"; + repo = "ixblue_stdbin_decoder-release"; + rev = "release/noetic/ixblue_stdbin_decoder/0.2.0-1"; + sha256 = "sha256-fjucNh530wldQfBOf7SINGGp0e2XJKOhjMCw3aiWI2w="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/jackal-control/default.nix b/distros/noetic/jackal-control/default.nix index d9fdb22506..6e94cfbda6 100644 --- a/distros/noetic/jackal-control/default.nix +++ b/distros/noetic/jackal-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jackal-control"; version = "0.8.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_control/0.8.6-1.tar.gz"; - name = "0.8.6-1.tar.gz"; - sha256 = "c11f3523ad2b13789ab33fa175b15befddb2f8691a8d53493eeadaf5dabc0ec1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/noetic/jackal_control/0.8.6-1"; + sha256 = "sha256-fgdXViMGyv0cuto+OIA2nBydMX3fDSUZLyKvhrMO4k4="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/jackal-description/default.nix b/distros/noetic/jackal-description/default.nix index ce2022ff6e..e64301917d 100644 --- a/distros/noetic/jackal-description/default.nix +++ b/distros/noetic/jackal-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jackal-description"; version = "0.8.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_description/0.8.6-1.tar.gz"; - name = "0.8.6-1.tar.gz"; - sha256 = "361da61ffbf9bd686ffa5c336cde209df4aeb01be4ff0aeed37e32b8a43128ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/noetic/jackal_description/0.8.6-1"; + sha256 = "sha256-CNALATaFMvqSOeNX0xSEGXaRX/7VGqpHYrtGf5dtfig="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/jackal-gazebo/default.nix b/distros/noetic/jackal-gazebo/default.nix index 85688b154d..154c89212c 100644 --- a/distros/noetic/jackal-gazebo/default.nix +++ b/distros/noetic/jackal-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jackal-gazebo"; version = "0.4.0-r4"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_simulator-release/archive/release/noetic/jackal_gazebo/0.4.0-4.tar.gz"; - name = "0.4.0-4.tar.gz"; - sha256 = "369ad6b2cc59e75584868ff62bfdaee8317835ae9d8629637dc65ad182ad4413"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_simulator-release"; + rev = "release/noetic/jackal_gazebo/0.4.0-4"; + sha256 = "sha256-Q2AGmvi2h5fUsGMYzhQVAgW62umb6gPdpixVBMDOvyk="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/jackal-msgs/default.nix b/distros/noetic/jackal-msgs/default.nix index d21c78d67e..a6dc60d8da 100644 --- a/distros/noetic/jackal-msgs/default.nix +++ b/distros/noetic/jackal-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jackal-msgs"; version = "0.8.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_msgs/0.8.6-1.tar.gz"; - name = "0.8.6-1.tar.gz"; - sha256 = "a71cd0845aa63e7c1469c45c417ab8844439d43e7dd6b1dcb254f6a4e48c69db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/noetic/jackal_msgs/0.8.6-1"; + sha256 = "sha256-ZvG+DuYyD1TkX0BMg/vg8LP3x7WAfoSuld9GN5WUE6Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/jackal-navigation/default.nix b/distros/noetic/jackal-navigation/default.nix index 68e035ddd7..f48b914d08 100644 --- a/distros/noetic/jackal-navigation/default.nix +++ b/distros/noetic/jackal-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jackal-navigation"; version = "0.8.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_navigation/0.8.6-1.tar.gz"; - name = "0.8.6-1.tar.gz"; - sha256 = "53af8b60e1ae0ab3c52dc8c3f098220995ad0f137c1b2f9b17fd23be3bef5b03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/noetic/jackal_navigation/0.8.6-1"; + sha256 = "sha256-RJe8gy30qSzMiqPY5cvMYuHkAV/CBQGUSexSYmUkOBM="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/jackal-simulator/default.nix b/distros/noetic/jackal-simulator/default.nix index d2aedef3df..775378b049 100644 --- a/distros/noetic/jackal-simulator/default.nix +++ b/distros/noetic/jackal-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jackal-simulator"; version = "0.4.0-r4"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal_simulator-release/archive/release/noetic/jackal_simulator/0.4.0-4.tar.gz"; - name = "0.4.0-4.tar.gz"; - sha256 = "5f4397585ff862204ec38dad61b1a68c87b71148441f43066b3c7ea4b2b8cf39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal_simulator-release"; + rev = "release/noetic/jackal_simulator/0.4.0-4"; + sha256 = "sha256-XS3UbgAnUqZXLJkaAlp+N6AMNlPetcCqCdHusgrNEB0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jackal-tutorials/default.nix b/distros/noetic/jackal-tutorials/default.nix index bef8656325..f1151e3094 100644 --- a/distros/noetic/jackal-tutorials/default.nix +++ b/distros/noetic/jackal-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jackal-tutorials"; version = "0.8.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_tutorials/0.8.6-1.tar.gz"; - name = "0.8.6-1.tar.gz"; - sha256 = "7b0811f58982a4478b5f7156109c88a7a6b986a3db16304d004a54d3bc63fde9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "jackal-release"; + rev = "release/noetic/jackal_tutorials/0.8.6-1"; + sha256 = "sha256-p2X2a88dgDVSHvy2b19TEou8mbtFNIF5UuuycJrboAc="; + }; buildType = "catkin"; buildInputs = [ catkin rosdoc-lite ]; diff --git a/distros/noetic/jderobot-assets/default.nix b/distros/noetic/jderobot-assets/default.nix index b9e737855d..c97896603a 100644 --- a/distros/noetic/jderobot-assets/default.nix +++ b/distros/noetic/jderobot-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jderobot-assets"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/assets-release/archive/release/noetic/jderobot_assets/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "3c11d5065095615c276e2e67a4b940545a0a8e7faf1208f7f678a688c1242cca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "assets-release"; + rev = "release/noetic/jderobot_assets/1.1.0-1"; + sha256 = "sha256-hJqE6OjpHzr6eoWmIkHIYfgoaNoyV57frxF56yy5G+I="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/jderobot-drones/default.nix b/distros/noetic/jderobot-drones/default.nix index ce50d300ea..c146206411 100644 --- a/distros/noetic/jderobot-drones/default.nix +++ b/distros/noetic/jderobot-drones/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jderobot-drones"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/noetic/jderobot_drones/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "4993de1fb338d286572a2d737cae4977737658febd1aecaf82ae96637531a1ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/noetic/jderobot_drones/1.4.2-1"; + sha256 = "sha256-0I0g+OpGxoW3RhCP9OtI4rl71VeFEKc3Qepm1hz3q5g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joint-limits-interface/default.nix b/distros/noetic/joint-limits-interface/default.nix index fed96d325e..b8bdec005e 100644 --- a/distros/noetic/joint-limits-interface/default.nix +++ b/distros/noetic/joint-limits-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joint-limits-interface"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/joint_limits_interface/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "d4989bdfaa71b8027e2c650c98c20d399c601856812afbf038aedb274af0aebc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/joint_limits_interface/0.19.6-1"; + sha256 = "sha256-5y4Bw/K2wGI4dRFOAOp23pFzDcOqzljB48zWTcpsgG0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joint-qualification-controllers/default.nix b/distros/noetic/joint-qualification-controllers/default.nix index b8a1a075db..dc5ac813a2 100644 --- a/distros/noetic/joint-qualification-controllers/default.nix +++ b/distros/noetic/joint-qualification-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joint-qualification-controllers"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/noetic/joint_qualification_controllers/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "6f558ae2bd912625a0ca5f95bee94b25369793e70bcaebe6dbff1ed735349479"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/noetic/joint_qualification_controllers/1.0.15-1"; + sha256 = "sha256-uvnfL4x18yI+1gH0HhMnbgPmwqrkBPF9Pl+eB8WCKOE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/joint-state-controller/default.nix b/distros/noetic/joint-state-controller/default.nix index e00fb62cec..ee4a1773a2 100644 --- a/distros/noetic/joint-state-controller/default.nix +++ b/distros/noetic/joint-state-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-interface, hardware-interface, pluginlib, realtime-tools, roscpp, rostest, sensor-msgs }: buildRosPackage { pname = "ros-noetic-joint-state-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/joint_state_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "481caa3fa4796a9094a2c572b686bf9ebfd2e349e0681cac3d33b447f22b2ff7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/joint_state_controller/0.21.1-1"; + sha256 = "sha256-dczTEd3V2uWIMPaCYMLmGsaZynEZLS63dTCDwESXYn8="; + }; buildType = "catkin"; buildInputs = [ catkin pluginlib ]; diff --git a/distros/noetic/joint-state-publisher-gui/default.nix b/distros/noetic/joint-state-publisher-gui/default.nix index aacf557a56..8296a5e888 100644 --- a/distros/noetic/joint-state-publisher-gui/default.nix +++ b/distros/noetic/joint-state-publisher-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joint-state-publisher-gui"; version = "1.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joint_state_publisher-release/archive/release/noetic/joint_state_publisher_gui/1.15.1-1.tar.gz"; - name = "1.15.1-1.tar.gz"; - sha256 = "0a285a9ff411a8dc5944e4540fade94f52a067f70fe79656ae40061938f8dc34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/noetic/joint_state_publisher_gui/1.15.1-1"; + sha256 = "sha256-WBP8BJpbRTVTJveSGDTGX/+YAEQ2Z4mkVPCHOjWiAEo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joint-state-publisher/default.nix b/distros/noetic/joint-state-publisher/default.nix index 6669827e21..53736d0b1a 100644 --- a/distros/noetic/joint-state-publisher/default.nix +++ b/distros/noetic/joint-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joint-state-publisher"; version = "1.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joint_state_publisher-release/archive/release/noetic/joint_state_publisher/1.15.1-1.tar.gz"; - name = "1.15.1-1.tar.gz"; - sha256 = "e12c52894f255b6b5682d14ebe3a12c0d865a72d92455992987a31e51922115a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/noetic/joint_state_publisher/1.15.1-1"; + sha256 = "sha256-vrLYB9dIaGetgfOshaHAQBuXOrRs3zusugjb1BUxDnI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joint-states-settler/default.nix b/distros/noetic/joint-states-settler/default.nix index a8579f9d40..df2ddd7c47 100644 --- a/distros/noetic/joint-states-settler/default.nix +++ b/distros/noetic/joint-states-settler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joint-states-settler"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/joint_states_settler/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "ee45d920a5f98e55c7619fe1526c0d75e6d141fee0e6e7cf3dbe4facc16ba38c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/joint_states_settler/0.10.15-1"; + sha256 = "sha256-UI31iL1SwY1U6qK6dorNCeuBkZcu2U3ZLV3srahaNsM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joint-trajectory-action-tools/default.nix b/distros/noetic/joint-trajectory-action-tools/default.nix index f9ee2929c0..228f610b5d 100644 --- a/distros/noetic/joint-trajectory-action-tools/default.nix +++ b/distros/noetic/joint-trajectory-action-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joint-trajectory-action-tools"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/noetic/joint_trajectory_action_tools/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "0e2e3aaaa99502094b8e3d01eb11fd97c7343ad034d1396c2d571e83da7e09f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/noetic/joint_trajectory_action_tools/0.0.12-1"; + sha256 = "sha256-syBo0jBAN77I2sQ7h3k1LPP9KVliS0WNkRCnnSOZk+4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joint-trajectory-action/default.nix b/distros/noetic/joint-trajectory-action/default.nix index c1ad52efab..48d1df3140 100644 --- a/distros/noetic/joint-trajectory-action/default.nix +++ b/distros/noetic/joint-trajectory-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joint-trajectory-action"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/joint_trajectory_action/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "420aea15c157faddb4abd0abda90f3b701d3549ca642c6a0435bc06d7db07136"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/joint_trajectory_action/1.10.18-1"; + sha256 = "sha256-lT+aP3Vj/QKlHnkH1lSeyO9w3oglb0UpW1InwMD5g0A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joint-trajectory-controller/default.nix b/distros/noetic/joint-trajectory-controller/default.nix index 45489d2052..1e8415198f 100644 --- a/distros/noetic/joint-trajectory-controller/default.nix +++ b/distros/noetic/joint-trajectory-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, angles, boost, catkin, code-coverage, control-msgs, control-toolbox, controller-interface, controller-manager, hardware-interface, pluginlib, realtime-tools, roscpp, rostest, std-msgs, trajectory-msgs, urdf, xacro }: buildRosPackage { pname = "ros-noetic-joint-trajectory-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/joint_trajectory_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "6c04c77fba8f34d3347a1fb997c2436c3c03cc5a92fbaf729389d355298550da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/joint_trajectory_controller/0.21.1-1"; + sha256 = "sha256-BSVPK9s1FjRzdGIbd0nUQCEHE/rizhVuw20Gu5C8P7E="; + }; buildType = "catkin"; buildInputs = [ catkin pluginlib ]; diff --git a/distros/noetic/joint-trajectory-generator/default.nix b/distros/noetic/joint-trajectory-generator/default.nix index e2b1884a40..a1dd002295 100644 --- a/distros/noetic/joint-trajectory-generator/default.nix +++ b/distros/noetic/joint-trajectory-generator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joint-trajectory-generator"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/noetic/joint_trajectory_generator/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "d2287a1ee1b9672ccd3e597113761ac8ff41025f73a9b3cdffa992ec8a480bb7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/noetic/joint_trajectory_generator/0.0.12-1"; + sha256 = "sha256-pYIF+K73obPdvJlBPLxRZ7jnPK8wcqOtxTT/N9meCvk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joy-listener/default.nix b/distros/noetic/joy-listener/default.nix index 0e8b1cb2ce..61405d3a2d 100644 --- a/distros/noetic/joy-listener/default.nix +++ b/distros/noetic/joy-listener/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joy-listener"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/noetic/joy_listener/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "ed8d02e94e400cbe16efce75d3b11c3474f9bf5b1e2cf4f1eae1202cb2deaa6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/noetic/joy_listener/0.3.0-1"; + sha256 = "sha256-9tIrXl9pGLfxbU6qAPirNIMEkQv95fyz9092oC58Zjg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joy-mouse/default.nix b/distros/noetic/joy-mouse/default.nix index 4acbf3190b..593d6cae40 100644 --- a/distros/noetic/joy-mouse/default.nix +++ b/distros/noetic/joy-mouse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joy-mouse"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/joy_mouse/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "4876131f722fa3039230dc0057afd48333a74da69cca0f665a250f2bc4fc97e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/joy_mouse/0.1.16-1"; + sha256 = "sha256-MvD0OmrRF3bH9VZNfQGwdi0KjliMpZdKbmn+lBJkByc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joy-teleop/default.nix b/distros/noetic/joy-teleop/default.nix index b245423d31..308d23f67a 100644 --- a/distros/noetic/joy-teleop/default.nix +++ b/distros/noetic/joy-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joy-teleop"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/noetic/joy_teleop/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "8824c105187a12a47186db7ff08706673316d2aca3dae67ffa987eeaeb74d475"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/noetic/joy_teleop/0.4.0-1"; + sha256 = "sha256-Zg9siLvtC3jaPqI0EO64Kg1lNwI/4TCpd7ICdSQ4p+k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/joy/default.nix b/distros/noetic/joy/default.nix index f746e5c94c..a4495aca1e 100644 --- a/distros/noetic/joy/default.nix +++ b/distros/noetic/joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-joy"; version = "1.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joystick_drivers-release/archive/release/noetic/joy/1.15.1-1.tar.gz"; - name = "1.15.1-1.tar.gz"; - sha256 = "d09ea880713158e4a7455a892bd618e1c8d2b634cc9fa5d03b7cf9cf73e1ad0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joystick_drivers-release"; + rev = "release/noetic/joy/1.15.1-1"; + sha256 = "sha256-Ka+iGzT0MwLWj2DaC9TL/2pA45hwMk8CbG550GrZEBA="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/joystick-interrupt/default.nix b/distros/noetic/joystick-interrupt/default.nix index 067a8d1849..b7f1705502 100644 --- a/distros/noetic/joystick-interrupt/default.nix +++ b/distros/noetic/joystick-interrupt/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, neonavigation-common, roscpp, roslint, rostest, sensor-msgs, topic-tools }: buildRosPackage { pname = "ros-noetic-joystick-interrupt"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/joystick_interrupt/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "d7c299727627ba66e5285bdadf317a2db6c1dfc4a7f291beda8f96dbb10c518d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/joystick_interrupt/0.12.0-1"; + sha256 = "sha256-Wb2GnCI7TbxxsppPPpubxTYQEmUb+29ebC84qgiLtQM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-calibration/default.nix b/distros/noetic/jsk-calibration/default.nix index 4622d3d90b..97c93e363d 100644 --- a/distros/noetic/jsk-calibration/default.nix +++ b/distros/noetic/jsk-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-calibration"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/jsk_calibration/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "5a0517ce201c7c293df300b22f12c1d265253dfd73f93db9f25db33c148a713a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/jsk_calibration/0.1.16-1"; + sha256 = "sha256-C0ViUnTsZ1bs8/mhCdlS34UmBr88sgfEPIHtxDmwOEY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-common-msgs/default.nix b/distros/noetic/jsk-common-msgs/default.nix index 6138fed677..63783fc01b 100644 --- a/distros/noetic/jsk-common-msgs/default.nix +++ b/distros/noetic/jsk-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-common-msgs"; version = "4.3.2-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/noetic/jsk_common_msgs/4.3.2-1.tar.gz"; - name = "4.3.2-1.tar.gz"; - sha256 = "97e34ef1a7a0d001ee6fd9f2a660bec245c92deb96bf0baa14009babb5a8df86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/noetic/jsk_common_msgs/4.3.2-1"; + sha256 = "sha256-RbmHR0OFmpjcvneWSg5SUm6f4clt6f4LDGFb6YekHXg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-common/default.nix b/distros/noetic/jsk-common/default.nix index f3df8d2b6c..16a34f4ad3 100644 --- a/distros/noetic/jsk-common/default.nix +++ b/distros/noetic/jsk-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-common"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/jsk_common/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "aba0111078224438e6e2135b0553eb2307494052ad39d89f77dc95eab1408945"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/jsk_common/2.2.12-1"; + sha256 = "sha256-XazgDRNWipT1K+kgE9sQWDoQc/DxjLCpq/C0dgjICtQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-control/default.nix b/distros/noetic/jsk-control/default.nix index 006f9f98f0..6110148c71 100644 --- a/distros/noetic/jsk-control/default.nix +++ b/distros/noetic/jsk-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-control"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/jsk_control/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "d9147f76e0e6ddd8d01656c801e6acf003e0f6b3843e8d7647cafc7f691d7f4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/jsk_control/0.1.16-1"; + sha256 = "sha256-0TFki9mag61pN0NN5ibF6UgSLdBR/Oy126KoeuxQmj8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-footstep-controller/default.nix b/distros/noetic/jsk-footstep-controller/default.nix index 39a3c95103..2d9a485aec 100644 --- a/distros/noetic/jsk-footstep-controller/default.nix +++ b/distros/noetic/jsk-footstep-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-footstep-controller"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/jsk_footstep_controller/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "08d7383c10f7e79aa872ec7fc3fc1e1a00b66572f4498278cc55d5815e822913"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/jsk_footstep_controller/0.1.16-1"; + sha256 = "sha256-gTfi5vl9Dpj0P0BeGeeWUaLPHFhnlZrNgxwwQ671Y9I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-footstep-msgs/default.nix b/distros/noetic/jsk-footstep-msgs/default.nix index cc45521dac..8fcfc075c8 100644 --- a/distros/noetic/jsk-footstep-msgs/default.nix +++ b/distros/noetic/jsk-footstep-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-footstep-msgs"; version = "4.3.2-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/noetic/jsk_footstep_msgs/4.3.2-1.tar.gz"; - name = "4.3.2-1.tar.gz"; - sha256 = "b2b7a43c4d6575bac585650d2ae849299248c3ae676e80ad068eebcd193b31c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/noetic/jsk_footstep_msgs/4.3.2-1"; + sha256 = "sha256-XD4hiHTiNsg6vBFZu3sSQ6osI0CGq57fJxF6C0pfEUU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/jsk-footstep-planner/default.nix b/distros/noetic/jsk-footstep-planner/default.nix index 2fbcb709d4..a02a944ae1 100644 --- a/distros/noetic/jsk-footstep-planner/default.nix +++ b/distros/noetic/jsk-footstep-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-footstep-planner"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/jsk_footstep_planner/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "c9e606876741ca11315de87743e58c85ad0930af4a279564348713d67f02c869"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/jsk_footstep_planner/0.1.16-1"; + sha256 = "sha256-d22ielC/PDHwo6NqeoocfX8Ak27TsRPnqs2tZcKlY7w="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/jsk-gui-msgs/default.nix b/distros/noetic/jsk-gui-msgs/default.nix index 841f522643..7569d42593 100644 --- a/distros/noetic/jsk-gui-msgs/default.nix +++ b/distros/noetic/jsk-gui-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-gui-msgs"; version = "4.3.2-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/noetic/jsk_gui_msgs/4.3.2-1.tar.gz"; - name = "4.3.2-1.tar.gz"; - sha256 = "35f8d474f2c514de458ba051ecccbd38b318be27e019c9bb781d6ab96b48a4e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/noetic/jsk_gui_msgs/4.3.2-1"; + sha256 = "sha256-jYSWz9D3lYZkmWoOerYObURtoYmJoJhU90uu2yhCiFw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/jsk-hark-msgs/default.nix b/distros/noetic/jsk-hark-msgs/default.nix index 9cfca7079f..f5b631cce3 100644 --- a/distros/noetic/jsk-hark-msgs/default.nix +++ b/distros/noetic/jsk-hark-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-hark-msgs"; version = "4.3.2-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/noetic/jsk_hark_msgs/4.3.2-1.tar.gz"; - name = "4.3.2-1.tar.gz"; - sha256 = "a3716e37532d49d5ca8565c09e68e01b88ca2f25da26a4b0f4360b473df6c2e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/noetic/jsk_hark_msgs/4.3.2-1"; + sha256 = "sha256-+A7rktLXqq4ygxJQExrx043pmh0dGRNRZbtzr+BgPbk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/jsk-ik-server/default.nix b/distros/noetic/jsk-ik-server/default.nix index ac3d6ccc6a..6a83e66da9 100644 --- a/distros/noetic/jsk-ik-server/default.nix +++ b/distros/noetic/jsk-ik-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-ik-server"; version = "0.1.16-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_control-release/archive/release/noetic/jsk_ik_server/0.1.16-1.tar.gz"; - name = "0.1.16-1.tar.gz"; - sha256 = "80eb52f7cfdba38a0a7d6f5754488a36c21d694edff326988a0546fdd5883364"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_control-release"; + rev = "release/noetic/jsk_ik_server/0.1.16-1"; + sha256 = "sha256-J0+SCpwcTHtm/MTGzy9k9Ch4qKmAtkoOXeKJabCwSKg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-interactive-marker/default.nix b/distros/noetic/jsk-interactive-marker/default.nix index f1e676b823..95297920f6 100644 --- a/distros/noetic/jsk-interactive-marker/default.nix +++ b/distros/noetic/jsk-interactive-marker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-interactive-marker"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/noetic/jsk_interactive_marker/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "9e07b602208265e5bb46357a019f215995e3f3ebe2adb30a6ecf2223d494f4cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/noetic/jsk_interactive_marker/2.1.8-1"; + sha256 = "sha256-yJkdd5hoJTVP8AyHwwSO5PEOH8BXnROUR2F1Q6dPfJ8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation mk rosbuild ]; diff --git a/distros/noetic/jsk-interactive-test/default.nix b/distros/noetic/jsk-interactive-test/default.nix index 2e1ecbad29..f8f350303c 100644 --- a/distros/noetic/jsk-interactive-test/default.nix +++ b/distros/noetic/jsk-interactive-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-interactive-test"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/noetic/jsk_interactive_test/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "72224913f0e66eff0379ca04eaf852bef3e281dd97ebd43eaa5a3c1e18d8b46a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/noetic/jsk_interactive_test/2.1.8-1"; + sha256 = "sha256-TTsMi9XDN5YpqmHVT260wRbgrXgWd2QdxXhwI3qoanU="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosbuild ]; diff --git a/distros/noetic/jsk-interactive/default.nix b/distros/noetic/jsk-interactive/default.nix index 51e7eed368..d5001e26b9 100644 --- a/distros/noetic/jsk-interactive/default.nix +++ b/distros/noetic/jsk-interactive/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-interactive"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/noetic/jsk_interactive/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "ade9c8c7968de594d1f5ca67d8bda9adb2570635b1f35141004f5dabbe0a6eff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/noetic/jsk_interactive/2.1.8-1"; + sha256 = "sha256-C+M96eJuZZF6C9yX4tInILOfgUeuYbiQrDkG4U0nZBg="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosbuild ]; diff --git a/distros/noetic/jsk-model-tools/default.nix b/distros/noetic/jsk-model-tools/default.nix index 99befcd96b..f21f1e08f9 100644 --- a/distros/noetic/jsk-model-tools/default.nix +++ b/distros/noetic/jsk-model-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-model-tools"; version = "0.4.4-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_model_tools-release/archive/release/noetic/jsk_model_tools/0.4.4-2.tar.gz"; - name = "0.4.4-2.tar.gz"; - sha256 = "01078b70b2d69d83a5a531d05c4f546d557a8281c6376a3e090aa274df68173b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_model_tools-release"; + rev = "release/noetic/jsk_model_tools/0.4.4-2"; + sha256 = "sha256-zvzP7mUCPf61EnF41GEPxJ3kB6VrI1gLE+HEhG1Q0jM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-network-tools/default.nix b/distros/noetic/jsk-network-tools/default.nix index 1ff7aa71fa..6d3d0a787f 100644 --- a/distros/noetic/jsk-network-tools/default.nix +++ b/distros/noetic/jsk-network-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-network-tools"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/jsk_network_tools/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "21b402ed5de2bcf9052d49b0c4cb1e5607eeb7320474179995e5d04cfb8d508f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/jsk_network_tools/2.2.12-1"; + sha256 = "sha256-5syw3GvBtwT+SoBMPN63X2RLJcMOIXKHwfVXfJxP3FM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/noetic/jsk-recognition-msgs/default.nix b/distros/noetic/jsk-recognition-msgs/default.nix index 45fc77d0e5..fb4a8b07a7 100644 --- a/distros/noetic/jsk-recognition-msgs/default.nix +++ b/distros/noetic/jsk-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-recognition-msgs"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/noetic/jsk_recognition_msgs/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "a5a024053de6d9f174a22c418696d6097d53ab3b283255a359bb0d463ac3ea2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/noetic/jsk_recognition_msgs/1.2.15-1"; + sha256 = "sha256-pTlRnRxhSm8VEDkgg6BRIZSnxvK2m86qOokTuzrUPJ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-recognition-utils/default.nix b/distros/noetic/jsk-recognition-utils/default.nix index b9b0b7431e..22daeddbf0 100644 --- a/distros/noetic/jsk-recognition-utils/default.nix +++ b/distros/noetic/jsk-recognition-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-recognition-utils"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/noetic/jsk_recognition_utils/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "feda9ac4dc973880fdd5747bb1ee2188cc71d5a556392eb81cc45fb40d0c3cb3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/noetic/jsk_recognition_utils/1.2.15-1"; + sha256 = "sha256-k3WWrIY2lKmJ0VvcGmxEsm91VbbLBxpDkjh/8aHCxs4="; + }; buildType = "catkin"; buildInputs = [ catkin dynamic-reconfigure message-generation python3Packages.setuptools pythonPackages.cython qt5.qtbase ]; diff --git a/distros/noetic/jsk-recognition/default.nix b/distros/noetic/jsk-recognition/default.nix index 95ca8bf05a..99ba2e014a 100644 --- a/distros/noetic/jsk-recognition/default.nix +++ b/distros/noetic/jsk-recognition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-recognition"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/noetic/jsk_recognition/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "eb418e1268b69ae5ac4dd14eaa396b081c86b6c02e7f64829e63fa7b3dc5ecc5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/noetic/jsk_recognition/1.2.15-1"; + sha256 = "sha256-/zGusMJaBzIsW3bOlA/A+3xI/ZB7QBCyZ+nYdRpUEiQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-roseus/default.nix b/distros/noetic/jsk-roseus/default.nix index 2d1aff4a64..8d1cb18f87 100644 --- a/distros/noetic/jsk-roseus/default.nix +++ b/distros/noetic/jsk-roseus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-roseus"; version = "1.7.5-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/noetic/jsk_roseus/1.7.5-2.tar.gz"; - name = "1.7.5-2.tar.gz"; - sha256 = "888a689c528c75b99cf38b04a5094670bbbdda3220b7b54dc5f4f43628d3cd69"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/noetic/jsk_roseus/1.7.5-2"; + sha256 = "sha256-q4M4SBFhasEM2xtFbfn72f0IsMLGa2pbOPW/R3MyFfU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jsk-rqt-plugins/default.nix b/distros/noetic/jsk-rqt-plugins/default.nix index f24ddd90c1..81eba29feb 100644 --- a/distros/noetic/jsk-rqt-plugins/default.nix +++ b/distros/noetic/jsk-rqt-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-rqt-plugins"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/noetic/jsk_rqt_plugins/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "1018fa78ab28b6366e768e7e368e4566dcf910079c9704119fda55433b414a25"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/noetic/jsk_rqt_plugins/2.1.8-1"; + sha256 = "sha256-jNSPwfw42DF7OqCFHzBzrID/8nHrgadV/KPxtI2UpFA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation mk rosbuild ]; diff --git a/distros/noetic/jsk-tilt-laser/default.nix b/distros/noetic/jsk-tilt-laser/default.nix index f75b7a316d..8cb4729589 100644 --- a/distros/noetic/jsk-tilt-laser/default.nix +++ b/distros/noetic/jsk-tilt-laser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-tilt-laser"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/jsk_tilt_laser/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "a7f28528f48b54cabeaa344687640f515aa524f5f1c8c9e213137193848797a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/jsk_tilt_laser/2.2.12-1"; + sha256 = "sha256-0g9YIl+KFy/5BRAu3Z83tXgP//WdTN6Ivy9XwTw1i84="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/jsk-topic-tools/default.nix b/distros/noetic/jsk-topic-tools/default.nix index b2c8275539..d0899fd1c3 100644 --- a/distros/noetic/jsk-topic-tools/default.nix +++ b/distros/noetic/jsk-topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-topic-tools"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/jsk_topic_tools/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "4dd91f7b7c8c736cba993b8866f47166a4b6c7de7e28f888053e052b71f5dfc7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/jsk_topic_tools/2.2.12-1"; + sha256 = "sha256-dSPXQ06+0SIVrSfTQvpFc1zYYuZ09sjqpQdlGRUO5Fo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/noetic/jsk-visualization/default.nix b/distros/noetic/jsk-visualization/default.nix index 6d083095e7..54898f6ea0 100644 --- a/distros/noetic/jsk-visualization/default.nix +++ b/distros/noetic/jsk-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jsk-visualization"; version = "2.1.8-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_visualization-release/archive/release/noetic/jsk_visualization/2.1.8-1.tar.gz"; - name = "2.1.8-1.tar.gz"; - sha256 = "a6822f98ef9339b56265c4fbf861f3b0d2bbd8d342a3f8c97180c2d72e8e50d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_visualization-release"; + rev = "release/noetic/jsk_visualization/2.1.8-1"; + sha256 = "sha256-sR2bHaoN3KTK1cAi9+Maizm3PFbNpLjALHa3FNCXjAc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/jskeus/default.nix b/distros/noetic/jskeus/default.nix index 67db37f809..689743d2c0 100644 --- a/distros/noetic/jskeus/default.nix +++ b/distros/noetic/jskeus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-jskeus"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jskeus-release/archive/release/noetic/jskeus/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "bb43fd1f54ff95c468ea7bda7cc7063013b11c15b7430eb88dcc7880b8f2257e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jskeus-release"; + rev = "release/noetic/jskeus/1.2.5-1"; + sha256 = "sha256-uvYrbSlxEtlpPztESHzDI7PDMmqu/rc2Z9epqlb2yI0="; + }; buildType = "cmake"; buildInputs = [ catkin ]; diff --git a/distros/noetic/julius/default.nix b/distros/noetic/julius/default.nix index d135b715c2..e3f462abcc 100644 --- a/distros/noetic/julius/default.nix +++ b/distros/noetic/julius/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-julius"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/julius/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "014823789ce21da94f4a4338eb1a967c378ce71107a0bf578befe17b79584387"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/julius/2.1.21-2"; + sha256 = "sha256-DoeIPtQf3KXyx/DlW13I8UDg6ipLHcVYC2tYHl8UWWE="; + }; buildType = "catkin"; buildInputs = [ catkin mk roslib rospack ]; diff --git a/distros/noetic/kalman-filter/default.nix b/distros/noetic/kalman-filter/default.nix index 0e84bdb6e4..86fe1b8e2b 100644 --- a/distros/noetic/kalman-filter/default.nix +++ b/distros/noetic/kalman-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kalman-filter"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/noetic/kalman_filter/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "343082c9f9a54591f3e81a0fdb6c3b92731e54f25818208be8dad393bed88312"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/noetic/kalman_filter/0.3.0-1"; + sha256 = "sha256-NKYbf+Ii+Whgl9rEaZCmNDMJktWY0RNybPCRjASFArE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/kartech-linear-actuator-msgs/default.nix b/distros/noetic/kartech-linear-actuator-msgs/default.nix index 26764fda81..70e309f642 100644 --- a/distros/noetic/kartech-linear-actuator-msgs/default.nix +++ b/distros/noetic/kartech-linear-actuator-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kartech-linear-actuator-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/kartech_linear_actuator_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "3e6cd3bac9e7693fd27ffd3318a85d9537fdb749e15626d1e920b1084b6de628"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/kartech_linear_actuator_msgs/3.3.0-1"; + sha256 = "sha256-uh/ORW9mcX0klEqpFsiLSbVtvE0AjuGpi9VMZBY1qB8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/kdl-conversions/default.nix b/distros/noetic/kdl-conversions/default.nix index 323ecdbb18..f52947e321 100644 --- a/distros/noetic/kdl-conversions/default.nix +++ b/distros/noetic/kdl-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kdl-conversions"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/noetic/kdl_conversions/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "8bf8790de2b08b6274348c68c23337dc16e4ca2b4a1ca4028d5555cb53094a5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/noetic/kdl_conversions/1.13.2-1"; + sha256 = "sha256-jiTjkWyWzb78RXDQ4YlpWIxB7IJ9Td+BqLiPkWOKCUs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/kdl-parser-py/default.nix b/distros/noetic/kdl-parser-py/default.nix index b19a0044c8..bbcf586e5d 100644 --- a/distros/noetic/kdl-parser-py/default.nix +++ b/distros/noetic/kdl-parser-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kdl-parser-py"; version = "1.14.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/kdl_parser-release/archive/release/noetic/kdl_parser_py/1.14.2-1.tar.gz"; - name = "1.14.2-1.tar.gz"; - sha256 = "21e02913bc61d60fb30d14533c9073c4ce350f6c8d642e40301bca23c6df351c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "kdl_parser-release"; + rev = "release/noetic/kdl_parser_py/1.14.2-1"; + sha256 = "sha256-aMYdlUJX/gNJ33S06mLvcyrgO+p5yipiK1NUTyHSY38="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.catkin-pkg python3Packages.setuptools ]; diff --git a/distros/noetic/kdl-parser/default.nix b/distros/noetic/kdl-parser/default.nix index ef97032f25..e4ca298dd4 100644 --- a/distros/noetic/kdl-parser/default.nix +++ b/distros/noetic/kdl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kdl-parser"; version = "1.14.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/kdl_parser-release/archive/release/noetic/kdl_parser/1.14.2-1.tar.gz"; - name = "1.14.2-1.tar.gz"; - sha256 = "a7236d3f21524007defe5bfc596e71b2b6febaebda9c991bbb79a8a7d348865d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "kdl_parser-release"; + rev = "release/noetic/kdl_parser/1.14.2-1"; + sha256 = "sha256-r3WrYeWFNA8mzLDmVCU7mgtvthz5b7EgQcNsVY/5s5s="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/key-teleop/default.nix b/distros/noetic/key-teleop/default.nix index 483a5d9a7a..c649523b88 100644 --- a/distros/noetic/key-teleop/default.nix +++ b/distros/noetic/key-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-key-teleop"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/noetic/key_teleop/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "eb2a780a6771f9f56569c9e7c5c186a1623ab6e1df367b8e06518363cd8a4639"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/noetic/key_teleop/0.4.0-1"; + sha256 = "sha256-oPLvwG4TGEy4+xLRlP6mvs+hc+RSxOx6r6qarS4Dy6I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-duaro-description/default.nix b/distros/noetic/khi-duaro-description/default.nix index 28f84260e5..c18aae3d48 100644 --- a/distros/noetic/khi-duaro-description/default.nix +++ b/distros/noetic/khi-duaro-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-duaro-description"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_duaro_description/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "ec3d893121f8dea57c5a3bb3050a22ea785bf5a0bd7eb25ff81b7f4ecbb00f42"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_duaro_description/1.3.0-2"; + sha256 = "sha256-SI44DxF0iR2QLWMYIP3exN6t/BVbOcd0wgTEMFM4n0k="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/khi-duaro-gazebo/default.nix b/distros/noetic/khi-duaro-gazebo/default.nix index 3e8b7997a2..c57db1c4d8 100644 --- a/distros/noetic/khi-duaro-gazebo/default.nix +++ b/distros/noetic/khi-duaro-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-duaro-gazebo"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_duaro_gazebo/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "3b9c35cc2850ce1f3b7b7686ddc507688b73c7f1555d17aa9fadc7c859b4657d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_duaro_gazebo/1.3.0-2"; + sha256 = "sha256-WQmZ/EPwuZL5RBhxOzD8I3/tjURyDBOUZ8GUJg6lFa8="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-ros-control ]; diff --git a/distros/noetic/khi-duaro-ikfast-plugin/default.nix b/distros/noetic/khi-duaro-ikfast-plugin/default.nix index b07aa201ec..56deb0672f 100644 --- a/distros/noetic/khi-duaro-ikfast-plugin/default.nix +++ b/distros/noetic/khi-duaro-ikfast-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-duaro-ikfast-plugin"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_duaro_ikfast_plugin/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "8e04bf9a27110105da896f1bfc4a47241f7269c0faf124bb354355a1181c191a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_duaro_ikfast_plugin/1.3.0-2"; + sha256 = "sha256-VoTn3ujaq3vuKx6C9JFp70whb6HgyOsTsxZVelcU9fU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-duaro-moveit-config/default.nix b/distros/noetic/khi-duaro-moveit-config/default.nix index aaf52783bf..52306dc1fe 100644 --- a/distros/noetic/khi-duaro-moveit-config/default.nix +++ b/distros/noetic/khi-duaro-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-duaro-moveit-config"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_duaro_moveit_config/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "2bd499fbbe1bf10d666740baf31871cbb07ae712e22fc6f5babcc9669d2e1bfe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_duaro_moveit_config/1.3.0-2"; + sha256 = "sha256-36QIfyvcvU3cieZsiahpdj0vBYPrCESbGH7tGHSPq/Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-robot-bringup/default.nix b/distros/noetic/khi-robot-bringup/default.nix index 4a4589e295..18c125e060 100644 --- a/distros/noetic/khi-robot-bringup/default.nix +++ b/distros/noetic/khi-robot-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-robot-bringup"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_robot_bringup/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "2fb5d538ff7cca22d2210aac7ff0f6ca52d388b2fbd6eee3920de9fdb3909c81"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_robot_bringup/1.3.0-2"; + sha256 = "sha256-dvvgeIzES9feoeAnfQGBhBC0CroEuIQxmNTxQEvBwEk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-robot-control/default.nix b/distros/noetic/khi-robot-control/default.nix index 515c2d8674..7b20bb736b 100644 --- a/distros/noetic/khi-robot-control/default.nix +++ b/distros/noetic/khi-robot-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-robot-control"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_robot_control/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "527e8a00ea752dfc9aa391ba39e90c1e0d88b4ccc595eb08778e35c3a14f0f50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_robot_control/1.3.0-2"; + sha256 = "sha256-36s/pekl0SQvVOGiSScyhv73jtOLgEqcexvFBRBQBR8="; + }; buildType = "catkin"; buildInputs = [ catkin realtime-tools ]; diff --git a/distros/noetic/khi-robot-msgs/default.nix b/distros/noetic/khi-robot-msgs/default.nix index 7ba1ae282a..dfe03bd7ce 100644 --- a/distros/noetic/khi-robot-msgs/default.nix +++ b/distros/noetic/khi-robot-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-robot-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_robot_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "aecc5dda3fef55a0d6f319fef0eb0e928359af996bf18d38e2286bf5047fc99b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_robot_msgs/1.3.0-2"; + sha256 = "sha256-9IoEYS7oAV78YOhN5bHWMFhl3KFZQM5auMTuMZJ0R84="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/khi-robot-test/default.nix b/distros/noetic/khi-robot-test/default.nix index e6cf9348bc..6f5825de09 100644 --- a/distros/noetic/khi-robot-test/default.nix +++ b/distros/noetic/khi-robot-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-robot-test"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_robot_test/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "e3b618300bb7535964da9ae8d925debfe23dfcd653d104bd6f893495e4397468"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_robot_test/1.3.0-2"; + sha256 = "sha256-Lu4EgBe+6v78lQf0CQJ1mx2yAqJZveKfi86BMgbhMz8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-robot/default.nix b/distros/noetic/khi-robot/default.nix index 361176f2ba..fc11669047 100644 --- a/distros/noetic/khi-robot/default.nix +++ b/distros/noetic/khi-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-robot"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_robot/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "38402ef00c78324a9a31b42d3d8962b81edbbdb6fa8e14fa9e01f2bdc868a439"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_robot/1.3.0-2"; + sha256 = "sha256-TJLbIX/JAn1w5z5i83jyjHAr91s9k5fH+5ntPr8Et7s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-rs-description/default.nix b/distros/noetic/khi-rs-description/default.nix index 0248a9f0ec..b3770d05b1 100644 --- a/distros/noetic/khi-rs-description/default.nix +++ b/distros/noetic/khi-rs-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-rs-description"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_rs_description/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "eaac6a38c8730a093ab13599e9c2abcfe588c4ea5bd2c3c0bdc662c6b953a757"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_rs_description/1.3.0-2"; + sha256 = "sha256-7JuPxIOpqMfFbZgvSOLcBA0w++RGPCXrg7SteGQLvJA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/khi-rs-gazebo/default.nix b/distros/noetic/khi-rs-gazebo/default.nix index b5936c577f..94e68e8b0b 100644 --- a/distros/noetic/khi-rs-gazebo/default.nix +++ b/distros/noetic/khi-rs-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-rs-gazebo"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_rs_gazebo/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "26191af79756afa3964934a023f720205ede62cc2203746726d0cfada5312fb7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_rs_gazebo/1.3.0-2"; + sha256 = "sha256-+8XMuGdpF4/nEOa1Nr0vuYocgUYtbCjz6ygxdxp9q4I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-rs-ikfast-plugin/default.nix b/distros/noetic/khi-rs-ikfast-plugin/default.nix index d774d0d753..643c839356 100644 --- a/distros/noetic/khi-rs-ikfast-plugin/default.nix +++ b/distros/noetic/khi-rs-ikfast-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-rs-ikfast-plugin"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_rs_ikfast_plugin/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "ba133fc7343e832ac36593564aa79567291e050d9c5a4a72fe197517da6827b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_rs_ikfast_plugin/1.3.0-2"; + sha256 = "sha256-/MbFHz8xTxZnoTl9EP7KPbylSSfGFyaz+yvIUqHtzCQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-rs007l-moveit-config/default.nix b/distros/noetic/khi-rs007l-moveit-config/default.nix index e57ce4dafb..ae214ae1be 100644 --- a/distros/noetic/khi-rs007l-moveit-config/default.nix +++ b/distros/noetic/khi-rs007l-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-rs007l-moveit-config"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_rs007l_moveit_config/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "d088992459383496125e2d552275b0c1937f872754cced1a61586d69dfbf6ceb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_rs007l_moveit_config/1.3.0-2"; + sha256 = "sha256-gEFYKMhTbaQIaDk1u5X+8LRFzlC1aPcwAM1v1PixjOI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-rs007n-moveit-config/default.nix b/distros/noetic/khi-rs007n-moveit-config/default.nix index d608730163..0ff394c2cc 100644 --- a/distros/noetic/khi-rs007n-moveit-config/default.nix +++ b/distros/noetic/khi-rs007n-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-rs007n-moveit-config"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_rs007n_moveit_config/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "03dc6f0443fda959dbe275eaaf711ce0344140656acccdff112ad7bea54cf7c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_rs007n_moveit_config/1.3.0-2"; + sha256 = "sha256-I+gQN2o5tSGzchxz+Wh3BbG/BooAzjrnoBybdvw22v4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-rs013n-moveit-config/default.nix b/distros/noetic/khi-rs013n-moveit-config/default.nix index 4efaab54df..d69092d0ae 100644 --- a/distros/noetic/khi-rs013n-moveit-config/default.nix +++ b/distros/noetic/khi-rs013n-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-rs013n-moveit-config"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_rs013n_moveit_config/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "06c90df22698e6ba21c701fc39cdeec0afb7d1d74c2034d665ae64e724f5d22d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_rs013n_moveit_config/1.3.0-2"; + sha256 = "sha256-dvrIeVpb8fbHPP9m6TRaFcSZs3M7sAA/ZEfwP+SG6VI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/khi-rs080n-moveit-config/default.nix b/distros/noetic/khi-rs080n-moveit-config/default.nix index 0e9f2af664..198dc61724 100644 --- a/distros/noetic/khi-rs080n-moveit-config/default.nix +++ b/distros/noetic/khi-rs080n-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-khi-rs080n-moveit-config"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/Kawasaki-Robotics/khi_robot-release/archive/release/noetic/khi_rs080n_moveit_config/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "0d2d13e6379d9cb141f147a1ab4be91180059db4c5bb15aecd26ecc7d9cb7158"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kawasaki-Robotics"; + repo = "khi_robot-release"; + rev = "release/noetic/khi_rs080n_moveit_config/1.3.0-2"; + sha256 = "sha256-KCNEO9DoyLGMR1bFVqwEu6HxIKCciXcUE9DJUZTEA6M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/knowledge-representation/default.nix b/distros/noetic/knowledge-representation/default.nix index c3a9e1a08d..b09fb89ac9 100644 --- a/distros/noetic/knowledge-representation/default.nix +++ b/distros/noetic/knowledge-representation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-knowledge-representation"; version = "0.9.6-r1"; - src = fetchurl { - url = "https://github.com/utexas-bwi-gbp/knowledge_representation-release/archive/release/noetic/knowledge_representation/0.9.6-1.tar.gz"; - name = "0.9.6-1.tar.gz"; - sha256 = "fad16bb2d5c4b082e11b1969accdf506789cbc771b76fae614f0fbbf5a2b40c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "utexas-bwi-gbp"; + repo = "knowledge_representation-release"; + rev = "release/noetic/knowledge_representation/0.9.6-1"; + sha256 = "sha256-P/OLYmaKPV/J28yEO47TmnqgZilAvi7anGUTrZa++Dw="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools roslint ]; diff --git a/distros/noetic/kobuki-core/default.nix b/distros/noetic/kobuki-core/default.nix index e7e1e04f34..952ab39a02 100644 --- a/distros/noetic/kobuki-core/default.nix +++ b/distros/noetic/kobuki-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kobuki-core"; version = "0.7.12-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_core-release/archive/release/noetic/kobuki_core/0.7.12-1.tar.gz"; - name = "0.7.12-1.tar.gz"; - sha256 = "e9c04dfff9fa404901b01cd7cce253bed12a00385b76a24da99f5e96158d869e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_core-release"; + rev = "release/noetic/kobuki_core/0.7.12-1"; + sha256 = "sha256-FJ6sT/26Sul/nwI17KnFDkFKz7eoZIwu1pA/RbbhmbE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/kobuki-dock-drive/default.nix b/distros/noetic/kobuki-dock-drive/default.nix index 6dc2ce9814..c13b9e88a4 100644 --- a/distros/noetic/kobuki-dock-drive/default.nix +++ b/distros/noetic/kobuki-dock-drive/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kobuki-dock-drive"; version = "0.7.12-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_core-release/archive/release/noetic/kobuki_dock_drive/0.7.12-1.tar.gz"; - name = "0.7.12-1.tar.gz"; - sha256 = "09bfee1de3dd1c0c372a4148546db5ec2b1750513c6f6fef419ee0e39288983f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_core-release"; + rev = "release/noetic/kobuki_dock_drive/0.7.12-1"; + sha256 = "sha256-hv4seL1TnWeg/AzXHsXU6avtUCMupu0l9zvKZHZzlgM="; + }; buildType = "catkin"; buildInputs = [ catkin ecl-build ]; diff --git a/distros/noetic/kobuki-driver/default.nix b/distros/noetic/kobuki-driver/default.nix index 8ca9704f02..a6abc99ade 100644 --- a/distros/noetic/kobuki-driver/default.nix +++ b/distros/noetic/kobuki-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kobuki-driver"; version = "0.7.12-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_core-release/archive/release/noetic/kobuki_driver/0.7.12-1.tar.gz"; - name = "0.7.12-1.tar.gz"; - sha256 = "b0f18fe6187363b8f02af194048f4401f2f92f45ec42500f9ee5e4bb354ac692"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_core-release"; + rev = "release/noetic/kobuki_driver/0.7.12-1"; + sha256 = "sha256-d09KDqqPXd6jw3/dU6Y7aHSyv7xBhOJhwAY72amQGIM="; + }; buildType = "catkin"; buildInputs = [ catkin ecl-build ]; diff --git a/distros/noetic/kobuki-ftdi/default.nix b/distros/noetic/kobuki-ftdi/default.nix index 4b8129261a..2c35b117d1 100644 --- a/distros/noetic/kobuki-ftdi/default.nix +++ b/distros/noetic/kobuki-ftdi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kobuki-ftdi"; version = "0.7.12-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_core-release/archive/release/noetic/kobuki_ftdi/0.7.12-1.tar.gz"; - name = "0.7.12-1.tar.gz"; - sha256 = "18412e46db87688bbb61c3fc5ff42be7aed0f10bab0de1677028c3152f663356"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_core-release"; + rev = "release/noetic/kobuki_ftdi/0.7.12-1"; + sha256 = "sha256-i2LlVZgPhygnQ1VayUu65PWLgt4CPqOSiL1X4jqq4IA="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/kobuki-msgs/default.nix b/distros/noetic/kobuki-msgs/default.nix index 909e09c0d7..8e83c01aa0 100644 --- a/distros/noetic/kobuki-msgs/default.nix +++ b/distros/noetic/kobuki-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kobuki-msgs"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/kobuki_msgs-release/archive/release/noetic/kobuki_msgs/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "201bad0e573625f3b2f4da22f6d9d4292acddd5c99db3fa5033262c367e7a5ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "kobuki_msgs-release"; + rev = "release/noetic/kobuki_msgs/0.7.0-1"; + sha256 = "sha256-pPNOb/rCCyHVD5v9TWCWjYenDPJcoAmRDEn2BUsyG4o="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/kvh-geo-fog-3d-driver/default.nix b/distros/noetic/kvh-geo-fog-3d-driver/default.nix index 12e9e9868d..8e91ab843e 100644 --- a/distros/noetic/kvh-geo-fog-3d-driver/default.nix +++ b/distros/noetic/kvh-geo-fog-3d-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kvh-geo-fog-3d-driver"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/MITRE/kvh_geo_fog_3d-release/archive/release/noetic/kvh_geo_fog_3d_driver/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "a4b21fb5cea577af79ef19fd9feb96625daba8af93b5c10fd57158f9d50ed6b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MITRE"; + repo = "kvh_geo_fog_3d-release"; + rev = "release/noetic/kvh_geo_fog_3d_driver/1.5.1-1"; + sha256 = "sha256-NzHPOtfKvXWFJK+MMYhpqaJb6qCx+61cdVpz66j12mw="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/kvh-geo-fog-3d-msgs/default.nix b/distros/noetic/kvh-geo-fog-3d-msgs/default.nix index 8a935b686d..1f8d621a6f 100644 --- a/distros/noetic/kvh-geo-fog-3d-msgs/default.nix +++ b/distros/noetic/kvh-geo-fog-3d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kvh-geo-fog-3d-msgs"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/MITRE/kvh_geo_fog_3d-release/archive/release/noetic/kvh_geo_fog_3d_msgs/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "20eb1568add8a3edfefaea64ad4675cf00511945ae10cad9c6ff5dcf2aaf4477"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MITRE"; + repo = "kvh_geo_fog_3d-release"; + rev = "release/noetic/kvh_geo_fog_3d_msgs/1.5.1-1"; + sha256 = "sha256-3Iif23aBXpZVarMlripUtWjO6saS/vSwInZruF6HDps="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/kvh-geo-fog-3d-rviz/default.nix b/distros/noetic/kvh-geo-fog-3d-rviz/default.nix index 4f40a64575..2f492574c2 100644 --- a/distros/noetic/kvh-geo-fog-3d-rviz/default.nix +++ b/distros/noetic/kvh-geo-fog-3d-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kvh-geo-fog-3d-rviz"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/MITRE/kvh_geo_fog_3d-release/archive/release/noetic/kvh_geo_fog_3d_rviz/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "e1fa880c67be39646d09d36eb4707c89429ae39fc544e7d931770f8eddd422e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MITRE"; + repo = "kvh_geo_fog_3d-release"; + rev = "release/noetic/kvh_geo_fog_3d_rviz/1.5.1-1"; + sha256 = "sha256-QwWD95ht7fYpC8FMr1LfwRlt6vipVp+7lMtQFNe66TU="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase qt5.qtdeclarative qt5.qtmultimedia qt5.qtsvg roslint ]; diff --git a/distros/noetic/kvh-geo-fog-3d/default.nix b/distros/noetic/kvh-geo-fog-3d/default.nix index e7b3dc735e..2b904243e4 100644 --- a/distros/noetic/kvh-geo-fog-3d/default.nix +++ b/distros/noetic/kvh-geo-fog-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-kvh-geo-fog-3d"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/MITRE/kvh_geo_fog_3d-release/archive/release/noetic/kvh_geo_fog_3d/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "e2722ed45a72e67d54c1ae3ee3c474a5ae1e682c21bfd049bf4d6a44ae146061"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MITRE"; + repo = "kvh_geo_fog_3d-release"; + rev = "release/noetic/kvh_geo_fog_3d/1.5.1-1"; + sha256 = "sha256-3jNCCKMdZNlkLZS8gWJzd1KBfOEqCUC3VLZ3P29fVMI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/label-manager/default.nix b/distros/noetic/label-manager/default.nix index 1cdf225cd6..665f367d13 100644 --- a/distros/noetic/label-manager/default.nix +++ b/distros/noetic/label-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-label-manager"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/noetic/label_manager/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "6858c277c528ea94ab7bc1efcd561ff4d9c94680761650220078d4e2f6affd9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/noetic/label_manager/1.1.0-1"; + sha256 = "sha256-z4qdRuckd+O/q4Y3ibC6/Fyao0yGI+IZIWVGj2PK/Mk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lanelet2-core/default.nix b/distros/noetic/lanelet2-core/default.nix index 4cfca0eee0..f6b212f641 100644 --- a/distros/noetic/lanelet2-core/default.nix +++ b/distros/noetic/lanelet2-core/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, eigen, gtest, mrt-cmake-modules }: buildRosPackage { pname = "ros-noetic-lanelet2-core"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_core/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "ddfea83676a4f5c5e963b8d2862b482ebdd7a59b67df52cfdb23f4bd43bfa7d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_core/1.2.0-1"; + sha256 = "sha256-9Pc8mJomoUm48RTXulwVjyvk72j1Xj1LB++Cwgkjqv8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lanelet2-examples/default.nix b/distros/noetic/lanelet2-examples/default.nix index 98f5687976..a75da633df 100644 --- a/distros/noetic/lanelet2-examples/default.nix +++ b/distros/noetic/lanelet2-examples/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, gtest, lanelet2-core, lanelet2-io, lanelet2-projection, lanelet2-python, lanelet2-routing, lanelet2-traffic-rules, mrt-cmake-modules, rosbash }: +{ lib, buildRosPackage, fetchurl, catkin, gtest, lanelet2-core, lanelet2-io, lanelet2-matching, lanelet2-projection, lanelet2-python, lanelet2-routing, lanelet2-traffic-rules, mrt-cmake-modules, rosbash }: buildRosPackage { pname = "ros-noetic-lanelet2-examples"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_examples/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "57602b504adc7f742ff2a6cd04f679e515e0ad4e88bd3d698130eb47f205b524"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_examples/1.2.0-1"; + sha256 = "sha256-0Z4YZHamLkqpqhhBbz548XOCM7TQm66V12BQFdH+aPk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; checkInputs = [ gtest ]; - propagatedBuildInputs = [ lanelet2-core lanelet2-io lanelet2-projection lanelet2-python lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules rosbash ]; + propagatedBuildInputs = [ lanelet2-core lanelet2-io lanelet2-matching lanelet2-projection lanelet2-python lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules rosbash ]; nativeBuildInputs = [ catkin mrt-cmake-modules ]; meta = { diff --git a/distros/noetic/lanelet2-io/default.nix b/distros/noetic/lanelet2-io/default.nix index 52613c46a4..3295c82612 100644 --- a/distros/noetic/lanelet2-io/default.nix +++ b/distros/noetic/lanelet2-io/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, gtest, lanelet2-core, mrt-cmake-modules, pugixml }: buildRosPackage { pname = "ros-noetic-lanelet2-io"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_io/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "c17faa85a5a1fad9b956597b60963cb78e7f497e2b45356c67b24aea8c1efc4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_io/1.2.0-1"; + sha256 = "sha256-Vddshf3IB7al/wVhfcuV5o1W+bHMquWtQHA3W5I0OEQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lanelet2-maps/default.nix b/distros/noetic/lanelet2-maps/default.nix index eacd9f2edb..1a53d7f6c4 100644 --- a/distros/noetic/lanelet2-maps/default.nix +++ b/distros/noetic/lanelet2-maps/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, lanelet2-core, mrt-cmake-modules }: buildRosPackage { pname = "ros-noetic-lanelet2-maps"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_maps/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "606cfe35ab43bfeca8abb7213e030056dc3a4eb920f49c59f5add39ab04aa7ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_maps/1.2.0-1"; + sha256 = "sha256-YppHdL/MseGvfqUgxRjX7BErluhqvD1I7GeJeA8mNjE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lanelet2-matching/default.nix b/distros/noetic/lanelet2-matching/default.nix new file mode 100644 index 0000000000..6e6a677965 --- /dev/null +++ b/distros/noetic/lanelet2-matching/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, gtest, lanelet2-core, lanelet2-io, lanelet2-maps, lanelet2-projection, lanelet2-traffic-rules, mrt-cmake-modules }: +buildRosPackage { + pname = "ros-noetic-lanelet2-matching"; + version = "1.2.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_matching/1.2.0-1"; + sha256 = "sha256-dkqpKnp57mhunnpK5fv8579kznbrR/tQaty7QdfU+lk="; + }; + + buildType = "catkin"; + buildInputs = [ catkin ]; + checkInputs = [ gtest lanelet2-io lanelet2-maps lanelet2-projection ]; + propagatedBuildInputs = [ lanelet2-core lanelet2-traffic-rules mrt-cmake-modules ]; + nativeBuildInputs = [ catkin mrt-cmake-modules ]; + + meta = { + description = ''Library to match objects to lanelets''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/lanelet2-projection/default.nix b/distros/noetic/lanelet2-projection/default.nix index 1037c4ca11..8e0942a0d5 100644 --- a/distros/noetic/lanelet2-projection/default.nix +++ b/distros/noetic/lanelet2-projection/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geographiclib, gtest, lanelet2-io, mrt-cmake-modules }: buildRosPackage { pname = "ros-noetic-lanelet2-projection"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_projection/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "722991b38fdaf300d51b46ae7706017a934c2190ff5d6e84e9f5137e2d1dbcd1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_projection/1.2.0-1"; + sha256 = "sha256-j+k/9fp/o0Stqox6Jvg9+mOCHxqYfuN5LSXuRTEzkPY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lanelet2-python/default.nix b/distros/noetic/lanelet2-python/default.nix index 65361bd818..2f03353ff4 100644 --- a/distros/noetic/lanelet2-python/default.nix +++ b/distros/noetic/lanelet2-python/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, catkin, gtest, lanelet2-core, lanelet2-io, lanelet2-projection, lanelet2-routing, lanelet2-traffic-rules, mrt-cmake-modules }: +{ lib, buildRosPackage, fetchurl, boost, catkin, gtest, lanelet2-core, lanelet2-io, lanelet2-matching, lanelet2-projection, lanelet2-routing, lanelet2-traffic-rules, mrt-cmake-modules }: buildRosPackage { pname = "ros-noetic-lanelet2-python"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_python/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "12f04c8e937e1ac5f922d3f8afe4ef6f847d5a06a29bbbcfa1724379800841f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_python/1.2.0-1"; + sha256 = "sha256-v2i0RcEchQzpHnN3YrcQ2HJIzx95WREIUpuEfCswID0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; checkInputs = [ gtest ]; - propagatedBuildInputs = [ boost lanelet2-core lanelet2-io lanelet2-projection lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules ]; + propagatedBuildInputs = [ boost lanelet2-core lanelet2-io lanelet2-matching lanelet2-projection lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules ]; nativeBuildInputs = [ catkin mrt-cmake-modules ]; meta = { diff --git a/distros/noetic/lanelet2-routing/default.nix b/distros/noetic/lanelet2-routing/default.nix index 9de7294afe..ff29690920 100644 --- a/distros/noetic/lanelet2-routing/default.nix +++ b/distros/noetic/lanelet2-routing/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, gtest, lanelet2-core, lanelet2-traffic-rules, mrt-cmake-modules }: buildRosPackage { pname = "ros-noetic-lanelet2-routing"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_routing/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "929df4e7c8aee6ec92fb03a8dd0b0bbe41bd57e3c99ebb3f355674d08c502e02"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_routing/1.2.0-1"; + sha256 = "sha256-gfJIEfWxl1BYkUqFcMOV2tp93I4Vt0UfnLjpooQ7Uf8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lanelet2-traffic-rules/default.nix b/distros/noetic/lanelet2-traffic-rules/default.nix index 36a95ac394..49da2b0cfa 100644 --- a/distros/noetic/lanelet2-traffic-rules/default.nix +++ b/distros/noetic/lanelet2-traffic-rules/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, gtest, lanelet2-core, mrt-cmake-modules }: buildRosPackage { pname = "ros-noetic-lanelet2-traffic-rules"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_traffic_rules/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "85f85ce06f1e71e26bd5c8bea1fa08cbc32300547fa4d417cccec8b8231e970a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_traffic_rules/1.2.0-1"; + sha256 = "sha256-VaoyGQE/mACfFCVeO0vtjkNhLQ7w/8NqH0CPZd4SGQU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lanelet2-validation/default.nix b/distros/noetic/lanelet2-validation/default.nix index b2156281b3..e3d5299e2a 100644 --- a/distros/noetic/lanelet2-validation/default.nix +++ b/distros/noetic/lanelet2-validation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, gtest, lanelet2-core, lanelet2-io, lanelet2-maps, lanelet2-projection, lanelet2-routing, lanelet2-traffic-rules, mrt-cmake-modules }: buildRosPackage { pname = "ros-noetic-lanelet2-validation"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2_validation/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "7e790e68136a204efbbbd3b6df8f7faa2dca79cf7c2b37bfa143f6313af6e9a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2_validation/1.2.0-1"; + sha256 = "sha256-Uw/r1r4fIDHTfsxzLYslLY2wHQ3NJ9BhR5dATIIibL8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lanelet2/default.nix b/distros/noetic/lanelet2/default.nix index 7200e35ba6..0857f030df 100644 --- a/distros/noetic/lanelet2/default.nix +++ b/distros/noetic/lanelet2/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, lanelet2-core, lanelet2-examples, lanelet2-io, lanelet2-maps, lanelet2-projection, lanelet2-python, lanelet2-routing, lanelet2-traffic-rules, lanelet2-validation, ros-environment }: +{ lib, buildRosPackage, fetchurl, catkin, lanelet2-core, lanelet2-examples, lanelet2-io, lanelet2-maps, lanelet2-matching, lanelet2-projection, lanelet2-python, lanelet2-routing, lanelet2-traffic-rules, lanelet2-validation, ros-environment }: buildRosPackage { pname = "ros-noetic-lanelet2"; - version = "1.1.1-r1"; + version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/lanelet2-release/archive/release/noetic/lanelet2/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "c34c9b5f14881562d39c80145644750c465f28146f5bf5a3679903728d2be40c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "lanelet2-release"; + rev = "release/noetic/lanelet2/1.2.0-1"; + sha256 = "sha256-6LCbCrQMFxGdiE1pTvgmYivgIMMI+pd7O3AbnIffw/0="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; - propagatedBuildInputs = [ lanelet2-core lanelet2-examples lanelet2-io lanelet2-maps lanelet2-projection lanelet2-python lanelet2-routing lanelet2-traffic-rules lanelet2-validation ]; + propagatedBuildInputs = [ lanelet2-core lanelet2-examples lanelet2-io lanelet2-maps lanelet2-matching lanelet2-projection lanelet2-python lanelet2-routing lanelet2-traffic-rules lanelet2-validation ]; nativeBuildInputs = [ catkin ros-environment ]; meta = { diff --git a/distros/noetic/laptop-battery-monitor/default.nix b/distros/noetic/laptop-battery-monitor/default.nix index b9a027bced..5e6b0e261f 100644 --- a/distros/noetic/laptop-battery-monitor/default.nix +++ b/distros/noetic/laptop-battery-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laptop-battery-monitor"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/linux_peripheral_interfaces-release/archive/release/noetic/laptop_battery_monitor/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "99f83a99cde03b74c19fc0ca4b6deb962001b6f2b2be34fb1e2ffbf6d4a905c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "linux_peripheral_interfaces-release"; + rev = "release/noetic/laptop_battery_monitor/0.2.2-1"; + sha256 = "sha256-J+Y6ECaOzF6cjAacS2upk7NAYS5fltX2SYyXPxaqrUw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-assembler/default.nix b/distros/noetic/laser-assembler/default.nix index d005bdc681..9b382db247 100644 --- a/distros/noetic/laser-assembler/default.nix +++ b/distros/noetic/laser-assembler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-assembler"; version = "1.7.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_assembler-release/archive/release/noetic/laser_assembler/1.7.8-1.tar.gz"; - name = "1.7.8-1.tar.gz"; - sha256 = "4d50d7eb169caf53f5027b63c5165647834c3dddf82ba66ddcf40a5a8437fbc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_assembler-release"; + rev = "release/noetic/laser_assembler/1.7.8-1"; + sha256 = "sha256-WKfZxAD30xWxfSFcmsSbZkEBPiaumcAwi8/TRjNEQbE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/noetic/laser-cb-detector/default.nix b/distros/noetic/laser-cb-detector/default.nix index 6a431472ad..70ba4ebce3 100644 --- a/distros/noetic/laser-cb-detector/default.nix +++ b/distros/noetic/laser-cb-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-cb-detector"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/laser_cb_detector/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "d5647f95c0a0ad831cdd3c825063cb8cef0baedf204467db0ea72a4f1e035ca7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/laser_cb_detector/0.10.15-1"; + sha256 = "sha256-5zhA0YPuHP+ODUlVQWJXmkLGzUZTsUWQAU9RfJ9gSPU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-filtering/default.nix b/distros/noetic/laser-filtering/default.nix index e2cc363542..d363f02227 100644 --- a/distros/noetic/laser-filtering/default.nix +++ b/distros/noetic/laser-filtering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-filtering"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/laser_filtering_release/archive/release/noetic/laser_filtering/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "b2d105b7598d93ede269fb388bf842b9a2af441a5bcfe8a3db2ce8696de77af6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "laser_filtering_release"; + rev = "release/noetic/laser_filtering/0.0.5-1"; + sha256 = "sha256-srvGlOmSVgnSQxbo6lyReX9JSj3RAvNBRZuWtEIxZ9w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-filters-jsk-patch/default.nix b/distros/noetic/laser-filters-jsk-patch/default.nix index a585318ffc..9ca91e90a0 100644 --- a/distros/noetic/laser-filters-jsk-patch/default.nix +++ b/distros/noetic/laser-filters-jsk-patch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-filters-jsk-patch"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/laser_filters_jsk_patch/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "ca31c4a5e7524d96d3caa2cf9e92945a59a6cd448a8f9771ea74fedde4569ec1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/laser_filters_jsk_patch/2.1.21-2"; + sha256 = "sha256-5QTm8sHZ3DxH0dJ0LB3hn9P2Qtms43hJJW+PftT+SjU="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules git laser-geometry mk ]; diff --git a/distros/noetic/laser-filters/default.nix b/distros/noetic/laser-filters/default.nix index 113cb169b5..5ea8f57cd7 100644 --- a/distros/noetic/laser-filters/default.nix +++ b/distros/noetic/laser-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-filters"; version = "1.9.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_filters-release/archive/release/noetic/laser_filters/1.9.0-1.tar.gz"; - name = "1.9.0-1.tar.gz"; - sha256 = "e802be9bc80e6352906e628b86cbfdbcce37b45da5890146d21893095514b6b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_filters-release"; + rev = "release/noetic/laser_filters/1.9.0-1"; + sha256 = "sha256-DCXxPVbarjpHVg/EmzAhaM1UloU0Gaa0YkqRwxrPlks="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/laser-geometry/default.nix b/distros/noetic/laser-geometry/default.nix index 80477748c8..cf5ae76983 100644 --- a/distros/noetic/laser-geometry/default.nix +++ b/distros/noetic/laser-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-geometry"; version = "1.6.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_geometry-release/archive/release/noetic/laser_geometry/1.6.7-1.tar.gz"; - name = "1.6.7-1.tar.gz"; - sha256 = "81c363c1ab9719c59cf41d01c0624af2307259f711a2de85ef3287137c0794e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_geometry-release"; + rev = "release/noetic/laser_geometry/1.6.7-1"; + sha256 = "sha256-KcI82Rd7PWIfEY2IiK5EpWVcf4+HEVcttkFfaTIrH18="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-geometry-msgs ]; diff --git a/distros/noetic/laser-ortho-projector/default.nix b/distros/noetic/laser-ortho-projector/default.nix index 471e508558..48d35ff461 100644 --- a/distros/noetic/laser-ortho-projector/default.nix +++ b/distros/noetic/laser-ortho-projector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-ortho-projector"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/noetic/laser_ortho_projector/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "9f40b03eae8a2194ec41a9a803ca9305d0ee905be908d2ebac11ba6dcfb80349"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/noetic/laser_ortho_projector/0.3.3-1"; + sha256 = "sha256-eEe1oaKKiuLndzhIBwMWpgmpOe8cmZMgYWNthK26c0g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-pipeline/default.nix b/distros/noetic/laser-pipeline/default.nix index e68760121a..20522675e1 100644 --- a/distros/noetic/laser-pipeline/default.nix +++ b/distros/noetic/laser-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-pipeline"; version = "1.6.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_pipeline-release/archive/release/noetic/laser_pipeline/1.6.4-1.tar.gz"; - name = "1.6.4-1.tar.gz"; - sha256 = "82a30e8eb4352285020531334f0167e76b46d5d4ea47f89570029f7f56d5e9fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_pipeline-release"; + rev = "release/noetic/laser_pipeline/1.6.4-1"; + sha256 = "sha256-n5HqCNf5d7ifjCxKCGTjJzbO6qjdyH+GFzAPGpT3MHo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-proc/default.nix b/distros/noetic/laser-proc/default.nix index 1202eebd96..e09a1419e3 100644 --- a/distros/noetic/laser-proc/default.nix +++ b/distros/noetic/laser-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-proc"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/laser_proc-release/archive/release/noetic/laser_proc/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "5360596a9ded7aa37e3e8bac79473086631fce5968fa60c853e126c9edaa4486"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "laser_proc-release"; + rev = "release/noetic/laser_proc/0.1.6-1"; + sha256 = "sha256-l1f0cy64NCRxPwM/6QM3e1Hg6X8wjiixb16t16zZgAI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-scan-densifier/default.nix b/distros/noetic/laser-scan-densifier/default.nix index 10c14bd05e..f51e9dcb02 100644 --- a/distros/noetic/laser-scan-densifier/default.nix +++ b/distros/noetic/laser-scan-densifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-scan-densifier"; version = "0.7.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/laser_scan_densifier/0.7.14-1.tar.gz"; - name = "0.7.14-1.tar.gz"; - sha256 = "2ac1c5545d1a8bf5553f3cc84d9da56e0b36ad93082262a3fa676fec40a20d7e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_driver-release"; + rev = "release/noetic/laser_scan_densifier/0.7.14-1"; + sha256 = "sha256-fKe8RKibsC1tfEqpQxFVXsKs5NgSMrM45rTH0eQFQqY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-scan-matcher/default.nix b/distros/noetic/laser-scan-matcher/default.nix index 3b8322d378..a855e5a637 100644 --- a/distros/noetic/laser-scan-matcher/default.nix +++ b/distros/noetic/laser-scan-matcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-scan-matcher"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/noetic/laser_scan_matcher/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "6000f160af9d500dc98962fe003cc963573abbcec0bc7d7a0b6092896c49d285"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/noetic/laser_scan_matcher/0.3.3-1"; + sha256 = "sha256-0DoaU2d17cy0hZBh3U4GIMZzt7o00lAH+ktCY0JDrxo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-scan-sparsifier/default.nix b/distros/noetic/laser-scan-sparsifier/default.nix index d93dd5e278..c0a47401b2 100644 --- a/distros/noetic/laser-scan-sparsifier/default.nix +++ b/distros/noetic/laser-scan-sparsifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-scan-sparsifier"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/noetic/laser_scan_sparsifier/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "5afafd970b7168c341b18704b5592f793957f9d08870509ab3e46922d6f79741"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/noetic/laser_scan_sparsifier/0.3.3-1"; + sha256 = "sha256-ZlPQsfW2+9xFA9xEaak6OSQnAAz57RTyKezMjVL/UN0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-scan-splitter/default.nix b/distros/noetic/laser-scan-splitter/default.nix index e530353b73..2fba6c26c6 100644 --- a/distros/noetic/laser-scan-splitter/default.nix +++ b/distros/noetic/laser-scan-splitter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-scan-splitter"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/noetic/laser_scan_splitter/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "e2232be64fc25cc003de31a38c986fe4104262f07fabe7de66f33e676463404c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/noetic/laser_scan_splitter/0.3.3-1"; + sha256 = "sha256-f6tHTbi0RfnnhWtSJ9pHStElYS5HkBH/Csoz0BKs/2c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/laser-tilt-controller-filter/default.nix b/distros/noetic/laser-tilt-controller-filter/default.nix index 61c13c5bdd..154c41de21 100644 --- a/distros/noetic/laser-tilt-controller-filter/default.nix +++ b/distros/noetic/laser-tilt-controller-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-laser-tilt-controller-filter"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/laser_tilt_controller_filter/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "41f120ac8c70022e91763ef75c1fb26fbd594c3e8115439aa55dacbf37e6df76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/laser_tilt_controller_filter/0.2.0-1"; + sha256 = "sha256-dcZG85aSNpS2XB8juhkrEYqA7cX5xmWSZSo+EwwXVj8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/led-msgs/default.nix b/distros/noetic/led-msgs/default.nix index 3ddb78b284..b0fcd519cd 100644 --- a/distros/noetic/led-msgs/default.nix +++ b/distros/noetic/led-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-led-msgs"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/ros_led-release/archive/release/noetic/led_msgs/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "214072ab918d642a84d04b0e07b0b70e8b41208f2dac55c6bb2dc1cff10d1178"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "ros_led-release"; + rev = "release/noetic/led_msgs/0.0.11-1"; + sha256 = "sha256-04t5GVtPsGh5wWfRmASubhvUaNFruhoh0aIwJEswCPg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/leo-bringup/default.nix b/distros/noetic/leo-bringup/default.nix index 2aa4232579..2319cda23b 100644 --- a/distros/noetic/leo-bringup/default.nix +++ b/distros/noetic/leo-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-bringup"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_bringup/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "0a554fd104fa5af59540f8fb510f1285d13b8f8a177ec6131bda309bccd37d32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_robot-release"; + rev = "release/noetic/leo_bringup/2.3.0-1"; + sha256 = "sha256-a+L7y3WJAZ1YZjEuR+3RjM1s6+la6NvgtHYhaOLm6ug="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-description/default.nix b/distros/noetic/leo-description/default.nix index 5f5931ec8f..88e968f6f7 100644 --- a/distros/noetic/leo-description/default.nix +++ b/distros/noetic/leo-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-description"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_common-release/archive/release/noetic/leo_description/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "d4a3687c06555c145d40a39ae81900503c4667728e32b1cf75af4fd47f998af6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_common-release"; + rev = "release/noetic/leo_description/2.2.0-1"; + sha256 = "sha256-RR/2jDPu637k9JVw7NX+QCqli/7v/tj/uUHgWZY6cH8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-desktop/default.nix b/distros/noetic/leo-desktop/default.nix index 6ae6c335c9..2656063079 100644 --- a/distros/noetic/leo-desktop/default.nix +++ b/distros/noetic/leo-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-desktop"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_desktop-release/archive/release/noetic/leo_desktop/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "55ac702284d3099a5989caed3caf43508e17de27a8dc1a58334df1e394144391"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_desktop-release"; + rev = "release/noetic/leo_desktop/0.2.3-1"; + sha256 = "sha256-GBIA8oy/0NvsPVdCdDI3/fme7gfNQoWVZqp+zzX/aMY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-example-follow-ar-tag/default.nix b/distros/noetic/leo-example-follow-ar-tag/default.nix index 1ca706e1ff..63832641f4 100644 --- a/distros/noetic/leo-example-follow-ar-tag/default.nix +++ b/distros/noetic/leo-example-follow-ar-tag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-example-follow-ar-tag"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_examples-release/archive/release/noetic/leo_example_follow_ar_tag/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "acda595805f0ccc2af37bdaa22b3b587ca82ced2242b7fd93587d8587583f0f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_examples-release"; + rev = "release/noetic/leo_example_follow_ar_tag/0.1.1-1"; + sha256 = "sha256-kmjPTufeVHd1ZKPq0vObOwNjFXi+xvHhygqjM1MOdWQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-example-line-follower/default.nix b/distros/noetic/leo-example-line-follower/default.nix index 99e8673706..ec901ae056 100644 --- a/distros/noetic/leo-example-line-follower/default.nix +++ b/distros/noetic/leo-example-line-follower/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-example-line-follower"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_examples-release/archive/release/noetic/leo_example_line_follower/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "a7f28d6e6d9ae99c4e3a572de169874f79094fd275d6f92f647c4e684932e545"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_examples-release"; + rev = "release/noetic/leo_example_line_follower/0.1.1-1"; + sha256 = "sha256-ui4ZY8Qw4EsglilTTGEYb8PWIabqPkoWwU3EloMbSBs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-example-object-detection/default.nix b/distros/noetic/leo-example-object-detection/default.nix index ed82bd8902..2c16d7bc34 100644 --- a/distros/noetic/leo-example-object-detection/default.nix +++ b/distros/noetic/leo-example-object-detection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-example-object-detection"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_examples-release/archive/release/noetic/leo_example_object_detection/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "2f4ee0324414397600d37ae209348b50c574fa2a812152400ef08bb4d02a2742"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_examples-release"; + rev = "release/noetic/leo_example_object_detection/0.1.1-1"; + sha256 = "sha256-oQ9LdtpwIn77iT78upM3aYJH9i/1wfC+z8x9Fy18j+o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-examples/default.nix b/distros/noetic/leo-examples/default.nix index cbb69ac03a..f9f49e8899 100644 --- a/distros/noetic/leo-examples/default.nix +++ b/distros/noetic/leo-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-examples"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_examples-release/archive/release/noetic/leo_examples/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "b1900c84ab421a366dc2f9b53753118a3b3c4d22ae4cef2ae34bc3e21d2d0d6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_examples-release"; + rev = "release/noetic/leo_examples/0.1.1-1"; + sha256 = "sha256-KBCAGgZly7P8nG8P/yZR52gMBdIDuKUM5Z3+i/tWn6o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-fw/default.nix b/distros/noetic/leo-fw/default.nix index 3e0f9360ce..70fa931560 100644 --- a/distros/noetic/leo-fw/default.nix +++ b/distros/noetic/leo-fw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-fw"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_fw/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "bc87102d915f7bfd65aee57a81a942bd22a5729a7b77adbe308debf7238d8ee7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_robot-release"; + rev = "release/noetic/leo_fw/2.3.0-1"; + sha256 = "sha256-WbWMMP5u+CBYtSRil5nwAWLGRjpNqqboCQpDeAnOxLg="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/leo-gazebo-plugins/default.nix b/distros/noetic/leo-gazebo-plugins/default.nix index ceb6efba8d..8389fdf279 100644 --- a/distros/noetic/leo-gazebo-plugins/default.nix +++ b/distros/noetic/leo-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-gazebo-plugins"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_simulator-release/archive/release/noetic/leo_gazebo_plugins/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "b3cbb9d2f429a1bb41bbe819cc8e3bba898f48a03efb63618720ad6aa9dbef79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_simulator-release"; + rev = "release/noetic/leo_gazebo_plugins/1.1.0-1"; + sha256 = "sha256-G7Ka1HmNoZtk2Rat2nAKH6GTf18K7M/XSWoumgIB1YU="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo-dev gazebo-ros roscpp ]; diff --git a/distros/noetic/leo-gazebo-worlds/default.nix b/distros/noetic/leo-gazebo-worlds/default.nix index 725c4a64f5..7e36116574 100644 --- a/distros/noetic/leo-gazebo-worlds/default.nix +++ b/distros/noetic/leo-gazebo-worlds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-gazebo-worlds"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_simulator-release/archive/release/noetic/leo_gazebo_worlds/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "21b32578fe4cde8d82c93691a6269cd2fba29b8b5b7ad27b77a0b7e2732e70fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_simulator-release"; + rev = "release/noetic/leo_gazebo_worlds/1.1.0-1"; + sha256 = "sha256-iuAv5uzTHs+F/TWJRzGaeuLy8x20vxmY6h+ec+q1PWA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-gazebo/default.nix b/distros/noetic/leo-gazebo/default.nix index 23419afbb2..d2b5d85404 100644 --- a/distros/noetic/leo-gazebo/default.nix +++ b/distros/noetic/leo-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-gazebo"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_simulator-release/archive/release/noetic/leo_gazebo/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "289c73e4ad9ff8c54da57f045fd2113a1412739d9afcd810007565fa0b7257e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_simulator-release"; + rev = "release/noetic/leo_gazebo/1.1.0-1"; + sha256 = "sha256-pr23p7Dz1SI8hVz1u8OWbhDHOUl0bK+YaY6TtN8JWCY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-msgs/default.nix b/distros/noetic/leo-msgs/default.nix index 49d8f22c19..f28d3fa054 100644 --- a/distros/noetic/leo-msgs/default.nix +++ b/distros/noetic/leo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-msgs"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_common-release/archive/release/noetic/leo_msgs/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "58d2a15a9e8884bfc7e49de8c32d47ffc1a72a3f943cfb5b2b821fc1f8f6a3a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_common-release"; + rev = "release/noetic/leo_msgs/2.2.0-1"; + sha256 = "sha256-B0zAatn3pgFkfVpsADr2loRRFO/opKvXxyAKHFXOgew="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/leo-robot/default.nix b/distros/noetic/leo-robot/default.nix index f55b41abab..75da13b22e 100644 --- a/distros/noetic/leo-robot/default.nix +++ b/distros/noetic/leo-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-robot"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_robot/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "f7c674eff3757145fb1caa61d2b52d73ab8eed0946b4ca35d983d8fa1910d372"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_robot-release"; + rev = "release/noetic/leo_robot/2.3.0-1"; + sha256 = "sha256-Of6XLuZAhBM+v67/GpbLyk9i6YfmfxsjzI8rqiQak64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-simulator/default.nix b/distros/noetic/leo-simulator/default.nix index c7ec1612f4..3da5e0564b 100644 --- a/distros/noetic/leo-simulator/default.nix +++ b/distros/noetic/leo-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-simulator"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_simulator-release/archive/release/noetic/leo_simulator/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "b5c7410960e5b17bf4c7747c1c21af5aa61c201c9dc7779711a2e06ef7f750fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_simulator-release"; + rev = "release/noetic/leo_simulator/1.1.0-1"; + sha256 = "sha256-ybKYtm1ZPTXRS1NNvFssjfu3hLxpUpurkg8BFt23SL0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-teleop/default.nix b/distros/noetic/leo-teleop/default.nix index a56e95e557..9febd71073 100644 --- a/distros/noetic/leo-teleop/default.nix +++ b/distros/noetic/leo-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-teleop"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_common-release/archive/release/noetic/leo_teleop/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "bff115326eccbbc735783352e779c6e74e4f4af390c4ff38c220985b28eb62e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_common-release"; + rev = "release/noetic/leo_teleop/2.2.0-1"; + sha256 = "sha256-EUjX7qY9NI0XBRiPE5MAh7AkfPLy/M4tRgRvdJUn0+I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo-viz/default.nix b/distros/noetic/leo-viz/default.nix index 62a3577a11..dd692f59e4 100644 --- a/distros/noetic/leo-viz/default.nix +++ b/distros/noetic/leo-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo-viz"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_desktop-release/archive/release/noetic/leo_viz/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "ed773e9094a5ffbfe607b216cfe80b2d1e90f6f1f03fc3d7a6f9374969d8c49f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_desktop-release"; + rev = "release/noetic/leo_viz/0.2.3-1"; + sha256 = "sha256-68HDcR6Ubc9B8rpaE8x6WRyyx9xvE4gHErhX15cNac4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/leo/default.nix b/distros/noetic/leo/default.nix index c62ccdcd36..0d0c21515c 100644 --- a/distros/noetic/leo/default.nix +++ b/distros/noetic/leo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-leo"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_common-release/archive/release/noetic/leo/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "f7ad600b2ac91137aad450f3c657041399a9a4d3d2239e3b8d7f93be7001a220"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "leo_common-release"; + rev = "release/noetic/leo/2.2.0-1"; + sha256 = "sha256-xj4xR4/QZEn2KAma8jXwYGTSNW/sB627dp7WyXGLvLU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lgsvl-msgs/default.nix b/distros/noetic/lgsvl-msgs/default.nix index f2b0e4b556..49b3c61367 100644 --- a/distros/noetic/lgsvl-msgs/default.nix +++ b/distros/noetic/lgsvl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-lgsvl-msgs"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/lgsvl/lgsvl_msgs-release/archive/release/noetic/lgsvl_msgs/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "fa83ef1c1fb1ac692d5a1d5b3c41d341642103660b778950574332514033e124"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lgsvl"; + repo = "lgsvl_msgs-release"; + rev = "release/noetic/lgsvl_msgs/0.0.4-1"; + sha256 = "sha256-Pd5TP0wLuUr0/m+WvLpkvURpB0d0hbik3SOPkifg8YU="; + }; buildType = "catkin"; buildInputs = [ message-generation ros-environment ]; diff --git a/distros/noetic/libcmt/default.nix b/distros/noetic/libcmt/default.nix index 1cec14732a..33a3732bc0 100644 --- a/distros/noetic/libcmt/default.nix +++ b/distros/noetic/libcmt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libcmt"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/libcmt/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "5460174b56e8eedb403a1f24883e4da4ba5f86e50d57cc0fa95e18084694c092"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/libcmt/2.1.21-2"; + sha256 = "sha256-Wm1MIZqkm/j3wEiStK0DaOvYM6snXMmG09isl8fBDiY="; + }; buildType = "cmake"; buildInputs = [ cacert cmake git openssl ]; diff --git a/distros/noetic/libcreate/default.nix b/distros/noetic/libcreate/default.nix index cfd37f9ddc..901d33a18e 100644 --- a/distros/noetic/libcreate/default.nix +++ b/distros/noetic/libcreate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libcreate"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/AutonomyLab/libcreate-release/archive/release/noetic/libcreate/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "8bc46366b2db0f0cdcf37790f74d2dde46bb3e552f4a42d6701a41f82dcd14c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AutonomyLab"; + repo = "libcreate-release"; + rev = "release/noetic/libcreate/3.0.0-1"; + sha256 = "sha256-N4LES05+bOdNbL4UiPVhWx8Hfa/1JO/zpsh8wiiH7Tk="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/libdlib/default.nix b/distros/noetic/libdlib/default.nix index 239d6cbf30..72fd24d934 100644 --- a/distros/noetic/libdlib/default.nix +++ b/distros/noetic/libdlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libdlib"; version = "0.6.18-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/noetic/libdlib/0.6.18-1.tar.gz"; - name = "0.6.18-1.tar.gz"; - sha256 = "217bb8d8c749b3c2d3235183c0ee685a1bb0310ab92391a8b2a4b1e37a748f7c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/noetic/libdlib/0.6.18-1"; + sha256 = "sha256-/12G3kgE+IpmwRKbX5LCM8lT9Akc9+tHWUJVU3NGK+o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libfranka/default.nix b/distros/noetic/libfranka/default.nix index 9a25c2fe92..c8f353acce 100644 --- a/distros/noetic/libfranka/default.nix +++ b/distros/noetic/libfranka/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libfranka"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/frankaemika/libfranka-release/archive/release/noetic/libfranka/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "cdd15f0f3a4e032cb93c156240c122bea496a96e25a4ee434c9ca6c70da36fa3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "frankaemika"; + repo = "libfranka-release"; + rev = "release/noetic/libfranka/0.9.2-1"; + sha256 = "sha256-B7Os4o7rDd5LD5owtLxHx35PuGLi9UfuOKsG4hYvGRg="; + }; buildType = "cmake"; buildInputs = [ cmake eigen ]; diff --git a/distros/noetic/libg2o/default.nix b/distros/noetic/libg2o/default.nix index 03ab711b1d..79d87d3a2a 100644 --- a/distros/noetic/libg2o/default.nix +++ b/distros/noetic/libg2o/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libg2o"; version = "2020.5.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/libg2o-release/archive/release/noetic/libg2o/2020.5.3-1.tar.gz"; - name = "2020.5.3-1.tar.gz"; - sha256 = "115c41cdce39bc27adf6522557b97749db1624a0692316486a855689b345dcb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "libg2o-release"; + rev = "release/noetic/libg2o/2020.5.3-1"; + sha256 = "sha256-j6LaiZyrX8D37hsRiSJ//h5u3XYVWwBUigmkNiydWXU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/libmavconn/default.nix b/distros/noetic/libmavconn/default.nix index 9201fbfe79..160de64024 100644 --- a/distros/noetic/libmavconn/default.nix +++ b/distros/noetic/libmavconn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libmavconn"; version = "1.15.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/noetic/libmavconn/1.15.0-1.tar.gz"; - name = "1.15.0-1.tar.gz"; - sha256 = "7a65b804d6f49e462bdb4f89d1a2a43e38b71bad7bac48479a4d0cd1fcb0565d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/noetic/libmavconn/1.15.0-1"; + sha256 = "sha256-lXSx4S4P5UwUq3xokxQWr1Bg+6819eEdhWJZIaJJc2A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libnabo/default.nix b/distros/noetic/libnabo/default.nix index 526394f078..7135e90ef4 100644 --- a/distros/noetic/libnabo/default.nix +++ b/distros/noetic/libnabo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libnabo"; version = "1.0.7-r1"; - src = fetchurl { - url = "https://github.com/nobleo/libnabo-release/archive/release/noetic/libnabo/1.0.7-1.tar.gz"; - name = "1.0.7-1.tar.gz"; - sha256 = "26fe2ba879222857c58137774f0f8dc608adc75093fbdd45c8d03c7890508cf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "libnabo-release"; + rev = "release/noetic/libnabo/1.0.7-1"; + sha256 = "sha256-5DH360YkpI9MAjPZh229CprgVvqjpLpLJ1svEWfgei0="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/libntcan/default.nix b/distros/noetic/libntcan/default.nix index f236ee0de6..2efd16b308 100644 --- a/distros/noetic/libntcan/default.nix +++ b/distros/noetic/libntcan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libntcan"; version = "0.6.18-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/noetic/libntcan/0.6.18-1.tar.gz"; - name = "0.6.18-1.tar.gz"; - sha256 = "d7723026b5cf16ace323ad374e6d327cdbd887cf2735d4aa691322458da20659"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/noetic/libntcan/0.6.18-1"; + sha256 = "sha256-2HOkhRos20M5Goh+9cpLkbWFR4W736+vh7zWLennG4Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libpcan/default.nix b/distros/noetic/libpcan/default.nix index 18c654c4d9..7750a26b2e 100644 --- a/distros/noetic/libpcan/default.nix +++ b/distros/noetic/libpcan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libpcan"; version = "0.6.18-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/noetic/libpcan/0.6.18-1.tar.gz"; - name = "0.6.18-1.tar.gz"; - sha256 = "634d7fe32f5cdda1a70fd01d76ec7538948cf891bf037594f8358eafbf9ea091"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/noetic/libpcan/0.6.18-1"; + sha256 = "sha256-CRL7v02SKKXwJdlp2oT+81rSvVY482G6Sh5uhzG4Xk8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libphidget22/default.nix b/distros/noetic/libphidget22/default.nix index e7ff8cbb46..9bab943a13 100644 --- a/distros/noetic/libphidget22/default.nix +++ b/distros/noetic/libphidget22/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libphidget22"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/libphidget22/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "01d782068a654dbff47e8225a4a783c448f688028d02592dc56394c2c28cb81d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/libphidget22/1.0.6-1"; + sha256 = "sha256-y/YuckpD+QCkY8KPNELZFZXd60bA1VOEthrorS/GaYs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libphidgets/default.nix b/distros/noetic/libphidgets/default.nix index d0b71a6ddb..38c6a10582 100644 --- a/distros/noetic/libphidgets/default.nix +++ b/distros/noetic/libphidgets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libphidgets"; version = "0.6.18-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/noetic/libphidgets/0.6.18-1.tar.gz"; - name = "0.6.18-1.tar.gz"; - sha256 = "8819ed4fdd6d7f69744ef34c7d5573aee979beb11e64714897e5d9a3cc55e910"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/noetic/libphidgets/0.6.18-1"; + sha256 = "sha256-2fJ7qdTQgQaFA7seFPxKuAKW8aM7JcD8kbqtKgpQM64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libpointmatcher/default.nix b/distros/noetic/libpointmatcher/default.nix index 45ab6996e1..7ff93ffa3e 100644 --- a/distros/noetic/libpointmatcher/default.nix +++ b/distros/noetic/libpointmatcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libpointmatcher"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/nobleo/libpointmatcher-release/archive/release/noetic/libpointmatcher/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "858e42e3cbc55c43c5dae2166c9f40a6577af8fa1b0c1b03336ba8029ad99a78"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "libpointmatcher-release"; + rev = "release/noetic/libpointmatcher/1.3.1-1"; + sha256 = "sha256-96czxG0jg3fhdnnpfunDXT5SeulBTS0I2wHxgBhzunA="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/librealsense2/default.nix b/distros/noetic/librealsense2/default.nix index 1919f34a82..87d2377708 100644 --- a/distros/noetic/librealsense2/default.nix +++ b/distros/noetic/librealsense2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-librealsense2"; version = "2.50.0-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/librealsense2-release/archive/release/noetic/librealsense2/2.50.0-1.tar.gz"; - name = "2.50.0-1.tar.gz"; - sha256 = "309e30be33aaf0a794f4ee3291356806ea6d238c0798f70f0388d2cec9a08ba0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "librealsense2-release"; + rev = "release/noetic/librealsense2/2.50.0-1"; + sha256 = "sha256-MSWX2NYm0g8fEdQTuEXSmSHcuwChBdOTemt/bD/zrX0="; + }; buildType = "cmake"; buildInputs = [ catkin libusb1 openssl pkg-config udev ]; diff --git a/distros/noetic/librviz-tutorial/default.nix b/distros/noetic/librviz-tutorial/default.nix index 70481977ed..1cee6e004b 100644 --- a/distros/noetic/librviz-tutorial/default.nix +++ b/distros/noetic/librviz-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-librviz-tutorial"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/noetic/librviz_tutorial/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "0a090780b1304627cff505805fafb7ed99b4ba1bb3e99fb1a40516be84bfa951"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/noetic/librviz_tutorial/0.11.0-1"; + sha256 = "sha256-r4zj4UjajppVpGyGrVG/knn6XMJ/PPvhFz3y20qW68Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libsensors-monitor/default.nix b/distros/noetic/libsensors-monitor/default.nix index cf842bf976..bb1918b698 100644 --- a/distros/noetic/libsensors-monitor/default.nix +++ b/distros/noetic/libsensors-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libsensors-monitor"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/linux_peripheral_interfaces-release/archive/release/noetic/libsensors_monitor/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "ecec8c4a61494b5d1682b34ce0e452a003156d73b9c41a0100e3ad10728b771e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "linux_peripheral_interfaces-release"; + rev = "release/noetic/libsensors_monitor/0.2.2-1"; + sha256 = "sha256-FMqPGAlzgDVBRnHXPQHfu4gdHvdJHTwg4UoZueMDSxY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libsiftfast/default.nix b/distros/noetic/libsiftfast/default.nix index a89f2c9cd8..4b80f8ec65 100644 --- a/distros/noetic/libsiftfast/default.nix +++ b/distros/noetic/libsiftfast/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libsiftfast"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/libsiftfast/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "4069ebf700d60562e1e8b991a20930b26faaea96b74d5723c65cead215c7b445"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/libsiftfast/2.1.21-2"; + sha256 = "sha256-g4Wl5Lf6BAbXJL1K+gu2ASbROBGBQ6bHdTGuUPfV2Q8="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosboost-cfg roslib rospack subversion ]; diff --git a/distros/noetic/libuvc-camera/default.nix b/distros/noetic/libuvc-camera/default.nix index 7959aebcce..124824478b 100644 --- a/distros/noetic/libuvc-camera/default.nix +++ b/distros/noetic/libuvc-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libuvc-camera"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/libuvc_ros-release/archive/release/noetic/libuvc_camera/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "b329b9e56923f8b9c6c8bb01985d470769cb57a54e08429b496615bd009dcb89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "libuvc_ros-release"; + rev = "release/noetic/libuvc_camera/0.0.11-1"; + sha256 = "sha256-MhpnBPbU4cCd5UcRnNhfX6zYxgb1Ji3cHZjTKUmpsTI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/libuvc-ros/default.nix b/distros/noetic/libuvc-ros/default.nix index 069ad28026..2f39183951 100644 --- a/distros/noetic/libuvc-ros/default.nix +++ b/distros/noetic/libuvc-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-libuvc-ros"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/libuvc_ros-release/archive/release/noetic/libuvc_ros/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "b2da80d64e704f65aa4833edcc0c34868326d9cae3a32ededd99a3202ac9a790"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "libuvc_ros-release"; + rev = "release/noetic/libuvc_ros/0.0.11-1"; + sha256 = "sha256-+VLUKncrHQ1v4JxMM672o3c/D2dKkJAMeuJcbNw0xzA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/linux-peripheral-interfaces/default.nix b/distros/noetic/linux-peripheral-interfaces/default.nix index 68a4767c2e..26b286ee1c 100644 --- a/distros/noetic/linux-peripheral-interfaces/default.nix +++ b/distros/noetic/linux-peripheral-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-linux-peripheral-interfaces"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/linux_peripheral_interfaces-release/archive/release/noetic/linux_peripheral_interfaces/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "c2da8bce0693ee4268de91e273dd47cc8e63bb4422e30b6445bbe51bfede833e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "linux_peripheral_interfaces-release"; + rev = "release/noetic/linux_peripheral_interfaces/0.2.2-1"; + sha256 = "sha256-iroBExDPMILuv8NHA+U4Plq1E65g1H0/wjYvXtIvCGw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lms1xx/default.nix b/distros/noetic/lms1xx/default.nix index bd4e28dd98..4f790d656c 100644 --- a/distros/noetic/lms1xx/default.nix +++ b/distros/noetic/lms1xx/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-lms1xx"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/lms1xx-release/archive/release/noetic/lms1xx/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "542f79a2e70c555941a560b801052355adfc58fb791078a6da4d28d7e01a6ffe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "lms1xx-release"; + rev = "release/noetic/lms1xx/0.3.0-2"; + sha256 = "sha256-3L+mj7WIM7ZasReF+lKT07BZb0+TLo41dgASpnCEq60="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lockfree/default.nix b/distros/noetic/lockfree/default.nix index ff64978059..71f8bef77a 100644 --- a/distros/noetic/lockfree/default.nix +++ b/distros/noetic/lockfree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-lockfree"; version = "1.0.25-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/noetic/lockfree/1.0.25-1.tar.gz"; - name = "1.0.25-1.tar.gz"; - sha256 = "b72d3a14bcf278cd607e730ad2f0d988f4f03c8d116fdf401fbc75440269a8d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/noetic/lockfree/1.0.25-1"; + sha256 = "sha256-/CwUQED0MsIv35TlfO0WPspHfG0BOg1NMCOoC+HKSH0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/locomotor-msgs/default.nix b/distros/noetic/locomotor-msgs/default.nix index fe750b4b4e..16c5a807a9 100644 --- a/distros/noetic/locomotor-msgs/default.nix +++ b/distros/noetic/locomotor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-locomotor-msgs"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/locomotor_msgs/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "090e71c23ac44da88b614d2cd37c5daab2bacfb1a69a3a62e109d7abc7d1e46a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/locomotor_msgs/0.3.0-2"; + sha256 = "sha256-8wd+GkOEiZVqiKbiPlW6w46GlIpukjGUmKaFONH6NhM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/locomotor/default.nix b/distros/noetic/locomotor/default.nix index d2ee1f8eaf..7da0720465 100644 --- a/distros/noetic/locomotor/default.nix +++ b/distros/noetic/locomotor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-locomotor"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/locomotor/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "cfc7f120c4321938de66608941cb312ef1ecfe925dcc2f698985751feabd8617"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/locomotor/0.3.0-2"; + sha256 = "sha256-6kaeiVqQQXuk1FiGb9diHZGgqlpmtuPwUaSR8aS8jNY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/locomove-base/default.nix b/distros/noetic/locomove-base/default.nix index e0ddb4eb5f..f91de6a7d0 100644 --- a/distros/noetic/locomove-base/default.nix +++ b/distros/noetic/locomove-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-locomove-base"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/locomove_base/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "adc38904239987e62831c4fc0ce28d392d817e3266eb8e03fe1b01ba6b4e8a79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/locomove_base/0.3.0-2"; + sha256 = "sha256-2Ri7zaCF0qhInUk7qMDo4+7PUZ057974rXvgFwG8cvE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/log-view/default.nix b/distros/noetic/log-view/default.nix index fab8714817..c19ea1c0b0 100644 --- a/distros/noetic/log-view/default.nix +++ b/distros/noetic/log-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-log-view"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/hatchbed/log_view-release/archive/release/noetic/log_view/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "ae83c301379e194490f5aa2a392d6a2b20986be11b5a36ff1d8bfff993c24e1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "hatchbed"; + repo = "log_view-release"; + rev = "release/noetic/log_view/0.1.3-1"; + sha256 = "sha256-aCxYKgynCd7OZqWNJNIBW9TZk5jcCewfyQUTEc1nBP8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lpg-planner/default.nix b/distros/noetic/lpg-planner/default.nix index 8f7d2fb243..1a3a1dd088 100644 --- a/distros/noetic/lpg-planner/default.nix +++ b/distros/noetic/lpg-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-lpg-planner"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/lpg_planner/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "c6a37a8be30644bb340534844822ed765cce283f7b7e4708834fffac523ba5e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/lpg_planner/2.1.21-2"; + sha256 = "sha256-IReDlPo8M5HcMkmpuJDpOO2jZzwr3jQVLx/ipque9X8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/lsc-ros-driver/default.nix b/distros/noetic/lsc-ros-driver/default.nix index 92b1b585c1..04600c449a 100644 --- a/distros/noetic/lsc-ros-driver/default.nix +++ b/distros/noetic/lsc-ros-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-lsc-ros-driver"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/AutonicsLiDAR-release/lsc_ros_driver-release/archive/release/noetic/lsc_ros_driver/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "42c98d9245a7adf469b21dba3a12a2be6a8d91567cb37ece7f285d394f1e78c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AutonicsLiDAR-release"; + repo = "lsc_ros_driver-release"; + rev = "release/noetic/lsc_ros_driver/1.0.2-2"; + sha256 = "sha256-xYpSqVbtrXn/3u/Xxe7aYYJnOGgMohZ2Chgf/aTFFZo="; + }; buildType = "catkin"; buildInputs = [ catkin diagnostic-updater self-test ]; diff --git a/distros/noetic/lusb/default.nix b/distros/noetic/lusb/default.nix index 5d2b087a07..d7ffe7aeb8 100644 --- a/distros/noetic/lusb/default.nix +++ b/distros/noetic/lusb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-lusb"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/lusb-release/archive/release/noetic/lusb/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "65aeadc9a0f6e40009b2f8c5befeb581d7b83f954c40bf9bdf66847b9c9d53bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "lusb-release"; + rev = "release/noetic/lusb/1.1.0-1"; + sha256 = "sha256-zAbwlREDTG5YSycBEr/RFaxKOCiynL4dg1xJjDv9mJE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/magic-enum/default.nix b/distros/noetic/magic-enum/default.nix index 4c736296af..76121cc189 100644 --- a/distros/noetic/magic-enum/default.nix +++ b/distros/noetic/magic-enum/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-magic-enum"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/nobleo/magic_enum-release/archive/release/noetic/magic_enum/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "61de1b8f2efbce9574758aaaa3fb54128a78f93caa2d0c06f6d2e7815756811d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "magic_enum-release"; + rev = "release/noetic/magic_enum/0.8.2-1"; + sha256 = "sha256-6XoJ7gjgFAQsS2v094KvA9UxRZYvV1PNlBRcbQ/5Z8c="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/magical-ros2-conversion-tool/default.nix b/distros/noetic/magical-ros2-conversion-tool/default.nix index c61ffbc1ee..4227fcfd57 100644 --- a/distros/noetic/magical-ros2-conversion-tool/default.nix +++ b/distros/noetic/magical-ros2-conversion-tool/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-magical-ros2-conversion-tool"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/roscompile-release/archive/release/noetic/magical_ros2_conversion_tool/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "ee4a496fc629420949f653293ac017c24c09981af81f9cc48cd1dc127708ae61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "roscompile-release"; + rev = "release/noetic/magical_ros2_conversion_tool/1.2.1-1"; + sha256 = "sha256-KXRVv6k4iuuI5LLTLHu4uA4foaVsYWfJQ/2RtcPD8RE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/map-laser/default.nix b/distros/noetic/map-laser/default.nix index 8f48c5d8e2..e1ee10e5a2 100644 --- a/distros/noetic/map-laser/default.nix +++ b/distros/noetic/map-laser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-map-laser"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/laser_filtering_release/archive/release/noetic/map_laser/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "9c55dec2f10d9b6710024e9af11b0a3e46a677c0e524b4d13856da9b4712d5ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "laser_filtering_release"; + rev = "release/noetic/map_laser/0.0.5-1"; + sha256 = "sha256-0QY1xNgy/QF2t/q05OFhXNeajn3TY/DyNN9axd6S+nI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/map-msgs/default.nix b/distros/noetic/map-msgs/default.nix index 65a684100d..d44492ae18 100644 --- a/distros/noetic/map-msgs/default.nix +++ b/distros/noetic/map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-map-msgs"; version = "1.14.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_msgs-release/archive/release/noetic/map_msgs/1.14.1-1.tar.gz"; - name = "1.14.1-1.tar.gz"; - sha256 = "e9ae695b8c3f745dc6c3878810a97546c4dd528000a0c8058d6f1f41983df432"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_msgs-release"; + rev = "release/noetic/map_msgs/1.14.1-1"; + sha256 = "sha256-7IurC6RLbfmueYraUPE0560XMCKFL7Ld61V9DfOD5eE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/map-organizer-msgs/default.nix b/distros/noetic/map-organizer-msgs/default.nix index 406ed7df5e..7b690da1df 100644 --- a/distros/noetic/map-organizer-msgs/default.nix +++ b/distros/noetic/map-organizer-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, nav-msgs }: buildRosPackage { pname = "ros-noetic-map-organizer-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/noetic/map_organizer_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "1434e36726307ee6ed9b2a58934b286802700a685e8382c35af4b4aa200060ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/noetic/map_organizer_msgs/0.12.0-1"; + sha256 = "sha256-yt9sQC9Hbonqb5oVmE6buwC3iPWmxhXHK3Bs11eZYb8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/map-organizer/default.nix b/distros/noetic/map-organizer/default.nix index 628fd94c1a..6bdc802f1f 100644 --- a/distros/noetic/map-organizer/default.nix +++ b/distros/noetic/map-organizer/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, eigen, geometry-msgs, map-organizer-msgs, map-server, nav-msgs, neonavigation-common, pcl, pcl-conversions, roscpp, roslint, rostest, sensor-msgs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-map-organizer"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/map_organizer/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "a9640cc8e1953a173b4a05404d9e6f7e5feab1fe8829314a8ed5006c0338210c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/map_organizer/0.12.0-1"; + sha256 = "sha256-vDLGQ4rhAjKB4zrtB3VOf93DvBkBoa9W0HiViTqEkVw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/map-server/default.nix b/distros/noetic/map-server/default.nix index d7bd632f64..5b1508fd59 100644 --- a/distros/noetic/map-server/default.nix +++ b/distros/noetic/map-server/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, SDL, SDL_image, bullet, catkin, libyamlcpp, nav-msgs, roscpp, roslib, rospy, rostest, rosunit, tf2 }: buildRosPackage { pname = "ros-noetic-map-server"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/map_server/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "2aba872bfa613a6f0b91cfe7005e168c82919e3d38c6c6330f8bab2c2b028b82"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/map_server/1.17.3-1"; + sha256 = "sha256-9OsvyxzF0rCpfG5UmdrNGjOaw5WNKXQeQeJr0DrJ6dE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mapviz-plugins/default.nix b/distros/noetic/mapviz-plugins/default.nix index b26b328426..8ee032602c 100644 --- a/distros/noetic/mapviz-plugins/default.nix +++ b/distros/noetic/mapviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mapviz-plugins"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/noetic/mapviz_plugins/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "4c2972160dc7a5fd7858760b98b68f0a87c185d6c1926be7983162d83d447129"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/noetic/mapviz_plugins/1.4.2-1"; + sha256 = "sha256-yMfiAoI1u2L5wdxkm25ZI9zoNwhOmOt0M+xrDq7c57w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mapviz/default.nix b/distros/noetic/mapviz/default.nix index 8c24fc929e..8909c5c020 100644 --- a/distros/noetic/mapviz/default.nix +++ b/distros/noetic/mapviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mapviz"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/noetic/mapviz/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "46114381cfdbe6e838810c21ed5994d4a91669c6a7d038b72de21522a8ce2787"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/noetic/mapviz/1.4.2-1"; + sha256 = "sha256-LYhbsYxhTxTKtc5ttcCDiikDBdvihqj12RGBRjCnA6E="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pkg-config ]; diff --git a/distros/noetic/marker-msgs/default.nix b/distros/noetic/marker-msgs/default.nix index b9678e722d..a7850ed377 100644 --- a/distros/noetic/marker-msgs/default.nix +++ b/distros/noetic/marker-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marker-msgs"; version = "0.0.6-r7"; - src = fetchurl { - url = "https://github.com/tuw-robotics/marker_msgs-release/archive/release/noetic/marker_msgs/0.0.6-7.tar.gz"; - name = "0.0.6-7.tar.gz"; - sha256 = "5e6d538a7981661af4e75752a3a3d254b8f6f9afb79a7f3c5b6a55f1f38b2bce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tuw-robotics"; + repo = "marker_msgs-release"; + rev = "release/noetic/marker_msgs/0.0.6-7"; + sha256 = "sha256-KFmVAhnAs7l2wJqmM4VODUrE8DpKORIt9npqoLYCApo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-can-msgs/default.nix b/distros/noetic/marti-can-msgs/default.nix index 1908548cec..216d511284 100644 --- a/distros/noetic/marti-can-msgs/default.nix +++ b/distros/noetic/marti-can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-can-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_can_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "babb64d0980f74a1fb67a3cf8ad983f6fbe758a16f3dc0aa9de22088fef9ad45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_can_msgs/0.11.0-1"; + sha256 = "sha256-2fTU3MddM9ASjVcv6Fwatjjebv28DYhBkCJ9UOhX5Cs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-common-msgs/default.nix b/distros/noetic/marti-common-msgs/default.nix index cdd863e7d6..90a9fb2064 100644 --- a/distros/noetic/marti-common-msgs/default.nix +++ b/distros/noetic/marti-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-common-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_common_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "38e5ad3a372eb954c413d2fc26f114a933779a82b1f0b3dce70743d5071c5e2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_common_msgs/0.11.0-1"; + sha256 = "sha256-TI0Ie7rtNnkvYK3slDpl+GjkGFxmt507eP0RWKz7tpw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-data-structures/default.nix b/distros/noetic/marti-data-structures/default.nix index 10aa469a17..2b2305ad2d 100644 --- a/distros/noetic/marti-data-structures/default.nix +++ b/distros/noetic/marti-data-structures/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-data-structures"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/marti_data_structures/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "a67b17e049c3821463e666259f06639b15a73ee12e6a5e9aa1c477b9dfad4333"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/marti_data_structures/2.15.2-1"; + sha256 = "sha256-QYtsHGdpf2JqsadQrM9lHT8XP8Bs+MkWkQMQlGJARWY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/marti-dbw-msgs/default.nix b/distros/noetic/marti-dbw-msgs/default.nix index e74ecfe1f9..15e4aa05ca 100644 --- a/distros/noetic/marti-dbw-msgs/default.nix +++ b/distros/noetic/marti-dbw-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-dbw-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_dbw_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "176be07b25ce1ad4e6cbfe8812797d1848b25d42880657c7bce29808f50ecc2e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_dbw_msgs/0.11.0-1"; + sha256 = "sha256-z1nXObjFzu3QKvhPcXiZu+BhqrY35fT1awgvIj24CJY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-introspection-msgs/default.nix b/distros/noetic/marti-introspection-msgs/default.nix index 6d334ff137..31b94806a0 100644 --- a/distros/noetic/marti-introspection-msgs/default.nix +++ b/distros/noetic/marti-introspection-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-introspection-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_introspection_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "14b01f49d4c7e7dc1a8222fc3ca5c59f9601d36f6bbf4999130b69456e81cf0d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_introspection_msgs/0.11.0-1"; + sha256 = "sha256-3OYAQY8YbYECRrHj3mZz9BbLZlFpac/75UO+P5tP910="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-nav-msgs/default.nix b/distros/noetic/marti-nav-msgs/default.nix index 9e89ddce59..c58a81aab8 100644 --- a/distros/noetic/marti-nav-msgs/default.nix +++ b/distros/noetic/marti-nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-nav-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_nav_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "627500b5a3c69d00602711b61539bd702377189cf529c2d6e6a94699e5a1a1b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_nav_msgs/0.11.0-1"; + sha256 = "sha256-bH1lf6wdHr8UzyN8D5wvFa9kp6zcQqH0CQl6o3vndDI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-perception-msgs/default.nix b/distros/noetic/marti-perception-msgs/default.nix index f3e5eb7722..ada08c3840 100644 --- a/distros/noetic/marti-perception-msgs/default.nix +++ b/distros/noetic/marti-perception-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-perception-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_perception_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "8b4d5f2e4791ee54f675c83203deb0df09fd6b2c70729f334e78480c82461961"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_perception_msgs/0.11.0-1"; + sha256 = "sha256-FRJDo+QsX1dQsncDtoCqByBOfhQUTXOnqSnReh5icJk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-sensor-msgs/default.nix b/distros/noetic/marti-sensor-msgs/default.nix index d05a27dbd2..677a63763a 100644 --- a/distros/noetic/marti-sensor-msgs/default.nix +++ b/distros/noetic/marti-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-sensor-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_sensor_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "7b78aebe19a212b2e6d22dd7181dd376173adb82b8f74f6a228d658c3d91f290"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_sensor_msgs/0.11.0-1"; + sha256 = "sha256-eJV9Q5YsLGE4R3+bKfBRlyCsbaa4n97hANLD2o4F3AI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-status-msgs/default.nix b/distros/noetic/marti-status-msgs/default.nix index 0370791421..2e422b591c 100644 --- a/distros/noetic/marti-status-msgs/default.nix +++ b/distros/noetic/marti-status-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-status-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_status_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "34816e459b00b84a94b060aa87ed3da13500e9a20a04df80ce26094f3da85621"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_status_msgs/0.11.0-1"; + sha256 = "sha256-Lsyg4lPiardAzAd/3HPGNN1v7NsylkDRiOJ7PeVaUzQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marti-visualization-msgs/default.nix b/distros/noetic/marti-visualization-msgs/default.nix index 9e45655d4a..aebc77cc68 100644 --- a/distros/noetic/marti-visualization-msgs/default.nix +++ b/distros/noetic/marti-visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marti-visualization-msgs"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_messages-release/archive/release/noetic/marti_visualization_msgs/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "729340251387b7c85d1e1143eb90c6978ad90202521033a6fd98403ff541d499"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_messages-release"; + rev = "release/noetic/marti_visualization_msgs/0.11.0-1"; + sha256 = "sha256-d9GigcJGKb6uWYzGyUGq9R5cYF43Wj8ZNM1SHracDpY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/marvelmind-nav/default.nix b/distros/noetic/marvelmind-nav/default.nix index 0bbf18d1e7..77f2639f46 100644 --- a/distros/noetic/marvelmind-nav/default.nix +++ b/distros/noetic/marvelmind-nav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-marvelmind-nav"; version = "1.0.13-r1"; - src = fetchurl { - url = "https://github.com/MarvelmindRobotics/marvelmind_nav-release/archive/release/noetic/marvelmind_nav/1.0.13-1.tar.gz"; - name = "1.0.13-1.tar.gz"; - sha256 = "3f9ace8cf37ec2f21c90d2ed3f5ab15db82f4ff2d7f0d5cb0da27b7dcec5e2cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarvelmindRobotics"; + repo = "marvelmind_nav-release"; + rev = "release/noetic/marvelmind_nav/1.0.13-1"; + sha256 = "sha256-YVnjKcqnRKWD01m3ehuVWBvKDQe3gpFydc9iH3onXy4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/massrobotics-amr-sender/default.nix b/distros/noetic/massrobotics-amr-sender/default.nix index 241a26780f..1cfcd9b032 100644 --- a/distros/noetic/massrobotics-amr-sender/default.nix +++ b/distros/noetic/massrobotics-amr-sender/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-massrobotics-amr-sender"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/inorbit-ai/ros_amr_interop-release/archive/release/noetic/massrobotics_amr_sender/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "8dcdb3482f774de4774b744a03d8fbe17f8325d8f4412d4da254d81f425f7611"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "inorbit-ai"; + repo = "ros_amr_interop-release"; + rev = "release/noetic/massrobotics_amr_sender/1.0.1-1"; + sha256 = "sha256-BSkPvfJhIPM4gnwZ3UA6ZaCngG0n7th6VilOI+TKh4w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mavlink/default.nix b/distros/noetic/mavlink/default.nix index 2de267e0a6..99f3a28754 100644 --- a/distros/noetic/mavlink/default.nix +++ b/distros/noetic/mavlink/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mavlink"; version = "2022.12.30-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2022.12.30-1.tar.gz"; - name = "2022.12.30-1.tar.gz"; - sha256 = "10b6a0eed3b9b8591d29fe2aca52a240bc953830ea08b6b5547121abb9ebb563"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavlink-gbp-release"; + rev = "release/noetic/mavlink/2022.12.30-1"; + sha256 = "sha256-weCXfCMFBO/hfDHDLJs1Pc7lXxkWPFu9Ug1E0j4bbQI="; + }; buildType = "cmake"; buildInputs = [ cmake python3 python3Packages.future python3Packages.lxml ]; diff --git a/distros/noetic/mavros-extras/default.nix b/distros/noetic/mavros-extras/default.nix index eae096a907..d8ae79f40f 100644 --- a/distros/noetic/mavros-extras/default.nix +++ b/distros/noetic/mavros-extras/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mavros-extras"; version = "1.15.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/noetic/mavros_extras/1.15.0-1.tar.gz"; - name = "1.15.0-1.tar.gz"; - sha256 = "37376b3a39c1cbf34c9d2de279af35a358fc931fa5fa9a9a27827c029a912328"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/noetic/mavros_extras/1.15.0-1"; + sha256 = "sha256-B6IFLJzmCcU6+Zh0tR4xSMbSPVPdNnYuOGJlVtyea7Y="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/mavros-msgs/default.nix b/distros/noetic/mavros-msgs/default.nix index f08885f18e..f4b861bc62 100644 --- a/distros/noetic/mavros-msgs/default.nix +++ b/distros/noetic/mavros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mavros-msgs"; version = "1.15.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/noetic/mavros_msgs/1.15.0-1.tar.gz"; - name = "1.15.0-1.tar.gz"; - sha256 = "dff2c1f66e32982b5114eae56449a36876ed606387afa6667cc04388e9e2cc52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/noetic/mavros_msgs/1.15.0-1"; + sha256 = "sha256-TW4W7L/6pX5Iuf3JipHvqFE9t23Ur/GQUgzT+k2LIeY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/mavros/default.nix b/distros/noetic/mavros/default.nix index f4b3856546..a098412f2b 100644 --- a/distros/noetic/mavros/default.nix +++ b/distros/noetic/mavros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mavros"; version = "1.15.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/noetic/mavros/1.15.0-1.tar.gz"; - name = "1.15.0-1.tar.gz"; - sha256 = "e658fcf7d6dbeccae0200a3a42807501ba7b31bd8c6a40ee4c23296e7541a8b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/noetic/mavros/1.15.0-1"; + sha256 = "sha256-y6QupmeEQ4CD1R9ochP/iaT0LE4+ej8tVF9XFtG3YcI="; + }; buildType = "catkin"; buildInputs = [ angles catkin cmake-modules ]; diff --git a/distros/noetic/mbf-abstract-core/default.nix b/distros/noetic/mbf-abstract-core/default.nix index dc08b04d4c..6f2b7b4a94 100644 --- a/distros/noetic/mbf-abstract-core/default.nix +++ b/distros/noetic/mbf-abstract-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-abstract-core"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/noetic/mbf_abstract_core/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "5833bf85e5c0c3f1b4edf23cc5160185cedc71df5d4f1d07c8f35916e1083a05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/noetic/mbf_abstract_core/0.4.0-1"; + sha256 = "sha256-cVZQuNJVL83ts/zUtcmLWtEIfYN7V8L2FzU+Kps9pXo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mbf-abstract-nav/default.nix b/distros/noetic/mbf-abstract-nav/default.nix index f3b3e90806..9bf044fc4d 100644 --- a/distros/noetic/mbf-abstract-nav/default.nix +++ b/distros/noetic/mbf-abstract-nav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-abstract-nav"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/noetic/mbf_abstract_nav/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "21fdc9e09d4986ac779e1d539d5357d7023346bd22174cc180850a1e853053d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/noetic/mbf_abstract_nav/0.4.0-1"; + sha256 = "sha256-NMwBMLkOoH275hXbeGSeDOGBS7wGy8D4+Pcf44PwYkw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mbf-costmap-core/default.nix b/distros/noetic/mbf-costmap-core/default.nix index ff2204030d..0824c781a3 100644 --- a/distros/noetic/mbf-costmap-core/default.nix +++ b/distros/noetic/mbf-costmap-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-costmap-core"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/noetic/mbf_costmap_core/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "9942ff1299b2b7714ff6276b0b42e87c2fefb00e01f758dc65e7d322204538ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/noetic/mbf_costmap_core/0.4.0-1"; + sha256 = "sha256-CJUL9Kmo1Uv4oA86nWfb+BkR7lEop0acl5CPCyfb4Ws="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mbf-costmap-nav/default.nix b/distros/noetic/mbf-costmap-nav/default.nix index b73282f1df..ea005d21d5 100644 --- a/distros/noetic/mbf-costmap-nav/default.nix +++ b/distros/noetic/mbf-costmap-nav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-costmap-nav"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/noetic/mbf_costmap_nav/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "276f86ef47afaf98ea888f4983cca5a170da3eea3c04d9944f0772bc6899eac4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/noetic/mbf_costmap_nav/0.4.0-1"; + sha256 = "sha256-q5tl9sG0jps/akYCjcU3kGNOs+dLovzt0GxCAHG43ew="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mbf-mesh-core/default.nix b/distros/noetic/mbf-mesh-core/default.nix index f66578c62d..6c0449f253 100644 --- a/distros/noetic/mbf-mesh-core/default.nix +++ b/distros/noetic/mbf-mesh-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-mesh-core"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/mbf_mesh_core/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "f337999c2ea623831a872308f4932be1eca59747d293a5fd16247240063859be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/mbf_mesh_core/1.0.1-2"; + sha256 = "sha256-GmuQlfB/4M2WAbDJQYLDtZPqKFrk1APfG1AZfKRez5Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mbf-mesh-nav/default.nix b/distros/noetic/mbf-mesh-nav/default.nix index b86af80f23..c1fb6624a3 100644 --- a/distros/noetic/mbf-mesh-nav/default.nix +++ b/distros/noetic/mbf-mesh-nav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-mesh-nav"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/mbf_mesh_nav/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "83155069a48c6a31234e76247db9d783bb8edf2037323ae9db684cf99f0f9b11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/mbf_mesh_nav/1.0.1-2"; + sha256 = "sha256-6hiz4x7Wx3CLbp6dYvDOVYEUSIfVBckZYfbfs5IL6aE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mbf-msgs/default.nix b/distros/noetic/mbf-msgs/default.nix index 5ad9c151bf..ccc99c1484 100644 --- a/distros/noetic/mbf-msgs/default.nix +++ b/distros/noetic/mbf-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-msgs"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/noetic/mbf_msgs/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "1f43c2ee455624205424362a51065d378e4a24755d17d0b166c746caf1cc0378"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/noetic/mbf_msgs/0.4.0-1"; + sha256 = "sha256-Z/JlWP+Ass+2PoNIPWVTxnqILT7ahie7aOAk/XIf0uY="; + }; buildType = "catkin"; buildInputs = [ catkin genmsg message-generation ]; diff --git a/distros/noetic/mbf-simple-nav/default.nix b/distros/noetic/mbf-simple-nav/default.nix index 588b1d647e..c813b5ca25 100644 --- a/distros/noetic/mbf-simple-nav/default.nix +++ b/distros/noetic/mbf-simple-nav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-simple-nav"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/noetic/mbf_simple_nav/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "7c6fed059c024b49aa57d66b5c0568bfd3058e6d94f5a16fd48cdcc93c1f046f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/noetic/mbf_simple_nav/0.4.0-1"; + sha256 = "sha256-lkt7Z5n5X3msZDshAhOQdAcM234uCHTV/CVb7gcmphI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mbf-utility/default.nix b/distros/noetic/mbf-utility/default.nix index c4bf3b7e3c..f13226f494 100644 --- a/distros/noetic/mbf-utility/default.nix +++ b/distros/noetic/mbf-utility/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mbf-utility"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/noetic/mbf_utility/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "8ddc3f7fa8c0475762d76d57d73a939b36291f4b2f6cfdcd49d97b7e09790c38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/noetic/mbf_utility/0.4.0-1"; + sha256 = "sha256-X87dUh60k3o/3if4RI8FGEaN/HILyXQvREPQumKEfzg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mcl-3dl-msgs/default.nix b/distros/noetic/mcl-3dl-msgs/default.nix index 7d3354cf44..6c668267c9 100644 --- a/distros/noetic/mcl-3dl-msgs/default.nix +++ b/distros/noetic/mcl-3dl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mcl-3dl-msgs"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/mcl_3dl_msgs-release/archive/release/noetic/mcl_3dl_msgs/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "d2ea9655c093e240f4acdd1619cb5a75aa4f73c2d0406f8250a3f5664282034b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "mcl_3dl_msgs-release"; + rev = "release/noetic/mcl_3dl_msgs/0.6.0-1"; + sha256 = "sha256-Kam+fpj0OxRpkAKZt4JmLryUm8CefE/1iDYgcQQZcHY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/mcl-3dl/default.nix b/distros/noetic/mcl-3dl/default.nix index 9f1d66da5c..e9082f9d53 100644 --- a/distros/noetic/mcl-3dl/default.nix +++ b/distros/noetic/mcl-3dl/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, diagnostic-updater, eigen, geometry-msgs, mcl-3dl-msgs, nav-msgs, pcl-ros, roscpp, roslint, rostest, rosunit, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros, tf2-sensor-msgs, visualization-msgs }: buildRosPackage { pname = "ros-noetic-mcl-3dl"; - version = "0.6.0-r1"; + version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/at-wat/mcl_3dl-release/archive/release/noetic/mcl_3dl/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "307271fe5886008f3a09991dbd62142b090ff93f57eb627001baf45bbf453741"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "mcl_3dl-release"; + rev = "release/noetic/mcl_3dl/0.6.1-1"; + sha256 = "sha256-S1us03yu6Zpv2LDDUVRZwCXj3iIiJRYiAxbgII+d13Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mecanum-gazebo-plugin/default.nix b/distros/noetic/mecanum-gazebo-plugin/default.nix index 06488708b2..50c18e1270 100644 --- a/distros/noetic/mecanum-gazebo-plugin/default.nix +++ b/distros/noetic/mecanum-gazebo-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mecanum-gazebo-plugin"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_simulator-release/archive/release/noetic/mecanum_gazebo_plugin/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "6e7a78111fb928268342e2f240a9508389688cb8dcce2b4f3c66622f4fb7f27a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_simulator-release"; + rev = "release/noetic/mecanum_gazebo_plugin/0.2.0-1"; + sha256 = "sha256-EOxUHcg1yURA8LURPBDkU8X6XKdYDVwW7BUoxh77Vww="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/media-export/default.nix b/distros/noetic/media-export/default.nix index d5d72c08ba..17972ce172 100644 --- a/distros/noetic/media-export/default.nix +++ b/distros/noetic/media-export/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-media-export"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/media_export-release/archive/release/noetic/media_export/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "52d1af6155ad5b84dac185f7a738cacfcfd4073f47cd634a04b506c6d2a346e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "media_export-release"; + rev = "release/noetic/media_export/0.3.0-1"; + sha256 = "sha256-cPOCGxFzZIs6T1ybAgpQp5lbJeYkBhTwmJTRL7dWRGI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mesh-client/default.nix b/distros/noetic/mesh-client/default.nix index 571f57218b..87aa7e289b 100644 --- a/distros/noetic/mesh-client/default.nix +++ b/distros/noetic/mesh-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-client"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/mesh_client/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "2e48408be7af93a21f425580e2b528bf61f4e4563f2cb9c089acc717f5e4acfa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/mesh_client/1.0.1-2"; + sha256 = "sha256-ivpJEfNTKMdvaeUo5BALd3xWgS0VqU91/yt6q924w3U="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/mesh-controller/default.nix b/distros/noetic/mesh-controller/default.nix index 59cbc25ac0..538cce4025 100644 --- a/distros/noetic/mesh-controller/default.nix +++ b/distros/noetic/mesh-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-controller"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/mesh_controller/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "8c64d5a719a38d06e048510a3c88497f83063c872c4e849e40f67c9769f5f880"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/mesh_controller/1.0.1-2"; + sha256 = "sha256-pkomKNKQWYeAlMfi9aDmJCw3172/AOsXGzTpgy6jyz0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mesh-layers/default.nix b/distros/noetic/mesh-layers/default.nix index cd1fce37d8..6fbf50189a 100644 --- a/distros/noetic/mesh-layers/default.nix +++ b/distros/noetic/mesh-layers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-layers"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/mesh_layers/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "d8e5139bde9271e15296b9cfedd2bd281fd470d8f473bae3899df99c08d02440"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/mesh_layers/1.0.1-2"; + sha256 = "sha256-8W5HSLDDKT6r3joVN4dimh2hU/A5pHwedQNEOcJHhdU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mesh-map/default.nix b/distros/noetic/mesh-map/default.nix index e878206e80..84d45021b3 100644 --- a/distros/noetic/mesh-map/default.nix +++ b/distros/noetic/mesh-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-map"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/mesh_map/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "449d021b79a204f4b71da4eb3259d7a62d9f35d32ad38b0629c7eac9fbb2737e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/mesh_map/1.0.1-2"; + sha256 = "sha256-0XHNA4yMPd4Ewx5JcLv0QtUw1mg90QdP43J6txkV8TU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mesh-msgs-conversions/default.nix b/distros/noetic/mesh-msgs-conversions/default.nix index 6460ffb3ae..e422fe377c 100644 --- a/distros/noetic/mesh-msgs-conversions/default.nix +++ b/distros/noetic/mesh-msgs-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-msgs-conversions"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/noetic/mesh_msgs_conversions/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "e69f5498f0167c7d5088658e961b247233b9a4048016d7b82427e05247f3501d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/noetic/mesh_msgs_conversions/1.1.0-1"; + sha256 = "sha256-QcWLafcS/hIPlcSTItRswYYpQlIgUr75HmrrFSrJZ0g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mesh-msgs-hdf5/default.nix b/distros/noetic/mesh-msgs-hdf5/default.nix index 3b5bf9897f..c89f319bb7 100644 --- a/distros/noetic/mesh-msgs-hdf5/default.nix +++ b/distros/noetic/mesh-msgs-hdf5/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-msgs-hdf5"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/noetic/mesh_msgs_hdf5/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "7279fa88fdb99d73322b17b85ba620afa1957bc3ff85ffda44fbef68b30d7ca3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/noetic/mesh_msgs_hdf5/1.1.0-1"; + sha256 = "sha256-Kf9SeFfh5uU41UM+re99mUAJyr+edzyE8/KCkuYqR/U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mesh-msgs-transform/default.nix b/distros/noetic/mesh-msgs-transform/default.nix index 9be8480328..686723dd11 100644 --- a/distros/noetic/mesh-msgs-transform/default.nix +++ b/distros/noetic/mesh-msgs-transform/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-msgs-transform"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/noetic/mesh_msgs_transform/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "de93526223abf69b02a31e845bb95036c41110e147f4de0fbe40fc21b6d0030c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/noetic/mesh_msgs_transform/1.1.0-1"; + sha256 = "sha256-QHwpSWWeSQakmvluvES5XGrVT3piyt2FVjgnXXsssBM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mesh-msgs/default.nix b/distros/noetic/mesh-msgs/default.nix index 2dccf151aa..c122913b6a 100644 --- a/distros/noetic/mesh-msgs/default.nix +++ b/distros/noetic/mesh-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh-tools/archive/release/noetic/mesh_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "4ac4997e202d67691249727fe4aa2a5129ce2292de59ba38a963020dfcdb1853"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh-tools"; + rev = "release/noetic/mesh_msgs/1.1.0-1"; + sha256 = "sha256-9xmdecvsjFLEV6J8ZNnoHY7UjbTg1MTj1VQF9gtlwBU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/mesh-navigation/default.nix b/distros/noetic/mesh-navigation/default.nix index c53290d909..5dd248d01a 100644 --- a/distros/noetic/mesh-navigation/default.nix +++ b/distros/noetic/mesh-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mesh-navigation"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/uos-gbp/mesh_navigation-release/archive/release/noetic/mesh_navigation/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "52f5754149baba3151cf1fd7ed3830bfe6133eb88edad1934b0f3c6b71336ff6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mesh_navigation-release"; + rev = "release/noetic/mesh_navigation/1.0.1-2"; + sha256 = "sha256-iqJC/Re6269IJFptqE3UVfIoCy89JawCt6u0MnVqy7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/message-filters/default.nix b/distros/noetic/message-filters/default.nix index f37eea551c..5a40162b9c 100644 --- a/distros/noetic/message-filters/default.nix +++ b/distros/noetic/message-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-message-filters"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/message_filters/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "7ebb2d1ab3243cc02cf341ea4fc89a532c59dc3c84cb1ebdfc8e23d80f4a4a0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/message_filters/1.15.15-1"; + sha256 = "sha256-m8r1wlXVobHzAa1EWTMyUTkYo08kiKrIZzflhBVNLQ0="; + }; buildType = "catkin"; buildInputs = [ catkin rostest rosunit ]; diff --git a/distros/noetic/message-generation/default.nix b/distros/noetic/message-generation/default.nix index fff4e3eae9..c5879f0eef 100644 --- a/distros/noetic/message-generation/default.nix +++ b/distros/noetic/message-generation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-message-generation"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/message_generation-release/archive/release/noetic/message_generation/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "5733a6180d2cd104c5cbbbcd1f20eb11b0edeb6a6253ccdcb300f550264dbde0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "message_generation-release"; + rev = "release/noetic/message_generation/0.4.1-1"; + sha256 = "sha256-OcZUypiOwRulERTbxJV5sMzsSKXMMqWkJFWQvexUZtQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/message-runtime/default.nix b/distros/noetic/message-runtime/default.nix index 0b1339c46c..24f4012198 100644 --- a/distros/noetic/message-runtime/default.nix +++ b/distros/noetic/message-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-message-runtime"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/message_runtime-release/archive/release/noetic/message_runtime/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "ed3ea8f62850d371e9f44aa764896b429b4016d3b278a760b9214bfb9d57dc35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "message_runtime-release"; + rev = "release/noetic/message_runtime/0.4.13-1"; + sha256 = "sha256-jmepqaIACOIFGe4WQSG9um733v9hB6okBr4zfxcpQZI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/message-to-tf/default.nix b/distros/noetic/message-to-tf/default.nix index c8206c032e..6cd836a79e 100644 --- a/distros/noetic/message-to-tf/default.nix +++ b/distros/noetic/message-to-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-message-to-tf"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/tu-darmstadt-ros-pkg-gbp/hector_localization-release/archive/release/noetic/message_to_tf/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "fedfa6c5ab7ac1807512c9cbe4047d165fada0658fbf612b4fcef8397d3d4c11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tu-darmstadt-ros-pkg-gbp"; + repo = "hector_localization-release"; + rev = "release/noetic/message_to_tf/0.4.0-1"; + sha256 = "sha256-4OaET2k/pzb4Uo/uOdcjg6AjOJeF9XKvW1F6kt5BL8E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mia-hand-bringup/default.nix b/distros/noetic/mia-hand-bringup/default.nix index 509742b2de..69f1673450 100644 --- a/distros/noetic/mia-hand-bringup/default.nix +++ b/distros/noetic/mia-hand-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mia-hand-bringup"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/Prensilia-srl/mia_hand_ros_pkgs-release/archive/release/noetic/mia_hand_bringup/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "68d68e63d33613b45e437abc06eb8fe24037aad21fa119a46b09a0f191fcf3e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Prensilia-srl"; + repo = "mia_hand_ros_pkgs-release"; + rev = "release/noetic/mia_hand_bringup/1.0.2-1"; + sha256 = "sha256-6vMSfJ9wvHkTOEjli2BACOSwG5kQ5KnUWmyWjO9wIjU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mia-hand-description/default.nix b/distros/noetic/mia-hand-description/default.nix index aa22185cc3..8055356787 100644 --- a/distros/noetic/mia-hand-description/default.nix +++ b/distros/noetic/mia-hand-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mia-hand-description"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/Prensilia-srl/mia_hand_ros_pkgs-release/archive/release/noetic/mia_hand_description/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "e27ef85e461f7ad68703b67a616c26277c5f582c5ae7997a718be8972702a7c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Prensilia-srl"; + repo = "mia_hand_ros_pkgs-release"; + rev = "release/noetic/mia_hand_description/1.0.2-1"; + sha256 = "sha256-kEisstggLAJIRNgNi55swsNUqc08UDJb5IiOBfshwhE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mia-hand-gazebo/default.nix b/distros/noetic/mia-hand-gazebo/default.nix index 80dceab84a..c3f13a3102 100644 --- a/distros/noetic/mia-hand-gazebo/default.nix +++ b/distros/noetic/mia-hand-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mia-hand-gazebo"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/Prensilia-srl/mia_hand_ros_pkgs-release/archive/release/noetic/mia_hand_gazebo/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "65a76cc981c7e7283376aef273ece732f8be91c6a9e9da27ea4be9b0d3d3ebb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Prensilia-srl"; + repo = "mia_hand_ros_pkgs-release"; + rev = "release/noetic/mia_hand_gazebo/1.0.2-1"; + sha256 = "sha256-qJ8I0Do+n0BzslFLUCMDyGTbB127tgQk/kH89atyI8E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mia-hand-moveit-config/default.nix b/distros/noetic/mia-hand-moveit-config/default.nix index 1d9707e1b9..28f97c1bbf 100644 --- a/distros/noetic/mia-hand-moveit-config/default.nix +++ b/distros/noetic/mia-hand-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mia-hand-moveit-config"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/Prensilia-srl/mia_hand_ros_pkgs-release/archive/release/noetic/mia_hand_moveit_config/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "2a8a6765846be755de46b935417af73097ff848e3f62efb5dae4c87b9e95c645"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Prensilia-srl"; + repo = "mia_hand_ros_pkgs-release"; + rev = "release/noetic/mia_hand_moveit_config/1.0.2-1"; + sha256 = "sha256-IBM557bQVyT5mv0IdALg6m1jaKPbcr14lKIfj23zR2I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mia-hand-msgs/default.nix b/distros/noetic/mia-hand-msgs/default.nix index 2c001874ed..604a28b7ea 100644 --- a/distros/noetic/mia-hand-msgs/default.nix +++ b/distros/noetic/mia-hand-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mia-hand-msgs"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/Prensilia-srl/mia_hand_ros_pkgs-release/archive/release/noetic/mia_hand_msgs/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "2185777f63221499fe20d4d2e01ec4dec24a319ccad0a013ee12b3e17fb371b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Prensilia-srl"; + repo = "mia_hand_ros_pkgs-release"; + rev = "release/noetic/mia_hand_msgs/1.0.2-1"; + sha256 = "sha256-TPxVC7tNFfSiQxEwucwCmnx/Cy5HZ2VR0WVKGcDu998="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mia-hand-ros-control/default.nix b/distros/noetic/mia-hand-ros-control/default.nix index d424489c16..e68376629f 100644 --- a/distros/noetic/mia-hand-ros-control/default.nix +++ b/distros/noetic/mia-hand-ros-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mia-hand-ros-control"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/Prensilia-srl/mia_hand_ros_pkgs-release/archive/release/noetic/mia_hand_ros_control/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "7533ff9d9288bc4a672a546a7a6dd93cb96148cc37808003375be12d573e1e28"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Prensilia-srl"; + repo = "mia_hand_ros_pkgs-release"; + rev = "release/noetic/mia_hand_ros_control/1.0.2-1"; + sha256 = "sha256-JwPZNs2XqmhXeNFJQtLg85wChLLxm3wUxa/L1Qr3Bto="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mia-hand-ros-pkgs/default.nix b/distros/noetic/mia-hand-ros-pkgs/default.nix index a6d7fdc09c..9e149424c1 100644 --- a/distros/noetic/mia-hand-ros-pkgs/default.nix +++ b/distros/noetic/mia-hand-ros-pkgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mia-hand-ros-pkgs"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/Prensilia-srl/mia_hand_ros_pkgs-release/archive/release/noetic/mia_hand_ros_pkgs/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "e068a990866f6332cca52d145391755c07bab1f8205373d82c8fc2469ca539d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Prensilia-srl"; + repo = "mia_hand_ros_pkgs-release"; + rev = "release/noetic/mia_hand_ros_pkgs/1.0.2-1"; + sha256 = "sha256-4OEkDHp6Ip4BYd6uGMrLvQ0fLe/qN17Wus/hEvvg+8o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/microstrain-3dmgx2-imu/default.nix b/distros/noetic/microstrain-3dmgx2-imu/default.nix index cfe3afa12b..7f820d2715 100644 --- a/distros/noetic/microstrain-3dmgx2-imu/default.nix +++ b/distros/noetic/microstrain-3dmgx2-imu/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-microstrain-3dmgx2-imu"; version = "1.5.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/microstrain_3dmgx2_imu-release/archive/release/noetic/microstrain_3dmgx2_imu/1.5.13-1.tar.gz"; - name = "1.5.13-1.tar.gz"; - sha256 = "d4c264bcc54eedddc778acdb0679cd9feae75ed9014b03a4e3f61038e6e23c98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "microstrain_3dmgx2_imu-release"; + rev = "release/noetic/microstrain_3dmgx2_imu/1.5.13-1"; + sha256 = "sha256-7MKmlZuU6NLA+ZUDKedUhkyc8Xek4d9LKGqDHO2PNno="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/microstrain-inertial-driver/default.nix b/distros/noetic/microstrain-inertial-driver/default.nix index 918b621e51..92e3797fe6 100644 --- a/distros/noetic/microstrain-inertial-driver/default.nix +++ b/distros/noetic/microstrain-inertial-driver/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, cmake-modules, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, jq, mavros-msgs, message-generation, message-runtime, microstrain-inertial-msgs, nav-msgs, nmea-msgs, roscpp, roslint, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: +{ lib, buildRosPackage, fetchurl, catkin, cmake-modules, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, git, jq, mavros-msgs, message-generation, message-runtime, microstrain-inertial-msgs, nav-msgs, nmea-msgs, roscpp, roslint, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-microstrain-inertial-driver"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/microstrain_inertial-release/archive/release/noetic/microstrain_inertial_driver/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "43d118a0c86f147809d877f06d5517f4d85394c5bd0f65876becf1dfeba2157c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "microstrain_inertial-release"; + rev = "release/noetic/microstrain_inertial_driver/3.0.0-1"; + sha256 = "sha256-P9+EqIumEu2WY6+MTpggYT2mTSflt83ursjDPHV/21s="; + }; buildType = "catkin"; - buildInputs = [ catkin curl jq message-generation roslint ]; + buildInputs = [ catkin curl git jq message-generation roslint ]; propagatedBuildInputs = [ cmake-modules diagnostic-aggregator diagnostic-updater geometry-msgs mavros-msgs message-runtime microstrain-inertial-msgs nav-msgs nmea-msgs roscpp sensor-msgs std-msgs std-srvs tf2 tf2-geometry-msgs tf2-ros ]; - nativeBuildInputs = [ catkin ]; + nativeBuildInputs = [ catkin git ]; meta = { description = ''The ros_mscl package provides a driver for the LORD/Microstrain inertial products.''; diff --git a/distros/noetic/microstrain-inertial-examples/default.nix b/distros/noetic/microstrain-inertial-examples/default.nix index 4494a155cb..1266b71b91 100644 --- a/distros/noetic/microstrain-inertial-examples/default.nix +++ b/distros/noetic/microstrain-inertial-examples/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, microstrain-inertial-msgs, roscpp, roslint, rospy, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-noetic-microstrain-inertial-examples"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/microstrain_inertial-release/archive/release/noetic/microstrain_inertial_examples/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "bef3436d2ec850947223ce0e917021cf025fdf75c9730ebde8225e45cb07ac35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "microstrain_inertial-release"; + rev = "release/noetic/microstrain_inertial_examples/3.0.0-1"; + sha256 = "sha256-gPe93DN4jh6MrxFe3uiA22qxYHTcTnWfVmdmZuaSyyw="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/microstrain-inertial-msgs/default.nix b/distros/noetic/microstrain-inertial-msgs/default.nix index f6ca6a2439..7b54c0bd84 100644 --- a/distros/noetic/microstrain-inertial-msgs/default.nix +++ b/distros/noetic/microstrain-inertial-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-microstrain-inertial-msgs"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/microstrain_inertial-release/archive/release/noetic/microstrain_inertial_msgs/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "5c7d4c41f834a79b8c6b9a25bd8bc00b378df65863a4a7a13325210fe6e1225a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "microstrain_inertial-release"; + rev = "release/noetic/microstrain_inertial_msgs/3.0.0-1"; + sha256 = "sha256-HU0Zby1GEorVJwyZdFf2/+5xaDYnpikb9T6N8pOOa/Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/microstrain-inertial-rqt/default.nix b/distros/noetic/microstrain-inertial-rqt/default.nix index 4a657b16af..6e081df0bb 100644 --- a/distros/noetic/microstrain-inertial-rqt/default.nix +++ b/distros/noetic/microstrain-inertial-rqt/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, microstrain-inertial-msgs, nav-msgs, rospy, rqt-gui, rqt-gui-py, std-msgs, tf }: buildRosPackage { pname = "ros-noetic-microstrain-inertial-rqt"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/microstrain_inertial-release/archive/release/noetic/microstrain_inertial_rqt/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "3386514273710a3e33909a664d18b0e40dd8ee91025e331b9e57d6ac39a7796e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "microstrain_inertial-release"; + rev = "release/noetic/microstrain_inertial_rqt/3.0.0-1"; + sha256 = "sha256-rEnFQo7RoQQv1o2DDcPqzTFNqTTjQftxD2/w1s8sUlM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mikrotik-swos-tools/default.nix b/distros/noetic/mikrotik-swos-tools/default.nix index bd5271a391..ba94ae6dbf 100644 --- a/distros/noetic/mikrotik-swos-tools/default.nix +++ b/distros/noetic/mikrotik-swos-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mikrotik-swos-tools"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/peci1/mikrotik_swos_tools-release/archive/release/noetic/mikrotik_swos_tools/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "de151d2c0d3828cb6f9888ce781c7d5f9f90c1b25b5dd06dbc74c4cc49073021"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "mikrotik_swos_tools-release"; + rev = "release/noetic/mikrotik_swos_tools/1.1.0-1"; + sha256 = "sha256-hDlFaCX5XMRPn8JHcbovhY608LICGVRBKvUDopb24Bw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/mimic-joint-controller/default.nix b/distros/noetic/mimic-joint-controller/default.nix index 1606fc7702..7fecb3f423 100644 --- a/distros/noetic/mimic-joint-controller/default.nix +++ b/distros/noetic/mimic-joint-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mimic-joint-controller"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/mimic_joint_controller/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "583df314fc48f83c8bba3195a19519cb778810d1a268f76b3d129891d41aa513"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/mimic_joint_controller/0.1.7-1"; + sha256 = "sha256-cJxDyk9kabVS2BMPSdY5FJ2EdDVYYL1ASRjncqI8nLE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mini-maxwell/default.nix b/distros/noetic/mini-maxwell/default.nix index fd0eff3b4b..c8cab43667 100644 --- a/distros/noetic/mini-maxwell/default.nix +++ b/distros/noetic/mini-maxwell/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mini-maxwell"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/mini_maxwell/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "5cc4e6f489ebcd95ba061ee6c49c0929163c8704434bbfbe3d9ef0fdfd53990f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/mini_maxwell/2.1.21-2"; + sha256 = "sha256-TNcwybzUvaydQ3jLDVJLgzHpD/fhRY7H9ehmebh5Ttk="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules roslib ]; diff --git a/distros/noetic/mir-actions/default.nix b/distros/noetic/mir-actions/default.nix index cefa8646b8..cf48fb9078 100644 --- a/distros/noetic/mir-actions/default.nix +++ b/distros/noetic/mir-actions/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, actionlib, catkin, geometry-msgs, message-generation, message-runtime, nav-msgs }: +{ lib, buildRosPackage, fetchurl, actionlib, catkin, geometry-msgs, message-generation, message-runtime, mir-msgs, nav-msgs }: buildRosPackage { pname = "ros-noetic-mir-actions"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/mir_actions/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "4102869138d4a85e81f6e71feb9f8c2d138d0fbc06b3082c94775277350f5dea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/mir_actions/1.1.7-1"; + sha256 = "sha256-x8uQG5cfti2y6o9WS4EyjyjBTqedJqqdxN2EKkxgfAk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; - propagatedBuildInputs = [ actionlib geometry-msgs message-runtime nav-msgs ]; + propagatedBuildInputs = [ actionlib geometry-msgs message-runtime mir-msgs nav-msgs ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/mir-description/default.nix b/distros/noetic/mir-description/default.nix index 84a0d1c869..d6a455a03e 100644 --- a/distros/noetic/mir-description/default.nix +++ b/distros/noetic/mir-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, diff-drive-controller, gazebo-plugins, gazebo-ros-control, hector-gazebo-plugins, joint-state-controller, joint-state-publisher, joint-state-publisher-gui, position-controllers, robot-state-publisher, roslaunch, rviz, urdf, xacro }: buildRosPackage { pname = "ros-noetic-mir-description"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/mir_description/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "b6206ed02b24e22354bc239fafa903d9cf6618251656d81b8e6093e89c9105f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/mir_description/1.1.7-1"; + sha256 = "sha256-Yc1DzkcskdJruR/1Wn8GuSFWZTQhJHrh+m7g0wH6dnA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/mir-driver/default.nix b/distros/noetic/mir-driver/default.nix index 129e6f16a8..fc0bdc77f9 100644 --- a/distros/noetic/mir-driver/default.nix +++ b/distros/noetic/mir-driver/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, diagnostic-msgs, dynamic-reconfigure, geometry-msgs, mir-actions, mir-description, mir-msgs, move-base-msgs, nav-msgs, python3Packages, robot-state-publisher, rosgraph-msgs, roslaunch, rospy, rospy-message-converter, sensor-msgs, std-msgs, tf, visualization-msgs }: buildRosPackage { pname = "ros-noetic-mir-driver"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/mir_driver/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "95c399f07a2aaf0c334a812d346df500d565c49a4bd424d1b57b0d3fa74a9675"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/mir_driver/1.1.7-1"; + sha256 = "sha256-aJNyHmd6YvNL9jZbtuEQzY2bvnWSLMlRz9OICWQ7yMA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/mir-dwb-critics/default.nix b/distros/noetic/mir-dwb-critics/default.nix index ff5fbccc30..6cb335c585 100644 --- a/distros/noetic/mir-dwb-critics/default.nix +++ b/distros/noetic/mir-dwb-critics/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, catkin, costmap-queue, dwb-critics, dwb-local-planner, geometry-msgs, nav-2d-msgs, nav-2d-utils, nav-core2, nav-grid-iterators, pluginlib, python3Packages, roscpp, sensor-msgs }: buildRosPackage { pname = "ros-noetic-mir-dwb-critics"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/mir_dwb_critics/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "7188f6b4f55ab4bb434e38a4f6f714166fda8229783a0d9b4003449447473c39"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/mir_dwb_critics/1.1.7-1"; + sha256 = "sha256-dIasBycOOy+Q/lSS9t6Skn3h47ECPM+rpnuk97K+6KI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mir-gazebo/default.nix b/distros/noetic/mir-gazebo/default.nix index 3dc35e7c10..7ea21d78c2 100644 --- a/distros/noetic/mir-gazebo/default.nix +++ b/distros/noetic/mir-gazebo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-manager, fake-localization, gazebo-ros, joint-state-publisher, mir-description, mir-driver, robot-localization, robot-state-publisher, roslaunch, rostopic, rqt-robot-steering, topic-tools }: buildRosPackage { pname = "ros-noetic-mir-gazebo"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/mir_gazebo/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "807f570cc0c61f6e362639997c8c8a0f0293225d8923f202f23c08f57a419993"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/mir_gazebo/1.1.7-1"; + sha256 = "sha256-HzKmcsGuAA5qGl4vFIa2m5skAs526p+mQFuA7w6jefk="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/mir-msgs/default.nix b/distros/noetic/mir-msgs/default.nix index 051dda23eb..90a99be482 100644 --- a/distros/noetic/mir-msgs/default.nix +++ b/distros/noetic/mir-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime }: buildRosPackage { pname = "ros-noetic-mir-msgs"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/mir_msgs/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "a16a3387e70c5a5d16473cf627f5dca057716f3e5d9ca00d373cc3338a4abe89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/mir_msgs/1.1.7-1"; + sha256 = "sha256-5PZxtvLKMpLbuvw2qLJV/sqnjf/zCZj/wrXiyJFsPgk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/mir-navigation/default.nix b/distros/noetic/mir-navigation/default.nix index 04e43752ed..2e93d8b027 100644 --- a/distros/noetic/mir-navigation/default.nix +++ b/distros/noetic/mir-navigation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, amcl, base-local-planner, catkin, dwa-local-planner, dwb-critics, dwb-local-planner, dwb-plugins, hector-mapping, map-server, mir-driver, mir-dwb-critics, mir-gazebo, move-base, nav-core-adapter, python3Packages, roslaunch, sbpl-lattice-planner, teb-local-planner }: buildRosPackage { pname = "ros-noetic-mir-navigation"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/mir_navigation/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "ee5eb011c5df71f351da4d3e01d27a5fa02b2ec936f77b955f2f8efdb879e27c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/mir_navigation/1.1.7-1"; + sha256 = "sha256-KFehN1dbKjboM6ieXeb6HVUeTSNQT0gZT8Ts9EOzBX8="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/mir-robot/default.nix b/distros/noetic/mir-robot/default.nix index f2e1bfad3e..58fdd92f5b 100644 --- a/distros/noetic/mir-robot/default.nix +++ b/distros/noetic/mir-robot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, mir-actions, mir-description, mir-driver, mir-dwb-critics, mir-gazebo, mir-msgs, mir-navigation, sdc21x0 }: buildRosPackage { pname = "ros-noetic-mir-robot"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/mir_robot/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "886dba0cd5d3e7aba779ef99b82251cff7047314c4f4d5d2e0248c3e9c5a3ef1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/mir_robot/1.1.7-1"; + sha256 = "sha256-0wuXosEn1PGnwa0d8jumh9V/gVbLWe8JjfvVRQTITwE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mk/default.nix b/distros/noetic/mk/default.nix index 92b1c8991f..5e6ff4eb5c 100644 --- a/distros/noetic/mk/default.nix +++ b/distros/noetic/mk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mk"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/mk/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "6e570970ed335eace1b1b4ed1f2cdf9b079c31a1a61bd6e73fe794f53ca17bdc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/mk/1.15.8-1"; + sha256 = "sha256-F5Vd+XSjwoFpZ1e8iHMFQuDQCvHkwJEH2j2mxUxfOpY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mobile-robot-simulator/default.nix b/distros/noetic/mobile-robot-simulator/default.nix index a143a38631..685e61af9f 100644 --- a/distros/noetic/mobile-robot-simulator/default.nix +++ b/distros/noetic/mobile-robot-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mobile-robot-simulator"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/nobleo/mobile_robot_simulator-release/archive/release/noetic/mobile_robot_simulator/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "264f763be9c1dac02cf090026034ceb2d94c89278b8ecab316c482b079d6a26d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "mobile_robot_simulator-release"; + rev = "release/noetic/mobile_robot_simulator/1.0.1-1"; + sha256 = "sha256-Oq0f6dDI4QyXSeXB4S3He1oni35peRzDBLchC0GpvME="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mobileye-560-660-msgs/default.nix b/distros/noetic/mobileye-560-660-msgs/default.nix index 9e17598890..2a20189179 100644 --- a/distros/noetic/mobileye-560-660-msgs/default.nix +++ b/distros/noetic/mobileye-560-660-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mobileye-560-660-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/mobileye_560_660_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "37fdd5604617ffda80d4926bb39e588dedaebdd430f25f234c2a2f15b8807109"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/mobileye_560_660_msgs/3.3.0-1"; + sha256 = "sha256-j3kbOy3v3nzX/371wwDctrTWs3bNrvWhUcevn1ZJ7VA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/mocap-nokov/default.nix b/distros/noetic/mocap-nokov/default.nix index 048d2b566b..4798fe2cfa 100644 --- a/distros/noetic/mocap-nokov/default.nix +++ b/distros/noetic/mocap-nokov/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mocap-nokov"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/NOKOV-MOCAP/mocap_nokov_release/archive/release/noetic/mocap_nokov/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "5c4aa056767f0ad442a0a21c6a4e9a471dac06b7e03bcedccddc2a372f6b4792"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "NOKOV-MOCAP"; + repo = "mocap_nokov_release"; + rev = "release/noetic/mocap_nokov/0.0.4-1"; + sha256 = "sha256-SYWnhkBXRFs20zmKslIpEo+dOHwbWwFDO6+TrFBPyd8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mocap-optitrack/default.nix b/distros/noetic/mocap-optitrack/default.nix index 618ece9c17..b56bad4f9a 100644 --- a/distros/noetic/mocap-optitrack/default.nix +++ b/distros/noetic/mocap-optitrack/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mocap-optitrack"; version = "0.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/mocap_optitrack-release/archive/release/noetic/mocap_optitrack/0.1.4-1.tar.gz"; - name = "0.1.4-1.tar.gz"; - sha256 = "da97430ade87f439925a50f94cf6b2e2df0617396fb058c8d732c0b2dee8eab0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "mocap_optitrack-release"; + rev = "release/noetic/mocap_optitrack/0.1.4-1"; + sha256 = "sha256-IsRKzaxlPl8k1LmQ6TLQ742SWX1J/ZpiUrWWFxwYSQ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mongodb-log/default.nix b/distros/noetic/mongodb-log/default.nix index ecc7047c01..2c61a64ab8 100644 --- a/distros/noetic/mongodb-log/default.nix +++ b/distros/noetic/mongodb-log/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mongodb-log"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/strands-project-releases/mongodb_store/archive/release/noetic/mongodb_log/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "6b9fe0fa8c16ad44856c618367fa5fefd1911bf7a90d3f57ab8fff833e7ba75b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "strands-project-releases"; + repo = "mongodb_store"; + rev = "release/noetic/mongodb_log/0.6.0-1"; + sha256 = "sha256-cZ/XWiyyPvvH9cE2yUKHtpLOLXuWr4gRaNxeOoZbnJk="; + }; buildType = "catkin"; buildInputs = [ catkin openssl ]; diff --git a/distros/noetic/mongodb-store-msgs/default.nix b/distros/noetic/mongodb-store-msgs/default.nix index 73cdea7913..30f771dc03 100644 --- a/distros/noetic/mongodb-store-msgs/default.nix +++ b/distros/noetic/mongodb-store-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mongodb-store-msgs"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/strands-project-releases/mongodb_store/archive/release/noetic/mongodb_store_msgs/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "0074332d35316904b5cd14dd86efbabc5285a3a1a07907b87244f1d05536832a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "strands-project-releases"; + repo = "mongodb_store"; + rev = "release/noetic/mongodb_store_msgs/0.6.0-1"; + sha256 = "sha256-qTOwaiL4j1OAGXSL+EV+djhaD8ga/6Q72IJO4l+wlpE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/monkeywrench/default.nix b/distros/noetic/monkeywrench/default.nix index 6e297e9304..c623fc0d8c 100644 --- a/distros/noetic/monkeywrench/default.nix +++ b/distros/noetic/monkeywrench/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-monkeywrench"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/cst0/ros-monkeywrench-release/archive/release/noetic/monkeywrench/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "83679b45cddbd1c95865ea08962840ab0cd6107d9407873b0b83baf8a0e13273"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cst0"; + repo = "ros-monkeywrench-release"; + rev = "release/noetic/monkeywrench/0.1.0-1"; + sha256 = "sha256-LoYnBgHNEcfa0ANgYX7cxHeZWvQxe4SQW3BzkE+M5VE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/monocam-settler/default.nix b/distros/noetic/monocam-settler/default.nix index ec6b1d0fea..66b2dd8861 100644 --- a/distros/noetic/monocam-settler/default.nix +++ b/distros/noetic/monocam-settler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-monocam-settler"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/monocam_settler/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "3366087331b2f73cdec33ae2052a6a903bb1ff7386bb9d6f560cd04f77e6ec97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/monocam_settler/0.10.15-1"; + sha256 = "sha256-lK1Obf9oB5zn6ZhAxHS9w/rRPpTF6LnQgLGhmTJzXdk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mouse-teleop/default.nix b/distros/noetic/mouse-teleop/default.nix index 363e72a35d..d7173f76a8 100644 --- a/distros/noetic/mouse-teleop/default.nix +++ b/distros/noetic/mouse-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mouse-teleop"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/noetic/mouse_teleop/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "503f0f74b7858db4eca3c48c5e8fa80d312964e5922bb40ae29d73af766e2c3f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/noetic/mouse_teleop/0.4.0-1"; + sha256 = "sha256-a6xyu7lpd/hOtydZjXp8V8x+2Px5TkrZc/LgIUCyBZw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/move-base-flex/default.nix b/distros/noetic/move-base-flex/default.nix index 4001cb3e42..eeb513a31f 100644 --- a/distros/noetic/move-base-flex/default.nix +++ b/distros/noetic/move-base-flex/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-move-base-flex"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/move_base_flex-release/archive/release/noetic/move_base_flex/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "5f98632ccdf48a5d5ce61e1da7db0f15d36ea302dfa83b0f8f4981b428511a90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "move_base_flex-release"; + rev = "release/noetic/move_base_flex/0.4.0-1"; + sha256 = "sha256-0iTYubCTfWaWCwoHbHiujNfqow3Z7NUxFmyKh5NLRNM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/move-base-msgs/default.nix b/distros/noetic/move-base-msgs/default.nix index b52f1a34e2..df32ea4548 100644 --- a/distros/noetic/move-base-msgs/default.nix +++ b/distros/noetic/move-base-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-move-base-msgs"; version = "1.14.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_msgs-release/archive/release/noetic/move_base_msgs/1.14.1-1.tar.gz"; - name = "1.14.1-1.tar.gz"; - sha256 = "a3cfcbeed9a83959c3a7b12abf8737062bee94c627d1a961be4ff589a4c4ad7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_msgs-release"; + rev = "release/noetic/move_base_msgs/1.14.1-1"; + sha256 = "sha256-M04IFEmWhE3/U8wT5cMz1LjWX9Vgfkc1FP0R54QQoKg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/move-base-sequence/default.nix b/distros/noetic/move-base-sequence/default.nix index 35da838ee9..72417dfcc6 100644 --- a/distros/noetic/move-base-sequence/default.nix +++ b/distros/noetic/move-base-sequence/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-move-base-sequence"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/MarkNaeem/move_base_sequence-release/archive/release/noetic/move_base_sequence/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "b3dc4489b880f87708249280f6b9eb3b5fb7b6b827563cec478326fad010a6ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MarkNaeem"; + repo = "move_base_sequence-release"; + rev = "release/noetic/move_base_sequence/0.0.1-1"; + sha256 = "sha256-oqxbZ5bmLpaSRgmTv/7TyipOXVPQgGUxoqsJpVR2hs0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/move-base/default.nix b/distros/noetic/move-base/default.nix index 6f259e8176..9fab9cde21 100644 --- a/distros/noetic/move-base/default.nix +++ b/distros/noetic/move-base/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, base-local-planner, catkin, clear-costmap-recovery, cmake-modules, costmap-2d, dynamic-reconfigure, geometry-msgs, message-generation, message-runtime, move-base-msgs, nav-core, nav-msgs, navfn, pluginlib, roscpp, rospy, rotate-recovery, std-srvs, tf2-geometry-msgs, tf2-ros, visualization-msgs }: buildRosPackage { pname = "ros-noetic-move-base"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/move_base/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "9d46fc421767d28c64b66649fb743fb371d371d54f4678aa4309dca75c8dd453"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/move_base/1.17.3-1"; + sha256 = "sha256-wmkWhTGn3CGuPVFBOIFIUvJprAWvjYVXYTAHHhYHAmo="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation tf2-geometry-msgs ]; diff --git a/distros/noetic/move-basic/default.nix b/distros/noetic/move-basic/default.nix index eabd4283e2..e3b6d982bc 100644 --- a/distros/noetic/move-basic/default.nix +++ b/distros/noetic/move-basic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-move-basic"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/move_basic-release/archive/release/noetic/move_basic/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "b333b99887c409c0efcf50bc80a353b7de1df597005a83b27b6a6dc5b38f0859"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "move_basic-release"; + rev = "release/noetic/move_basic/0.4.2-1"; + sha256 = "sha256-oF6KOfQtmkUJDcdizRFznH37DcyToo2JkR/W2bzxh7o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/move-slow-and-clear/default.nix b/distros/noetic/move-slow-and-clear/default.nix index 446597afd7..a3a7835902 100644 --- a/distros/noetic/move-slow-and-clear/default.nix +++ b/distros/noetic/move-slow-and-clear/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, costmap-2d, geometry-msgs, nav-core, pluginlib, roscpp }: buildRosPackage { pname = "ros-noetic-move-slow-and-clear"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/move_slow_and_clear/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "40d597dddc79fa8f15830ade5bbee6f1f72cb748bde6795eb987a1073cbb353c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/move_slow_and_clear/1.17.3-1"; + sha256 = "sha256-Ny0O1PlpgkbE4qZFAo02Tr7Uko+GUqvDHS14tGbKon4="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/moveit-calibration-gui/default.nix b/distros/noetic/moveit-calibration-gui/default.nix index 62142bd671..a6ec8ac865 100644 --- a/distros/noetic/moveit-calibration-gui/default.nix +++ b/distros/noetic/moveit-calibration-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-calibration-gui"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/JStech/moveit_calibration-release/archive/release/noetic/moveit_calibration_gui/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "6578848f9cbc27af349c82a0e7dd87d5cbcc832441ed133d5c49df02314988fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JStech"; + repo = "moveit_calibration-release"; + rev = "release/noetic/moveit_calibration_gui/0.1.0-1"; + sha256 = "sha256-HLD3BEIn+ZDHAKI2jibsNQ22D56SCcwfKIENt7eV1Fc="; + }; buildType = "catkin"; buildInputs = [ catkin class-loader eigen image-geometry pkg-config qt5.qtbase ]; diff --git a/distros/noetic/moveit-calibration-plugins/default.nix b/distros/noetic/moveit-calibration-plugins/default.nix index 96030942a3..b273c0dc0b 100644 --- a/distros/noetic/moveit-calibration-plugins/default.nix +++ b/distros/noetic/moveit-calibration-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-calibration-plugins"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/JStech/moveit_calibration-release/archive/release/noetic/moveit_calibration_plugins/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "56adbbdc424c1c5cb95d8274a4dd5b475d71b08994b2cedaed56976dd64106e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JStech"; + repo = "moveit_calibration-release"; + rev = "release/noetic/moveit_calibration_plugins/0.1.0-1"; + sha256 = "sha256-nIC1LxgXook6P52XMEWQ3f37MkRLJKmBBHuFFeIsqQM="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/noetic/moveit-chomp-optimizer-adapter/default.nix b/distros/noetic/moveit-chomp-optimizer-adapter/default.nix index 13dc99a66e..53399692e2 100644 --- a/distros/noetic/moveit-chomp-optimizer-adapter/default.nix +++ b/distros/noetic/moveit-chomp-optimizer-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-chomp-optimizer-adapter"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_chomp_optimizer_adapter/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "e0d9989e14a21150f9261e1f75827ea74f86e7341a70cfa5da6f7da8e257b038"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_chomp_optimizer_adapter/1.1.11-1"; + sha256 = "sha256-1/aElHNnaGWwkxF4GoZQrHkpf5AfRv3w6j+XbESDB/Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-commander/default.nix b/distros/noetic/moveit-commander/default.nix new file mode 100644 index 0000000000..4bab7508ea --- /dev/null +++ b/distros/noetic/moveit-commander/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, moveit-msgs, moveit-resources-fanuc-moveit-config, moveit-ros-planning-interface, python3, python3Packages, rospy, rostest, sensor-msgs, shape-msgs, tf, assimp }: +buildRosPackage { + pname = "ros-noetic-moveit-commander"; + version = "1.1.11-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_commander/1.1.11-1"; + sha256 = "sha256-ZqtaeCEGY3fQp9iBo285DgJp+jnaBoD97myycuyD7Cs="; + }; + + buildType = "catkin"; + buildInputs = [ catkin python3Packages.catkin-pkg ]; + checkInputs = [ moveit-resources-fanuc-moveit-config rostest ]; + propagatedBuildInputs = [ geometry-msgs moveit-msgs moveit-ros-planning-interface python3 rospy sensor-msgs shape-msgs tf assimp ]; + nativeBuildInputs = [ catkin python3Packages.catkin-pkg ]; + + meta = { + description = ''Python interfaces to MoveIt''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/moveit-core/default.nix b/distros/noetic/moveit-core/default.nix index af223a46da..070ce70011 100644 --- a/distros/noetic/moveit-core/default.nix +++ b/distros/noetic/moveit-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-core"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_core/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "e439e607979521397192558d3b56cae72a5a109aa8a5830c898e3146c0a7d1bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_core/1.1.11-1"; + sha256 = "sha256-ekvZJA8B1UqcR3uqK/nNHyajA82uYtDOoni9LXcC6eI="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/moveit-fake-controller-manager/default.nix b/distros/noetic/moveit-fake-controller-manager/default.nix index 8e14269d7c..003bbe2e8b 100644 --- a/distros/noetic/moveit-fake-controller-manager/default.nix +++ b/distros/noetic/moveit-fake-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-fake-controller-manager"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_fake_controller_manager/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "9688d622e8127589c25610b60828375e49dca28f84f2ebe7ef180d4df26e151d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_fake_controller_manager/1.1.11-1"; + sha256 = "sha256-nQsqcP6sAwWEl+/4iyeHEUw2wNcuPIxkFv/QwgS2wwE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-kinematics/default.nix b/distros/noetic/moveit-kinematics/default.nix index 11b277ef51..0e5134ac8f 100644 --- a/distros/noetic/moveit-kinematics/default.nix +++ b/distros/noetic/moveit-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-kinematics"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_kinematics/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "420326e567e66e956e7b05f6851cad2c3c21baab6ff699676cd5882d528ad7b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_kinematics/1.1.11-1"; + sha256 = "sha256-LpVGq53VHQBP1jp4HODdBUjTX089EOr7/XLvPnFvbi4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-msgs/default.nix b/distros/noetic/moveit-msgs/default.nix index dc84b65c2c..eddb891dd4 100644 --- a/distros/noetic/moveit-msgs/default.nix +++ b/distros/noetic/moveit-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-msgs"; version = "0.11.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_msgs-release/archive/release/noetic/moveit_msgs/0.11.4-1.tar.gz"; - name = "0.11.4-1.tar.gz"; - sha256 = "ee9b010332c606a8c0853cdcce502134fefca02e9e8fa8a7d91b8bc7011ea3a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_msgs-release"; + rev = "release/noetic/moveit_msgs/0.11.4-1"; + sha256 = "sha256-3MpaYwxyZigiLEVRJhLb90FfkfV/E+tufEYt78m+s7I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-opw-kinematics-plugin/default.nix b/distros/noetic/moveit-opw-kinematics-plugin/default.nix index 9c6c0aff98..25d9b9d6da 100644 --- a/distros/noetic/moveit-opw-kinematics-plugin/default.nix +++ b/distros/noetic/moveit-opw-kinematics-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-opw-kinematics-plugin"; version = "0.4.0-r3"; - src = fetchurl { - url = "https://github.com/JeroenDM/moveit_opw_kinematics_plugin-release/archive/release/noetic/moveit_opw_kinematics_plugin/0.4.0-3.tar.gz"; - name = "0.4.0-3.tar.gz"; - sha256 = "4ea47a42e607c52c82470fb1dff8e901368c18071eeb331592803c9322d20d3f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JeroenDM"; + repo = "moveit_opw_kinematics_plugin-release"; + rev = "release/noetic/moveit_opw_kinematics_plugin/0.4.0-3"; + sha256 = "sha256-oEvrtKS47oJXPycA2LIPRAwiO0+pF/LU/jQ7h+x5Cok="; + }; buildType = "catkin"; buildInputs = [ catkin eigen-conversions opw-kinematics ]; diff --git a/distros/noetic/moveit-planners-chomp/default.nix b/distros/noetic/moveit-planners-chomp/default.nix index 30c52c307c..548c117eb4 100644 --- a/distros/noetic/moveit-planners-chomp/default.nix +++ b/distros/noetic/moveit-planners-chomp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-planners-chomp"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_planners_chomp/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "b3bf0b98e9da1cfa7352742ef0afeaf9cd0bd44be36a99610544ac09b9d4b97d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_planners_chomp/1.1.11-1"; + sha256 = "sha256-AJt1cv4d3WQfCErh17nKlJwluB5ZagnmFHo+xnBrPtw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-planners-ompl/default.nix b/distros/noetic/moveit-planners-ompl/default.nix index 77a3404a6c..0fd442fb14 100644 --- a/distros/noetic/moveit-planners-ompl/default.nix +++ b/distros/noetic/moveit-planners-ompl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-planners-ompl"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_planners_ompl/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "cf7d28dc918dc4f4605093822171b90c90aa43841868077b1c97b4b020a9ba71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_planners_ompl/1.1.11-1"; + sha256 = "sha256-05oUeexcOY+aUrx9TjFqf6iqE3YS//bsE+6AbxGsbVw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-planners/default.nix b/distros/noetic/moveit-planners/default.nix index 26f8d83ebc..f7f2f3b51d 100644 --- a/distros/noetic/moveit-planners/default.nix +++ b/distros/noetic/moveit-planners/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-planners"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_planners/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "7bc3708371aa72dbc2eb071d0c9863d68ecbf2871b62532597e530a1c5c4f6a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_planners/1.1.11-1"; + sha256 = "sha256-r0EXTiUq0ScR60CTTeQtVxhpdbzT3sS2iGhAYgqh+dY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-plugins/default.nix b/distros/noetic/moveit-plugins/default.nix index b9b8da28a6..5292a45705 100644 --- a/distros/noetic/moveit-plugins/default.nix +++ b/distros/noetic/moveit-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-plugins"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_plugins/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "45cd855778073e02f5560af0b9113d69efda56a8e81ce215b1a630bc508791e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_plugins/1.1.11-1"; + sha256 = "sha256-qKTLVGC3QfBkyoiroaWFibenzoTqlbCRhfCjoLITA10="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources-fanuc-description/default.nix b/distros/noetic/moveit-resources-fanuc-description/default.nix index 5c0c5b221f..db0620d81a 100644 --- a/distros/noetic/moveit-resources-fanuc-description/default.nix +++ b/distros/noetic/moveit-resources-fanuc-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-fanuc-description"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_fanuc_description/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "517b2216d7bbb6b14cac50556294a3d79d2f80da8851d799555b1a82eb18db44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_fanuc_description/0.8.2-1"; + sha256 = "sha256-vqi8SzXtYbES+ys7dcZ6CIXQgrT4zzumcEOAbJ4lHAI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources-fanuc-moveit-config/default.nix b/distros/noetic/moveit-resources-fanuc-moveit-config/default.nix index 3142fed72f..d56b5ec4ac 100644 --- a/distros/noetic/moveit-resources-fanuc-moveit-config/default.nix +++ b/distros/noetic/moveit-resources-fanuc-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-fanuc-moveit-config"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_fanuc_moveit_config/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "5c2471a150b4ab84eb81b1c63e794eb982f9f600401f6d80666d5775d4f044c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_fanuc_moveit_config/0.8.2-1"; + sha256 = "sha256-KdI+ZkCV7R/zubzWEDdnPO8HajSztsxPjLj4lrsCQ8I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources-panda-description/default.nix b/distros/noetic/moveit-resources-panda-description/default.nix index 4a5abc655e..8243517da7 100644 --- a/distros/noetic/moveit-resources-panda-description/default.nix +++ b/distros/noetic/moveit-resources-panda-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-panda-description"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_panda_description/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "85a92c552a02e2aebd256f06253b2f188cfd606ca40f639a63757fe94f650f4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_panda_description/0.8.2-1"; + sha256 = "sha256-xYeqjY/ZAk0xVPuLMy/6DOBsN4IZ6XE6vAJdDbkEpjE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources-panda-moveit-config/default.nix b/distros/noetic/moveit-resources-panda-moveit-config/default.nix index 8497c556ba..a280776f5c 100644 --- a/distros/noetic/moveit-resources-panda-moveit-config/default.nix +++ b/distros/noetic/moveit-resources-panda-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-panda-moveit-config"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_panda_moveit_config/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "e5b5da7f3f30a6e0ddd98c802432f99fa526c623d00780c1c4e66759c3813164"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_panda_moveit_config/0.8.2-1"; + sha256 = "sha256-Xn+vBeaUEWIjh8acZevbK9ecXZXN9vit7x/uPdbfK4Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources-pr2-description/default.nix b/distros/noetic/moveit-resources-pr2-description/default.nix index 789ac806a0..82f69383ec 100644 --- a/distros/noetic/moveit-resources-pr2-description/default.nix +++ b/distros/noetic/moveit-resources-pr2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-pr2-description"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_pr2_description/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "df362edff68e3769c672f3105d63ae675d27e0f3f15a2d54f6e79ab00aa14aa1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_pr2_description/0.8.2-1"; + sha256 = "sha256-Q+V2GvquCtjESB3cIe07yZS41RxAPl8Y3hia9/uxAoc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix b/distros/noetic/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix index baabfcbb90..11be6feee0 100644 --- a/distros/noetic/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix +++ b/distros/noetic/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-prbt-ikfast-manipulator-plugin"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_prbt_ikfast_manipulator_plugin/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "7b9a978e377e94714f8f1a13e6ca778e300453ffdc7d98f4a869989b3fddac11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_prbt_ikfast_manipulator_plugin/0.8.2-1"; + sha256 = "sha256-asAIb4XxZsD3eXqiXs4CjRLLUp3Ly/Jp7YTCslAUAR0="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen ]; diff --git a/distros/noetic/moveit-resources-prbt-moveit-config/default.nix b/distros/noetic/moveit-resources-prbt-moveit-config/default.nix index 8b65b58d9e..309e365bce 100644 --- a/distros/noetic/moveit-resources-prbt-moveit-config/default.nix +++ b/distros/noetic/moveit-resources-prbt-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-prbt-moveit-config"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_prbt_moveit_config/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "0d77142a1dc3fc0ee9b1bc1a21ca67939ac01345de09d456f0cec0cd36af22b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_prbt_moveit_config/0.8.2-1"; + sha256 = "sha256-bIYay27qM7wc1yanGxbmi5bOPDnRY8ODil94U/COaMM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources-prbt-pg70-support/default.nix b/distros/noetic/moveit-resources-prbt-pg70-support/default.nix index 917ad8af91..0559d17d8f 100644 --- a/distros/noetic/moveit-resources-prbt-pg70-support/default.nix +++ b/distros/noetic/moveit-resources-prbt-pg70-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-prbt-pg70-support"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_prbt_pg70_support/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "12d22c95034d670242999e2fb67155c8a5fadc627e03003d67e636b92457dbef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_prbt_pg70_support/0.8.2-1"; + sha256 = "sha256-IWH45Xs5jhmDag0Uio1oJZOuBXicS+t1sWIrH0XKn+I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources-prbt-support/default.nix b/distros/noetic/moveit-resources-prbt-support/default.nix index 69992033dd..b8d37984ef 100644 --- a/distros/noetic/moveit-resources-prbt-support/default.nix +++ b/distros/noetic/moveit-resources-prbt-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources-prbt-support"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources_prbt_support/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "ea64280d527970b6d0740709f21d84e8e2333c5f1eb2519ea51bbb6658a78d9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources_prbt_support/0.8.2-1"; + sha256 = "sha256-d6yfXC8JVjp5keCYXz+vg77ZNiLFVU6VSCRc4tS58Q8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-resources/default.nix b/distros/noetic/moveit-resources/default.nix index f810ac18dc..d39a1656d9 100644 --- a/distros/noetic/moveit-resources/default.nix +++ b/distros/noetic/moveit-resources/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-resources"; version = "0.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_resources-release/archive/release/noetic/moveit_resources/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "70ef3cd5af45c756157a24608eaa89ffaa87619c3b02b50559b727f78fdff247"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_resources-release"; + rev = "release/noetic/moveit_resources/0.8.2-1"; + sha256 = "sha256-YgyRQnnB4tpizcbI0CkjxwFQwedudK+iY0ECIkXdm7Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-ros-benchmarks/default.nix b/distros/noetic/moveit-ros-benchmarks/default.nix index ba0d407658..43363643b3 100644 --- a/distros/noetic/moveit-ros-benchmarks/default.nix +++ b/distros/noetic/moveit-ros-benchmarks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-benchmarks"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_benchmarks/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "9f9e7a7f3931fc1d3e36410e0589770edb04c8f60ae5bb219749436fbf0401b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_benchmarks/1.1.11-1"; + sha256 = "sha256-NtEJGlX55k8RV7wExl83rScfh7+ESxD+iqw5dIxWFjU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-ros-control-interface/default.nix b/distros/noetic/moveit-ros-control-interface/default.nix index 45796b1d61..d3f10c1f88 100644 --- a/distros/noetic/moveit-ros-control-interface/default.nix +++ b/distros/noetic/moveit-ros-control-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-control-interface"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_control_interface/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "6ada34db9b0c6d9309be152a1094aaa08c7872e097ec97cef41888f688d2f894"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_control_interface/1.1.11-1"; + sha256 = "sha256-egOnBclGD2qCDVdx9HXMaetDjpMKWM2l+31BP6XgSps="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-ros-manipulation/default.nix b/distros/noetic/moveit-ros-manipulation/default.nix index 9d089e0fcd..1528da92a1 100644 --- a/distros/noetic/moveit-ros-manipulation/default.nix +++ b/distros/noetic/moveit-ros-manipulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-manipulation"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_manipulation/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "a536fc18f29a077c737f97e8d7e051c7ae70e2af713f1d54fbd520e74725296a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_manipulation/1.1.11-1"; + sha256 = "sha256-DXLs2/gGpK10Gmufga7SjLDuWx6aDmlV52mHbNBlPI8="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/noetic/moveit-ros-move-group/default.nix b/distros/noetic/moveit-ros-move-group/default.nix index 428df86f0a..fb41c0edc7 100644 --- a/distros/noetic/moveit-ros-move-group/default.nix +++ b/distros/noetic/moveit-ros-move-group/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-move-group"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_move_group/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "b1b929b7e81c9660a6be980271886d8be135d656b0dec3c1906d42becdecbc0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_move_group/1.1.11-1"; + sha256 = "sha256-bZU/zZx0GFgOslG7YGjXCL/dgxxDpNRy364uMhDdUUc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-ros-occupancy-map-monitor/default.nix b/distros/noetic/moveit-ros-occupancy-map-monitor/default.nix index 3f864876af..a3a628aa98 100644 --- a/distros/noetic/moveit-ros-occupancy-map-monitor/default.nix +++ b/distros/noetic/moveit-ros-occupancy-map-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-occupancy-map-monitor"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_occupancy_map_monitor/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "3482659693e76c45665125ac3a81f88cfb025a300a6b0fd120cc07cefd367f85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_occupancy_map_monitor/1.1.11-1"; + sha256 = "sha256-UGvry7a7yll4BGtvWkcfUPwCOt2PoL7tSZQXRYaaY20="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/noetic/moveit-ros-perception/default.nix b/distros/noetic/moveit-ros-perception/default.nix index d1eef8407b..9745064795 100644 --- a/distros/noetic/moveit-ros-perception/default.nix +++ b/distros/noetic/moveit-ros-perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-perception"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_perception/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "3c47387e40dfe90de39484ded54873179351a099ec4a870b6e9f00258c6a7c65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_perception/1.1.11-1"; + sha256 = "sha256-CuQwZ9fOdB+JXdXS6Px6aQwlESQB65QtI0IF5VGaadU="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/noetic/moveit-ros-planning-interface/default.nix b/distros/noetic/moveit-ros-planning-interface/default.nix index a3cdeca37c..875c31f7d2 100644 --- a/distros/noetic/moveit-ros-planning-interface/default.nix +++ b/distros/noetic/moveit-ros-planning-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-planning-interface"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_planning_interface/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "bd4ce4aee536f550697114c9317d0dec1bbef996eddbdea7988eeb3fe278973c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_planning_interface/1.1.11-1"; + sha256 = "sha256-G4a+aTVtSRFBAUZcdGv3pKkLjfP47NB5OdvsAsLlw6s="; + }; buildType = "catkin"; buildInputs = [ catkin eigen python3Packages.catkin-pkg ]; diff --git a/distros/noetic/moveit-ros-planning/default.nix b/distros/noetic/moveit-ros-planning/default.nix index f1d49f61a8..2f34a8d664 100644 --- a/distros/noetic/moveit-ros-planning/default.nix +++ b/distros/noetic/moveit-ros-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-planning"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_planning/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "2add2fdda1af08d9400c16cd27d5182de36a4dbdeacb754093c3747ab581c65b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_planning/1.1.11-1"; + sha256 = "sha256-ft8Y7z1wT3Oe8Toi6Eiu2XQnC+jHXbcakt0f8RMWumg="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/noetic/moveit-ros-robot-interaction/default.nix b/distros/noetic/moveit-ros-robot-interaction/default.nix index e7f3e0f86e..0235108c75 100644 --- a/distros/noetic/moveit-ros-robot-interaction/default.nix +++ b/distros/noetic/moveit-ros-robot-interaction/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-robot-interaction"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_robot_interaction/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "97d125f94e0f144be421f13edb125f89b3c1a7442fe34dd12ccbaaa472cd43f2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_robot_interaction/1.1.11-1"; + sha256 = "sha256-KrvgFBIPZzvIKSzRaOMotdQaZWZDNv90ejsNzIhjrOs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-ros-visualization/default.nix b/distros/noetic/moveit-ros-visualization/default.nix index 804102cfe6..d41484f384 100644 --- a/distros/noetic/moveit-ros-visualization/default.nix +++ b/distros/noetic/moveit-ros-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-visualization"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_visualization/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "b79088f0c19e546d2fa1f658d64a2071f96344b2630e63930066f6bba88e6d07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_visualization/1.1.11-1"; + sha256 = "sha256-bGQiBlhpBw7hf8XmHfELNXbmk6V3jSOwDYYiXxXbHms="; + }; buildType = "catkin"; buildInputs = [ catkin class-loader eigen ogre1_9 pkg-config qt5.qtbase ]; diff --git a/distros/noetic/moveit-ros-warehouse/default.nix b/distros/noetic/moveit-ros-warehouse/default.nix index d3f6fa6aa9..b087175a63 100644 --- a/distros/noetic/moveit-ros-warehouse/default.nix +++ b/distros/noetic/moveit-ros-warehouse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros-warehouse"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros_warehouse/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "0cc161324d2f1e41f1ef9f111ad3ffc4b8f4acc0bfdcad5f09c495a8ed27783e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros_warehouse/1.1.11-1"; + sha256 = "sha256-Ft7KuDp/uJJ5CTY98kf6PA8awgQhHyhDwL0vpIdRq0Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-ros/default.nix b/distros/noetic/moveit-ros/default.nix index 3842f556d8..e34b8ffb40 100644 --- a/distros/noetic/moveit-ros/default.nix +++ b/distros/noetic/moveit-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-ros"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_ros/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "a887cb182404c1a009395173c7387f78600efb6f09d8925665142e04cda2eee2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_ros/1.1.11-1"; + sha256 = "sha256-O/zOS1tJ4Wb18xLsdcknJ/ASds4cXDajGP8uT0kn32U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-runtime/default.nix b/distros/noetic/moveit-runtime/default.nix index 161465848a..60d4430992 100644 --- a/distros/noetic/moveit-runtime/default.nix +++ b/distros/noetic/moveit-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-runtime"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_runtime/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "29eaf5bc9876ed12faa738b66786391ddb6718b41adc1dfd280c76b1a6146efa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_runtime/1.1.11-1"; + sha256 = "sha256-JmOS2UlAWdzxFpcXp6VktWm+ynbXgA5kUPNqKtKSYWI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-servo/default.nix b/distros/noetic/moveit-servo/default.nix index 486723bde0..f68fbf7e06 100644 --- a/distros/noetic/moveit-servo/default.nix +++ b/distros/noetic/moveit-servo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-servo"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_servo/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "a1d59373afb603c7132d3975a072378fd4616dcc891822bcb336a97d919ff526"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_servo/1.1.11-1"; + sha256 = "sha256-f7LMPjeqpzOK5BcXEd/7T9juD5a5MRgjWNGGvLMs1fM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-setup-assistant/default.nix b/distros/noetic/moveit-setup-assistant/default.nix index ae55782871..60d6ebea2a 100644 --- a/distros/noetic/moveit-setup-assistant/default.nix +++ b/distros/noetic/moveit-setup-assistant/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-setup-assistant"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_setup_assistant/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "094f75f1559fcdf81d2ae5f4a6bb833f488345b5fbe4538fc557278b621be89a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_setup_assistant/1.1.11-1"; + sha256 = "sha256-tprcRPzMSrBQPZMXn3mjQI52QaWUfCRA560Ua4IZZfI="; + }; buildType = "catkin"; buildInputs = [ catkin ogre1_9 ompl qt5.qtbase ]; diff --git a/distros/noetic/moveit-sim-controller/default.nix b/distros/noetic/moveit-sim-controller/default.nix index 951e397293..89b8a03d6c 100644 --- a/distros/noetic/moveit-sim-controller/default.nix +++ b/distros/noetic/moveit-sim-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-sim-controller"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/moveit_sim_controller-release/archive/release/noetic/moveit_sim_controller/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "e14d41295815c0152a42a74bddf9c18e49b5d89a361de3555f50ba5459e9eed9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "moveit_sim_controller-release"; + rev = "release/noetic/moveit_sim_controller/0.3.0-1"; + sha256 = "sha256-sQUHt7VDNG+g8QVKrjRA11/vvomM7IvNCHu3xxUGOuI="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/moveit-simple-controller-manager/default.nix b/distros/noetic/moveit-simple-controller-manager/default.nix index e837c0b196..176a6b1589 100644 --- a/distros/noetic/moveit-simple-controller-manager/default.nix +++ b/distros/noetic/moveit-simple-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-simple-controller-manager"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit_simple_controller_manager/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "70beeca47ddae60922a1d4b706e38201ebfcefcfb2da1311d2692ab08740260e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit_simple_controller_manager/1.1.11-1"; + sha256 = "sha256-TX2VJjSafeO0ypumC59LakIN065DbsvhpHI7AdJiAI8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit-visual-tools/default.nix b/distros/noetic/moveit-visual-tools/default.nix index ccaf4cd0b1..8dc73f56a8 100644 --- a/distros/noetic/moveit-visual-tools/default.nix +++ b/distros/noetic/moveit-visual-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit-visual-tools"; version = "3.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit_visual_tools-release/archive/release/noetic/moveit_visual_tools/3.6.0-1.tar.gz"; - name = "3.6.0-1.tar.gz"; - sha256 = "f6df4a22012e3f8aa930d07e68fdb21239ab8addabd48872bcecbd62b382af03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit_visual_tools-release"; + rev = "release/noetic/moveit_visual_tools/3.6.0-1"; + sha256 = "sha256-XYpuwFclrYDONvVrcoue+VIRTPw/d6s/C9ztD7D5qPQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/moveit/default.nix b/distros/noetic/moveit/default.nix index 05ecdc96a1..0a2c477f1d 100644 --- a/distros/noetic/moveit/default.nix +++ b/distros/noetic/moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-moveit"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/moveit/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "504073ca1c20a5b4c63a5288c1dd5dcd9f797aa551c9918a282d4c50e5148f8a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/moveit/1.1.11-1"; + sha256 = "sha256-s0OTIVLqAj3s0aGWT1wb+UH/iA4ijJSgbH5eP44v77A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/movie-publisher/default.nix b/distros/noetic/movie-publisher/default.nix index 2589276645..94b6ec399e 100644 --- a/distros/noetic/movie-publisher/default.nix +++ b/distros/noetic/movie-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-movie-publisher"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/peci1/movie_publisher-release/archive/release/noetic/movie_publisher/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "6edca14980b83ae2e65e9b7e7a630d5a1c342391ada74da7bbc0cf3be35ff51d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "movie_publisher-release"; + rev = "release/noetic/movie_publisher/1.4.0-1"; + sha256 = "sha256-tSfS7N3J1x/CtxS8uk8NcQxbKjkj17nk14q7hfj5+Fs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mpc-local-planner-examples/default.nix b/distros/noetic/mpc-local-planner-examples/default.nix index 4b5e91b0db..66f1c444b2 100644 --- a/distros/noetic/mpc-local-planner-examples/default.nix +++ b/distros/noetic/mpc-local-planner-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mpc-local-planner-examples"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/mpc_local_planner-release/archive/release/noetic/mpc_local_planner_examples/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "b0ef5b7b4bf1c078f9dc2aa977e465a8435c3c7640ea94afe6848e79467b849b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "mpc_local_planner-release"; + rev = "release/noetic/mpc_local_planner_examples/0.0.3-1"; + sha256 = "sha256-b0ah2/zKdH5K97yrriZ/Y2p+dSNrQfgD/p74fqlwT3o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mpc-local-planner-msgs/default.nix b/distros/noetic/mpc-local-planner-msgs/default.nix index eec1ab715c..6f3ce281d9 100644 --- a/distros/noetic/mpc-local-planner-msgs/default.nix +++ b/distros/noetic/mpc-local-planner-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mpc-local-planner-msgs"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/mpc_local_planner-release/archive/release/noetic/mpc_local_planner_msgs/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "bf44761253edd16b87eaa7f092b82e3d36f95998b681cd8df831746804ed8033"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "mpc_local_planner-release"; + rev = "release/noetic/mpc_local_planner_msgs/0.0.3-1"; + sha256 = "sha256-6FOcckDTHzwh756Pq/lfuT0de+nfgGD8Y+MA+VqEoDk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/mpc-local-planner/default.nix b/distros/noetic/mpc-local-planner/default.nix index a1d543950c..eb300fff4a 100644 --- a/distros/noetic/mpc-local-planner/default.nix +++ b/distros/noetic/mpc-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mpc-local-planner"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/mpc_local_planner-release/archive/release/noetic/mpc_local_planner/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "5ac9ee2b283c30626a85282071d60d083a1ec139e94ad4d6817359bcc1cb50d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "mpc_local_planner-release"; + rev = "release/noetic/mpc_local_planner/0.0.3-1"; + sha256 = "sha256-Jl0nXk5CrF/i/HLKUXfCvyGmxucRZz/zr25BiGihV9k="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen tf2-geometry-msgs ]; diff --git a/distros/noetic/mqtt-bridge/default.nix b/distros/noetic/mqtt-bridge/default.nix index 3c3c6a5b4b..67edb487f9 100644 --- a/distros/noetic/mqtt-bridge/default.nix +++ b/distros/noetic/mqtt-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mqtt-bridge"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/groove-x/mqtt_bridge-release/archive/release/noetic/mqtt_bridge/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "f35df5101540e03754e6d9a80d5e64babf9e7b4a16aeaa595c6235d82c91b8d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "groove-x"; + repo = "mqtt_bridge-release"; + rev = "release/noetic/mqtt_bridge/0.2.1-1"; + sha256 = "sha256-Ra3UUsr6DjknDqRwIHNpW8d9HPNgn6vSr0ZOKjOnzzY="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.pip python3Packages.setuptools ]; diff --git a/distros/noetic/mqtt-client/default.nix b/distros/noetic/mqtt-client/default.nix index e2f5144ed5..1edf41c657 100644 --- a/distros/noetic/mqtt-client/default.nix +++ b/distros/noetic/mqtt-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mqtt-client"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ika-rwth-aachen/mqtt_client-release/archive/release/noetic/mqtt_client/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "e43c7965db804290c24eeea06cac90f64a0ec07e60de8a74e721cd560c995fb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ika-rwth-aachen"; + repo = "mqtt_client-release"; + rev = "release/noetic/mqtt_client/1.1.0-1"; + sha256 = "sha256-F8VqcdSY7UR/5vOYba+xaam6fiRb7TvbPoodZVLwtSg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-ekf-slam-2d/default.nix b/distros/noetic/mrpt-ekf-slam-2d/default.nix index 68b847baf2..d22ba284f9 100644 --- a/distros/noetic/mrpt-ekf-slam-2d/default.nix +++ b/distros/noetic/mrpt-ekf-slam-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-ekf-slam-2d"; version = "0.1.11-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/noetic/mrpt_ekf_slam_2d/0.1.11-1.tar.gz"; - name = "0.1.11-1.tar.gz"; - sha256 = "21ec278234298b03fe9d066a7cdd93c86b0ceea137239887774091287def6e2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/noetic/mrpt_ekf_slam_2d/0.1.11-1"; + sha256 = "sha256-BByvMbA7jsHvpVkj7H03JSR88uqmgQrhLkSsTnrkH+Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-ekf-slam-3d/default.nix b/distros/noetic/mrpt-ekf-slam-3d/default.nix index 0c5152e3f8..3a9cca5cbb 100644 --- a/distros/noetic/mrpt-ekf-slam-3d/default.nix +++ b/distros/noetic/mrpt-ekf-slam-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-ekf-slam-3d"; version = "0.1.11-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/noetic/mrpt_ekf_slam_3d/0.1.11-1.tar.gz"; - name = "0.1.11-1.tar.gz"; - sha256 = "efd46ed9041241ca4160234c4db70bd95488f0564c4ed8c1a8806e45deef4aef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/noetic/mrpt_ekf_slam_3d/0.1.11-1"; + sha256 = "sha256-GHj9o/sPAHNzsB3MpWMzZ6z93HP6aaS2BGiQGkSSBfc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-generic-sensor/default.nix b/distros/noetic/mrpt-generic-sensor/default.nix index 17a3c78361..3d8fccf1af 100644 --- a/distros/noetic/mrpt-generic-sensor/default.nix +++ b/distros/noetic/mrpt-generic-sensor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-generic-sensor"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_sensors-release/archive/release/noetic/mrpt_generic_sensor/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "99619824bb7ebfde60c350946ed3ec9693c59691963aa845afbe57af433dab24"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_sensors-release"; + rev = "release/noetic/mrpt_generic_sensor/0.0.2-1"; + sha256 = "sha256-TQeEDnO4mSjkLg/n3JFX25GpI5sRkTCfejPnCvONfVA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-graphslam-2d/default.nix b/distros/noetic/mrpt-graphslam-2d/default.nix index 1f649831d5..83864074c9 100644 --- a/distros/noetic/mrpt-graphslam-2d/default.nix +++ b/distros/noetic/mrpt-graphslam-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-graphslam-2d"; version = "0.1.11-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/noetic/mrpt_graphslam_2d/0.1.11-1.tar.gz"; - name = "0.1.11-1.tar.gz"; - sha256 = "004a9f7e9a6ebbdb9db83b1c2b45e1389754fedd5ded644b08d217261268bf9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/noetic/mrpt_graphslam_2d/0.1.11-1"; + sha256 = "sha256-DWL5d5HjwdDSHXeCGc10tF3EpRuznaZcBEAxnORLL9o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-icp-slam-2d/default.nix b/distros/noetic/mrpt-icp-slam-2d/default.nix index bf02fad513..4b25465589 100644 --- a/distros/noetic/mrpt-icp-slam-2d/default.nix +++ b/distros/noetic/mrpt-icp-slam-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-icp-slam-2d"; version = "0.1.11-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/noetic/mrpt_icp_slam_2d/0.1.11-1.tar.gz"; - name = "0.1.11-1.tar.gz"; - sha256 = "8027b57f93610518e7580e15912181a3b0d7b9329f750f268ff14a34d09780a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/noetic/mrpt_icp_slam_2d/0.1.11-1"; + sha256 = "sha256-ngyM8EXisql4cgTp9otUHG1XmNkQhlpphuIrAVF3V2k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-local-obstacles/default.nix b/distros/noetic/mrpt-local-obstacles/default.nix index 7dcb445f76..ecc634251f 100644 --- a/distros/noetic/mrpt-local-obstacles/default.nix +++ b/distros/noetic/mrpt-local-obstacles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-local-obstacles"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/noetic/mrpt_local_obstacles/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "9503be42ae3e96ae3b2a56ed3bedf01d1df1d039ca3fd9ccfae8f3793fbef07c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/noetic/mrpt_local_obstacles/1.0.3-1"; + sha256 = "sha256-+XelWhmpNWGN2VPwsYxvnDqE5n0evaT4N/G8w9QpAgk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-localization/default.nix b/distros/noetic/mrpt-localization/default.nix index 1ce494e785..75a30ad86a 100644 --- a/distros/noetic/mrpt-localization/default.nix +++ b/distros/noetic/mrpt-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-localization"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/noetic/mrpt_localization/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "a914b6aed98ee95d00e2f4633742f9583f33411870a700be25f6eccfbc6e48e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/noetic/mrpt_localization/1.0.3-1"; + sha256 = "sha256-WK/jEAj5/7TRKeD8CYbsiRu8Ml899vp6vHzBBeyX1+M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-map/default.nix b/distros/noetic/mrpt-map/default.nix index c9139ca3bc..a00971cf61 100644 --- a/distros/noetic/mrpt-map/default.nix +++ b/distros/noetic/mrpt-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-map"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/noetic/mrpt_map/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "9fcc7b62c1c398b76086ffebfff86a10bce18cfe9dda5df3703a0f5fe6266fd2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/noetic/mrpt_map/1.0.3-1"; + sha256 = "sha256-uVw11bzQNNLeCSkYlWpN502jdgIKwQcXt+atEOItQvw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-msgs-bridge/default.nix b/distros/noetic/mrpt-msgs-bridge/default.nix index 871d0abe33..dca4885d58 100644 --- a/distros/noetic/mrpt-msgs-bridge/default.nix +++ b/distros/noetic/mrpt-msgs-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-msgs-bridge"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/noetic/mrpt_msgs_bridge/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "f6c355b4d13d3b99100526b9d29a85e7be079b0c09b8620c5da2911844a77b05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/noetic/mrpt_msgs_bridge/1.0.3-1"; + sha256 = "sha256-dVjKauDC+Ln4glEsjm6Ecq5I6DjaKqn+Lavuj+rh7F4="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/noetic/mrpt-msgs/default.nix b/distros/noetic/mrpt-msgs/default.nix index c8059b9344..235ace8bee 100644 --- a/distros/noetic/mrpt-msgs/default.nix +++ b/distros/noetic/mrpt-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-msgs"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_msgs-release/archive/release/noetic/mrpt_msgs/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "28ed29f25f7680e838c0d3066e6e3a3ed0c673e1efa590eba163e380299a125b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_msgs-release"; + rev = "release/noetic/mrpt_msgs/0.4.4-1"; + sha256 = "sha256-FSw//54G9jpJoibViHkmDUI+/IqcjDC67ZxH4JOk4qk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/mrpt-navigation/default.nix b/distros/noetic/mrpt-navigation/default.nix index 2d0719d1b0..89e52acc6a 100644 --- a/distros/noetic/mrpt-navigation/default.nix +++ b/distros/noetic/mrpt-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-navigation"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/noetic/mrpt_navigation/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "dcdb033ee157f532cb51e3c945b9c8e23a7964a9f411495944dcf279c94d0ae9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/noetic/mrpt_navigation/1.0.3-1"; + sha256 = "sha256-uiNJN999GkU9rDHDzD2qXEkyOiOiZr0Y4OhEKU/AfPc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-rawlog/default.nix b/distros/noetic/mrpt-rawlog/default.nix index 6f1ad6ca87..3c7deda26d 100644 --- a/distros/noetic/mrpt-rawlog/default.nix +++ b/distros/noetic/mrpt-rawlog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-rawlog"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/noetic/mrpt_rawlog/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "69e6a8aa77ffc0db373e8878ebba3b32a118ea4df86efbe7918340e954b21afe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/noetic/mrpt_rawlog/1.0.3-1"; + sha256 = "sha256-uuhErd4GPirrV6bwgHc6quoRNFP7wFAi7NEsaV9JfNw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-rbpf-slam/default.nix b/distros/noetic/mrpt-rbpf-slam/default.nix index fd2bc8540c..d98decf588 100644 --- a/distros/noetic/mrpt-rbpf-slam/default.nix +++ b/distros/noetic/mrpt-rbpf-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-rbpf-slam"; version = "0.1.11-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/noetic/mrpt_rbpf_slam/0.1.11-1.tar.gz"; - name = "0.1.11-1.tar.gz"; - sha256 = "29d9e82f748f18580fd8b628c708f68461ba338ab1bbf0214ae4f35f617a9470"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/noetic/mrpt_rbpf_slam/0.1.11-1"; + sha256 = "sha256-S9voaKHnvhr1x/m5p2YAk57lulo17tfE6XZ5B1jRets="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-reactivenav2d/default.nix b/distros/noetic/mrpt-reactivenav2d/default.nix index e6ddac5718..6f6c44a484 100644 --- a/distros/noetic/mrpt-reactivenav2d/default.nix +++ b/distros/noetic/mrpt-reactivenav2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-reactivenav2d"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/noetic/mrpt_reactivenav2d/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "234c6fae02512b5a0dfe33fc3e89ec70284294ea12d0388590e206a32d584e19"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/noetic/mrpt_reactivenav2d/1.0.3-1"; + sha256 = "sha256-dUdn7k6NmRqU+epcTmEkWezxr1pqlq9LjxiNQgNnhoY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-sensorlib/default.nix b/distros/noetic/mrpt-sensorlib/default.nix index fe4c526228..d763d29abd 100644 --- a/distros/noetic/mrpt-sensorlib/default.nix +++ b/distros/noetic/mrpt-sensorlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-sensorlib"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_sensors-release/archive/release/noetic/mrpt_sensorlib/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "c70391dffc776e5b5cdac8106d8829aaa22d1b62c3a73c60027e348f3e828d7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_sensors-release"; + rev = "release/noetic/mrpt_sensorlib/0.0.2-1"; + sha256 = "sha256-qSgppjhZk98hlF7X1tscTHmd6lnIQTJkpO9MpADFCx4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-sensors/default.nix b/distros/noetic/mrpt-sensors/default.nix index 1667a14181..b9ef1e6ebd 100644 --- a/distros/noetic/mrpt-sensors/default.nix +++ b/distros/noetic/mrpt-sensors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-sensors"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_sensors-release/archive/release/noetic/mrpt_sensors/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "0af2934a0866238496c073ca88e5a5e9735730bfffab2b75e5dbfdbd2c286bef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_sensors-release"; + rev = "release/noetic/mrpt_sensors/0.0.2-1"; + sha256 = "sha256-+aiZEQzrirC1eOu5md/Rkrm2wNbNutYD11mpc2RwRCI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-slam/default.nix b/distros/noetic/mrpt-slam/default.nix index 2caa0ffab3..8ce763cc62 100644 --- a/distros/noetic/mrpt-slam/default.nix +++ b/distros/noetic/mrpt-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-slam"; version = "0.1.11-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_slam-release/archive/release/noetic/mrpt_slam/0.1.11-1.tar.gz"; - name = "0.1.11-1.tar.gz"; - sha256 = "732c625387478084e7d28ad83657ca7af8d807bdcf523cbdeaa1f4d173c26a3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_slam-release"; + rev = "release/noetic/mrpt_slam/0.1.11-1"; + sha256 = "sha256-P7dE6HtCHO6v+A0DXM06qwgRvefv59VbZrHHXslx5EM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrpt-tutorials/default.nix b/distros/noetic/mrpt-tutorials/default.nix index 3554c74a1f..b34c85883d 100644 --- a/distros/noetic/mrpt-tutorials/default.nix +++ b/distros/noetic/mrpt-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrpt-tutorials"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/mrpt_navigation-release/archive/release/noetic/mrpt_tutorials/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "b6a8337039fdf84f0c3d01e4e65c26fc7f8feaab900e75511dbc15c70a652b21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "mrpt_navigation-release"; + rev = "release/noetic/mrpt_tutorials/1.0.3-1"; + sha256 = "sha256-aDAE+hDZ5XU1ELITVpiKAnXbhV+H9FWx3euVqFjfXVo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mrt-cmake-modules/default.nix b/distros/noetic/mrt-cmake-modules/default.nix index 11582f0c16..7e2ad5a8b0 100644 --- a/distros/noetic/mrt-cmake-modules/default.nix +++ b/distros/noetic/mrt-cmake-modules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-mrt-cmake-modules"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/KIT-MRT/mrt_cmake_modules-release/archive/release/noetic/mrt_cmake_modules/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "a57151852aaea4af01ddd8037c45e191cdf38a2b3e4e402c14f87d0d8548385d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KIT-MRT"; + repo = "mrt_cmake_modules-release"; + rev = "release/noetic/mrt_cmake_modules/1.0.4-1"; + sha256 = "sha256-HsXMI+9eH6Suh9jIyPUkkwkOrPzB7vvm5fwmFO99V7s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/multi-map-server/default.nix b/distros/noetic/multi-map-server/default.nix index 8f7cb530b2..46c2584e7b 100644 --- a/distros/noetic/multi-map-server/default.nix +++ b/distros/noetic/multi-map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multi-map-server"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/multi_map_server/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "2c5ce65b15604abc1c9786f7a777931762d636f6d8198a7db495c89fa7843f3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/multi_map_server/2.2.12-1"; + sha256 = "sha256-e0aYLRc1kI+gHkjBn9uy+l6RrVim+ePXD+pJDLdDYNU="; + }; buildType = "catkin"; buildInputs = [ catkin jsk-tools python3Packages.pyyaml pythonPackages.pillow rosmake ]; diff --git a/distros/noetic/multi-object-tracking-lidar/default.nix b/distros/noetic/multi-object-tracking-lidar/default.nix index 4c7a38b67f..601313d289 100644 --- a/distros/noetic/multi-object-tracking-lidar/default.nix +++ b/distros/noetic/multi-object-tracking-lidar/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multi-object-tracking-lidar"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/praveen-palanisamy/multi_object_tracking_lidar-release/archive/release/noetic/multi_object_tracking_lidar/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "934d72355b1e02337c0b9cb6ed42e43ed9bd6f4930277c8182f69251c8a14c59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "praveen-palanisamy"; + repo = "multi_object_tracking_lidar-release"; + rev = "release/noetic/multi_object_tracking_lidar/1.0.4-1"; + sha256 = "sha256-I6R5gL5M0zk6+KVOWOoZSj0kEvqQ2K1TptYmXspLTo0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/multires-image/default.nix b/distros/noetic/multires-image/default.nix index 9cdcef71b7..77a7a8df19 100644 --- a/distros/noetic/multires-image/default.nix +++ b/distros/noetic/multires-image/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multires-image"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/noetic/multires_image/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "99f107b5e3dd220a36b74628fc7a29f16bd979dc94d28e4ad823a38f280768ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/noetic/multires_image/1.4.2-1"; + sha256 = "sha256-aHgyyFOdYXhYq5wpO2N6SaGl5xFqZviBbhp8xYP8Ogg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/multirobot-map-merge/default.nix b/distros/noetic/multirobot-map-merge/default.nix index 79398d809a..827e3074b4 100644 --- a/distros/noetic/multirobot-map-merge/default.nix +++ b/distros/noetic/multirobot-map-merge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multirobot-map-merge"; version = "2.1.4-r1"; - src = fetchurl { - url = "https://github.com/hrnr/m-explore-release/archive/release/noetic/multirobot_map_merge/2.1.4-1.tar.gz"; - name = "2.1.4-1.tar.gz"; - sha256 = "6e17c3b65acc6daa656045525b6dda26a0893326d7c1dc1a0952bc0f81f0aab6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "hrnr"; + repo = "m-explore-release"; + rev = "release/noetic/multirobot_map_merge/2.1.4-1"; + sha256 = "sha256-y2/4j5S1DXEjv860XEhaPFk5KNqljNLeCYxbgkgL2XA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/multisense-bringup/default.nix b/distros/noetic/multisense-bringup/default.nix index 6a9a39ef27..daae6f1035 100644 --- a/distros/noetic/multisense-bringup/default.nix +++ b/distros/noetic/multisense-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multisense-bringup"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/noetic/multisense_bringup/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "daff65572fd5139c354d55727220300149041e6145604396bb8ebd67044c1af7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/noetic/multisense_bringup/4.0.5-1"; + sha256 = "sha256-aAqxaT4IyBLLiFtdUzPlbUpJU8B/AMdpVtaXOTj/MzE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/multisense-cal-check/default.nix b/distros/noetic/multisense-cal-check/default.nix index 8c08c3f113..ad32dc3008 100644 --- a/distros/noetic/multisense-cal-check/default.nix +++ b/distros/noetic/multisense-cal-check/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multisense-cal-check"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/noetic/multisense_cal_check/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "c7104fe9adc7061663442052ade41c5d83f0583a208bca3f996631c7212b324a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/noetic/multisense_cal_check/4.0.5-1"; + sha256 = "sha256-upOl7SEFRQKvS+QLg65hyyAJAt7SYAkQSe8RdwNexLw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/multisense-description/default.nix b/distros/noetic/multisense-description/default.nix index e090114156..4a10d75393 100644 --- a/distros/noetic/multisense-description/default.nix +++ b/distros/noetic/multisense-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multisense-description"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/noetic/multisense_description/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "ccb4694552f4a0e3798a127357f42357415abcce5c6d3e18dde20cb494f9f7c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/noetic/multisense_description/4.0.5-1"; + sha256 = "sha256-NZgTCGunYZEeFlhum8z60Xxd2SJ3c2caSElNQkkltm0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/multisense-lib/default.nix b/distros/noetic/multisense-lib/default.nix index db9a9f8414..62a0c2409b 100644 --- a/distros/noetic/multisense-lib/default.nix +++ b/distros/noetic/multisense-lib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multisense-lib"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/noetic/multisense_lib/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "071544f8344d81e4194c353a6674846bd6967990980c4f3d6fc7954b7c303514"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/noetic/multisense_lib/4.0.5-1"; + sha256 = "sha256-QNxkWpR9lnfVEiXF3vfdN21fdqEQhSMQB+TnMmN98JU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/multisense-ros/default.nix b/distros/noetic/multisense-ros/default.nix index 2547c729d6..5e7f81571a 100644 --- a/distros/noetic/multisense-ros/default.nix +++ b/distros/noetic/multisense-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multisense-ros"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/noetic/multisense_ros/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "97daa179c011827a5f2f455a43e7151c410b5848cfb15e69a9dbb9e564657eb0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/noetic/multisense_ros/4.0.5-1"; + sha256 = "sha256-ySGUYxV4JdmNFtkWzNTrXQwZo8Ogd8uxM6aO1uBojQs="; + }; buildType = "catkin"; buildInputs = [ catkin libyamlcpp ]; diff --git a/distros/noetic/multisense/default.nix b/distros/noetic/multisense/default.nix index 087697cd01..fa6a094057 100644 --- a/distros/noetic/multisense/default.nix +++ b/distros/noetic/multisense/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-multisense"; version = "4.0.5-r1"; - src = fetchurl { - url = "https://github.com/carnegieroboticsllc/multisense_ros-release/archive/release/noetic/multisense/4.0.5-1.tar.gz"; - name = "4.0.5-1.tar.gz"; - sha256 = "ddde54a00047819f054bcc20b9ca09073e8edf2930acabea01cefc6c183db9be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "carnegieroboticsllc"; + repo = "multisense_ros-release"; + rev = "release/noetic/multisense/4.0.5-1"; + sha256 = "sha256-fnpjUeQlJ0cNsMsOy6ueAezod7gJbHajYu33RrMNVlU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/mvsim/default.nix b/distros/noetic/mvsim/default.nix index 53ef81adc6..dbc71290d6 100644 --- a/distros/noetic/mvsim/default.nix +++ b/distros/noetic/mvsim/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, box2d, catkin, cmake, cppzmq, dynamic-reconfigure, gtest, mrpt2, nav-msgs, protobuf, python3, pythonPackages, ros-environment, roscpp, sensor-msgs, tf2, tf2-geometry-msgs, visualization-msgs }: +{ lib, buildRosPackage, fetchurl, boost, box2d, catkin, cmake, cppzmq, dynamic-reconfigure, gtest, mrpt2, nav-msgs, protobuf, python3, python3Packages, pythonPackages, ros-environment, roscpp, sensor-msgs, tf2, tf2-geometry-msgs, unzip, visualization-msgs, wget }: buildRosPackage { pname = "ros-noetic-mvsim"; - version = "0.4.3-r1"; + version = "0.5.2-r1"; - src = fetchurl { - url = "https://github.com/ual-arm-ros-pkg-release/mvsim-release/archive/release/noetic/mvsim/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "60e7e9c144a7e75e26677136eae28a5b94d3564b1de3b5f01605215c3d09dc2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ual-arm-ros-pkg-release"; + repo = "mvsim-release"; + rev = "release/noetic/mvsim/0.5.2-1"; + sha256 = "sha256-cGQVuHdJId4ReoOuGjUcZQ5FaQ56U5pwpGuv3WP1CPU="; + }; buildType = "catkin"; buildInputs = [ catkin cmake ros-environment ]; checkInputs = [ gtest ]; - propagatedBuildInputs = [ boost box2d cppzmq dynamic-reconfigure mrpt2 nav-msgs protobuf python3 pythonPackages.pybind11 roscpp sensor-msgs tf2 tf2-geometry-msgs visualization-msgs ]; + propagatedBuildInputs = [ boost box2d cppzmq dynamic-reconfigure mrpt2 nav-msgs protobuf python3 python3Packages.protobuf pythonPackages.pybind11 roscpp sensor-msgs tf2 tf2-geometry-msgs unzip visualization-msgs wget ]; nativeBuildInputs = [ catkin cmake ]; meta = { diff --git a/distros/noetic/nao-meshes/default.nix b/distros/noetic/nao-meshes/default.nix index 2e406b2eb3..947f14db72 100644 --- a/distros/noetic/nao-meshes/default.nix +++ b/distros/noetic/nao-meshes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nao-meshes"; version = "0.1.13"; - src = fetchurl { - url = "https://github.com/ros-naoqi/nao_meshes-release/archive/release/noetic/nao_meshes/0.1.13-0.tar.gz"; - name = "0.1.13-0.tar.gz"; - sha256 = "45bbadfb32df9bb25b48560aa4fbe709082a8077ab6ef5a2dc0f239aad5b1c15"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "nao_meshes-release"; + rev = "release/noetic/nao_meshes/0.1.13-0"; + sha256 = "sha256-TMvN7BqtZgYcXbW5k3gE1lRXUKGXTpZiQvfbVKfsfQE="; + }; buildType = "catkin"; buildInputs = [ catkin openjdk ]; diff --git a/distros/noetic/naoqi-bridge-msgs/default.nix b/distros/noetic/naoqi-bridge-msgs/default.nix index 1fba6a8f3c..ccb756cb5b 100644 --- a/distros/noetic/naoqi-bridge-msgs/default.nix +++ b/distros/noetic/naoqi-bridge-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-naoqi-bridge-msgs"; version = "0.0.9-r1"; - src = fetchurl { - url = "https://github.com/ros-naoqi/naoqi_bridge_msgs-release/archive/release/noetic/naoqi_bridge_msgs/0.0.9-1.tar.gz"; - name = "0.0.9-1.tar.gz"; - sha256 = "b93b08f2909efdadd7848fe7507a384f6c69954b0f20d9d0d97a84033494f377"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "naoqi_bridge_msgs-release"; + rev = "release/noetic/naoqi_bridge_msgs/0.0.9-1"; + sha256 = "sha256-1mGwSB0Xdi02Fl09CaiGHTx2MTrD7Kou52kS8JRYuYA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/naoqi-driver/default.nix b/distros/noetic/naoqi-driver/default.nix index 91aef5b7d9..172ff10c38 100644 --- a/distros/noetic/naoqi-driver/default.nix +++ b/distros/noetic/naoqi-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-naoqi-driver"; version = "0.5.13"; - src = fetchurl { - url = "https://github.com/ros-naoqi/naoqi_driver-release/archive/release/noetic/naoqi_driver/0.5.13-0.tar.gz"; - name = "0.5.13-0.tar.gz"; - sha256 = "e7c9a6b41e27f1b7af037eb423b64134c6e345ec04bfcfd5a322e4d6407f71e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "naoqi_driver-release"; + rev = "release/noetic/naoqi_driver/0.5.13-0"; + sha256 = "sha256-Lwc/27qwsnn4JG0kMgkiApPCiL511rSNTesP3/5Ia4k="; + }; buildType = "catkin"; buildInputs = [ catkin diagnostic-msgs diagnostic-updater geometry-msgs rosgraph-msgs sensor-msgs tf2-geometry-msgs tf2-msgs ]; diff --git a/distros/noetic/naoqi-libqi/default.nix b/distros/noetic/naoqi-libqi/default.nix index 8cf6fb8cf9..e5a04eb4c5 100644 --- a/distros/noetic/naoqi-libqi/default.nix +++ b/distros/noetic/naoqi-libqi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-naoqi-libqi"; version = "2.9.7"; - src = fetchurl { - url = "https://github.com/ros-naoqi/libqi-release/archive/release/noetic/naoqi_libqi/2.9.7-0.tar.gz"; - name = "2.9.7-0.tar.gz"; - sha256 = "76aecfaceb5619dfbd57fdfdd477746ab1ed3c925cc61ffaac927cb5c65a8331"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "libqi-release"; + rev = "release/noetic/naoqi_libqi/2.9.7-0"; + sha256 = "sha256-yPeM8IWwRJRQfnFPlJPBlmDzsSpv+VMLlba0tkBGpm0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/naoqi-libqicore/default.nix b/distros/noetic/naoqi-libqicore/default.nix index 5b4db96aca..af2280fe1f 100644 --- a/distros/noetic/naoqi-libqicore/default.nix +++ b/distros/noetic/naoqi-libqicore/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-naoqi-libqicore"; version = "2.9.7"; - src = fetchurl { - url = "https://github.com/ros-naoqi/libqicore-release/archive/release/noetic/naoqi_libqicore/2.9.7-0.tar.gz"; - name = "2.9.7-0.tar.gz"; - sha256 = "a8a1c074dd1e4070379a53a714279e41f84986271ad970fead609d186a6d165c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "libqicore-release"; + rev = "release/noetic/naoqi_libqicore/2.9.7-0"; + sha256 = "sha256-HbCSC/ib3FHb6Fv+UAUeW977LvzOAGshLBJ3n/MbNg8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-2d-msgs/default.nix b/distros/noetic/nav-2d-msgs/default.nix index a59c3e852c..7c8518c599 100644 --- a/distros/noetic/nav-2d-msgs/default.nix +++ b/distros/noetic/nav-2d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-2d-msgs"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/nav_2d_msgs/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "aac48d25c1060890f448b77de2528cc40b6bc1d69fb222ea0eea4588cd932b38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/nav_2d_msgs/0.3.0-2"; + sha256 = "sha256-OyBvIot9zrxplyWwZmGVg6CJ/hkJPM7JglKIoCrL9Vw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/nav-2d-utils/default.nix b/distros/noetic/nav-2d-utils/default.nix index debab82f20..fa501af1ac 100644 --- a/distros/noetic/nav-2d-utils/default.nix +++ b/distros/noetic/nav-2d-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-2d-utils"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/nav_2d_utils/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "cd39cac06e4ec5f6162f5059db7a5fed9118b6c7d15649e3b3e2b5531cdf1563"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/nav_2d_utils/0.3.0-2"; + sha256 = "sha256-BuRFHQvlBHUPY9RkwL4bmTIO0Dq4h58y9GpwyZquFM8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-core-adapter/default.nix b/distros/noetic/nav-core-adapter/default.nix index bab8d14e4c..52e84eb650 100644 --- a/distros/noetic/nav-core-adapter/default.nix +++ b/distros/noetic/nav-core-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-core-adapter"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/nav_core_adapter/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "df35f24c4d64eb0b25f8bf4fdffe2f09a8505992678da5f5c5ff432c99e1dd8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/nav_core_adapter/0.3.0-2"; + sha256 = "sha256-vowLCtbmyH+JciRFH89foI2UXV7AVRfMksMhyDCwqmg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-core/default.nix b/distros/noetic/nav-core/default.nix index 7058152cef..beac44c9d5 100644 --- a/distros/noetic/nav-core/default.nix +++ b/distros/noetic/nav-core/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-2d, geometry-msgs, std-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-nav-core"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/nav_core/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "319e2bcb324f9229899c41944ca013d64c1f0d4adaff84a3c53aa7651816fadd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/nav_core/1.17.3-1"; + sha256 = "sha256-/lT8dG4nreN6IXio1cu76bieXSsYhWvpfPzabkkRxhM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-core2/default.nix b/distros/noetic/nav-core2/default.nix index 92b44c8428..fb48d1a42d 100644 --- a/distros/noetic/nav-core2/default.nix +++ b/distros/noetic/nav-core2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-core2"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/nav_core2/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "a102ef0294f5159bc5d4a4751951d302e0935ee0d0cf9ca8fedda3196bcfdae4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/nav_core2/0.3.0-2"; + sha256 = "sha256-9Zltic/fAkiKS7p9+TBOHnxUDwloEeqyBV4anoXOI2s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-grid-iterators/default.nix b/distros/noetic/nav-grid-iterators/default.nix index be13eebb16..d03ce9ec13 100644 --- a/distros/noetic/nav-grid-iterators/default.nix +++ b/distros/noetic/nav-grid-iterators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-grid-iterators"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/nav_grid_iterators/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "715a29d86f34cf38708568e4910bc44aab11cf807ec1e60e07525059753a3162"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/nav_grid_iterators/0.3.0-2"; + sha256 = "sha256-/SeMwrawK+s8y829ZdwAlvKajQp/y/14RDCqaDxwZ6g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-grid-pub-sub/default.nix b/distros/noetic/nav-grid-pub-sub/default.nix index 991d67c3fc..a5e78e00a8 100644 --- a/distros/noetic/nav-grid-pub-sub/default.nix +++ b/distros/noetic/nav-grid-pub-sub/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-grid-pub-sub"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/nav_grid_pub_sub/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "558ae8160b38f4e7d4f3896f071de517215b4ea65c3f0b22e43108e8314a1e5a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/nav_grid_pub_sub/0.3.0-2"; + sha256 = "sha256-hCGpOEFTLJFyH2qek/Jb3NVnYRR7C8/XKMBU7RzpXXo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-grid-server/default.nix b/distros/noetic/nav-grid-server/default.nix index 93faaf75ba..005e583b03 100644 --- a/distros/noetic/nav-grid-server/default.nix +++ b/distros/noetic/nav-grid-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-grid-server"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/nav_grid_server/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "7f9a3ff151aaca65d672920ff96c2d2b0fcaa90ce9af788524da2ba8bd13ea51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/nav_grid_server/0.3.0-2"; + sha256 = "sha256-6kBGntznzhd53DFFdfw7mly9zkDGmqGfN86peaPIEqU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-grid/default.nix b/distros/noetic/nav-grid/default.nix index 26efd8e267..a253ed54bb 100644 --- a/distros/noetic/nav-grid/default.nix +++ b/distros/noetic/nav-grid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-grid"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/nav_grid/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "9ac9d9c48aba901c90aba46248a52dbd06c7d0379dc08e54c2aea1375bb17bbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/nav_grid/0.3.0-2"; + sha256 = "sha256-A5Q70LXKruvFOTTou+LfaVucCYO2EazGAw6HCfMijkQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav-msgs/default.nix b/distros/noetic/nav-msgs/default.nix index 8ca55b054b..fae2956794 100644 --- a/distros/noetic/nav-msgs/default.nix +++ b/distros/noetic/nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/nav_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "32c2b9aa8f94a20f4718675c655e8f6d1ec0c00fa3b753bc2a0f9c0abcbec06a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/nav_msgs/1.13.1-1"; + sha256 = "sha256-4h6OxOdmcmUCXyyEtWvansDk8HFvDgj2rs74jgX1ms4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/nav2d-exploration/default.nix b/distros/noetic/nav2d-exploration/default.nix index c6adcb41f9..c1c92ce492 100644 --- a/distros/noetic/nav2d-exploration/default.nix +++ b/distros/noetic/nav2d-exploration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d-exploration"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d_exploration/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "b28cf2ddb5f4ebe6b1b2192bb9788ed7c839a47745d6362089230309a0cc650d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d_exploration/0.4.3-1"; + sha256 = "sha256-jml/Gvvz0wfHngq2Wb0zTIDB9avVwyCaz//WSURs3rg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav2d-karto/default.nix b/distros/noetic/nav2d-karto/default.nix index 134cc0f63c..92ddca2eac 100644 --- a/distros/noetic/nav2d-karto/default.nix +++ b/distros/noetic/nav2d-karto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d-karto"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d_karto/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "a6e7858170e9d813af27e4ec0b818d49ca0cf7c8ee5b05ff5ceee9d9e701190d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d_karto/0.4.3-1"; + sha256 = "sha256-VmdDvLhP+yUHcema1929O23154uOQ4HidnF+Olerr4A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav2d-localizer/default.nix b/distros/noetic/nav2d-localizer/default.nix index 218524e51f..07ee9cda25 100644 --- a/distros/noetic/nav2d-localizer/default.nix +++ b/distros/noetic/nav2d-localizer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d-localizer"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d_localizer/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "aba652974782ebc680b0a5d18ecee1a85de899cc0983c5078957febae191a32c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d_localizer/0.4.3-1"; + sha256 = "sha256-VwXUv3GG7RwYQxcRtQJUzdkNpOTpaEtsxyGuv3OBoWo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav2d-msgs/default.nix b/distros/noetic/nav2d-msgs/default.nix index 43ec86d887..a038cdec96 100644 --- a/distros/noetic/nav2d-msgs/default.nix +++ b/distros/noetic/nav2d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d-msgs"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d_msgs/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "7a9925f765c7a8511e383261a46cba96ba21180fb991f193bec75f710e6bcc7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d_msgs/0.4.3-1"; + sha256 = "sha256-crHJFtKYp3KQygnjODSqNpIggGHY1f3iCo03Q1764d0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/nav2d-navigator/default.nix b/distros/noetic/nav2d-navigator/default.nix index cb014a6804..ccb919fa53 100644 --- a/distros/noetic/nav2d-navigator/default.nix +++ b/distros/noetic/nav2d-navigator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d-navigator"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d_navigator/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "ce183be0588c405387ab166f3d42e8b01d204a6205a2be4d34e2c40ecc186863"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d_navigator/0.4.3-1"; + sha256 = "sha256-xuCTn335Ct+u4MaYSR5stI+CwLjFK2c8VNl/FdX8TJw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/nav2d-operator/default.nix b/distros/noetic/nav2d-operator/default.nix index 1682e154fd..1dc20bdd9b 100644 --- a/distros/noetic/nav2d-operator/default.nix +++ b/distros/noetic/nav2d-operator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d-operator"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d_operator/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "ac72183e832843c469d705fbf89c16da594efe0abaa1a85002963e98240dc017"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d_operator/0.4.3-1"; + sha256 = "sha256-hI9HTZOuyv9zCROajjUTfm+nfmXJaK3Rba4JB5/Lha8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation tf2-ros ]; diff --git a/distros/noetic/nav2d-remote/default.nix b/distros/noetic/nav2d-remote/default.nix index bd3278ad6b..11e10ee879 100644 --- a/distros/noetic/nav2d-remote/default.nix +++ b/distros/noetic/nav2d-remote/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d-remote"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d_remote/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "f3dfb200f139b41661c5c6e21c8a859c444922af46ba38befc9d1f2a298295b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d_remote/0.4.3-1"; + sha256 = "sha256-TuDjIIi50McRwdqBKc3tH4tQyybVPmyAslfDWeFfcJo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav2d-tutorials/default.nix b/distros/noetic/nav2d-tutorials/default.nix index d9ee7d53c6..946ea9ccae 100644 --- a/distros/noetic/nav2d-tutorials/default.nix +++ b/distros/noetic/nav2d-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d-tutorials"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d_tutorials/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "56ecf7b85421c00cbe828e17b78bfacd0dc841cbe4847d659782a8b42716ea0d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d_tutorials/0.4.3-1"; + sha256 = "sha256-Z4yRVoTemH2OUmlzQq6VycHzoIkI3FRMKMg55WcTvUc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nav2d/default.nix b/distros/noetic/nav2d/default.nix index 3e95cce47f..8c297662ec 100644 --- a/distros/noetic/nav2d/default.nix +++ b/distros/noetic/nav2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nav2d"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/skasperski/navigation_2d-release/archive/release/noetic/nav2d/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "28604c2fdf84af889a48f645b663d2b64a04bcbf7564ba70aeec8476296b59ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "skasperski"; + repo = "navigation_2d-release"; + rev = "release/noetic/nav2d/0.4.3-1"; + sha256 = "sha256-6wgqdwmEpa4N61+eKPUwgmvR2omZOxy2CZflzBn7v1A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/navfn/default.nix b/distros/noetic/navfn/default.nix index 702d2fcc14..4479b9591f 100644 --- a/distros/noetic/navfn/default.nix +++ b/distros/noetic/navfn/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, costmap-2d, geometry-msgs, message-generation, message-runtime, nav-core, nav-msgs, netpbm, pluginlib, rosconsole, roscpp, rosunit, sensor-msgs, tf2-ros, visualization-msgs }: buildRosPackage { pname = "ros-noetic-navfn"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/navfn/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "fcc0b0ec8831039cf46378d4bbace12deada0099b5e158904a2055bdeebf7b9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/navfn/1.17.3-1"; + sha256 = "sha256-pll/rWqohlbL6cLaQ5dYXgzGSB4y1yZV7QrxV9J+zHo="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation netpbm ]; diff --git a/distros/noetic/navigation-experimental/default.nix b/distros/noetic/navigation-experimental/default.nix index 7042caf605..fc3369076c 100644 --- a/distros/noetic/navigation-experimental/default.nix +++ b/distros/noetic/navigation-experimental/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-navigation-experimental"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/noetic/navigation_experimental/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "5e6674894debf5c1f00023a40dc8f04f4b75b4ba5961bee56e5896c1cdd3a978"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/noetic/navigation_experimental/0.4.1-1"; + sha256 = "sha256-8erktgMxlcXopXuO9bJ7xmvdBIVe58W5GunP9idnxjg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/navigation/default.nix b/distros/noetic/navigation/default.nix index 4c65f1f285..0444c852cd 100644 --- a/distros/noetic/navigation/default.nix +++ b/distros/noetic/navigation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, amcl, base-local-planner, carrot-planner, catkin, clear-costmap-recovery, costmap-2d, dwa-local-planner, fake-localization, global-planner, map-server, move-base, move-base-msgs, move-slow-and-clear, nav-core, navfn, rotate-recovery, voxel-grid }: buildRosPackage { pname = "ros-noetic-navigation"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/navigation/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "f9ad7c4bf14a54f994acb35405495d488d3b38001e46c29c1674898d81d368d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/navigation/1.17.3-1"; + sha256 = "sha256-sPbvPsPuHJTDdtqghvfCTHaMy9E15MdFoXrdo8g3O/Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ncd-parser/default.nix b/distros/noetic/ncd-parser/default.nix index 2273f6f36c..670e444ed9 100644 --- a/distros/noetic/ncd-parser/default.nix +++ b/distros/noetic/ncd-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ncd-parser"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/noetic/ncd_parser/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "b407bd8c0f11e9d1098373daaaaeca94fe2cddd7e05b0db427287a83ff880782"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/noetic/ncd_parser/0.3.3-1"; + sha256 = "sha256-rOvQtd9gUVqOGi10cNgMqfMDTWJp/ZomgJe0ldLjp1c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/neo-local-planner/default.nix b/distros/noetic/neo-local-planner/default.nix index a9764e7839..1e88a0a46a 100644 --- a/distros/noetic/neo-local-planner/default.nix +++ b/distros/noetic/neo-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-neo-local-planner"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/neobotix/neo_local_planner-release/archive/release/noetic/neo_local_planner/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "40b93b3cde461c30dd909faa95aca65cf4619191b3e4178cc9c3fa65bb4891ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "neobotix"; + repo = "neo_local_planner-release"; + rev = "release/noetic/neo_local_planner/1.0.1-1"; + sha256 = "sha256-UL6cUuL1JgJQRqmpHVdhX6g2eqAI13KHE3Si8nxF/Y0="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/neobotix-usboard-msgs/default.nix b/distros/noetic/neobotix-usboard-msgs/default.nix index e04834eebd..583998d973 100644 --- a/distros/noetic/neobotix-usboard-msgs/default.nix +++ b/distros/noetic/neobotix-usboard-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-neobotix-usboard-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/neobotix_usboard_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "caefc604c5d3ad50449839b1d48d05cc3d2c0f3695abb2c89ac1411d9e5f1500"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/neobotix_usboard_msgs/3.3.0-1"; + sha256 = "sha256-yNEAYOH1z1KchvD2r2t1D5ZZshbuDVnRF8wewizXRMA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/neonavigation-common/default.nix b/distros/noetic/neonavigation-common/default.nix index ab03c7bc1b..f6b6d132a1 100644 --- a/distros/noetic/neonavigation-common/default.nix +++ b/distros/noetic/neonavigation-common/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, roscpp, roslint, rostest, std-msgs, std-srvs }: buildRosPackage { pname = "ros-noetic-neonavigation-common"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/neonavigation_common/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "5610b34cb3941e18490cf8b89baba9d817aa43703e54e1422b46d430850ea95e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/neonavigation_common/0.12.0-1"; + sha256 = "sha256-PxAgRTEfsZqDQ2rNBJijr73Pjgg5xMJDCHEW1tTtauQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/neonavigation-launch/default.nix b/distros/noetic/neonavigation-launch/default.nix index 99478dd310..136d5376cd 100644 --- a/distros/noetic/neonavigation-launch/default.nix +++ b/distros/noetic/neonavigation-launch/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-cspace, map-server, planner-cspace, safety-limiter, tf2-ros, trajectory-tracker, trajectory-tracker-rviz-plugins }: buildRosPackage { pname = "ros-noetic-neonavigation-launch"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/neonavigation_launch/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "98aa063f9e6bbdc6b4534a42c0288442c5c44008da07d0b41d750441a280d740"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/neonavigation_launch/0.12.0-1"; + sha256 = "sha256-M6qLtK/VTTmIlEtLIUo0TKXDfTrjzDascW653Caa9BQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/neonavigation-msgs/default.nix b/distros/noetic/neonavigation-msgs/default.nix index c4517305eb..37b57d1abe 100644 --- a/distros/noetic/neonavigation-msgs/default.nix +++ b/distros/noetic/neonavigation-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-cspace-msgs, map-organizer-msgs, planner-cspace-msgs, safety-limiter-msgs, trajectory-tracker-msgs }: buildRosPackage { pname = "ros-noetic-neonavigation-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/noetic/neonavigation_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "22b11f09239459dfa5972250c5fb0d15d0df4ef5c97bd8c418a9eb2eb542627c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/noetic/neonavigation_msgs/0.12.0-1"; + sha256 = "sha256-LSpTYJU8PPuzlU1IgaE6ayrbsAbHyjQFlcN1XeVh+04="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/neonavigation-rviz-plugins/default.nix b/distros/noetic/neonavigation-rviz-plugins/default.nix index 95ac391176..1497d00404 100644 --- a/distros/noetic/neonavigation-rviz-plugins/default.nix +++ b/distros/noetic/neonavigation-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-neonavigation-rviz-plugins"; version = "0.11.6-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_rviz_plugins-release/archive/release/noetic/neonavigation_rviz_plugins/0.11.6-1.tar.gz"; - name = "0.11.6-1.tar.gz"; - sha256 = "effd352b1933ebc8ec68464755b7be27b2e701f36bfa13b1d4afe44bc12c81e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_rviz_plugins-release"; + rev = "release/noetic/neonavigation_rviz_plugins/0.11.6-1"; + sha256 = "sha256-OpxGl1p5+QI+5J6YQ2P3GuDz+0fXwJKCojzjEFmyfJo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/neonavigation/default.nix b/distros/noetic/neonavigation/default.nix index fe3f265983..7bdccf24a5 100644 --- a/distros/noetic/neonavigation/default.nix +++ b/distros/noetic/neonavigation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, costmap-cspace, joystick-interrupt, map-organizer, neonavigation-common, neonavigation-launch, obj-to-pointcloud, planner-cspace, safety-limiter, track-odometry, trajectory-tracker }: buildRosPackage { pname = "ros-noetic-neonavigation"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/neonavigation/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "6e8eaf5e14bb76e6a6fbeeed53226d37c861b8a292c433e875970dd5fad7d06e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/neonavigation/0.12.0-1"; + sha256 = "sha256-QLtN90O/69vWaDrsQcTo9qzwEUIN00WIBTKajC4rgfo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nerian-stereo/default.nix b/distros/noetic/nerian-stereo/default.nix index f5091db69a..ef935e7fb8 100644 --- a/distros/noetic/nerian-stereo/default.nix +++ b/distros/noetic/nerian-stereo/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, curl, cv-bridge, dynamic-reconfigure, message-generation, message-runtime, nodelet, roscpp, sensor-msgs, std-msgs, stereo-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-noetic-nerian-stereo"; - version = "3.10.0-r1"; + version = "3.11.0-r1"; - src = fetchurl { - url = "https://github.com/nerian-vision/nerian_stereo-release/archive/release/noetic/nerian_stereo/3.10.0-1.tar.gz"; - name = "3.10.0-1.tar.gz"; - sha256 = "f5772a719bfa7ac6aaad47c7f2af549a1b572c32f7ee09d803b490d589d68e77"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nerian-vision"; + repo = "nerian_stereo-release"; + rev = "release/noetic/nerian_stereo/3.11.0-1"; + sha256 = "sha256-m2ePuhLsm9GCIR91gLzZ6xJeu7fadpDeztkRS5p+06M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/network-interface/default.nix b/distros/noetic/network-interface/default.nix index c32095f480..7f4c97d0c6 100644 --- a/distros/noetic/network-interface/default.nix +++ b/distros/noetic/network-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-network-interface"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/network_interface-release/archive/release/noetic/network_interface/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "b55512f9cb6c73bfe0ba29cde2a3d47a4e9a8e14e339440a57ccd8a5a1cefaf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "network_interface-release"; + rev = "release/noetic/network_interface/3.1.0-1"; + sha256 = "sha256-KWNRsjmSr4lN9As7byjzyzFFa8UKhv8y3pmGCd5y014="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/noetic/nmea-comms/default.nix b/distros/noetic/nmea-comms/default.nix index 47bb9efdb6..62ec32aa65 100644 --- a/distros/noetic/nmea-comms/default.nix +++ b/distros/noetic/nmea-comms/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nmea-comms"; version = "1.2.0-r3"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/nmea_comms-release/archive/release/noetic/nmea_comms/1.2.0-3.tar.gz"; - name = "1.2.0-3.tar.gz"; - sha256 = "043ce2fedd2173e5d9fa7004aff8911555efeccb0a04150e737e149a6cdb7241"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "nmea_comms-release"; + rev = "release/noetic/nmea_comms/1.2.0-3"; + sha256 = "sha256-9vpACLn+DEJ/FvjqANRAnOPnY/OqUbmBIxzKguC+Vok="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch roslint rostest ]; diff --git a/distros/noetic/nmea-msgs/default.nix b/distros/noetic/nmea-msgs/default.nix index 8265484836..d51c5b6edc 100644 --- a/distros/noetic/nmea-msgs/default.nix +++ b/distros/noetic/nmea-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nmea-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/nmea_msgs-release/archive/release/noetic/nmea_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "046f13505f846ccee51d939024546f06013295f74a09e2fe98c5b482fff70eac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "nmea_msgs-release"; + rev = "release/noetic/nmea_msgs/1.1.0-1"; + sha256 = "sha256-X4Cs2+ARQU/iy6ibg7g4VwOF/Bsxs7Anqg9mLc8rWag="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/nmea-navsat-driver/default.nix b/distros/noetic/nmea-navsat-driver/default.nix index 4fe96a0c2b..23c3f5c1c0 100644 --- a/distros/noetic/nmea-navsat-driver/default.nix +++ b/distros/noetic/nmea-navsat-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nmea-navsat-driver"; version = "0.6.1-r2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/nmea_navsat_driver-release/archive/release/noetic/nmea_navsat_driver/0.6.1-2.tar.gz"; - name = "0.6.1-2.tar.gz"; - sha256 = "333a1a0c8f0ca93a91e6badeddc32c569ddae5f6a362679e67e0fcfb1e747d40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "nmea_navsat_driver-release"; + rev = "release/noetic/nmea_navsat_driver/0.6.1-2"; + sha256 = "sha256-/li7w2Z1iEkcxRjcFUw+vUuUIsoWdC0kRnhRTyNk31Y="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.catkin-pkg ]; diff --git a/distros/noetic/nodelet-core/default.nix b/distros/noetic/nodelet-core/default.nix index 5045cada98..ab5beef240 100644 --- a/distros/noetic/nodelet-core/default.nix +++ b/distros/noetic/nodelet-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nodelet-core"; version = "1.10.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet_core/1.10.2-1.tar.gz"; - name = "1.10.2-1.tar.gz"; - sha256 = "e0d132be009c5e023db662b72ed0ba76cb986b51f2603aee36dd15ce084ab8b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "nodelet_core-release"; + rev = "release/noetic/nodelet_core/1.10.2-1"; + sha256 = "sha256-H8gJzCKPoftRI+f2SlT8VXK3iHtJeyuT8AyNHjDV9Dg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nodelet-topic-tools/default.nix b/distros/noetic/nodelet-topic-tools/default.nix index 8af8f44d58..2b3cc0c2aa 100644 --- a/distros/noetic/nodelet-topic-tools/default.nix +++ b/distros/noetic/nodelet-topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nodelet-topic-tools"; version = "1.10.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet_topic_tools/1.10.2-1.tar.gz"; - name = "1.10.2-1.tar.gz"; - sha256 = "c05691304366f3249aac1cb411f3d29c45908bb72a30e917df319391bc67ed76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "nodelet_core-release"; + rev = "release/noetic/nodelet_topic_tools/1.10.2-1"; + sha256 = "sha256-xveAq66AFX6lRc6FQAt/UxZyIntI6D0F5VyMsHvxzEc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nodelet-tutorial-math/default.nix b/distros/noetic/nodelet-tutorial-math/default.nix index 3066237b3b..79cc5f61f9 100644 --- a/distros/noetic/nodelet-tutorial-math/default.nix +++ b/distros/noetic/nodelet-tutorial-math/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nodelet-tutorial-math"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/noetic/nodelet_tutorial_math/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "25a9f22b34a0cfdaded3e8e79ebcacde173689d9e05c4751cd033a759d441089"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/noetic/nodelet_tutorial_math/0.2.0-1"; + sha256 = "sha256-cBjW3YPcYJlrCX+fwR8p/6OIGRM7vl/Va5lQEBlQ5Qg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/nodelet/default.nix b/distros/noetic/nodelet/default.nix index ab8390e78c..1ff40a49c5 100644 --- a/distros/noetic/nodelet/default.nix +++ b/distros/noetic/nodelet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nodelet"; version = "1.10.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/nodelet_core-release/archive/release/noetic/nodelet/1.10.2-1.tar.gz"; - name = "1.10.2-1.tar.gz"; - sha256 = "71cd76bda95fa2bcb3938a4b1700faa2dcbaf741e0ba2494934e560b4c5ee92c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "nodelet_core-release"; + rev = "release/noetic/nodelet/1.10.2-1"; + sha256 = "sha256-aT4ZMxfTvxPs694VNjv0FTO/JPEy2dpk/GsxDE569r8="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/noetic/nonpersistent-voxel-layer/default.nix b/distros/noetic/nonpersistent-voxel-layer/default.nix index 9fa939b66c..4ba3a2c855 100644 --- a/distros/noetic/nonpersistent-voxel-layer/default.nix +++ b/distros/noetic/nonpersistent-voxel-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-nonpersistent-voxel-layer"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/SteveMacenski/nonpersistent_voxel_layer-release/archive/release/noetic/nonpersistent_voxel_layer/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "873ea35875641ee32e4bfd53dd41ff0425e742cc6dcb75309e9094caa8b37c37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "nonpersistent_voxel_layer-release"; + rev = "release/noetic/nonpersistent_voxel_layer/1.3.0-2"; + sha256 = "sha256-FSJKE5MWw/O7p2Fk8fohCmlQuUXFUb4RazGZQ6R1Rj4="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/noetic/novatel-gps-driver/default.nix b/distros/noetic/novatel-gps-driver/default.nix index bedfe45698..01c71dd7f9 100644 --- a/distros/noetic/novatel-gps-driver/default.nix +++ b/distros/noetic/novatel-gps-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-novatel-gps-driver"; version = "3.9.0-r2"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/novatel_gps_driver-release/archive/release/noetic/novatel_gps_driver/3.9.0-2.tar.gz"; - name = "3.9.0-2.tar.gz"; - sha256 = "db385458cdcd49d01f50734f2c45984973b0a5d1acb53f73d6ca8aa45d8769da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/noetic/novatel_gps_driver/3.9.0-2"; + sha256 = "sha256-L8vDk9aHMXH/KBT6V1EJTvDrkppgG30LjqbvtsfwNyo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/novatel-gps-msgs/default.nix b/distros/noetic/novatel-gps-msgs/default.nix index 1387dc95a5..0590201e9b 100644 --- a/distros/noetic/novatel-gps-msgs/default.nix +++ b/distros/noetic/novatel-gps-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-novatel-gps-msgs"; version = "3.9.0-r2"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/novatel_gps_driver-release/archive/release/noetic/novatel_gps_msgs/3.9.0-2.tar.gz"; - name = "3.9.0-2.tar.gz"; - sha256 = "385a28ccf1b1a41cae25d151638c9f75cee572ac0d5cd788a1c4f545a948abee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/noetic/novatel_gps_msgs/3.9.0-2"; + sha256 = "sha256-6ffgh4V6qqiJA8vtqw7QQiiP94CvFrRD2kEk4Pe43KQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/novatel-oem7-driver/default.nix b/distros/noetic/novatel-oem7-driver/default.nix index f848b2d380..53b023f0c6 100644 --- a/distros/noetic/novatel-oem7-driver/default.nix +++ b/distros/noetic/novatel-oem7-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-novatel-oem7-driver"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/novatel-gbp/novatel_oem7_driver-release/archive/release/noetic/novatel_oem7_driver/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "35d850869c4e4f84280d16fc9af9e511ba718123a194b1372ae09f25e3c83a97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "novatel-gbp"; + repo = "novatel_oem7_driver-release"; + rev = "release/noetic/novatel_oem7_driver/4.0.0-1"; + sha256 = "sha256-BrUlfFnQumacDophH1Itb+HJ0Bwzjk7/GReqnBWKzZs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/novatel-oem7-msgs/default.nix b/distros/noetic/novatel-oem7-msgs/default.nix index c0a7f683ee..7cee16b65c 100644 --- a/distros/noetic/novatel-oem7-msgs/default.nix +++ b/distros/noetic/novatel-oem7-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-novatel-oem7-msgs"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/novatel-gbp/novatel_oem7_driver-release/archive/release/noetic/novatel_oem7_msgs/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "635f364bd43680cdbb48e578ab79bccfee1920781a8cb9ac1e86516d92a0ba81"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "novatel-gbp"; + repo = "novatel_oem7_driver-release"; + rev = "release/noetic/novatel_oem7_msgs/4.0.0-1"; + sha256 = "sha256-tGroV/CWSJ0SuA30QZx0IneLcerfyBVSbHJJAH4aceA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ntpd-driver/default.nix b/distros/noetic/ntpd-driver/default.nix index 8ffe409612..967c4036ee 100644 --- a/distros/noetic/ntpd-driver/default.nix +++ b/distros/noetic/ntpd-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ntpd-driver"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/vooon/ntpd_driver-release/archive/release/noetic/ntpd_driver/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "6b5438d9c2b27ba76eed22d9a797949977a55cdd149ede626b97697c9b596798"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "vooon"; + repo = "ntpd_driver-release"; + rev = "release/noetic/ntpd_driver/1.3.0-1"; + sha256 = "sha256-g/hiQyI4OvE7y4IVAAaq2ct8CenRetNeunowJvkdAX8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ntrip-client/default.nix b/distros/noetic/ntrip-client/default.nix index 91356b5b8e..ee03ccc4e5 100644 --- a/distros/noetic/ntrip-client/default.nix +++ b/distros/noetic/ntrip-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ntrip-client"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/LORD-MicroStrain/ntrip_client-release/archive/release/noetic/ntrip_client/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "0066bb6efb9cfa6af71bb37d32f95c2daef51fd4f16aab44ba186bf29b9d3e77"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "LORD-MicroStrain"; + repo = "ntrip_client-release"; + rev = "release/noetic/ntrip_client/1.2.0-1"; + sha256 = "sha256-0ZTMxpzhLHRnwI8xJbUmaFtR0wqsmCHtmboU7eTRNLw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/obj-to-pointcloud/default.nix b/distros/noetic/obj-to-pointcloud/default.nix index 83539fe564..0bdc2ebb4c 100644 --- a/distros/noetic/obj-to-pointcloud/default.nix +++ b/distros/noetic/obj-to-pointcloud/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, eigen, geometry-msgs, neonavigation-common, pcl, pcl-conversions, roscpp, roslint, rostest, sensor-msgs }: buildRosPackage { pname = "ros-noetic-obj-to-pointcloud"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/obj_to_pointcloud/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "4d6cdfd09e36a8a3e71d90576da20d46493d8958cd5818f977fada7906d9ff50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/obj_to_pointcloud/0.12.0-1"; + sha256 = "sha256-8iTtLyetMfUEhS/3c+8BPGmgGNBkvWjKAsM4S2ABHr0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/object-recognition-msgs/default.nix b/distros/noetic/object-recognition-msgs/default.nix index 4ef09488ef..754a2e4a79 100644 --- a/distros/noetic/object-recognition-msgs/default.nix +++ b/distros/noetic/object-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-object-recognition-msgs"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/object_recognition_msgs-release/archive/release/noetic/object_recognition_msgs/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "4f78239509f037433d3b8dbc38dca2b452d693889a46c6f898168c20ff62aa32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "object_recognition_msgs-release"; + rev = "release/noetic/object_recognition_msgs/0.4.2-1"; + sha256 = "sha256-jUA6eKqXbSLJ3PPk9i1cBj3EKHZ6zDSQmLDnBQJX+r8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ocean-battery-driver/default.nix b/distros/noetic/ocean-battery-driver/default.nix index 996655c8f5..2b3d8920fe 100644 --- a/distros/noetic/ocean-battery-driver/default.nix +++ b/distros/noetic/ocean-battery-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ocean-battery-driver"; version = "1.1.10-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_power_drivers-release/archive/release/noetic/ocean_battery_driver/1.1.10-1.tar.gz"; - name = "1.1.10-1.tar.gz"; - sha256 = "e7a91c5f3b8eacc62bfade5e8bb1bac9d97a185b250da4531c03bf3b442d9bdf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_power_drivers-release"; + rev = "release/noetic/ocean_battery_driver/1.1.10-1"; + sha256 = "sha256-/IRMaNKq6Hg98vLz+6ABJcFeVqUY//kfSXCWY73Zl90="; + }; buildType = "catkin"; buildInputs = [ boost catkin ]; diff --git a/distros/noetic/octomap-mapping/default.nix b/distros/noetic/octomap-mapping/default.nix index 101e679fe9..098f261b7a 100644 --- a/distros/noetic/octomap-mapping/default.nix +++ b/distros/noetic/octomap-mapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-octomap-mapping"; version = "0.6.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_mapping-release/archive/release/noetic/octomap_mapping/0.6.7-1.tar.gz"; - name = "0.6.7-1.tar.gz"; - sha256 = "ee74a243e61605b47a6e8444e0db6edcc84c5e4f4182f53fe42e555aa11ed8d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_mapping-release"; + rev = "release/noetic/octomap_mapping/0.6.7-1"; + sha256 = "sha256-c9N7HXrthUVu655yUURBnC4E17ZoVnvSMI4k5zLSiD0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/octomap-msgs/default.nix b/distros/noetic/octomap-msgs/default.nix index 317d66d932..3e1d703d8e 100644 --- a/distros/noetic/octomap-msgs/default.nix +++ b/distros/noetic/octomap-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-octomap-msgs"; version = "0.3.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_msgs-release/archive/release/noetic/octomap_msgs/0.3.5-1.tar.gz"; - name = "0.3.5-1.tar.gz"; - sha256 = "3547dfabcaef35b1f13dc0094abbd6dde8e390387440786ebe13f0a493caa930"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_msgs-release"; + rev = "release/noetic/octomap_msgs/0.3.5-1"; + sha256 = "sha256-XBb//PZ07P6FEL1E8wNjH94EWn/NQMoxkJyppXazT7Q="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/octomap-ros/default.nix b/distros/noetic/octomap-ros/default.nix index 9aa848aa7f..e741767785 100644 --- a/distros/noetic/octomap-ros/default.nix +++ b/distros/noetic/octomap-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-octomap-ros"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_ros-release/archive/release/noetic/octomap_ros/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "100e3f796c48ca1d15059bc3ae81ab4de01e997cfe1ce6222a5e514ea2b6dae1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_ros-release"; + rev = "release/noetic/octomap_ros/0.4.1-1"; + sha256 = "sha256-OV9ySmXTXJotxv7HsYuSxMSEarPpPzkXtXvA/1BNRHo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/octomap-rviz-plugins/default.nix b/distros/noetic/octomap-rviz-plugins/default.nix index 1f28676f63..0df7d5001c 100644 --- a/distros/noetic/octomap-rviz-plugins/default.nix +++ b/distros/noetic/octomap-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-octomap-rviz-plugins"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_rviz_plugins-release/archive/release/noetic/octomap_rviz_plugins/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "a4df6a9a9bc37d5722c20b8e4da89ed1c14891c825f705b43e9fb26e2dcdc7f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_rviz_plugins-release"; + rev = "release/noetic/octomap_rviz_plugins/0.2.4-1"; + sha256 = "sha256-816alBU6FnAemoH9ar0U3cQIdUAZD0Ele8421wzdO7c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/octomap-server/default.nix b/distros/noetic/octomap-server/default.nix index a53fdef6f0..2d16a0f6cd 100644 --- a/distros/noetic/octomap-server/default.nix +++ b/distros/noetic/octomap-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-octomap-server"; version = "0.6.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap_mapping-release/archive/release/noetic/octomap_server/0.6.7-1.tar.gz"; - name = "0.6.7-1.tar.gz"; - sha256 = "d85b080b98a1699bcd6423c97bc0807b9a7790d06aa745651622af0c478b2c7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap_mapping-release"; + rev = "release/noetic/octomap_server/0.6.7-1"; + sha256 = "sha256-x7QZjnvGRm5Mg7EWwb4k+R3MA0EiT+IksrOITPdKPoI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/octomap/default.nix b/distros/noetic/octomap/default.nix index c6c1b1c38a..5cccaba73d 100644 --- a/distros/noetic/octomap/default.nix +++ b/distros/noetic/octomap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-octomap"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/noetic/octomap/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "b8e00029f05725f6367a03e337c5c2ffd2c7a140fa5e78a7f1ee4417e249a83b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/noetic/octomap/1.9.8-1"; + sha256 = "sha256-0dAJlm89h70A+p1jhMznxZiZ45LkW+a27R6W71Z+bRs="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/octovis/default.nix b/distros/noetic/octovis/default.nix index a901ab213d..bf93e8c7d8 100644 --- a/distros/noetic/octovis/default.nix +++ b/distros/noetic/octovis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-octovis"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/octomap-release/archive/release/noetic/octovis/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "2a72bc352c76f646762c18d9aa04f5bd99ab5356086fe78269789a994b116fce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "octomap-release"; + rev = "release/noetic/octovis/1.9.8-1"; + sha256 = "sha256-v5cRZO/N3iEbGh0/eWODpX4WUCYGbmTeN0rAPLQOzRg="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/odva-ethernetip/default.nix b/distros/noetic/odva-ethernetip/default.nix index 0190ac5ffe..0f1a217242 100644 --- a/distros/noetic/odva-ethernetip/default.nix +++ b/distros/noetic/odva-ethernetip/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-odva-ethernetip"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/odva_ethernetip-release/archive/release/noetic/odva_ethernetip/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "39e9f63175a38fe6ea8ff1e4953f9fbfbb9bcd616f6a7a962d7aa7d3471b8863"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "odva_ethernetip-release"; + rev = "release/noetic/odva_ethernetip/0.1.5-1"; + sha256 = "sha256-RiWFqkr6l+yaz79Fd3/9UULIMfvHluDerWACZwVU3vA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/oled-display-node/default.nix b/distros/noetic/oled-display-node/default.nix index a5e3c0660e..25e379afca 100644 --- a/distros/noetic/oled-display-node/default.nix +++ b/distros/noetic/oled-display-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-oled-display-node"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/oled_display_node-release/archive/release/noetic/oled_display_node/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "750524faffbef4380b8a808d522c70a6a5b6949bb44af667260c33047aa25d81"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "oled_display_node-release"; + rev = "release/noetic/oled_display_node/1.0.0-1"; + sha256 = "sha256-n3Ie1ny0PQKwqweV1Sfcdki7pCUeu5FIBtR823kIdvI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ompl/default.nix b/distros/noetic/ompl/default.nix index 0cb79ad172..7d5b0001e3 100644 --- a/distros/noetic/ompl/default.nix +++ b/distros/noetic/ompl/default.nix @@ -2,22 +2,30 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, cmake, eigen, flann, ode, pkg-config }: +{ lib, buildRosPackage, fetchurl, boost, cmake, eigen, flann, ode, pkg-config, sd }: buildRosPackage { pname = "ros-noetic-ompl"; - version = "1.5.2-r1"; + version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ompl-release/archive/release/noetic/ompl/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "1f45c6363e62424015aa5efdb27a7b0412dd9018676149f23200126241b6715a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ompl-release"; + rev = "release/noetic/ompl/1.6.0-1"; + sha256 = "sha256-Dst2FtQsK0+EzvSm7GEESWOU8QfMPzhSNNYEIlTNfc0="; + }; buildType = "cmake"; buildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ boost eigen flann ode ]; nativeBuildInputs = [ cmake ]; - + + installPhase = '' + ${sd}/bin/sd --string-mode '$${"{prefix}//nix/store"}' '/nix/store' **/*.pc + ''; + meta = { description = ''OMPL is a free sampling-based motion planning library.''; license = with lib.licenses; [ bsdOriginal ]; diff --git a/distros/noetic/omron-os32c-driver/default.nix b/distros/noetic/omron-os32c-driver/default.nix index 337453318a..7a6f6578e1 100644 --- a/distros/noetic/omron-os32c-driver/default.nix +++ b/distros/noetic/omron-os32c-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-omron-os32c-driver"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/omron-release/archive/release/noetic/omron_os32c_driver/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "4d52357a2d1273510c0ba289c8964a8d5b7d41f0d4f1d130ad7635f559f730b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "omron-release"; + rev = "release/noetic/omron_os32c_driver/1.1.0-1"; + sha256 = "sha256-BV06b4o53dvlYyrb3NwHBN7Zpnd/7VxqJVtAUBUaMlA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/open-karto/default.nix b/distros/noetic/open-karto/default.nix index 910c29396c..f86db4773c 100644 --- a/distros/noetic/open-karto/default.nix +++ b/distros/noetic/open-karto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-open-karto"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/open_karto-release/archive/release/noetic/open_karto/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "10049b93fa17eadee4f7ef7ee4a4ecbaf6550e390a76417ebb4bbef161fd44f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "open_karto-release"; + rev = "release/noetic/open_karto/1.2.2-1"; + sha256 = "sha256-9OdDpmRZo9L3oXXY7gXPFx/yREm/x7yba+QDj0QRqZI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/open-manipulator-gazebo/default.nix b/distros/noetic/open-manipulator-gazebo/default.nix index adf8609d04..184e0686a1 100644 --- a/distros/noetic/open-manipulator-gazebo/default.nix +++ b/distros/noetic/open-manipulator-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-open-manipulator-gazebo"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_simulations-release/archive/release/noetic/open_manipulator_gazebo/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "997691727a0925b8ec1f3fc0cd8d67a2eb5c5ee18b4fc8d15cc5941d6ec026b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_simulations-release"; + rev = "release/noetic/open_manipulator_gazebo/1.1.1-1"; + sha256 = "sha256-TjGn/NRIPgsqSzRDKpDM442Rh3BXCZpXMLh8okFQ4Aw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/open-manipulator-msgs/default.nix b/distros/noetic/open-manipulator-msgs/default.nix index 7e8ace397d..864cea8343 100644 --- a/distros/noetic/open-manipulator-msgs/default.nix +++ b/distros/noetic/open-manipulator-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-open-manipulator-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_msgs-release/archive/release/noetic/open_manipulator_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "39423343c47cc249fdae4bb7588fc7c6689f49c1374c84e846e7603ea4a09cb3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_msgs-release"; + rev = "release/noetic/open_manipulator_msgs/1.0.1-1"; + sha256 = "sha256-RrPyxm/xt001eXMHg8omNq0U8sHgKRTS8iXc5Q4lLOk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/open-manipulator-p-gazebo/default.nix b/distros/noetic/open-manipulator-p-gazebo/default.nix index 26124b4311..e114f15a88 100644 --- a/distros/noetic/open-manipulator-p-gazebo/default.nix +++ b/distros/noetic/open-manipulator-p-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-open-manipulator-p-gazebo"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p_simulations-release/archive/release/noetic/open_manipulator_p_gazebo/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "3acbf35cfbf201c8008cea6a70e4444a03c8f0f12bbae911a5f601cee074a62e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p_simulations-release"; + rev = "release/noetic/open_manipulator_p_gazebo/1.0.1-1"; + sha256 = "sha256-blrO2czuv7I36iBCDdn4KHn0PFykPczic1aNxdP+dIg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/open-manipulator-p-simulations/default.nix b/distros/noetic/open-manipulator-p-simulations/default.nix index f3dec77666..d1535c7ba9 100644 --- a/distros/noetic/open-manipulator-p-simulations/default.nix +++ b/distros/noetic/open-manipulator-p-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-open-manipulator-p-simulations"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_p_simulations-release/archive/release/noetic/open_manipulator_p_simulations/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "6fb11bddc91d991ff81ee705f6ff757641d93eb76343c0ba16e7f176c01b646f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_p_simulations-release"; + rev = "release/noetic/open_manipulator_p_simulations/1.0.1-1"; + sha256 = "sha256-+jZcd6g+V9uZ0HAQEtXXDcdOhyEhKjQxWeIt6O5pQSs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/open-manipulator-simulations/default.nix b/distros/noetic/open-manipulator-simulations/default.nix index 9931c3306e..9776925485 100644 --- a/distros/noetic/open-manipulator-simulations/default.nix +++ b/distros/noetic/open-manipulator-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-open-manipulator-simulations"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/open_manipulator_simulations-release/archive/release/noetic/open_manipulator_simulations/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "9d62659b5995a91a4a901e782358bc91c94a237a8c800bdece2cb8a1b8e9a391"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "open_manipulator_simulations-release"; + rev = "release/noetic/open_manipulator_simulations/1.1.1-1"; + sha256 = "sha256-dEU/Wh4/QLKuNO021QrKq84LsVjjFxG+HkkEUXQexFw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/opencv-apps/default.nix b/distros/noetic/opencv-apps/default.nix index 15312af542..ad83171228 100644 --- a/distros/noetic/opencv-apps/default.nix +++ b/distros/noetic/opencv-apps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-opencv-apps"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros-perception/opencv_apps-release/archive/release/noetic/opencv_apps/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "d6684f71808af4791903d10967d1783f7577512b9d5ccb1b64dfeb3065bf7a5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-perception"; + repo = "opencv_apps-release"; + rev = "release/noetic/opencv_apps/2.0.2-1"; + sha256 = "sha256-lfwwOz8v849SujkM2RVUSV4VCoGLpW5K/q3d4sId6Us="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/opengm/default.nix b/distros/noetic/opengm/default.nix index 7fc32eb611..31b968f617 100644 --- a/distros/noetic/opengm/default.nix +++ b/distros/noetic/opengm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-opengm"; version = "0.6.18-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_extern-release/archive/release/noetic/opengm/0.6.18-1.tar.gz"; - name = "0.6.18-1.tar.gz"; - sha256 = "5c29a653bbc69cc079bdf853a7298bb82844abc10dd215b66374c60b697eb128"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_extern-release"; + rev = "release/noetic/opengm/0.6.18-1"; + sha256 = "sha256-p1RXMVQJy9tqcb0bDjJzjStwlS08yUU8AMqCcNCAZ9A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/openni-description/default.nix b/distros/noetic/openni-description/default.nix index edb6411135..d4a52cbfa8 100644 --- a/distros/noetic/openni-description/default.nix +++ b/distros/noetic/openni-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-openni-description"; version = "1.11.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/openni_camera-release/archive/release/noetic/openni_description/1.11.1-1.tar.gz"; - name = "1.11.1-1.tar.gz"; - sha256 = "6cddd77bc3e372d26cdd86c3b17b102b8c061c77f525a5c4c06de907754a27ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openni_camera-release"; + rev = "release/noetic/openni_description/1.11.1-1"; + sha256 = "sha256-mW4AMBSFtuaRDAZ6puWpGX3N95MAnIzsaVqs6a19P5I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/openni-launch/default.nix b/distros/noetic/openni-launch/default.nix index 6ae50bea27..d9be28acdb 100644 --- a/distros/noetic/openni-launch/default.nix +++ b/distros/noetic/openni-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-openni-launch"; version = "1.11.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/openni_camera-release/archive/release/noetic/openni_launch/1.11.1-1.tar.gz"; - name = "1.11.1-1.tar.gz"; - sha256 = "2a09c7c74039e9db76f2b8fe47741e944ca036beabb689802dac06fc09b549fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openni_camera-release"; + rev = "release/noetic/openni_launch/1.11.1-1"; + sha256 = "sha256-UPmDcE5p6y1cZm960uo5+Pg3krFN3mKExu/uG4Hhvrw="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/openni2-camera/default.nix b/distros/noetic/openni2-camera/default.nix index 0927203dfe..0d2bdca010 100644 --- a/distros/noetic/openni2-camera/default.nix +++ b/distros/noetic/openni2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-openni2-camera"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/openni2_camera-release/archive/release/noetic/openni2_camera/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "be6698786c1add6f19733466b7ae1d97f59b1ac340c3cb8d479532eaae953076"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openni2_camera-release"; + rev = "release/noetic/openni2_camera/1.6.0-1"; + sha256 = "sha256-yFGreuBKZHu0EXVGogjo5RMENPQfjqGsx98r3gy/n2Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/openni2-launch/default.nix b/distros/noetic/openni2-launch/default.nix index 103adcd0c2..e2fe311505 100644 --- a/distros/noetic/openni2-launch/default.nix +++ b/distros/noetic/openni2-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-openni2-launch"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/openni2_camera-release/archive/release/noetic/openni2_launch/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "eb365e4d85b763816ba56ad2b2d369d519a801907b1b5ef66e695981191f2483"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openni2_camera-release"; + rev = "release/noetic/openni2_launch/1.6.0-1"; + sha256 = "sha256-0gRqRIEKsWnQYDaZwSeylZSgW+znkMgGV7q/PL6jsaI="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/openrtm-aist/default.nix b/distros/noetic/openrtm-aist/default.nix index 902254c0d0..02980749c5 100644 --- a/distros/noetic/openrtm-aist/default.nix +++ b/distros/noetic/openrtm-aist/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-openrtm-aist"; version = "1.1.2-r4"; - src = fetchurl { - url = "https://github.com/tork-a/openrtm_aist-release/archive/release/noetic/openrtm_aist/1.1.2-4.tar.gz"; - name = "1.1.2-4.tar.gz"; - sha256 = "61a7a22fbfbf87fff5685a08bde398fc1523e543865f24fe3bacc6f83afc341b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "openrtm_aist-release"; + rev = "release/noetic/openrtm_aist/1.1.2-4"; + sha256 = "sha256-5vAAUfnF6HB5ip3qznOxqk+BRCtiq+lyGjiVuCutRRs="; + }; buildType = "cmake"; buildInputs = [ automake cmake doxygen libtool pkg-config pythonPackages.python ]; diff --git a/distros/noetic/openslam-gmapping/default.nix b/distros/noetic/openslam-gmapping/default.nix index 859e75b36c..30825296eb 100644 --- a/distros/noetic/openslam-gmapping/default.nix +++ b/distros/noetic/openslam-gmapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-openslam-gmapping"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/openslam_gmapping-release/archive/release/noetic/openslam_gmapping/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "46b85b5f979f3ab7a93f0f9ddcbd4aad10cc493d137e8d5b68984ecc66e4c815"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "openslam_gmapping-release"; + rev = "release/noetic/openslam_gmapping/0.2.1-1"; + sha256 = "sha256-MUgh9i3a5ePHLcN+RO5D6R++QoGZdURh+t8diGdkZys="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/openzen-sensor/default.nix b/distros/noetic/openzen-sensor/default.nix index e268291bbf..05794bfc10 100644 --- a/distros/noetic/openzen-sensor/default.nix +++ b/distros/noetic/openzen-sensor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-openzen-sensor"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/lp-research/openzen_sensor-release/archive/release/noetic/openzen_sensor/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "d2a6931e13d2e6ddb0623a71397a4e9408335ec109831f0aeff988b46414f85c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lp-research"; + repo = "openzen_sensor-release"; + rev = "release/noetic/openzen_sensor/1.2.0-1"; + sha256 = "sha256-cywFqPpxCyoovfWUGDFODjiWMGbey98y3cAlR4U9jTA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/opt-camera/default.nix b/distros/noetic/opt-camera/default.nix index 5185f3a6d5..2b97eea23f 100644 --- a/distros/noetic/opt-camera/default.nix +++ b/distros/noetic/opt-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-opt-camera"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/opt_camera/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "0c00e853c675dd096a42190c862cfae422bc3897d7b9823b46dacb18ebad9d3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/opt_camera/2.1.21-2"; + sha256 = "sha256-viHY1fXmiyGSPwnXx+rZNwPqzm/bZWEQgJLXED0K6Xs="; + }; buildType = "catkin"; buildInputs = [ catkin roslang ]; diff --git a/distros/noetic/opw-kinematics/default.nix b/distros/noetic/opw-kinematics/default.nix index 7ca52c8b16..81f6aaf136 100644 --- a/distros/noetic/opw-kinematics/default.nix +++ b/distros/noetic/opw-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-opw-kinematics"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/opw_kinematics-release/archive/release/noetic/opw_kinematics/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "076f8b32d2e15749226cf1e5f41fc999b7345b2beec597905692a8515dfcf2f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "opw_kinematics-release"; + rev = "release/noetic/opw_kinematics/0.5.0-1"; + sha256 = "sha256-G2Lj2UvjoqAHRVoajJeE+nwExpIcXlNcajM3nLIBPh4="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/osm-cartography/default.nix b/distros/noetic/osm-cartography/default.nix index 22b2ac3ca2..af5e1a8daa 100644 --- a/distros/noetic/osm-cartography/default.nix +++ b/distros/noetic/osm-cartography/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-osm-cartography"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/open_street_map-release/archive/release/noetic/osm_cartography/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "8b5dfd2079b88425f498a5d590460ce9c32a9016413fa00af04fed5800c99da4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "open_street_map-release"; + rev = "release/noetic/osm_cartography/0.3.0-1"; + sha256 = "sha256-kzIxRXcX2qTe8OpYu7gjhXOkfjzZhfBPxF4iM66bHe0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/osqp-vendor/default.nix b/distros/noetic/osqp-vendor/default.nix index 3188374ccb..6878b947e6 100644 --- a/distros/noetic/osqp-vendor/default.nix +++ b/distros/noetic/osqp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-osqp-vendor"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/tier4/osqp_vendor-release/archive/release/noetic/osqp_vendor/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "e49b3bd538d8a93dc1f872bb3b52d6b2b27bfe14580ea7a6579337374d506d51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tier4"; + repo = "osqp_vendor-release"; + rev = "release/noetic/osqp_vendor/0.2.0-1"; + sha256 = "sha256-I6jhthmRppj6fiDd1M+bbW8W/bsR5/0ur5UWcf4/ZGQ="; + }; buildType = "catkin"; buildInputs = [ catkin git ros-environment ]; diff --git a/distros/noetic/oxford-gps-eth/default.nix b/distros/noetic/oxford-gps-eth/default.nix index 002465a844..f6dd012fb9 100644 --- a/distros/noetic/oxford-gps-eth/default.nix +++ b/distros/noetic/oxford-gps-eth/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-oxford-gps-eth"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/oxford_gps_eth-release/archive/release/noetic/oxford_gps_eth/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "c8b0e11dc06be0c20400031bde92ffa566bde872b1027a9430c935379f5b1cdc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "oxford_gps_eth-release"; + rev = "release/noetic/oxford_gps_eth/1.2.1-1"; + sha256 = "sha256-gIoKuH1fq8Wid1D0zTEmhCX0a4OuVaw8ji7zKsEzkjc="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/p2os-doc/default.nix b/distros/noetic/p2os-doc/default.nix index c0f59b2bd0..b50f3bf3d8 100644 --- a/distros/noetic/p2os-doc/default.nix +++ b/distros/noetic/p2os-doc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-p2os-doc"; version = "2.2.1-r2"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/noetic/p2os_doc/2.2.1-2.tar.gz"; - name = "2.2.1-2.tar.gz"; - sha256 = "af16e91552f917df1f6d9aeb4f37f718f3e2129f7c046564533829e7e85ea601"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/noetic/p2os_doc/2.2.1-2"; + sha256 = "sha256-bR5QihkZavtpmdUG7kAVKGf/AS1fO7mSMRrwHNXIO1k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/p2os-driver/default.nix b/distros/noetic/p2os-driver/default.nix index 3a781c8abb..aa338224df 100644 --- a/distros/noetic/p2os-driver/default.nix +++ b/distros/noetic/p2os-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-p2os-driver"; version = "2.2.1-r2"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/noetic/p2os_driver/2.2.1-2.tar.gz"; - name = "2.2.1-2.tar.gz"; - sha256 = "8aa76ee11da3490c0de741a401d9ffe8d6784959a1e03c1e05a75717b0f1463a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/noetic/p2os_driver/2.2.1-2"; + sha256 = "sha256-ApFyATWsSGEQNLfmlaJiDdAPjvqQtw6Vt2PdOcyRC+s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/p2os-launch/default.nix b/distros/noetic/p2os-launch/default.nix index 1c6cad2ce4..5a28aeecb3 100644 --- a/distros/noetic/p2os-launch/default.nix +++ b/distros/noetic/p2os-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-p2os-launch"; version = "2.2.1-r2"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/noetic/p2os_launch/2.2.1-2.tar.gz"; - name = "2.2.1-2.tar.gz"; - sha256 = "c542a66eae4be418f4ca606d7b4656b9dd4ad762ec86178959ab16bc2c4d57f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/noetic/p2os_launch/2.2.1-2"; + sha256 = "sha256-j4OeKtlaFXtmwGMDUNgsuvQNkWRW80YKMewzJDPJxGs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/p2os-msgs/default.nix b/distros/noetic/p2os-msgs/default.nix index 57856b06cf..b3af808425 100644 --- a/distros/noetic/p2os-msgs/default.nix +++ b/distros/noetic/p2os-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-p2os-msgs"; version = "2.2.1-r2"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/noetic/p2os_msgs/2.2.1-2.tar.gz"; - name = "2.2.1-2.tar.gz"; - sha256 = "e0888df40b8bb2b7b8cb517416b07ced4bebe92a118cd2ba3be14b1b1ac6ceca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/noetic/p2os_msgs/2.2.1-2"; + sha256 = "sha256-wpaMIZvcSwWlUh1fUNGLiCR/017AiCJ3t3pNrhjnqS0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/p2os-teleop/default.nix b/distros/noetic/p2os-teleop/default.nix index a4ab8b1ee8..f91da685be 100644 --- a/distros/noetic/p2os-teleop/default.nix +++ b/distros/noetic/p2os-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-p2os-teleop"; version = "2.2.1-r2"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/noetic/p2os_teleop/2.2.1-2.tar.gz"; - name = "2.2.1-2.tar.gz"; - sha256 = "0ca88afa5f7a774ec39c1f793799f53267d1971a3a25da7519b7844f08ccca95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/noetic/p2os_teleop/2.2.1-2"; + sha256 = "sha256-KHi5WjejxtngLbEqIGARd3QHamazwK1XE/qgSQPozYs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/p2os-urdf/default.nix b/distros/noetic/p2os-urdf/default.nix index df0bb7f749..4a230e507d 100644 --- a/distros/noetic/p2os-urdf/default.nix +++ b/distros/noetic/p2os-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-p2os-urdf"; version = "2.2.1-r2"; - src = fetchurl { - url = "https://github.com/allenh1/p2os-release/archive/release/noetic/p2os_urdf/2.2.1-2.tar.gz"; - name = "2.2.1-2.tar.gz"; - sha256 = "0d5c50d77beb3c16d2caac93311dff7d0add06bd0f20301dca10939c08bc0420"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "allenh1"; + repo = "p2os-release"; + rev = "release/noetic/p2os_urdf/2.2.1-2"; + sha256 = "sha256-G1fdIrSYwIvWAiIZZ/j5TuS07qSH/4m+dsxArUGza3E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pacmod-msgs/default.nix b/distros/noetic/pacmod-msgs/default.nix index 1c0e386f54..08c4a3f990 100644 --- a/distros/noetic/pacmod-msgs/default.nix +++ b/distros/noetic/pacmod-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pacmod-msgs"; version = "3.3.0-r1"; - src = fetchurl { - url = "https://github.com/astuff/astuff_sensor_msgs-release/archive/release/noetic/pacmod_msgs/3.3.0-1.tar.gz"; - name = "3.3.0-1.tar.gz"; - sha256 = "1c8266219b44c9c89d23c1f4d18e015d0a07493ca623625fc95010dd5c135bea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "astuff"; + repo = "astuff_sensor_msgs-release"; + rev = "release/noetic/pacmod_msgs/3.3.0-1"; + sha256 = "sha256-q3ZCN9PsDjXX0gRReRZHS5u/ZRJ7EXgN907yNQudB1A="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/panda-moveit-config/default.nix b/distros/noetic/panda-moveit-config/default.nix index a8554824bf..63a53f8649 100644 --- a/distros/noetic/panda-moveit-config/default.nix +++ b/distros/noetic/panda-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-panda-moveit-config"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/panda_moveit_config-release/archive/release/noetic/panda_moveit_config/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "f16260452267dd147765d981ca44ccd4843f70b222198870d2031a6f593ebbd8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "panda_moveit_config-release"; + rev = "release/noetic/panda_moveit_config/0.8.1-1"; + sha256 = "sha256-Zhn27VOU3XmerMh3Y1+QfsloEnBnyHZFOo+hmgNS1+8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/parameter-pa/default.nix b/distros/noetic/parameter-pa/default.nix index 20f15a4ae9..b7b7e58b4a 100644 --- a/distros/noetic/parameter-pa/default.nix +++ b/distros/noetic/parameter-pa/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-parameter-pa"; version = "1.2.3-r2"; - src = fetchurl { - url = "https://github.com/TUC-ProAut/ros_parameter-release/archive/release/noetic/parameter_pa/1.2.3-2.tar.gz"; - name = "1.2.3-2.tar.gz"; - sha256 = "f1a8023e6acd9cb328bb3a75167ea023470f21eac302b5f58ab966b9b01065ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "TUC-ProAut"; + repo = "ros_parameter-release"; + rev = "release/noetic/parameter_pa/1.2.3-2"; + sha256 = "sha256-UdbuPA4pBgqHS9lkFd5d5E3khQw6fDibj40vHZiThAM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pass-through-controllers/default.nix b/distros/noetic/pass-through-controllers/default.nix index 2b5fd7211b..6bcdeb2a7a 100644 --- a/distros/noetic/pass-through-controllers/default.nix +++ b/distros/noetic/pass-through-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pass-through-controllers"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_passthrough_controllers-release/archive/release/noetic/pass_through_controllers/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "834c1e9209fde4334698a94439895dcc9656191010add47169c3a89f5be56cb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_passthrough_controllers-release"; + rev = "release/noetic/pass_through_controllers/0.1.0-1"; + sha256 = "sha256-tTHapYRYN6T2c2/Ov7vNJOd10vjNRtfem1jjRImZWq4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pcl-conversions/default.nix b/distros/noetic/pcl-conversions/default.nix index 9d28663b04..7e83b07b26 100644 --- a/distros/noetic/pcl-conversions/default.nix +++ b/distros/noetic/pcl-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pcl-conversions"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/perception_pcl-release/archive/release/noetic/pcl_conversions/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "45306daa50a760bad09b95e2f544068caca7d0a872f4afca5d67237f2d44aa76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "perception_pcl-release"; + rev = "release/noetic/pcl_conversions/1.7.4-1"; + sha256 = "sha256-wwRfvN7cyB0FR39F82KzNiWwUlEdLgJjEpTE1KgE6cY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pcl-msgs/default.nix b/distros/noetic/pcl-msgs/default.nix index 726acb9fb5..fec3e9fc2e 100644 --- a/distros/noetic/pcl-msgs/default.nix +++ b/distros/noetic/pcl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pcl-msgs"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/pcl_msgs-release/archive/release/noetic/pcl_msgs/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "592fc28263e1d8bf6cd3ebe1d601bc5772c0058c0116f826adda975fb8a3c9cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "pcl_msgs-release"; + rev = "release/noetic/pcl_msgs/0.3.0-1"; + sha256 = "sha256-yizofZG+hOjqubj3y8fxNf5YbEogCXVFhvreSQCD3ts="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pcl-ros/default.nix b/distros/noetic/pcl-ros/default.nix index 7293e0265b..27bf258c85 100644 --- a/distros/noetic/pcl-ros/default.nix +++ b/distros/noetic/pcl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pcl-ros"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/perception_pcl-release/archive/release/noetic/pcl_ros/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "98c1f6dc4248b1bb110c904cae66c7e17c6d04b6117ace3bc4ea1fe515ad5138"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "perception_pcl-release"; + rev = "release/noetic/pcl_ros/1.7.4-1"; + sha256 = "sha256-wd5tKEGYlmrmK72ZMh7L9VHXF+gej2e5w47cNai0wO0="; + }; buildType = "catkin"; buildInputs = [ catkin rosconsole roslib ]; diff --git a/distros/noetic/people-msgs/default.nix b/distros/noetic/people-msgs/default.nix index 2d4d4a107b..b51bce6fbf 100644 --- a/distros/noetic/people-msgs/default.nix +++ b/distros/noetic/people-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-people-msgs"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/noetic/people_msgs/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "f043041d0eaa197f4f6a5774ce9439c20758f7b2bed809439f772faf1a29930c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/noetic/people_msgs/1.4.2-1"; + sha256 = "sha256-L5763fW5pCqlsFmLsjLfsHdncP66gacQxO38oGQHx4M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/people-velocity-tracker/default.nix b/distros/noetic/people-velocity-tracker/default.nix index 383a2bb06c..0110c3a5a4 100644 --- a/distros/noetic/people-velocity-tracker/default.nix +++ b/distros/noetic/people-velocity-tracker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-people-velocity-tracker"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/noetic/people_velocity_tracker/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "74f53f59f4d27e127b40e908bc6dddc8459ffd2799a54ee69331e136c77a34ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/noetic/people_velocity_tracker/1.4.2-1"; + sha256 = "sha256-XWtQPrQ9iU+nUy4kgWbjxyxME7P9n2dT5WqsdSLp9qI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/people/default.nix b/distros/noetic/people/default.nix index 1aabf2bb6a..45ff953abc 100644 --- a/distros/noetic/people/default.nix +++ b/distros/noetic/people/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-people"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/OSUrobotics/people-release/archive/release/noetic/people/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "d0a5fb8cdee62113702c3ee9b1174435999684165c08751c91afa57a7e107d8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OSUrobotics"; + repo = "people-release"; + rev = "release/noetic/people/1.4.2-1"; + sha256 = "sha256-sUs7wabv+MGxLofdN/OULCF2IIfkksl+hLeIH8DBE+c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pepper-meshes/default.nix b/distros/noetic/pepper-meshes/default.nix index e46207913a..b01a835705 100644 --- a/distros/noetic/pepper-meshes/default.nix +++ b/distros/noetic/pepper-meshes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pepper-meshes"; version = "0.2.5"; - src = fetchurl { - url = "https://github.com/ros-naoqi/pepper_meshes-release/archive/release/noetic/pepper_meshes/0.2.5-0.tar.gz"; - name = "0.2.5-0.tar.gz"; - sha256 = "08a86a6b1f3ef1378c9a02ac74fe74013cd897b1288cabc4dbfd914974290b6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-naoqi"; + repo = "pepper_meshes-release"; + rev = "release/noetic/pepper_meshes/0.2.5-0"; + sha256 = "sha256-XiNn6TnTQgjYdsLENGC2ljpYUaI48UXJhtHdgz41F+o="; + }; buildType = "catkin"; buildInputs = [ catkin openjdk ]; diff --git a/distros/noetic/perception-pcl/default.nix b/distros/noetic/perception-pcl/default.nix index ceaa623e6b..2303c8363f 100644 --- a/distros/noetic/perception-pcl/default.nix +++ b/distros/noetic/perception-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-perception-pcl"; version = "1.7.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/perception_pcl-release/archive/release/noetic/perception_pcl/1.7.4-1.tar.gz"; - name = "1.7.4-1.tar.gz"; - sha256 = "3077dfaf130b76eb2399373a28c4d9d403a0a9046c56e7f79352c34d8bb99fdd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "perception_pcl-release"; + rev = "release/noetic/perception_pcl/1.7.4-1"; + sha256 = "sha256-1J5fNsyjyAPxqPE04i/TaOSRsIiQK4ZMRLRKEzEwMCU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/perception/default.nix b/distros/noetic/perception/default.nix index c47b9e0a99..28ee9a8e9a 100644 --- a/distros/noetic/perception/default.nix +++ b/distros/noetic/perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-perception"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/noetic/perception/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "13be696a9b374687d002e1b040ddc16f33931c1b5dc9c2f8e802bc510cb1a541"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/noetic/perception/1.5.0-1"; + sha256 = "sha256-01jTD7u8J1hJ6oocF/YZW+dG8aTm1NqKNMAZDsT9onA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pf-description/default.nix b/distros/noetic/pf-description/default.nix index 477bde50af..86a8b2da06 100644 --- a/distros/noetic/pf-description/default.nix +++ b/distros/noetic/pf-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pf-description"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/PepperlFuchs/pf_lidar_ros_driver-release/archive/release/noetic/pf_description/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "e3dbb3a0801529e49456c53545ef3e6ed84b607cd28872d4152ec4b45d12624e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PepperlFuchs"; + repo = "pf_lidar_ros_driver-release"; + rev = "release/noetic/pf_description/1.2.0-1"; + sha256 = "sha256-Kur/IEgrsr0yInyUTpVwzW2ggO/tnlUITMr6PuaG340="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pf-driver/default.nix b/distros/noetic/pf-driver/default.nix index ccd8702f5d..10a29005a9 100644 --- a/distros/noetic/pf-driver/default.nix +++ b/distros/noetic/pf-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pf-driver"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/PepperlFuchs/pf_lidar_ros_driver-release/archive/release/noetic/pf_driver/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "5cf437f193925c44f47c36c345ad605e4e6161d016ff9778ed89c8f21a5dcae0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PepperlFuchs"; + repo = "pf_lidar_ros_driver-release"; + rev = "release/noetic/pf_driver/1.2.0-1"; + sha256 = "sha256-YIEJh7jpfsYOQ8jkmhSeJRFuBwjg6bYUTEVhcrs/YXM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/noetic/phidgets-accelerometer/default.nix b/distros/noetic/phidgets-accelerometer/default.nix index 5f8e6f054c..4a8fd83801 100644 --- a/distros/noetic/phidgets-accelerometer/default.nix +++ b/distros/noetic/phidgets-accelerometer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-accelerometer"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_accelerometer/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "53c84dc0c0b0e2a8d516deb4ecad662ed2afe11abd411a0282e670ca6388af92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_accelerometer/1.0.6-1"; + sha256 = "sha256-AbMewrGmi9PtvxMUoXvwqb60f9MayNB73nsr1Pvf4L4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-analog-inputs/default.nix b/distros/noetic/phidgets-analog-inputs/default.nix index c790c3d42b..897467c8f6 100644 --- a/distros/noetic/phidgets-analog-inputs/default.nix +++ b/distros/noetic/phidgets-analog-inputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-analog-inputs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_analog_inputs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "6d587f979b0ed686c13f6f99f21ccee96ab24680ac35d129592f8e598578d918"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_analog_inputs/1.0.6-1"; + sha256 = "sha256-PS8b8MEI2sDz8bEnnPsE/syGV4eWz48uJYshrNMk7KE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-analog-outputs/default.nix b/distros/noetic/phidgets-analog-outputs/default.nix index de7ac4d85a..70b4a31c8e 100644 --- a/distros/noetic/phidgets-analog-outputs/default.nix +++ b/distros/noetic/phidgets-analog-outputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-analog-outputs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_analog_outputs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "9bb558c6ac52a94ae69038b78d7d48e8d08444f43bdf7fdbb923b0ee84c60d1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_analog_outputs/1.0.6-1"; + sha256 = "sha256-qWVlJ/70ufw/I+8URx8WSZsax+WGVP5/tX1CRpj/Y+U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-api/default.nix b/distros/noetic/phidgets-api/default.nix index 7f5c5af6fc..38a1c62408 100644 --- a/distros/noetic/phidgets-api/default.nix +++ b/distros/noetic/phidgets-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-api"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_api/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "0f8d8aaa8266addc8757f030eead866eade47b00a3742f5fe6386388e5395e78"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_api/1.0.6-1"; + sha256 = "sha256-6u6sEih6vsuoZeoowvf9VaVsbJ3msVeR9sGrLbw6enY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-digital-inputs/default.nix b/distros/noetic/phidgets-digital-inputs/default.nix index 3dda3435db..d94d579aa3 100644 --- a/distros/noetic/phidgets-digital-inputs/default.nix +++ b/distros/noetic/phidgets-digital-inputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-digital-inputs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_digital_inputs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "206f6a633bb8df3d975796d8be18e952e7070494a10c2122e5c87a9172369d65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_digital_inputs/1.0.6-1"; + sha256 = "sha256-++6n9B8DeMM76OWDie+CPWL5sWhiazq0dRdg3VVEKhQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-digital-outputs/default.nix b/distros/noetic/phidgets-digital-outputs/default.nix index 40f854d59e..8afb9ad543 100644 --- a/distros/noetic/phidgets-digital-outputs/default.nix +++ b/distros/noetic/phidgets-digital-outputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-digital-outputs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_digital_outputs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "64eae6cfff523376867267e015b11c71d389b1f27dc3871effd7466972569383"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_digital_outputs/1.0.6-1"; + sha256 = "sha256-NWD3io+C7smMBBqPKlPH7xtn0jaiGVxULFcIagFw9fI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-drivers/default.nix b/distros/noetic/phidgets-drivers/default.nix index 00474b10e5..22528d97d7 100644 --- a/distros/noetic/phidgets-drivers/default.nix +++ b/distros/noetic/phidgets-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-drivers"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_drivers/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "d5b89f9e9e6db334b730993214027fb0c21aa7c7b886b0fe980368f7c7a6ddf4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_drivers/1.0.6-1"; + sha256 = "sha256-CO0GjL50g0wIVqG8PoKtFHnUG5vaTGKDMbPw88uvCQU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-gyroscope/default.nix b/distros/noetic/phidgets-gyroscope/default.nix index 9ec11b2a16..1c959aa25c 100644 --- a/distros/noetic/phidgets-gyroscope/default.nix +++ b/distros/noetic/phidgets-gyroscope/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-gyroscope"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_gyroscope/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "de20c50a229500ef5fa8c250825aafb248479e020a596cf686186096fff714c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_gyroscope/1.0.6-1"; + sha256 = "sha256-WhrqU4aXYYCcZaLLsCIT3/G6l2wFIeiEiAqyhZAaX60="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-high-speed-encoder/default.nix b/distros/noetic/phidgets-high-speed-encoder/default.nix index ca42c890ca..cfa021c1e4 100644 --- a/distros/noetic/phidgets-high-speed-encoder/default.nix +++ b/distros/noetic/phidgets-high-speed-encoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-high-speed-encoder"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_high_speed_encoder/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "584f77adb2631e5126bca4a4cde5e59d1b8a7190e1b3df9d14638c0424d0cdf7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_high_speed_encoder/1.0.6-1"; + sha256 = "sha256-s7CL7CQG+Y51iwdWo1n8rdh0J2vGBgvVqmEee9c8e1M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-ik/default.nix b/distros/noetic/phidgets-ik/default.nix index 1ee24dbc9b..5f91f7d379 100644 --- a/distros/noetic/phidgets-ik/default.nix +++ b/distros/noetic/phidgets-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-ik"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_ik/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "04453a960f2893d261887c13c346f37da88248d1b50c0a741708f1bfefe1ef0c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_ik/1.0.6-1"; + sha256 = "sha256-Ce377AOW1hoyTi2+ttMUrRrpBFJKRPxtjyUiY/Sc2Vc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-magnetometer/default.nix b/distros/noetic/phidgets-magnetometer/default.nix index 2a89ecf0de..6a5210b420 100644 --- a/distros/noetic/phidgets-magnetometer/default.nix +++ b/distros/noetic/phidgets-magnetometer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-magnetometer"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_magnetometer/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "470abfdebf1cc3cad0196aead1f2856a8d17771dfb9ccb80a00e2801b169fa97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_magnetometer/1.0.6-1"; + sha256 = "sha256-dbipRGZxFnfbGsz7IVr8V2DCIzGDMiU5Xt14vxGOzLw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-motors/default.nix b/distros/noetic/phidgets-motors/default.nix index 10ff50b967..d77b57b9de 100644 --- a/distros/noetic/phidgets-motors/default.nix +++ b/distros/noetic/phidgets-motors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-motors"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_motors/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "a69b61e34786949647a2865430a9406bbf53cb504a03e1c544a493a2b2df4302"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_motors/1.0.6-1"; + sha256 = "sha256-JeMGwwdrO4KycQcMmdkt3xGQhZ74SUEBXBvlqiVOlBM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-msgs/default.nix b/distros/noetic/phidgets-msgs/default.nix index 0a48b24064..126a006d4c 100644 --- a/distros/noetic/phidgets-msgs/default.nix +++ b/distros/noetic/phidgets-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-msgs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_msgs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "980f73c71b0e82b5fefc9ff6881f75ce4e75bb51e84563a411c1c0d4a9181924"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_msgs/1.0.6-1"; + sha256 = "sha256-h5mRX8darjde1U8sbGuKnz/5oKvGbSFBzxDAyQCs6lo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/phidgets-spatial/default.nix b/distros/noetic/phidgets-spatial/default.nix index dd301f5ca5..2e834c0095 100644 --- a/distros/noetic/phidgets-spatial/default.nix +++ b/distros/noetic/phidgets-spatial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-spatial"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_spatial/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "4b5ca55c76c2ad013a184daa7b436df316f07243c43f4fc63e42080563cd3c3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_spatial/1.0.6-1"; + sha256 = "sha256-D9O69y9hvos+Cu0mnWDBOnxoK+Op1z7F9o0l9Tiv/rY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/phidgets-temperature/default.nix b/distros/noetic/phidgets-temperature/default.nix index c147ade908..79701ce86f 100644 --- a/distros/noetic/phidgets-temperature/default.nix +++ b/distros/noetic/phidgets-temperature/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-phidgets-temperature"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/phidgets_drivers-release/archive/release/noetic/phidgets_temperature/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "58429ce86878ab4f3ddf3499d5b38168f3d7a9bc5274ddf9839a9731f2080cd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/noetic/phidgets_temperature/1.0.6-1"; + sha256 = "sha256-xx5nMHDgD5pKRuqkU451ttK5TSX6PUVc6EuVHN01Csw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/picovoice-driver/default.nix b/distros/noetic/picovoice-driver/default.nix index 668cb77d05..f25bff2c26 100644 --- a/distros/noetic/picovoice-driver/default.nix +++ b/distros/noetic/picovoice-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-picovoice-driver"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/reinzor/picovoice_ros-release/archive/release/noetic/picovoice_driver/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "696208227a732a4918b3aec973035bdbf57f5218e2d71bef2e057660d19b2d64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "reinzor"; + repo = "picovoice_ros-release"; + rev = "release/noetic/picovoice_driver/1.0.1-1"; + sha256 = "sha256-6k/xh6FZiEcOQoJQ8N08H/rv3IARVwwsY5IQYXfrXwU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/picovoice-msgs/default.nix b/distros/noetic/picovoice-msgs/default.nix index e0b08086bd..82d1825dc6 100644 --- a/distros/noetic/picovoice-msgs/default.nix +++ b/distros/noetic/picovoice-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-picovoice-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/reinzor/picovoice_ros-release/archive/release/noetic/picovoice_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "d63ee582eba6b4e8fe24de8e2b6289cbabcc4fbea585966e10f7605cda05975a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "reinzor"; + repo = "picovoice_ros-release"; + rev = "release/noetic/picovoice_msgs/1.0.1-1"; + sha256 = "sha256-BHv+7kGeQRMDE5FA6/WaaOYEz13odWOSHA65R0v4bjI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pid/default.nix b/distros/noetic/pid/default.nix index 8cd4bf79bd..158b1c7ec5 100644 --- a/distros/noetic/pid/default.nix +++ b/distros/noetic/pid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pid"; version = "0.0.28-r1"; - src = fetchurl { - url = "https://github.com/AndyZe/pid-release/archive/release/noetic/pid/0.0.28-1.tar.gz"; - name = "0.0.28-1.tar.gz"; - sha256 = "153a7267a1990b210abb2deec0531548ef9e98390bac86e7daaa3b44eca062fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "AndyZe"; + repo = "pid-release"; + rev = "release/noetic/pid/0.0.28-1"; + sha256 = "sha256-0i+1ynL2y1kpMfcv5/pWgSAXShUvfAex25KGEzWkdWM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pilz-control/default.nix b/distros/noetic/pilz-control/default.nix index 9928cf561e..7a23fdd765 100644 --- a/distros/noetic/pilz-control/default.nix +++ b/distros/noetic/pilz-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-control"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/noetic/pilz_control/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "8b6f39bf772fff9f2a7a3335923ffb990133968611c9ced7b02f82c77fe51f88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/noetic/pilz_control/0.6.0-1"; + sha256 = "sha256-XIynkAndMNgNasgoc9PtI4lHaMhN9frd/tToAxjL8So="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules roslint ]; diff --git a/distros/noetic/pilz-industrial-motion-planner-testutils/default.nix b/distros/noetic/pilz-industrial-motion-planner-testutils/default.nix index db8f0d01d2..0f6ce07c14 100644 --- a/distros/noetic/pilz-industrial-motion-planner-testutils/default.nix +++ b/distros/noetic/pilz-industrial-motion-planner-testutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-industrial-motion-planner-testutils"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/pilz_industrial_motion_planner_testutils/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "de499881a05cdaa6f4f8bbf7ca232dec7f349931474c5cbd8928533a638d6ef7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/pilz_industrial_motion_planner_testutils/1.1.11-1"; + sha256 = "sha256-8kHSm2Wts3LfNIipScpLtxkham8HFvPKTeMPqn/xde8="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen ]; diff --git a/distros/noetic/pilz-industrial-motion-planner/default.nix b/distros/noetic/pilz-industrial-motion-planner/default.nix index 976ce7a75e..64c47b0fce 100644 --- a/distros/noetic/pilz-industrial-motion-planner/default.nix +++ b/distros/noetic/pilz-industrial-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-industrial-motion-planner"; version = "1.1.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/moveit-release/archive/release/noetic/pilz_industrial_motion_planner/1.1.11-1.tar.gz"; - name = "1.1.11-1.tar.gz"; - sha256 = "a800e9525b218e9f50ab8b6fa323d4a86f8e67cae8d1f72f98531fca66df9997"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "moveit-release"; + rev = "release/noetic/pilz_industrial_motion_planner/1.1.11-1"; + sha256 = "sha256-IMjMQxUTWOg3BpNbF+8D+O4ptrm0uka1oZwTMFCE1P0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pilz-industrial-motion-testutils/default.nix b/distros/noetic/pilz-industrial-motion-testutils/default.nix index 86fb693191..c8bd54b85f 100644 --- a/distros/noetic/pilz-industrial-motion-testutils/default.nix +++ b/distros/noetic/pilz-industrial-motion-testutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-industrial-motion-testutils"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_common-release/archive/release/noetic/pilz_industrial_motion_testutils/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "fd2e4a3f4c386eec28fe42fe92f53b64bbeef13b013d3dcf6f79cbf106a572ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_common-release"; + rev = "release/noetic/pilz_industrial_motion_testutils/0.7.2-1"; + sha256 = "sha256-Y405fmpCVAC8NRxhy2BIhI6tYpVkK+LAwKnAPz1haL8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pilz-industrial-motion/default.nix b/distros/noetic/pilz-industrial-motion/default.nix index a6c13dc4b2..733cba5dce 100644 --- a/distros/noetic/pilz-industrial-motion/default.nix +++ b/distros/noetic/pilz-industrial-motion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-industrial-motion"; version = "0.5.0-r4"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_industrial_motion-release/archive/release/noetic/pilz_industrial_motion/0.5.0-4.tar.gz"; - name = "0.5.0-4.tar.gz"; - sha256 = "722c0b449c3c1f60769edd5ce16c2833c781d389d26b49a56a455aaaf5289641"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_industrial_motion-release"; + rev = "release/noetic/pilz_industrial_motion/0.5.0-4"; + sha256 = "sha256-BOeRT3u4HNEu3hpWuvSeIxQoiV/eW4MwFflWLoxkV0c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pilz-msgs/default.nix b/distros/noetic/pilz-msgs/default.nix index e7785a2ad2..49db13bd3b 100644 --- a/distros/noetic/pilz-msgs/default.nix +++ b/distros/noetic/pilz-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-msgs"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_common-release/archive/release/noetic/pilz_msgs/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "2b3d25c920f029fa70ce25f7189c24b933b9db2e901835fb0b6ef0618f519dbb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_common-release"; + rev = "release/noetic/pilz_msgs/0.7.2-1"; + sha256 = "sha256-W+oHv2aHEaybIric4kwM04YQ+xk6cc1X/nrQPQgxCSo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pilz-robot-programming/default.nix b/distros/noetic/pilz-robot-programming/default.nix index e1a0930c9f..a86171ac4b 100644 --- a/distros/noetic/pilz-robot-programming/default.nix +++ b/distros/noetic/pilz-robot-programming/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-robot-programming"; version = "0.5.0-r4"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_industrial_motion-release/archive/release/noetic/pilz_robot_programming/0.5.0-4.tar.gz"; - name = "0.5.0-4.tar.gz"; - sha256 = "4b094349fefd046eb81afc7c233cd56e763c5a7ba91bc13fcead1bf7bf598d62"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_industrial_motion-release"; + rev = "release/noetic/pilz_robot_programming/0.5.0-4"; + sha256 = "sha256-WZSJzQBaw263V9h1TLizLAd3BI9mA6DpiWaReZr13xA="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/pilz-robots/default.nix b/distros/noetic/pilz-robots/default.nix index 63942c5a7d..3371bee8fb 100644 --- a/distros/noetic/pilz-robots/default.nix +++ b/distros/noetic/pilz-robots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-robots"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/noetic/pilz_robots/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "fcc2acb4d679e4c28ca857adbbe15548f9430af9f16fa98e9c258d902eed0d80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/noetic/pilz_robots/0.6.0-1"; + sha256 = "sha256-NcU9CqJA8++QM7fAN7RnJLAGUcJMuY2Dv9UdaYxu14s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pilz-status-indicator-rqt/default.nix b/distros/noetic/pilz-status-indicator-rqt/default.nix index b2a51f8c62..d7adc239c4 100644 --- a/distros/noetic/pilz-status-indicator-rqt/default.nix +++ b/distros/noetic/pilz-status-indicator-rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-status-indicator-rqt"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/noetic/pilz_status_indicator_rqt/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "6a3b1821bf4b38214ed38d73e69d379432f322554df9cb79de991023c0848f90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/noetic/pilz_status_indicator_rqt/0.6.0-1"; + sha256 = "sha256-pEHVzWFdc1ktbaOUGyuzIQLQ8U7E8261CTPPQuRg8jE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pilz-testutils/default.nix b/distros/noetic/pilz-testutils/default.nix index 5adb30a383..0920af0dee 100644 --- a/distros/noetic/pilz-testutils/default.nix +++ b/distros/noetic/pilz-testutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-testutils"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_common-release/archive/release/noetic/pilz_testutils/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "a26eecef74aadd16dc7c5f8f1d9c57b54e139504a61d0725276167a026231960"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_common-release"; + rev = "release/noetic/pilz_testutils/0.7.2-1"; + sha256 = "sha256-gwY6PWuc05SFqc99zzjIKQmOotU6uKfekbuDpss2dUE="; + }; buildType = "catkin"; buildInputs = [ catkin pilz-utils roscpp sensor-msgs ]; diff --git a/distros/noetic/pilz-utils/default.nix b/distros/noetic/pilz-utils/default.nix index 28114de689..16ba19aa9a 100644 --- a/distros/noetic/pilz-utils/default.nix +++ b/distros/noetic/pilz-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pilz-utils"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_common-release/archive/release/noetic/pilz_utils/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "90a7aaec8293d761ba0e226e730c49c5ca6bf7fe337318c857de368f10387176"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_common-release"; + rev = "release/noetic/pilz_utils/0.7.2-1"; + sha256 = "sha256-1vnKARE1ohxkoVD6pXWGszW4SQePAsY1H6aJAsIbRUU="; + }; buildType = "catkin"; buildInputs = [ catkin clang roscpp ]; diff --git a/distros/noetic/pincher-arm-bringup/default.nix b/distros/noetic/pincher-arm-bringup/default.nix index 13ef3bd158..ba5055670d 100644 --- a/distros/noetic/pincher-arm-bringup/default.nix +++ b/distros/noetic/pincher-arm-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pincher-arm-bringup"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/noetic/pincher_arm_bringup/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "768ab57d8a042f3f7a9b191982261aab787ebe7ff8cb5c30166e11a71aefd103"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/noetic/pincher_arm_bringup/0.2.0-1"; + sha256 = "sha256-eFpmmfRgmkJrH2Sik9lRKqmpAhFwoHgGHkN2bJ90JE8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pincher-arm-description/default.nix b/distros/noetic/pincher-arm-description/default.nix index 220357baee..b4cfbc2d02 100644 --- a/distros/noetic/pincher-arm-description/default.nix +++ b/distros/noetic/pincher-arm-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pincher-arm-description"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/noetic/pincher_arm_description/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "6a65b4212527b1e82f01a2746eaf19d96578c173cf214263b6d3ceca58876989"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/noetic/pincher_arm_description/0.2.0-1"; + sha256 = "sha256-MdQyDNZzz9WikKS6YvpI9vKT7HJGccuKspkTzQNJ8J8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pincher-arm-ikfast-plugin/default.nix b/distros/noetic/pincher-arm-ikfast-plugin/default.nix index 8f275632ab..156e12898a 100644 --- a/distros/noetic/pincher-arm-ikfast-plugin/default.nix +++ b/distros/noetic/pincher-arm-ikfast-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pincher-arm-ikfast-plugin"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/noetic/pincher_arm_ikfast_plugin/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "f1da57fc59c5f2a46ed6ead7598bd9aadb4a36d06249dba1a07d2237d72afe13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/noetic/pincher_arm_ikfast_plugin/0.2.0-1"; + sha256 = "sha256-YPMdLXfqe3HujZW+F5ShqGpKCv7F0zD+6VrVn+Uz9Rc="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen tf2-kdl ]; diff --git a/distros/noetic/pincher-arm-moveit-config/default.nix b/distros/noetic/pincher-arm-moveit-config/default.nix index 824014b5aa..68bf67476d 100644 --- a/distros/noetic/pincher-arm-moveit-config/default.nix +++ b/distros/noetic/pincher-arm-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pincher-arm-moveit-config"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/noetic/pincher_arm_moveit_config/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "7cd39406af989138110d8030dcaccd7930798209c8c31817b1cd463495089668"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/noetic/pincher_arm_moveit_config/0.2.0-1"; + sha256 = "sha256-QIXYMNcL/cZ4whjCE18pFf4tWDVLle1EuXEqQmvuPEM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pincher-arm-moveit-demos/default.nix b/distros/noetic/pincher-arm-moveit-demos/default.nix index 339302fbc5..05e50fd9c6 100644 --- a/distros/noetic/pincher-arm-moveit-demos/default.nix +++ b/distros/noetic/pincher-arm-moveit-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pincher-arm-moveit-demos"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/noetic/pincher_arm_moveit_demos/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "e0fd1b86aa0a8754da9d3c8579bc6c9c56e0ff5bcaa63a9323dfc86d351c96ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/noetic/pincher_arm_moveit_demos/0.2.0-1"; + sha256 = "sha256-+pmwb0EqJTb2bQ6M/HmLmQWdJ61qq2y5s2T6big7ix0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pincher-arm/default.nix b/distros/noetic/pincher-arm/default.nix index 0924c5b66c..36004694db 100644 --- a/distros/noetic/pincher-arm/default.nix +++ b/distros/noetic/pincher-arm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pincher-arm"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/fictionlab-gbp/pincher_arm-release/archive/release/noetic/pincher_arm/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "c5f0fa05b6c03a083d31cd3acf4c9bd1ba83c519a45c2cda64b5f3e869453daa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fictionlab-gbp"; + repo = "pincher_arm-release"; + rev = "release/noetic/pincher_arm/0.2.0-1"; + sha256 = "sha256-M13EHfXPoBG75tR50Toawzt+D7tWgtHGc6BVES08HFU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pinocchio/default.nix b/distros/noetic/pinocchio/default.nix index b464cda404..2d93f2d819 100644 --- a/distros/noetic/pinocchio/default.nix +++ b/distros/noetic/pinocchio/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, catkin, clang, cmake, doxygen, eigen, eigenpy, git, hpp-fcl, python3, python3Packages, urdfdom }: buildRosPackage { pname = "ros-noetic-pinocchio"; - version = "2.6.12-r1"; + version = "2.6.14-r1"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/pinocchio-ros-release/archive/release/noetic/pinocchio/2.6.12-1.tar.gz"; - name = "2.6.12-1.tar.gz"; - sha256 = "ea185d9ec0bfb00ae4d306500d8856c4fe593f7301349b5e89e6ca88e47bd6fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "pinocchio-ros-release"; + rev = "release/noetic/pinocchio/2.6.14-1"; + sha256 = "sha256-m7DMYv+i+euRPDH7c85LPnolZpFuZvRSxGsNjHQz9aU="; + }; buildType = "cmake"; buildInputs = [ clang cmake doxygen git ]; diff --git a/distros/noetic/planner-cspace-msgs/default.nix b/distros/noetic/planner-cspace-msgs/default.nix index e0e3d9e178..c0e5004e5a 100644 --- a/distros/noetic/planner-cspace-msgs/default.nix +++ b/distros/noetic/planner-cspace-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-planner-cspace-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/noetic/planner_cspace_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "1dcaa56a3324805c727d96ec0769155b9921b96fe183a7e359928514be125718"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/noetic/planner_cspace_msgs/0.12.0-1"; + sha256 = "sha256-CO9XcIQ6PCAUokury0btDNVMjlB1onJJdqjwtWfciGY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/planner-cspace/default.nix b/distros/noetic/planner-cspace/default.nix index f45fc9088d..05530d33f0 100644 --- a/distros/noetic/planner-cspace/default.nix +++ b/distros/noetic/planner-cspace/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, costmap-cspace, costmap-cspace-msgs, diagnostic-updater, geometry-msgs, map-server, move-base-msgs, nav-msgs, neonavigation-common, planner-cspace-msgs, roscpp, roslint, rostest, sensor-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros, trajectory-msgs, trajectory-tracker, trajectory-tracker-msgs }: buildRosPackage { pname = "ros-noetic-planner-cspace"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/planner_cspace/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "0ff34c867306699822b834b25f46e17a9c102ad94469aa85d0121ee09cc1acd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/planner_cspace/0.12.0-1"; + sha256 = "sha256-uhbVC+ezq4+bwIC6WUfP/vrEMvK6EXVb9npkGrrYm+8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/plotjuggler-msgs/default.nix b/distros/noetic/plotjuggler-msgs/default.nix index 0bac1fcb9c..36632dbf06 100644 --- a/distros/noetic/plotjuggler-msgs/default.nix +++ b/distros/noetic/plotjuggler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-plotjuggler-msgs"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/facontidavide/plotjuggler_msgs-release/archive/release/noetic/plotjuggler_msgs/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "2af067089b7ea6584191410dd4bf8eda374b2d67fbc75f57e42b7581ff4928b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "plotjuggler_msgs-release"; + rev = "release/noetic/plotjuggler_msgs/0.2.1-1"; + sha256 = "sha256-LOj/zO/kVp+PLBNkVl/UyunkoA3npudzqmvzwcH5E9Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/plotjuggler-ros/default.nix b/distros/noetic/plotjuggler-ros/default.nix index 5d06953cb4..5acc02b97b 100644 --- a/distros/noetic/plotjuggler-ros/default.nix +++ b/distros/noetic/plotjuggler-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-plotjuggler-ros"; version = "1.7.0-r1"; - src = fetchurl { - url = "https://github.com/PlotJuggler/plotjuggler-ros-plugins-release/archive/release/noetic/plotjuggler_ros/1.7.0-1.tar.gz"; - name = "1.7.0-1.tar.gz"; - sha256 = "0288b7d6b123ce827873df51c9a0ed519e6c962e92ae960a40fb9048afab98db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PlotJuggler"; + repo = "plotjuggler-ros-plugins-release"; + rev = "release/noetic/plotjuggler_ros/1.7.0-1"; + sha256 = "sha256-kL86S4hw8+vC32Dh0EgrWHXUQPY2iPGT3vVRD9EN3PI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/plotjuggler/default.nix b/distros/noetic/plotjuggler/default.nix index 66b7ed6806..807c0b3b7c 100644 --- a/distros/noetic/plotjuggler/default.nix +++ b/distros/noetic/plotjuggler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-plotjuggler"; version = "3.6.0-r1"; - src = fetchurl { - url = "https://github.com/facontidavide/plotjuggler-release/archive/release/noetic/plotjuggler/3.6.0-1.tar.gz"; - name = "3.6.0-1.tar.gz"; - sha256 = "d8bf1819254a0f6a6d505791548c87658f7238ec2d3a68e8c27809d4d6b32c65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "plotjuggler-release"; + rev = "release/noetic/plotjuggler/3.6.0-1"; + sha256 = "sha256-nHSTE9bbmkR6byd/ACSbE16oscBg2pMgQIEUMdXFpg0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pluginlib-tutorials/default.nix b/distros/noetic/pluginlib-tutorials/default.nix index 1f4295cb1e..42bd1f6b2f 100644 --- a/distros/noetic/pluginlib-tutorials/default.nix +++ b/distros/noetic/pluginlib-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pluginlib-tutorials"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/noetic/pluginlib_tutorials/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "7ab5def4de3d6de1478cb73dad4610ae045d327076ef56c4815b5836faf684ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/noetic/pluginlib_tutorials/0.2.0-1"; + sha256 = "sha256-wA7L3gANhzeLnJtHF/4hbASwjZCqS7TM0q7yGPVW6kc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pluginlib/default.nix b/distros/noetic/pluginlib/default.nix index 3ea71bf0da..910e983c72 100644 --- a/distros/noetic/pluginlib/default.nix +++ b/distros/noetic/pluginlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pluginlib"; version = "1.13.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/pluginlib-release/archive/release/noetic/pluginlib/1.13.0-1.tar.gz"; - name = "1.13.0-1.tar.gz"; - sha256 = "0601378fa3e4471c7e995df4d4ccfc0e03fece47661e15df6ae83ce4fb62d74f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "pluginlib-release"; + rev = "release/noetic/pluginlib/1.13.0-1"; + sha256 = "sha256-Zvhtn3A5Im3JiWE80P0elDWuzvWLco7ANXtDYyDpv9A="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/pointcloud-to-laserscan/default.nix b/distros/noetic/pointcloud-to-laserscan/default.nix index 721f2f5e25..21a7f8b470 100644 --- a/distros/noetic/pointcloud-to-laserscan/default.nix +++ b/distros/noetic/pointcloud-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pointcloud-to-laserscan"; version = "1.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/pointcloud_to_laserscan-release/archive/release/noetic/pointcloud_to_laserscan/1.4.1-1.tar.gz"; - name = "1.4.1-1.tar.gz"; - sha256 = "acc561fc25b0b63f7eed1f56040bf2992e400e9bba6c22380d571c10478eeb40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "pointcloud_to_laserscan-release"; + rev = "release/noetic/pointcloud_to_laserscan/1.4.1-1"; + sha256 = "sha256-nbLSYZaMRpvQ4Jp9vmiZXIq+J8Rjjh68l09lpekS/lM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pointgrey-camera-description/default.nix b/distros/noetic/pointgrey-camera-description/default.nix index 6c7437cc80..d706af9faa 100644 --- a/distros/noetic/pointgrey-camera-description/default.nix +++ b/distros/noetic/pointgrey-camera-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pointgrey-camera-description"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/noetic/pointgrey_camera_description/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "021f4da2c001e95309e83fa90edad0200b51fd80df3d886ca573760e8e9c5111"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/noetic/pointgrey_camera_description/0.15.1-1"; + sha256 = "sha256-fcfQUGR08ugHXxM27riVk8xkpynQRa15lB2JtUZQaMY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pointgrey-camera-driver/default.nix b/distros/noetic/pointgrey-camera-driver/default.nix index 5b0ce96357..1fbecc2965 100644 --- a/distros/noetic/pointgrey-camera-driver/default.nix +++ b/distros/noetic/pointgrey-camera-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pointgrey-camera-driver"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/noetic/pointgrey_camera_driver/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "5af5603bb72ac4da3259ca169526f83b47ac2d62f5ae2755983696bf1ade1a81"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/noetic/pointgrey_camera_driver/0.15.1-1"; + sha256 = "sha256-a8+uQQouJtk36MCF/O7aCT8MjPWaW2c/iVQaUPE+pZA="; + }; buildType = "catkin"; buildInputs = [ catkin curl dpkg ]; diff --git a/distros/noetic/points-preprocessor/default.nix b/distros/noetic/points-preprocessor/default.nix index 8d65061d99..5d33a67e88 100644 --- a/distros/noetic/points-preprocessor/default.nix +++ b/distros/noetic/points-preprocessor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-points-preprocessor"; version = "1.14.14-r3"; - src = fetchurl { - url = "https://github.com/nobleo/core_perception-release/archive/release/noetic/points_preprocessor/1.14.14-3.tar.gz"; - name = "1.14.14-3.tar.gz"; - sha256 = "467ca95fcfe2d11039984820c368b26d6f212c051347dcd2d31843939e2767ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "core_perception-release"; + rev = "release/noetic/points_preprocessor/1.14.14-3"; + sha256 = "sha256-hV3o953aGBPoIFIpBm/bhGyfsmsxJxM35qYrpYDSLr0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/polar-scan-matcher/default.nix b/distros/noetic/polar-scan-matcher/default.nix index 153c38efae..9186164a7b 100644 --- a/distros/noetic/polar-scan-matcher/default.nix +++ b/distros/noetic/polar-scan-matcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-polar-scan-matcher"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/noetic/polar_scan_matcher/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "3e7d8367dfee2ad64dade2bb79db331c814c1a4f594c09eb41fc3f1263cf9833"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/noetic/polar_scan_matcher/0.3.3-1"; + sha256 = "sha256-Yp0SMPPD1m1o279HCJSTygOmAdVd+QDgf93Fg9Y+6gc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/polled-camera/default.nix b/distros/noetic/polled-camera/default.nix index 6010ba5f1a..8869030e93 100644 --- a/distros/noetic/polled-camera/default.nix +++ b/distros/noetic/polled-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-polled-camera"; version = "1.12.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_common-release/archive/release/noetic/polled_camera/1.12.0-1.tar.gz"; - name = "1.12.0-1.tar.gz"; - sha256 = "ef7758bb4a5e8e9cde9fb84846474e2df5ed0051eb17913f901f7d7c7889973e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_common-release"; + rev = "release/noetic/polled_camera/1.12.0-1"; + sha256 = "sha256-DusqcNzkxC35pl7y7nImBt9k5dLSmsvgqXHKBmM7kMI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pose-base-controller/default.nix b/distros/noetic/pose-base-controller/default.nix index 4c39bb2a3a..ed3488a5ae 100644 --- a/distros/noetic/pose-base-controller/default.nix +++ b/distros/noetic/pose-base-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pose-base-controller"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/noetic/pose_base_controller/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "b1849295bd12f2ab3acbaaa5878cf3c1b20fb08682e46bcaf7d7f6ec7388a93b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/noetic/pose_base_controller/0.4.1-1"; + sha256 = "sha256-ZYdbzGzbdCnQcZ+9HuOilc3qLQFSHSoI24BtYvJDPTg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pose-cov-ops/default.nix b/distros/noetic/pose-cov-ops/default.nix index ea1f550025..7bb76a0f5d 100644 --- a/distros/noetic/pose-cov-ops/default.nix +++ b/distros/noetic/pose-cov-ops/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pose-cov-ops"; version = "0.3.8-r1"; - src = fetchurl { - url = "https://github.com/mrpt-ros-pkg-release/pose_cov_ops-release/archive/release/noetic/pose_cov_ops/0.3.8-1.tar.gz"; - name = "0.3.8-1.tar.gz"; - sha256 = "d29d619df4e434f38ca90e53882d01a1035d13ceadcfd13916dcad89ba7e45af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mrpt-ros-pkg-release"; + repo = "pose_cov_ops-release"; + rev = "release/noetic/pose_cov_ops/0.3.8-1"; + sha256 = "sha256-PedCn7b0uRpfsVpaUyJ5yPWogpyzEvsBI6xR2g6O7RE="; + }; buildType = "catkin"; buildInputs = [ catkin cmake ros-environment ]; diff --git a/distros/noetic/pose-follower/default.nix b/distros/noetic/pose-follower/default.nix index 431826acb8..111b178a58 100644 --- a/distros/noetic/pose-follower/default.nix +++ b/distros/noetic/pose-follower/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pose-follower"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/noetic/pose_follower/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "4125ce1012b62fd5713fd179a6de088aaa89009b6b7bc6c346be828004c43971"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/noetic/pose_follower/0.4.1-1"; + sha256 = "sha256-g6kgumgaNZ0+72Xgasfc1PW4ZnezAO/ftVp0IH//EU8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/posedetection-msgs/default.nix b/distros/noetic/posedetection-msgs/default.nix index 4e12cf8b19..0ccc9f3c81 100644 --- a/distros/noetic/posedetection-msgs/default.nix +++ b/distros/noetic/posedetection-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-posedetection-msgs"; version = "4.3.2-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/noetic/posedetection_msgs/4.3.2-1.tar.gz"; - name = "4.3.2-1.tar.gz"; - sha256 = "9b7873709badd4ba3d027944f28f7eb11e5f79d8a9bfde2bcb5f5dd663170938"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/noetic/posedetection_msgs/4.3.2-1"; + sha256 = "sha256-IP8Qz4xflNECPu+ZxJCGQCamVQQVG3CqZmhokN+fIZ4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/position-controllers/default.nix b/distros/noetic/position-controllers/default.nix index 43a109209f..fe7101df50 100644 --- a/distros/noetic/position-controllers/default.nix +++ b/distros/noetic/position-controllers/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, controller-interface, forward-command-controller, hardware-interface, pluginlib, roscpp }: buildRosPackage { pname = "ros-noetic-position-controllers"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/position_controllers/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "062678a7125a118858ed423f1ea21f2a66f70a7452f8ce76bdd58681a55f769c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/position_controllers/0.21.1-1"; + sha256 = "sha256-MfWD0wLdp4LkQ/b1E4iwGFVqYJUwxUZgPXqHIv0FZfI="; + }; buildType = "catkin"; buildInputs = [ catkin pluginlib ]; diff --git a/distros/noetic/power-monitor/default.nix b/distros/noetic/power-monitor/default.nix index c0ce08152c..594d95dd2f 100644 --- a/distros/noetic/power-monitor/default.nix +++ b/distros/noetic/power-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-power-monitor"; version = "1.1.10-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_power_drivers-release/archive/release/noetic/power_monitor/1.1.10-1.tar.gz"; - name = "1.1.10-1.tar.gz"; - sha256 = "379ca3049bcd3d48bba2379b85a1b37cdd391196e55adc3d2276656940b9387c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_power_drivers-release"; + rev = "release/noetic/power_monitor/1.1.10-1"; + sha256 = "sha256-4JqY6AFxg3fz+ah+zoiMDPylpsdSFxVwgwEhK48Jsig="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/power-msgs/default.nix b/distros/noetic/power-msgs/default.nix index 6b5b7a5383..3ec3c47e37 100644 --- a/distros/noetic/power-msgs/default.nix +++ b/distros/noetic/power-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-power-msgs"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/power_msgs-release/archive/release/noetic/power_msgs/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "696eff7295d1352040e3223f176fa488815f14ef05066ee6ab43e479791d4120"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "power_msgs-release"; + rev = "release/noetic/power_msgs/0.4.2-1"; + sha256 = "sha256-QvZ5QmO3r+aHuScvApVtJBeMy9z8HwfEc0jhtBR40PY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-app-manager/default.nix b/distros/noetic/pr2-app-manager/default.nix index 11d9ca2cb5..5f6fcfc22a 100644 --- a/distros/noetic/pr2-app-manager/default.nix +++ b/distros/noetic/pr2-app-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-app-manager"; version = "0.6.2-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/noetic/pr2_app_manager/0.6.2-1.tar.gz"; - name = "0.6.2-1.tar.gz"; - sha256 = "f3cd087830e5f17457de40c24f9f499f3efe2a46a9db773d6ab54bd6c5c30d9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/noetic/pr2_app_manager/0.6.2-1"; + sha256 = "sha256-AE03CQ3ekbYoUn2rzQSB57Z8kDNU6jfssE/jEvX1Gm4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-apps/default.nix b/distros/noetic/pr2-apps/default.nix index 291bb3bd61..dfef9ccec9 100644 --- a/distros/noetic/pr2-apps/default.nix +++ b/distros/noetic/pr2-apps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-apps"; version = "0.6.2-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/noetic/pr2_apps/0.6.2-1.tar.gz"; - name = "0.6.2-1.tar.gz"; - sha256 = "9f440b86847576601a7ea53b1c349af21804075f861ef10c0f671a679b5bedf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/noetic/pr2_apps/0.6.2-1"; + sha256 = "sha256-hHc6kCQ7qOTZVnaLqMJWBkHe9ln+bTqVDCINfOjOBh8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-arm-kinematics/default.nix b/distros/noetic/pr2-arm-kinematics/default.nix index 4f15baaf4a..162974bbb3 100644 --- a/distros/noetic/pr2-arm-kinematics/default.nix +++ b/distros/noetic/pr2-arm-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-arm-kinematics"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_kinematics-release/archive/release/noetic/pr2_arm_kinematics/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "b0ba5739fbb795b156e5c746810d1ecefe4785d7ad49a2eb5d92fa0313abf20e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_kinematics-release"; + rev = "release/noetic/pr2_arm_kinematics/1.0.11-1"; + sha256 = "sha256-x9tmC8pof/LT3Fs9oJ2dpr/uCCt8r8uPrpJ2SpfT9mg="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/pr2-arm-move-ik/default.nix b/distros/noetic/pr2-arm-move-ik/default.nix index a94db9200e..281bdfcb67 100644 --- a/distros/noetic/pr2-arm-move-ik/default.nix +++ b/distros/noetic/pr2-arm-move-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-arm-move-ik"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/noetic/pr2_arm_move_ik/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "581d5308dc0fb1202eeb529ab4b9dd0b0228afa1f7a0fde9267631992aeb5a98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/noetic/pr2_arm_move_ik/0.0.12-1"; + sha256 = "sha256-Ng8jHLj4k2RJYoymCBHaxzSyOkjekphAB4lmbpEfqtM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-bringup-tests/default.nix b/distros/noetic/pr2-bringup-tests/default.nix index 2db106572c..3efc937a14 100644 --- a/distros/noetic/pr2-bringup-tests/default.nix +++ b/distros/noetic/pr2-bringup-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-bringup-tests"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/noetic/pr2_bringup_tests/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "26850da2346f6960f636510790236c6e1942ccfe83bd4e643d33cc2abe8df1a2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/noetic/pr2_bringup_tests/1.0.15-1"; + sha256 = "sha256-mGA3SQ2YUu5uhY3ucL7JS3QLlFen9+Y/RhsGr+B3B9o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-bringup/default.nix b/distros/noetic/pr2-bringup/default.nix index 1d047ac935..ffd5879c98 100644 --- a/distros/noetic/pr2-bringup/default.nix +++ b/distros/noetic/pr2-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-bringup"; version = "1.6.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/noetic/pr2_bringup/1.6.32-1.tar.gz"; - name = "1.6.32-1.tar.gz"; - sha256 = "d8e565fe9a2b5543b7dfe5482ed17712db223d3b668998df9678f5a2295482cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/noetic/pr2_bringup/1.6.32-1"; + sha256 = "sha256-Li+vd9Lr/fTAIs7HLqj4goP1TVYdl51ocTWEGgq+T94="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch rostest ]; diff --git a/distros/noetic/pr2-calibration-controllers/default.nix b/distros/noetic/pr2-calibration-controllers/default.nix index 7d2bfcf48d..a918dd19fa 100644 --- a/distros/noetic/pr2-calibration-controllers/default.nix +++ b/distros/noetic/pr2-calibration-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-calibration-controllers"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/pr2_calibration_controllers/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "80da6ee89676f08f30ce5148a52d0d63aefe3db6b58f0ae0c4a0ee445761b1c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/pr2_calibration_controllers/1.10.18-1"; + sha256 = "sha256-xNihhQUis7zOI9Z5HY+KLXZaSMYCeObVHCdw0REAXVM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-camera-synchronizer/default.nix b/distros/noetic/pr2-camera-synchronizer/default.nix index 111899e909..1c9f7b75c4 100644 --- a/distros/noetic/pr2-camera-synchronizer/default.nix +++ b/distros/noetic/pr2-camera-synchronizer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-camera-synchronizer"; version = "1.6.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/noetic/pr2_camera_synchronizer/1.6.32-1.tar.gz"; - name = "1.6.32-1.tar.gz"; - sha256 = "3434b67c2318b2123904dd0dd32b046cbb892cb7672fbfa04af36e540b13578f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/noetic/pr2_camera_synchronizer/1.6.32-1"; + sha256 = "sha256-80z4ZEl1fjAsTDxSCiQzoDY22uRuzklyr1JSE3o5s8k="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/pr2-common-action-msgs/default.nix b/distros/noetic/pr2-common-action-msgs/default.nix index 346b4ad6c5..cf1b2a0ae6 100644 --- a/distros/noetic/pr2-common-action-msgs/default.nix +++ b/distros/noetic/pr2-common-action-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-common-action-msgs"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/noetic/pr2_common_action_msgs/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "6d678dd60f1cb1ade07d869b5e22d82e532a1441cac83913faec03fb6c19ee51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/noetic/pr2_common_action_msgs/0.0.12-1"; + sha256 = "sha256-dhU+I0Hl4yQptNca8uXp9f8dv65zLh4vFATPvvWNuwQ="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-common-actions/default.nix b/distros/noetic/pr2-common-actions/default.nix index 9c6d318974..86ac662840 100644 --- a/distros/noetic/pr2-common-actions/default.nix +++ b/distros/noetic/pr2-common-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-common-actions"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/noetic/pr2_common_actions/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "7dfba611208532414ba926f98c67113d8a227a74c74e8eba44e559a76f6364ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/noetic/pr2_common_actions/0.0.12-1"; + sha256 = "sha256-qFohAtLPFmB4tkpEVd+qB32gkFWZIDjmWIoZNMZItIQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-common/default.nix b/distros/noetic/pr2-common/default.nix index 045f68b7dc..640662abb0 100644 --- a/distros/noetic/pr2-common/default.nix +++ b/distros/noetic/pr2-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-common"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/noetic/pr2_common/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "ad3cbd422f8f70acabc1253e26746689b616021507cee1f9c713600fb1ac5cf7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/noetic/pr2_common/1.13.1-1"; + sha256 = "sha256-nRXelHM0Ch/NlpPDDfUrb6IwU55CCbaAalhX/LqpXZw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-computer-monitor/default.nix b/distros/noetic/pr2-computer-monitor/default.nix index 1afe2bd367..4edff519a1 100644 --- a/distros/noetic/pr2-computer-monitor/default.nix +++ b/distros/noetic/pr2-computer-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-computer-monitor"; version = "1.6.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/noetic/pr2_computer_monitor/1.6.32-1.tar.gz"; - name = "1.6.32-1.tar.gz"; - sha256 = "30b52ef1b9ae7056eeff1be2b99e27b1d069252d3a8d56d1e9e93bb9ead05377"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/noetic/pr2_computer_monitor/1.6.32-1"; + sha256 = "sha256-KPpfeNoL1FaYJS2I2CpxIrqCqULQlC0/6qoSB1bT4Ag="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-controller-configuration-gazebo/default.nix b/distros/noetic/pr2-controller-configuration-gazebo/default.nix index cf09623ba4..66046129c4 100644 --- a/distros/noetic/pr2-controller-configuration-gazebo/default.nix +++ b/distros/noetic/pr2-controller-configuration-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-controller-configuration-gazebo"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_simulator-release/archive/release/noetic/pr2_controller_configuration_gazebo/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "8f2ae6424d2d1db440118a8feabc55b9ed4369c3fb1fba8907203030cc412fa2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_simulator-release"; + rev = "release/noetic/pr2_controller_configuration_gazebo/2.1.0-1"; + sha256 = "sha256-MDlvzd4pdInfsZYrEbBCP/C4i5qrWNmv7P53fTUsAmc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-controller-configuration/default.nix b/distros/noetic/pr2-controller-configuration/default.nix index 4753c51879..49c2043243 100644 --- a/distros/noetic/pr2-controller-configuration/default.nix +++ b/distros/noetic/pr2-controller-configuration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-controller-configuration"; version = "1.6.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/noetic/pr2_controller_configuration/1.6.32-1.tar.gz"; - name = "1.6.32-1.tar.gz"; - sha256 = "80b94e8c30c4b63aef0b152254063ea36fc0bea7928d3e5ec94a3149c05c1eac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/noetic/pr2_controller_configuration/1.6.32-1"; + sha256 = "sha256-jGYQpnMaIa4HOEGbAZMjwUDU078w1XryjoB2KVTk1NA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/pr2-controller-interface/default.nix b/distros/noetic/pr2-controller-interface/default.nix index b2cf5d7c95..8a39f07ca2 100644 --- a/distros/noetic/pr2-controller-interface/default.nix +++ b/distros/noetic/pr2-controller-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-controller-interface"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/noetic/pr2_controller_interface/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "df620b6b8c062ebddcc12df1b44e4f8f68ccde059936d8ac3c7a3be9f9edce67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/noetic/pr2_controller_interface/1.8.21-1"; + sha256 = "sha256-5jMSsUc65dvgHNzQGsh8PlQKMUj7jbFiMIa2oRzYHEY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-controller-manager/default.nix b/distros/noetic/pr2-controller-manager/default.nix index 21729b68b3..2b821d031a 100644 --- a/distros/noetic/pr2-controller-manager/default.nix +++ b/distros/noetic/pr2-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-controller-manager"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/noetic/pr2_controller_manager/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "7ee04c0a574c04e73efba92a61e9d62cc44916ea119873ba1de723f49dd4f791"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/noetic/pr2_controller_manager/1.8.21-1"; + sha256 = "sha256-T3qmvTLPyz+4l0cVVa1e8w87sgtoWWWmHLmvchpvI54="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules rostest ]; diff --git a/distros/noetic/pr2-controllers-msgs/default.nix b/distros/noetic/pr2-controllers-msgs/default.nix index ff32d5273d..3b89cdcb7a 100644 --- a/distros/noetic/pr2-controllers-msgs/default.nix +++ b/distros/noetic/pr2-controllers-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-controllers-msgs"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/pr2_controllers_msgs/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "f9c03a06ee60764b673fa836ba64064b5c679695c79e0471a169701af1e1605c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/pr2_controllers_msgs/1.10.18-1"; + sha256 = "sha256-6j+k75lKtzbHnP3R6Qwi9sOXbY5/xwn9fjjdFGTnKWY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-controllers/default.nix b/distros/noetic/pr2-controllers/default.nix index a7de9e5faa..171dc64e08 100644 --- a/distros/noetic/pr2-controllers/default.nix +++ b/distros/noetic/pr2-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-controllers"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/pr2_controllers/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "27537dbc0e3aecc450ba1a232140e147f2a9958178ac29abdda9aa57926d2f34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/pr2_controllers/1.10.18-1"; + sha256 = "sha256-Aw8qP+xXxJgYjR4BZQrAAIe/0o/k8Vl2MyoYkH2vTiY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-counterbalance-check/default.nix b/distros/noetic/pr2-counterbalance-check/default.nix index b89278c85f..c761ece73d 100644 --- a/distros/noetic/pr2-counterbalance-check/default.nix +++ b/distros/noetic/pr2-counterbalance-check/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-counterbalance-check"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/noetic/pr2_counterbalance_check/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "fd86f761e8d28ef9a7d5c3633926747fde4c7050758377595afac6914ef4ad92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/noetic/pr2_counterbalance_check/1.0.15-1"; + sha256 = "sha256-e+XFN5xpI3IKnd+BOeAlFjON7OLQRSxE1lQyo45hap8="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/pr2-dashboard-aggregator/default.nix b/distros/noetic/pr2-dashboard-aggregator/default.nix index 6217d6ab15..7f2f28c710 100644 --- a/distros/noetic/pr2-dashboard-aggregator/default.nix +++ b/distros/noetic/pr2-dashboard-aggregator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-dashboard-aggregator"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/noetic/pr2_dashboard_aggregator/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "cffbc94a2f17facbf3596353782a182d7304eac3b43d26af9f00fbad24a3347d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/noetic/pr2_dashboard_aggregator/1.13.1-1"; + sha256 = "sha256-jwWX2KShYOMNLypUEOTNTRjyzyyXfem8J+jop6mcoHs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-description/default.nix b/distros/noetic/pr2-description/default.nix index 994dbd3174..498813559f 100644 --- a/distros/noetic/pr2-description/default.nix +++ b/distros/noetic/pr2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-description"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/noetic/pr2_description/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "a330ee0985183df4ddbf72569f1ec2d4025ae5414bce874176ad68750344be76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/noetic/pr2_description/1.13.1-1"; + sha256 = "sha256-rUqVXmV7lxttZeaQuYfhqeX1vj3EF/d0UaEQSJzfEY0="; + }; buildType = "catkin"; buildInputs = [ catkin convex-decomposition ivcon ]; diff --git a/distros/noetic/pr2-ethercat-drivers/default.nix b/distros/noetic/pr2-ethercat-drivers/default.nix index 02b33da8ef..b5dbf09387 100644 --- a/distros/noetic/pr2-ethercat-drivers/default.nix +++ b/distros/noetic/pr2-ethercat-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-ethercat-drivers"; version = "1.9.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_ethercat_drivers-release/archive/release/noetic/pr2_ethercat_drivers/1.9.0-1.tar.gz"; - name = "1.9.0-1.tar.gz"; - sha256 = "a5f9b21836a44729c9c169a59601d14be248abd6ffee90716e770e362e0b88b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_ethercat_drivers-release"; + rev = "release/noetic/pr2_ethercat_drivers/1.9.0-1"; + sha256 = "sha256-IhBzJTFc1lxIA+nah4mCi1iyAAEEm48tA2D6kbQH0m0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-ethercat/default.nix b/distros/noetic/pr2-ethercat/default.nix index d6a1347249..aeca5019ae 100644 --- a/distros/noetic/pr2-ethercat/default.nix +++ b/distros/noetic/pr2-ethercat/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-ethercat"; version = "1.6.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/noetic/pr2_ethercat/1.6.32-1.tar.gz"; - name = "1.6.32-1.tar.gz"; - sha256 = "2112a2d2a0e6863abcb6bfaa32d46569e959c2530dc6731e05dd0970471de71b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/noetic/pr2_ethercat/1.6.32-1"; + sha256 = "sha256-7WSCXQXiQx10EqJldo9Cmy/2/A5I8VQA57Npv9jIXMY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-gazebo-plugins/default.nix b/distros/noetic/pr2-gazebo-plugins/default.nix index 5973470762..112589650f 100644 --- a/distros/noetic/pr2-gazebo-plugins/default.nix +++ b/distros/noetic/pr2-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-gazebo-plugins"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_simulator-release/archive/release/noetic/pr2_gazebo_plugins/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "115e2a383daf840fab400d4eaf78e732cbc03aa660085efe4f4abd0498862b96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_simulator-release"; + rev = "release/noetic/pr2_gazebo_plugins/2.1.0-1"; + sha256 = "sha256-RGRX02nW3txDOmWs0lJbRflZ4rg5K3FxkXgfm7oWrEI="; + }; buildType = "catkin"; buildInputs = [ catkin std-srvs ]; diff --git a/distros/noetic/pr2-gazebo/default.nix b/distros/noetic/pr2-gazebo/default.nix index a9bd412e42..3a4f278755 100644 --- a/distros/noetic/pr2-gazebo/default.nix +++ b/distros/noetic/pr2-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-gazebo"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_simulator-release/archive/release/noetic/pr2_gazebo/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "c076638d44c6dc0a5db2bce6b4c2863fc48bab11f7a2862a12c1803f67960379"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_simulator-release"; + rev = "release/noetic/pr2_gazebo/2.1.0-1"; + sha256 = "sha256-ITxdbyszak2Prx1F9X7WuAW2Zf/UoEQhnCUa4U5/kEg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-gripper-action/default.nix b/distros/noetic/pr2-gripper-action/default.nix index 6ca5c514c4..0dd850506b 100644 --- a/distros/noetic/pr2-gripper-action/default.nix +++ b/distros/noetic/pr2-gripper-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-gripper-action"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/pr2_gripper_action/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "7f56e298697eca4aa4844f5aba01a82984f78cbdaf180aa269bfad3b08cfad11"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/pr2_gripper_action/1.10.18-1"; + sha256 = "sha256-Ss20bLptdYLLDU0L8UPwn3RodUz6qgOy3Yp6PWSWw3E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-gripper-sensor-action/default.nix b/distros/noetic/pr2-gripper-sensor-action/default.nix index 1c2340df26..a850b9d8ea 100644 --- a/distros/noetic/pr2-gripper-sensor-action/default.nix +++ b/distros/noetic/pr2-gripper-sensor-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-gripper-sensor-action"; version = "1.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_gripper_sensor-release/archive/release/noetic/pr2_gripper_sensor_action/1.0.12-1.tar.gz"; - name = "1.0.12-1.tar.gz"; - sha256 = "13bb39024663b9f6c9816946a24e591ffda3c1a9d55306eab271a24f13cdbbf9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_gripper_sensor-release"; + rev = "release/noetic/pr2_gripper_sensor_action/1.0.12-1"; + sha256 = "sha256-+Smdt0wYeBugTcJ6zJFzUxIKzcf2fKQX7kAYOpsC1HU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-gripper-sensor-controller/default.nix b/distros/noetic/pr2-gripper-sensor-controller/default.nix index 038e8a5980..a02e884e26 100644 --- a/distros/noetic/pr2-gripper-sensor-controller/default.nix +++ b/distros/noetic/pr2-gripper-sensor-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-gripper-sensor-controller"; version = "1.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_gripper_sensor-release/archive/release/noetic/pr2_gripper_sensor_controller/1.0.12-1.tar.gz"; - name = "1.0.12-1.tar.gz"; - sha256 = "d733acc5d3fd5079f1cf1e7146d007d0c9adc907eb3371d9be2d3ba6c24acb47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_gripper_sensor-release"; + rev = "release/noetic/pr2_gripper_sensor_controller/1.0.12-1"; + sha256 = "sha256-dySX5Nl4IcqDTUiI8IzPPhL/GZ8A+kv8fxZ/ROB3zxY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-gripper-sensor-msgs/default.nix b/distros/noetic/pr2-gripper-sensor-msgs/default.nix index 9c7ad2e9f6..31dc9d64d1 100644 --- a/distros/noetic/pr2-gripper-sensor-msgs/default.nix +++ b/distros/noetic/pr2-gripper-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-gripper-sensor-msgs"; version = "1.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_gripper_sensor-release/archive/release/noetic/pr2_gripper_sensor_msgs/1.0.12-1.tar.gz"; - name = "1.0.12-1.tar.gz"; - sha256 = "4261bca54de1e531466fa524fca7686284d200b7a6d08f8db0171c5d0832d761"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_gripper_sensor-release"; + rev = "release/noetic/pr2_gripper_sensor_msgs/1.0.12-1"; + sha256 = "sha256-3oVif0Urt8H9lfK2eUb1CrIx+TviBUEGv/YN4Oz+7fs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-gripper-sensor/default.nix b/distros/noetic/pr2-gripper-sensor/default.nix index 4bae99a0b1..780fccbd5a 100644 --- a/distros/noetic/pr2-gripper-sensor/default.nix +++ b/distros/noetic/pr2-gripper-sensor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-gripper-sensor"; version = "1.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_gripper_sensor-release/archive/release/noetic/pr2_gripper_sensor/1.0.12-1.tar.gz"; - name = "1.0.12-1.tar.gz"; - sha256 = "658d8c50d17751bea67f26090006a86b7009cb960a4e06f4a12a04399883e8fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_gripper_sensor-release"; + rev = "release/noetic/pr2_gripper_sensor/1.0.12-1"; + sha256 = "sha256-18v7kFfXeXjXyznvDN5jyn615dCNnOY89yxdU4/4IWU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-hardware-interface/default.nix b/distros/noetic/pr2-hardware-interface/default.nix index 4bd72f1955..bfedf4583b 100644 --- a/distros/noetic/pr2-hardware-interface/default.nix +++ b/distros/noetic/pr2-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-hardware-interface"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/noetic/pr2_hardware_interface/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "49586d13272ba7514ab047b8f34173b27271b3bb675e3d1fa52787ce3b66d4cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/noetic/pr2_hardware_interface/1.8.21-1"; + sha256 = "sha256-zZ3EFEwumyf5IxInahyPlMe5i9ZoYeNImb1dUvXV0MI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-head-action/default.nix b/distros/noetic/pr2-head-action/default.nix index b63f5217c9..6a8a694dce 100644 --- a/distros/noetic/pr2-head-action/default.nix +++ b/distros/noetic/pr2-head-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-head-action"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/pr2_head_action/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "cecfe6fe06cc1135881c8e356de9897730ac9013ad6f160a1d5173e544791e72"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/pr2_head_action/1.10.18-1"; + sha256 = "sha256-uRWWaP+D7MHcDx6Mk9aCzgJq/fNqticqi2NffP0ij+Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-kinematics/default.nix b/distros/noetic/pr2-kinematics/default.nix index 750e58bdb6..e89eb3bab8 100644 --- a/distros/noetic/pr2-kinematics/default.nix +++ b/distros/noetic/pr2-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-kinematics"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_kinematics-release/archive/release/noetic/pr2_kinematics/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "b560d5ef8d8221b354b4ffc810da347d3a47400ac080cca788c1b08de99a4a05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_kinematics-release"; + rev = "release/noetic/pr2_kinematics/1.0.11-1"; + sha256 = "sha256-BD6IpLwjV48GIM1VpweG3d3r7ebSKfmejUCAfx8rO4Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-machine/default.nix b/distros/noetic/pr2-machine/default.nix index 6d5f4d81d2..b282047f35 100644 --- a/distros/noetic/pr2-machine/default.nix +++ b/distros/noetic/pr2-machine/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-machine"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/noetic/pr2_machine/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "1586780480d4ec1a797838f87265ef2c273be2455777f94b6742d1195a9481b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/noetic/pr2_machine/1.13.1-1"; + sha256 = "sha256-17o10Esp/xkazOyDsAvJ/HwHHZ3MAL3nahc6QGNjLNA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-mannequin-mode/default.nix b/distros/noetic/pr2-mannequin-mode/default.nix index 1f956e279a..32e622745f 100644 --- a/distros/noetic/pr2-mannequin-mode/default.nix +++ b/distros/noetic/pr2-mannequin-mode/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-mannequin-mode"; version = "0.6.2-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/noetic/pr2_mannequin_mode/0.6.2-1.tar.gz"; - name = "0.6.2-1.tar.gz"; - sha256 = "1df998e5dc209cf1fd65a1d84c4445d3279b489fdd2f49fb93f2e308f449e3db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/noetic/pr2_mannequin_mode/0.6.2-1"; + sha256 = "sha256-TJZYsPOJooFMcmkX3myvHbg0WQiuXKk+SDWiYwCN/tU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-mechanism-controllers/default.nix b/distros/noetic/pr2-mechanism-controllers/default.nix index d2efe35253..7909015fda 100644 --- a/distros/noetic/pr2-mechanism-controllers/default.nix +++ b/distros/noetic/pr2-mechanism-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-mechanism-controllers"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/pr2_mechanism_controllers/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "5126a1cb20e26793ed2c29a3aea466c4832fdab5cd0675cc665b20c266701ce7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/pr2_mechanism_controllers/1.10.18-1"; + sha256 = "sha256-nhMb7DswHy4pseVz7vSqNTsQKy1rSbrz3gDR096xxGw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-mechanism-diagnostics/default.nix b/distros/noetic/pr2-mechanism-diagnostics/default.nix index 7c0c111cfe..4cca44a3f7 100644 --- a/distros/noetic/pr2-mechanism-diagnostics/default.nix +++ b/distros/noetic/pr2-mechanism-diagnostics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-mechanism-diagnostics"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/noetic/pr2_mechanism_diagnostics/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "8ba0687a92fb5bf9db20ddf18f6a9fb7c0d14bbf6c5772e7237e1b1079facaa0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/noetic/pr2_mechanism_diagnostics/1.8.21-1"; + sha256 = "sha256-hCyfSKsZj4bNbqfLN+Ri7mX7c8mUfu2cSRu7RIXaDYM="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/pr2-mechanism-model/default.nix b/distros/noetic/pr2-mechanism-model/default.nix index d99466e48c..ed81373456 100644 --- a/distros/noetic/pr2-mechanism-model/default.nix +++ b/distros/noetic/pr2-mechanism-model/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-mechanism-model"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/noetic/pr2_mechanism_model/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "96f55706f4dd71093d8d87651c7856c80319051eec1fd3434b249c9547d410d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/noetic/pr2_mechanism_model/1.8.21-1"; + sha256 = "sha256-6tOfLbR3ePlkXuPq6m1fg9oasGlrvLgUZYZ0Goj87ws="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules rostest rosunit ]; diff --git a/distros/noetic/pr2-mechanism-msgs/default.nix b/distros/noetic/pr2-mechanism-msgs/default.nix index f6479d9cc7..f4c8a1124e 100644 --- a/distros/noetic/pr2-mechanism-msgs/default.nix +++ b/distros/noetic/pr2-mechanism-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-mechanism-msgs"; version = "1.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/pr2_mechanism_msgs-release/archive/release/noetic/pr2_mechanism_msgs/1.8.2-1.tar.gz"; - name = "1.8.2-1.tar.gz"; - sha256 = "5d3f5843590f3d0989a3def505112dbbcbd474766cfa2621f90082f6914cc8c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "pr2_mechanism_msgs-release"; + rev = "release/noetic/pr2_mechanism_msgs/1.8.2-1"; + sha256 = "sha256-eKaRMpfyKkOAMpTlbgQIZFfrLdgbFGwnpWQxLqruhjY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-mechanism/default.nix b/distros/noetic/pr2-mechanism/default.nix index 27591d7a84..b7c26e8b91 100644 --- a/distros/noetic/pr2-mechanism/default.nix +++ b/distros/noetic/pr2-mechanism/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-mechanism"; version = "1.8.21-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_mechanism-release/archive/release/noetic/pr2_mechanism/1.8.21-1.tar.gz"; - name = "1.8.21-1.tar.gz"; - sha256 = "4a14ba5e7beae789f61d22b7cb244b8871bfa539af91831f1b7a965fa1b6febc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_mechanism-release"; + rev = "release/noetic/pr2_mechanism/1.8.21-1"; + sha256 = "sha256-hjcv//Amj4NPiaL05WCAhg62JgE0gQ4t6f97Uiu7itA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-motor-diagnostic-tool/default.nix b/distros/noetic/pr2-motor-diagnostic-tool/default.nix index 8a03195730..c87df2b5e4 100644 --- a/distros/noetic/pr2-motor-diagnostic-tool/default.nix +++ b/distros/noetic/pr2-motor-diagnostic-tool/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-motor-diagnostic-tool"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/noetic/pr2_motor_diagnostic_tool/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "b0e0b0abde21ceeda34af122c65c952245a9bc99ecbff3477579504163828801"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/noetic/pr2_motor_diagnostic_tool/1.0.15-1"; + sha256 = "sha256-5/DmXkwkphIODg+r/GVnWBBFwgrf+oZMOZpX6JZK1UE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-move-base/default.nix b/distros/noetic/pr2-move-base/default.nix index 2b5ce78bd3..1c3f2c8ac8 100644 --- a/distros/noetic/pr2-move-base/default.nix +++ b/distros/noetic/pr2-move-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-move-base"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_move_base/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "92f10f4bbf993c229a8336a93fdb0868e835a43ad4b5ef42a890c21e8006bff5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_move_base/0.2.0-1"; + sha256 = "sha256-lBiL/7M4Drg6HOyTNTC/t4fHsaNlVyPGo3Dy1liN47o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-msgs/default.nix b/distros/noetic/pr2-msgs/default.nix index ab99fbe1a6..ad6a41629d 100644 --- a/distros/noetic/pr2-msgs/default.nix +++ b/distros/noetic/pr2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common-release/archive/release/noetic/pr2_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "175c98cd5c4ce84e88c8c64a1d0496b4bb4d367b366ec8aaf0efc4d8b69655e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common-release"; + rev = "release/noetic/pr2_msgs/1.13.1-1"; + sha256 = "sha256-ODekMftIC3ysPKUfCCGksc/tAVyure2rCl86gJAZvKc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-navigation-config/default.nix b/distros/noetic/pr2-navigation-config/default.nix index 2cd91085be..04f47eb1bd 100644 --- a/distros/noetic/pr2-navigation-config/default.nix +++ b/distros/noetic/pr2-navigation-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-navigation-config"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_navigation_config/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "b93b69cdb3b11916f3c40e2c93abf035e0dfc9e4a694d528a86c0d0a01403001"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_navigation_config/0.2.0-1"; + sha256 = "sha256-5WvcL/s0sncHR3CMbev4ZHAZnuijN44lM0ep3MdXzA0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-navigation-global/default.nix b/distros/noetic/pr2-navigation-global/default.nix index 18f8e890dd..034d1229d9 100644 --- a/distros/noetic/pr2-navigation-global/default.nix +++ b/distros/noetic/pr2-navigation-global/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-navigation-global"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_navigation_global/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "3b31ef840cf89724d95f86964134f7289b3133a5875a1e2c212ba4c0b8f2d2e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_navigation_global/0.2.0-1"; + sha256 = "sha256-r/WgbWVfYzOXc3biy7tUcKcn1Zo3E2L/FbtD1mjeJQM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-navigation-local/default.nix b/distros/noetic/pr2-navigation-local/default.nix index 7112f556d4..3bbfdb4af7 100644 --- a/distros/noetic/pr2-navigation-local/default.nix +++ b/distros/noetic/pr2-navigation-local/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-navigation-local"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_navigation_local/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "ce2e8ccda502ac1b7396baa5c530da99d172d76f2fc6f675d9a62c4a0f6ed595"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_navigation_local/0.2.0-1"; + sha256 = "sha256-OItduuMDGSOKK9dbdU8ndy0z8uHZ2Lz/AfS8QHQH8mU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-navigation-perception/default.nix b/distros/noetic/pr2-navigation-perception/default.nix index 500fcfd252..3092b8a060 100644 --- a/distros/noetic/pr2-navigation-perception/default.nix +++ b/distros/noetic/pr2-navigation-perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-navigation-perception"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_navigation_perception/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "0e26ff63d508ade9c80bf615bd9dd535dc25a600b816868fc6175e2566268501"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_navigation_perception/0.2.0-1"; + sha256 = "sha256-Dok/eSc/RVPlFTMqrU7+rzwkp32wJhlGvxbokF2GxXI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-navigation-self-filter/default.nix b/distros/noetic/pr2-navigation-self-filter/default.nix index fe0fa4819d..ac179232d8 100644 --- a/distros/noetic/pr2-navigation-self-filter/default.nix +++ b/distros/noetic/pr2-navigation-self-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-navigation-self-filter"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_navigation_self_filter/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "3b8177bfe8da07b2600f7bc0c01f73c33686a4411f1a669e52bf425376b350f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_navigation_self_filter/0.2.0-1"; + sha256 = "sha256-IdOf6HmO0M7GOPWRbHkTCr99n1pt18N1e6Dx1AQV4vU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-navigation-slam/default.nix b/distros/noetic/pr2-navigation-slam/default.nix index 0ccbf2e09c..dec3f7f83e 100644 --- a/distros/noetic/pr2-navigation-slam/default.nix +++ b/distros/noetic/pr2-navigation-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-navigation-slam"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_navigation_slam/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "9ddc0197025fbd2f56d9269dc5bebd9f159d94e50ebf4ac6ed0ebd56488809db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_navigation_slam/0.2.0-1"; + sha256 = "sha256-4QGXxeP0tH86jo2QWNV/+iB/AVyRke6ui0t3rVPM3Ik="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-navigation-teleop/default.nix b/distros/noetic/pr2-navigation-teleop/default.nix index 431e164f36..1d813f6a79 100644 --- a/distros/noetic/pr2-navigation-teleop/default.nix +++ b/distros/noetic/pr2-navigation-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-navigation-teleop"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_navigation_teleop/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "c00e9f1cec35b615a2bf681214efbbd39d7983a9a3fae4f435ff130ef732d887"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_navigation_teleop/0.2.0-1"; + sha256 = "sha256-ik+8wgg6lEt1zfWGcmpehHGsnn+PiX4CUrJIU0F7iWk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-navigation/default.nix b/distros/noetic/pr2-navigation/default.nix index e3748410a1..5b7f340b90 100644 --- a/distros/noetic/pr2-navigation/default.nix +++ b/distros/noetic/pr2-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-navigation"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/pr2_navigation/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "32ecc115470f2967e47b0f707f075e4e60fbb1c762f1adb9f57ae412e846d21f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/pr2_navigation/0.2.0-1"; + sha256 = "sha256-ADufJZlATh/7pCug+4DjvKA+JcvOsm+Viw7dofgnMc4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-position-scripts/default.nix b/distros/noetic/pr2-position-scripts/default.nix index 7e46bf3ed6..eb6c4d550f 100644 --- a/distros/noetic/pr2-position-scripts/default.nix +++ b/distros/noetic/pr2-position-scripts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-position-scripts"; version = "0.6.2-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/noetic/pr2_position_scripts/0.6.2-1.tar.gz"; - name = "0.6.2-1.tar.gz"; - sha256 = "a7961ac1ae17a5f1e15c714270d14312db801fd2b52991c70e8567bb105ddd7d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/noetic/pr2_position_scripts/0.6.2-1"; + sha256 = "sha256-OPPNSPuUeRCHYYVvQlpE97eUHjALkqZN/zp17yvROiE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-power-board/default.nix b/distros/noetic/pr2-power-board/default.nix index c392e413e9..af5a15f731 100644 --- a/distros/noetic/pr2-power-board/default.nix +++ b/distros/noetic/pr2-power-board/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-power-board"; version = "1.1.10-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_power_drivers-release/archive/release/noetic/pr2_power_board/1.1.10-1.tar.gz"; - name = "1.1.10-1.tar.gz"; - sha256 = "e7db741af1ca396c86b75584015c5688cf32d088d4c3be87792c4b3a879d8e31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_power_drivers-release"; + rev = "release/noetic/pr2_power_board/1.1.10-1"; + sha256 = "sha256-GGL3dANBXvhWGk9Ez1uoPPysLrohUg3Tegg+PA7RChI="; + }; buildType = "catkin"; buildInputs = [ boost catkin message-generation ]; diff --git a/distros/noetic/pr2-power-drivers/default.nix b/distros/noetic/pr2-power-drivers/default.nix index c71e0de722..0d09de1666 100644 --- a/distros/noetic/pr2-power-drivers/default.nix +++ b/distros/noetic/pr2-power-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-power-drivers"; version = "1.1.10-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_power_drivers-release/archive/release/noetic/pr2_power_drivers/1.1.10-1.tar.gz"; - name = "1.1.10-1.tar.gz"; - sha256 = "49207b2ea4bf92d7ac759ae7bb42dfd4931840fd59631e754f5b2dbccaa12665"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_power_drivers-release"; + rev = "release/noetic/pr2_power_drivers/1.1.10-1"; + sha256 = "sha256-OrfaN+SDleM4BID1riMS9jyppGc8inYERba+HoZFW6Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-robot/default.nix b/distros/noetic/pr2-robot/default.nix index 2afb7e9905..d89c463314 100644 --- a/distros/noetic/pr2-robot/default.nix +++ b/distros/noetic/pr2-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-robot"; version = "1.6.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/noetic/pr2_robot/1.6.32-1.tar.gz"; - name = "1.6.32-1.tar.gz"; - sha256 = "368195704a50d088e931ccd3739770e8626bb2df0ab03fb68d9d334d805761e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/noetic/pr2_robot/1.6.32-1"; + sha256 = "sha256-xPWb3+jop1behG902PUFi8DL9M+yK5AmtEQdkZVzwAs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-run-stop-auto-restart/default.nix b/distros/noetic/pr2-run-stop-auto-restart/default.nix index 3ad1622ccf..bf5806dcf0 100644 --- a/distros/noetic/pr2-run-stop-auto-restart/default.nix +++ b/distros/noetic/pr2-run-stop-auto-restart/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-run-stop-auto-restart"; version = "1.6.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_robot-release/archive/release/noetic/pr2_run_stop_auto_restart/1.6.32-1.tar.gz"; - name = "1.6.32-1.tar.gz"; - sha256 = "6010ed34f0a7f4e2c01d77f4ec969cdd04782b6e674c9c9d323b49fb456dfd63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_robot-release"; + rev = "release/noetic/pr2_run_stop_auto_restart/1.6.32-1"; + sha256 = "sha256-Pupn6w/zH6KlnWGK7Mjmb7IoJXGLq2rFQzCt7fwedls="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-self-test-msgs/default.nix b/distros/noetic/pr2-self-test-msgs/default.nix index ece58b3a96..d1656af3d1 100644 --- a/distros/noetic/pr2-self-test-msgs/default.nix +++ b/distros/noetic/pr2-self-test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-self-test-msgs"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/noetic/pr2_self_test_msgs/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "217d79de99304d31c78a25e12a11c81d85496dc3a15eb3c90edbdaae112e7cb9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/noetic/pr2_self_test_msgs/1.0.15-1"; + sha256 = "sha256-NdVcXF4v7qEuv/vIKPeIz9KmpBYNdP1zqfCblCekNOc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-self-test/default.nix b/distros/noetic/pr2-self-test/default.nix index c41ce13b1b..0bc05a0b72 100644 --- a/distros/noetic/pr2-self-test/default.nix +++ b/distros/noetic/pr2-self-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-self-test"; version = "1.0.15-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_self_test-release/archive/release/noetic/pr2_self_test/1.0.15-1.tar.gz"; - name = "1.0.15-1.tar.gz"; - sha256 = "16c9ed1182dfb953d741b40605c53ae37e2f1d9fd81394f1a07131040105ee4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_self_test-release"; + rev = "release/noetic/pr2_self_test/1.0.15-1"; + sha256 = "sha256-QKGI4UV3Lgp6swZDwW8P8JeEbWs19pBB4OU0AnluY3c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-simulator/default.nix b/distros/noetic/pr2-simulator/default.nix index ecba30c36f..220f0bfd5b 100644 --- a/distros/noetic/pr2-simulator/default.nix +++ b/distros/noetic/pr2-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-simulator"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_simulator-release/archive/release/noetic/pr2_simulator/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "0763e5edcd2d1434193a0386d06a5d296e2d8bd11528523a8e6913828447ae8f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_simulator-release"; + rev = "release/noetic/pr2_simulator/2.1.0-1"; + sha256 = "sha256-Ama8YxKZJgRoLKpew8xX+D7bMBc5nx7Qo8VXMjqlhX8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-teleop/default.nix b/distros/noetic/pr2-teleop/default.nix index 9e6f03a9d9..7639e53a54 100644 --- a/distros/noetic/pr2-teleop/default.nix +++ b/distros/noetic/pr2-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-teleop"; version = "0.6.2-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/noetic/pr2_teleop/0.6.2-1.tar.gz"; - name = "0.6.2-1.tar.gz"; - sha256 = "8e38afb599e92781f188cedf6f7f4d973694b1e87909afd67132594fd30cdc99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/noetic/pr2_teleop/0.6.2-1"; + sha256 = "sha256-yLFvttgndDeLj+/RXx0fSEyY236N1cuO2RjHMdaYPVQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-tilt-laser-interface/default.nix b/distros/noetic/pr2-tilt-laser-interface/default.nix index 687e225571..442933e495 100644 --- a/distros/noetic/pr2-tilt-laser-interface/default.nix +++ b/distros/noetic/pr2-tilt-laser-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-tilt-laser-interface"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/noetic/pr2_tilt_laser_interface/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "89a75cfac26b02cdaffe6a9ba9bd4c24cd3207cd0b8aea49eebf95e15af18f98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/noetic/pr2_tilt_laser_interface/0.0.12-1"; + sha256 = "sha256-aRcVuPhRWoPu5/vp/fh7HbfIhkGrwyeStXcfJfdmapU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/pr2-tuck-arms-action/default.nix b/distros/noetic/pr2-tuck-arms-action/default.nix index 2080c34865..00f372d2bf 100644 --- a/distros/noetic/pr2-tuck-arms-action/default.nix +++ b/distros/noetic/pr2-tuck-arms-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-tuck-arms-action"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_common_actions-release/archive/release/noetic/pr2_tuck_arms_action/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "6d220c5c9a5d796989de37b20bf5532a64eb4142693572be34ac96e70047e158"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_common_actions-release"; + rev = "release/noetic/pr2_tuck_arms_action/0.0.12-1"; + sha256 = "sha256-/aJFkNn5j4LgdJjabgchGIudhN8VydYXTpcRbCzOYyk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pr2-tuckarm/default.nix b/distros/noetic/pr2-tuckarm/default.nix index 947b4ba0c2..a1a17364fa 100644 --- a/distros/noetic/pr2-tuckarm/default.nix +++ b/distros/noetic/pr2-tuckarm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pr2-tuckarm"; version = "0.6.2-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_apps-release/archive/release/noetic/pr2_tuckarm/0.6.2-1.tar.gz"; - name = "0.6.2-1.tar.gz"; - sha256 = "38a87639aa3c05048409ab86f6f0d4f9d5ad001ce0cc6a106bd18a7ad640021d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_apps-release"; + rev = "release/noetic/pr2_tuckarm/0.6.2-1"; + sha256 = "sha256-2Cw3Ofax2OZMVs10tV3st7oj0w7ucNAcyhDJoJSk0zA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/prbt-gazebo/default.nix b/distros/noetic/prbt-gazebo/default.nix index 3bcc924946..e580b1197d 100644 --- a/distros/noetic/prbt-gazebo/default.nix +++ b/distros/noetic/prbt-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prbt-gazebo"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/noetic/prbt_gazebo/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "280c0ed66eb1a3da2af1948f312fce548ed54c929502b32b1f340de8f351a2b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/noetic/prbt_gazebo/0.6.0-1"; + sha256 = "sha256-ZH++mpfc8kWmp505WVHvWkfL8WS9tag6ePBg18eKJoA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/prbt-grippers/default.nix b/distros/noetic/prbt-grippers/default.nix index dae5520818..26e067c8de 100644 --- a/distros/noetic/prbt-grippers/default.nix +++ b/distros/noetic/prbt-grippers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prbt-grippers"; version = "0.0.5-r2"; - src = fetchurl { - url = "https://github.com/PilzDE/prbt_grippers-release/archive/release/noetic/prbt_grippers/0.0.5-2.tar.gz"; - name = "0.0.5-2.tar.gz"; - sha256 = "247d2f120856a583416b03754784fae60810ad9855c85b7681db9364547a44e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "prbt_grippers-release"; + rev = "release/noetic/prbt_grippers/0.0.5-2"; + sha256 = "sha256-fLyHAnipXvJrwYHBE8HPkAkyi/It9eLmqujUnrGU4X4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/prbt-hardware-support/default.nix b/distros/noetic/prbt-hardware-support/default.nix index 13554705ec..dc517ede6e 100644 --- a/distros/noetic/prbt-hardware-support/default.nix +++ b/distros/noetic/prbt-hardware-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prbt-hardware-support"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/noetic/prbt_hardware_support/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "e52a0dd1a3c31542f3c232f31b7daff8a3edb0073b690d72cd1f0494daad37e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/noetic/prbt_hardware_support/0.6.0-1"; + sha256 = "sha256-w3OZdXBw+WGya20pRJFKmBmpSwVJ7YIvD7LhfkN12VI="; + }; buildType = "catkin"; buildInputs = [ canopen-chain-node catkin dynamic-reconfigure libmodbus message-filters message-generation pilz-utils tf2 tf2-geometry-msgs tf2-ros urdf ]; diff --git a/distros/noetic/prbt-ikfast-manipulator-plugin/default.nix b/distros/noetic/prbt-ikfast-manipulator-plugin/default.nix index 87f0626716..c816ffeaf1 100644 --- a/distros/noetic/prbt-ikfast-manipulator-plugin/default.nix +++ b/distros/noetic/prbt-ikfast-manipulator-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prbt-ikfast-manipulator-plugin"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/noetic/prbt_ikfast_manipulator_plugin/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "9597d21902753ce2451b608d2c16bc6647a38a6070e6e4873fc860a6fc285061"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/noetic/prbt_ikfast_manipulator_plugin/0.6.0-1"; + sha256 = "sha256-lggwhiJxLmvlKU11L7XGiPRXBKXp8GKD4vKa/74sm/Q="; + }; buildType = "catkin"; buildInputs = [ catkin tf2-eigen ]; diff --git a/distros/noetic/prbt-moveit-config/default.nix b/distros/noetic/prbt-moveit-config/default.nix index f7b17bef28..8575a957b2 100644 --- a/distros/noetic/prbt-moveit-config/default.nix +++ b/distros/noetic/prbt-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prbt-moveit-config"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/noetic/prbt_moveit_config/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "430c360df9a9c17698dd9c114f73ff1b4aa200027bbd8f01cbf6211b0b41d13a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/noetic/prbt_moveit_config/0.6.0-1"; + sha256 = "sha256-uMTTKOOOp6ywG+smOT/07fju3NPZyk7JVPiQKErJE+U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/prbt-pg70-support/default.nix b/distros/noetic/prbt-pg70-support/default.nix index 6531f10c9e..f160abae0a 100644 --- a/distros/noetic/prbt-pg70-support/default.nix +++ b/distros/noetic/prbt-pg70-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prbt-pg70-support"; version = "0.0.5-r2"; - src = fetchurl { - url = "https://github.com/PilzDE/prbt_grippers-release/archive/release/noetic/prbt_pg70_support/0.0.5-2.tar.gz"; - name = "0.0.5-2.tar.gz"; - sha256 = "9b31e3222c15a3ef66fcbab83046465d7884e253ed7e827ac3a99f8690cdccd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "prbt_grippers-release"; + rev = "release/noetic/prbt_pg70_support/0.0.5-2"; + sha256 = "sha256-zLVcjlgy5yM7XETklBaRdnyZsXgocUz4x+yboDEBL34="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/prbt-support/default.nix b/distros/noetic/prbt-support/default.nix index 28a23175ae..69290757c5 100644 --- a/distros/noetic/prbt-support/default.nix +++ b/distros/noetic/prbt-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prbt-support"; version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/pilz_robots-release/archive/release/noetic/prbt_support/0.6.0-1.tar.gz"; - name = "0.6.0-1.tar.gz"; - sha256 = "66bdbbe527721dce392d9fa8449f0f857377f3a5b3f7e298595c478c9240444d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "pilz_robots-release"; + rev = "release/noetic/prbt_support/0.6.0-1"; + sha256 = "sha256-7M9+vHiwt11EX5Ch5o5N//JBlCgvqbm1Cly5BIjLRM4="; + }; buildType = "catkin"; buildInputs = [ canopen-chain-node catkin pilz-utils roslint sensor-msgs ]; diff --git a/distros/noetic/prosilica-camera/default.nix b/distros/noetic/prosilica-camera/default.nix index 69252e56a3..6b5c1effe7 100644 --- a/distros/noetic/prosilica-camera/default.nix +++ b/distros/noetic/prosilica-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prosilica-camera"; version = "1.9.5-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/prosilica_driver-release/archive/release/noetic/prosilica_camera/1.9.5-1.tar.gz"; - name = "1.9.5-1.tar.gz"; - sha256 = "f3372987e611a382ec12012e2f422cff4580236ad576aedc2515806f6a9f749e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "prosilica_driver-release"; + rev = "release/noetic/prosilica_camera/1.9.5-1"; + sha256 = "sha256-mTpHb3q2VJzCDD+lbdBUR/QVVfxvfNi+C0wZjy63DZ0="; + }; buildType = "catkin"; buildInputs = [ catkin rosconsole ]; diff --git a/distros/noetic/prosilica-gige-sdk/default.nix b/distros/noetic/prosilica-gige-sdk/default.nix index a98db796be..1f0338708d 100644 --- a/distros/noetic/prosilica-gige-sdk/default.nix +++ b/distros/noetic/prosilica-gige-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-prosilica-gige-sdk"; version = "1.26.3-r2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/prosilica_gige_sdk-release/archive/release/noetic/prosilica_gige_sdk/1.26.3-2.tar.gz"; - name = "1.26.3-2.tar.gz"; - sha256 = "9f6c2b87f379e186ffb2f156befd99157cad4c3532ff644ec84471fd3cd26bcc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "prosilica_gige_sdk-release"; + rev = "release/noetic/prosilica_gige_sdk/1.26.3-2"; + sha256 = "sha256-cX85yiPAgi7o6+4ejYv642BsMbesKjHlXtP3ZJ4bkQM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/psen-scan-v2/default.nix b/distros/noetic/psen-scan-v2/default.nix index d98ba38a84..e45711aef7 100644 --- a/distros/noetic/psen-scan-v2/default.nix +++ b/distros/noetic/psen-scan-v2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-psen-scan-v2"; version = "0.10.2-r1"; - src = fetchurl { - url = "https://github.com/PilzDE/psen_scan_v2-release/archive/release/noetic/psen_scan_v2/0.10.2-1.tar.gz"; - name = "0.10.2-1.tar.gz"; - sha256 = "3e47d0187a860ce418bc2f42d58aa563da2822585c075ff18793d02671adce9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PilzDE"; + repo = "psen_scan_v2-release"; + rev = "release/noetic/psen_scan_v2/0.10.2-1"; + sha256 = "sha256-Ufw3h/3Yl7IeD+f7U132XgTHjticFhuMQskiyohjrkk="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/noetic/py-trees-msgs/default.nix b/distros/noetic/py-trees-msgs/default.nix index 330a3a6243..22ba18dc66 100644 --- a/distros/noetic/py-trees-msgs/default.nix +++ b/distros/noetic/py-trees-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-py-trees-msgs"; version = "0.3.7-r2"; - src = fetchurl { - url = "https://github.com/stonier/py_trees_msgs-release/archive/release/noetic/py_trees_msgs/0.3.7-2.tar.gz"; - name = "0.3.7-2.tar.gz"; - sha256 = "9c976c1ff899f72608b244e445fe3900ef0b32b2ac4d7361c3c5ccd1a6f36c4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees_msgs-release"; + rev = "release/noetic/py_trees_msgs/0.3.7-2"; + sha256 = "sha256-+SGAsgz2JiPW3tfms+GmBsQwcF9Vus+TlUf4wT2yqno="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/py-trees-ros/default.nix b/distros/noetic/py-trees-ros/default.nix index fe1cb158c9..cf14dc84d6 100644 --- a/distros/noetic/py-trees-ros/default.nix +++ b/distros/noetic/py-trees-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-py-trees-ros"; version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/stonier/py_trees_ros-release/archive/release/noetic/py_trees_ros/0.6.1-1.tar.gz"; - name = "0.6.1-1.tar.gz"; - sha256 = "7f6488f258163a4693f30ec99f789ffab6d59b97981949f5b7ce7d700c085319"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees_ros-release"; + rev = "release/noetic/py_trees_ros/0.6.1-1"; + sha256 = "sha256-cgSfHSU1D6tMO84W8bK9PfkUOvSuwNM89WR3nl+QVMU="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/py-trees/default.nix b/distros/noetic/py-trees/default.nix index 85e1b9c5e1..01a12b3947 100644 --- a/distros/noetic/py-trees/default.nix +++ b/distros/noetic/py-trees/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-py-trees"; version = "0.7.6-r2"; - src = fetchurl { - url = "https://github.com/stonier/py_trees-release/archive/release/noetic/py_trees/0.7.6-2.tar.gz"; - name = "0.7.6-2.tar.gz"; - sha256 = "7d8e790d7269001586af8e85d78c8b8fb55dfdcee470d82ee22c53b720134e63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "py_trees-release"; + rev = "release/noetic/py_trees/0.7.6-2"; + sha256 = "sha256-jlzlrgCvhjtMdzDfJ2TKkL+HWsjCjE9pKQllSmOQGkM="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/pybind11-catkin/default.nix b/distros/noetic/pybind11-catkin/default.nix index 62580b5cf2..338604dca8 100644 --- a/distros/noetic/pybind11-catkin/default.nix +++ b/distros/noetic/pybind11-catkin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pybind11-catkin"; version = "2.5.0-r1"; - src = fetchurl { - url = "https://github.com/wxmerkt/pybind11_catkin-release/archive/release/noetic/pybind11_catkin/2.5.0-1.tar.gz"; - name = "2.5.0-1.tar.gz"; - sha256 = "7504356d8938e0eaa880204ce834e03dcba505c73de7f83164110857ba0ad7cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wxmerkt"; + repo = "pybind11_catkin-release"; + rev = "release/noetic/pybind11_catkin/2.5.0-1"; + sha256 = "sha256-xBvLN56+VVkJ5x1C/SaNVZ91sN/E2gu46IO5xSlS8a4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pyhri/default.nix b/distros/noetic/pyhri/default.nix index 673c164236..74b2395d52 100644 --- a/distros/noetic/pyhri/default.nix +++ b/distros/noetic/pyhri/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pyhri"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/pyhri-release/archive/release/noetic/pyhri/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "f7a5250dded3710394e8406ab8e69076803e25489fa9ba3443c1ac2517e679fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "pyhri-release"; + rev = "release/noetic/pyhri/0.3.2-1"; + sha256 = "sha256-WkS5r0qez63PD15iO/Ls/7wJmYuhZQDn8uGBfnqjxAI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/pyquaternion/default.nix b/distros/noetic/pyquaternion/default.nix index 1c728b5082..4bc7e45eb5 100644 --- a/distros/noetic/pyquaternion/default.nix +++ b/distros/noetic/pyquaternion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-pyquaternion"; version = "0.9.6-r1"; - src = fetchurl { - url = "https://github.com/Achllle/pyquaternion-release/archive/release/noetic/pyquaternion/0.9.6-1.tar.gz"; - name = "0.9.6-1.tar.gz"; - sha256 = "2e9df0ec02c91f4962b915bf34a8513e8f05556f8bc7d279bcc0e5d536c606a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Achllle"; + repo = "pyquaternion-release"; + rev = "release/noetic/pyquaternion/0.9.6-1"; + sha256 = "sha256-2pwJN5emYqg2sC+069bxaRTnievK0P8fFGZFBOGGteo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/python-qt-binding/default.nix b/distros/noetic/python-qt-binding/default.nix index 6336599cb8..751cf9ec53 100644 --- a/distros/noetic/python-qt-binding/default.nix +++ b/distros/noetic/python-qt-binding/default.nix @@ -2,21 +2,39 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python3Packages, qt5, rosbuild }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, python3, qt5, rosbuild, sd, tree }: buildRosPackage { pname = "ros-noetic-python-qt-binding"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/python_qt_binding-release/archive/release/noetic/python_qt_binding/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "d4db9983e7df47036a7afa16aac5db9e5c3de0de0c9a203fd0a2419456d035a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "python_qt_binding-release"; + rev = "release/noetic/python_qt_binding/0.4.4-1"; + sha256 = "sha256-jshBly6YLRxj7Pz//RIsW77viz0Sbw2Lypm7P97Ox50="; + }; buildType = "catkin"; buildInputs = [ qt5.qtbase rosbuild ]; - propagatedBuildInputs = [ catkin python3Packages.pyqt5 ]; + propagatedBuildInputs = [ + catkin + (python3Packages.pyqt5.overridePythonAttrs ( + old: { + dontConfigure = true; + dontWrapQtApps = true; + nativeBuildInputs = [ + python3Packages.pyqt-builder + python3Packages.sip + qt5.full + ]; + } + )) + ]; nativeBuildInputs = [ catkin ]; + meta = { description = ''This stack provides Python bindings for Qt. diff --git a/distros/noetic/qpoases-vendor/default.nix b/distros/noetic/qpoases-vendor/default.nix index f4acc6c0e4..8efc814615 100644 --- a/distros/noetic/qpoases-vendor/default.nix +++ b/distros/noetic/qpoases-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-qpoases-vendor"; version = "3.2.1-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/qpoases_vendor-release/archive/release/noetic/qpoases_vendor/3.2.1-1.tar.gz"; - name = "3.2.1-1.tar.gz"; - sha256 = "e4c533716e760bbd1a5f5c9170e3ad8f34968fa70fa88ca860fd6235fe6697ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "qpoases_vendor-release"; + rev = "release/noetic/qpoases_vendor/3.2.1-1"; + sha256 = "sha256-5vC2LEfIy6E56ZDbtAG93p6nsA+Wcus1SGR7dI5fhI8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/qt-dotgraph/default.nix b/distros/noetic/qt-dotgraph/default.nix index 8a5648dc12..64deda28f3 100644 --- a/distros/noetic/qt-dotgraph/default.nix +++ b/distros/noetic/qt-dotgraph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-qt-dotgraph"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/noetic/qt_dotgraph/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "a879051a9279d88ee26a6468b3ce27816868bb3c56c1b80a6eadaa8e2745630a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/noetic/qt_dotgraph/0.4.2-1"; + sha256 = "sha256-dkAg/cFhTaG/z2BBkDeDk117Si29jRwrPt/iA+F0h14="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/qt-gui-app/default.nix b/distros/noetic/qt-gui-app/default.nix index 67c6a61db5..509cd01f80 100644 --- a/distros/noetic/qt-gui-app/default.nix +++ b/distros/noetic/qt-gui-app/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-qt-gui-app"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/noetic/qt_gui_app/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "ac27afd75d8effd07b6654b7b6e6d71eba0c4b8d171f01516db07cbccee5f5a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/noetic/qt_gui_app/0.4.2-1"; + sha256 = "sha256-LnJNTjtCbVpIhggFL/rUzrhonYEVKUjb1Qtr/DdcYAg="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/qt-gui-core/default.nix b/distros/noetic/qt-gui-core/default.nix index 9644c6df30..db4d6bffe5 100644 --- a/distros/noetic/qt-gui-core/default.nix +++ b/distros/noetic/qt-gui-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-qt-gui-core"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/noetic/qt_gui_core/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "7a166499737a330456941515965c0357b715c1d145c9cc331e6ce6d338b543d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/noetic/qt_gui_core/0.4.2-1"; + sha256 = "sha256-5JXWAdVUnDG1d465MxDmvGOTUf4rp1AHXft1FQGZ7ww="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/qt-gui-cpp/default.nix b/distros/noetic/qt-gui-cpp/default.nix index 7fb8cc20d0..c43aaec3a0 100644 --- a/distros/noetic/qt-gui-cpp/default.nix +++ b/distros/noetic/qt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-qt-gui-cpp"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/noetic/qt_gui_cpp/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "4673918813e1660f1c5b05e49e7ad869fd9c91507972f38262efa79665d10fbe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/noetic/qt_gui_cpp/0.4.2-1"; + sha256 = "sha256-ubGKO0iQMzc67IEIOiIccxCAHTdk70EId1spz9ILyMQ="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules pkg-config python-qt-binding python3Packages.setuptools qt5.qtbase ]; diff --git a/distros/noetic/qt-gui-py-common/default.nix b/distros/noetic/qt-gui-py-common/default.nix index 2cbdd4b4cc..23e361b822 100644 --- a/distros/noetic/qt-gui-py-common/default.nix +++ b/distros/noetic/qt-gui-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-qt-gui-py-common"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/noetic/qt_gui_py_common/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "fa7d2b35a2513e6a10353cde91a8cbb1ad8e9eafee2f25d59b69c2f2187edd61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/noetic/qt_gui_py_common/0.4.2-1"; + sha256 = "sha256-JQ5AXh8nUZ047nuylxw7S/1b+QidmSxnj/sApb9OvNM="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/qt-gui/default.nix b/distros/noetic/qt-gui/default.nix index ae27cb2716..c038b6e68b 100644 --- a/distros/noetic/qt-gui/default.nix +++ b/distros/noetic/qt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-qt-gui"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/qt_gui_core-release/archive/release/noetic/qt_gui/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "b565d65a2049bb96f1ce7cd81aa9e95f510e36ab8fede8a8ca4e959bfe84d10a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qt_gui_core-release"; + rev = "release/noetic/qt_gui/0.4.2-1"; + sha256 = "sha256-CRyxDJ4uVKMNBcNOtvz1V3hvGeo58xmfjOk7GyINgSU="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.pyqt5 python3Packages.setuptools qt5.qtbase ]; diff --git a/distros/noetic/quanergy-client-ros/default.nix b/distros/noetic/quanergy-client-ros/default.nix index c9fa1b57fd..f8138bd110 100644 --- a/distros/noetic/quanergy-client-ros/default.nix +++ b/distros/noetic/quanergy-client-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-quanergy-client-ros"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/QuanergySystems/quanergy_client_ros-release/archive/release/noetic/quanergy_client_ros/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "0dd116d91350f9ce02e640e07165cf032e155c5a88917d9f6f78b47c6ce8380b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "QuanergySystems"; + repo = "quanergy_client_ros-release"; + rev = "release/noetic/quanergy_client_ros/4.0.1-1"; + sha256 = "sha256-PWFYfKcMTOwDw7g5rHruzrBcX5EFJEsNr5zD+x2IisU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/quanergy-client/default.nix b/distros/noetic/quanergy-client/default.nix index edae57b9cb..2a90cd527c 100644 --- a/distros/noetic/quanergy-client/default.nix +++ b/distros/noetic/quanergy-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-quanergy-client"; version = "5.0.0-r1"; - src = fetchurl { - url = "https://github.com/QuanergySystems/quanergy_client-release/archive/release/noetic/quanergy_client/5.0.0-1.tar.gz"; - name = "5.0.0-1.tar.gz"; - sha256 = "213f76e7975be608547c5459b9ddcea593993460236800dfd5e1fd90fd821f29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "QuanergySystems"; + repo = "quanergy_client-release"; + rev = "release/noetic/quanergy_client/5.0.0-1"; + sha256 = "sha256-AvobCVq5Du1Z7XFAEZNur9O/rxy6apcOoOCz1arYjcM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/qwt-dependency/default.nix b/distros/noetic/qwt-dependency/default.nix index 2a214c99b8..d9a05a9244 100644 --- a/distros/noetic/qwt-dependency/default.nix +++ b/distros/noetic/qwt-dependency/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-qwt-dependency"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/qwt_dependency-release/archive/release/noetic/qwt_dependency/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "23ee6a845be40f3e9c58aedf44210aa08ef1bcaa20d5b5c37968caa2a4aa03e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "qwt_dependency-release"; + rev = "release/noetic/qwt_dependency/1.1.1-2"; + sha256 = "sha256-yHOJfPxvh4HX/X2tn0AZYfbo8TGSTtGXKOOSpNaapJY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/radar-msgs/default.nix b/distros/noetic/radar-msgs/default.nix index 393c640f64..218df8e47e 100644 --- a/distros/noetic/radar-msgs/default.nix +++ b/distros/noetic/radar-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-radar-msgs"; version = "0.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/radar_msgs-release/archive/release/noetic/radar_msgs/0.1.0-2.tar.gz"; - name = "0.1.0-2.tar.gz"; - sha256 = "11f69076602e90734d55a57520c4b24bc317b15b4e57e1967df400e9a1cec083"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "radar_msgs-release"; + rev = "release/noetic/radar_msgs/0.1.0-2"; + sha256 = "sha256-Nnnd/cLwjYfcMuRjr9iu0/UF6Jug+9tBkny8qWFLY4U="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/random-numbers/default.nix b/distros/noetic/random-numbers/default.nix index 0abb5c30cd..1dc994effb 100644 --- a/distros/noetic/random-numbers/default.nix +++ b/distros/noetic/random-numbers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-random-numbers"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/random_numbers-release/archive/release/noetic/random_numbers/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "b1eba248517898185240a7f4f60dbddbe38d11b9409d55bc7512ea3903b909de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "random_numbers-release"; + rev = "release/noetic/random_numbers/0.3.2-1"; + sha256 = "sha256-Ahi8HGqZdCpFcqJ7cKYqmlBf0xTZ1tyUfXC38Nq715A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/raw-description/default.nix b/distros/noetic/raw-description/default.nix index 4d8a0500f8..4525d8a7e0 100644 --- a/distros/noetic/raw-description/default.nix +++ b/distros/noetic/raw-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-raw-description"; version = "0.7.8-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_common-release/archive/release/noetic/raw_description/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "68ac3ce6ad532c9ef2b4cf20e439b1294ec71ec76db56eac92376e8661ea2e9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_common-release"; + rev = "release/noetic/raw_description/0.7.8-1"; + sha256 = "sha256-dv77V/SigtfhQwXs8PQ7fuCUfNqJW0/M91oZ5nYwzHc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/razor-imu-9dof/default.nix b/distros/noetic/razor-imu-9dof/default.nix index 9fe672e8f2..47ae11dc0f 100644 --- a/distros/noetic/razor-imu-9dof/default.nix +++ b/distros/noetic/razor-imu-9dof/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-razor-imu-9dof"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ENSTABretagneRobotics/razor_imu_9dof-release/archive/release/noetic/razor_imu_9dof/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "96b9ff366ac1665105c8473acaf18fc2e6741c2454364150e9160d200560fe25"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ENSTABretagneRobotics"; + repo = "razor_imu_9dof-release"; + rev = "release/noetic/razor_imu_9dof/1.3.0-2"; + sha256 = "sha256-Rw43NOBQa8g1j28eWJtP1kpR8oEEMBxehjwTafyOkTg="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.catkin-pkg ]; diff --git a/distros/noetic/rc-common-msgs/default.nix b/distros/noetic/rc-common-msgs/default.nix index 3724e9311f..ce2fee836a 100644 --- a/distros/noetic/rc-common-msgs/default.nix +++ b/distros/noetic/rc-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-common-msgs"; version = "0.5.3-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_common_msgs-release/archive/release/noetic/rc_common_msgs/0.5.3-1.tar.gz"; - name = "0.5.3-1.tar.gz"; - sha256 = "7e3eba3d249fe39b358992f4bce414ddda30ac3a4538dee2edee9b90472f5b31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_common_msgs-release"; + rev = "release/noetic/rc_common_msgs/0.5.3-1"; + sha256 = "sha256-G47WPj4ioKwiG3LBDBwvrWSQ3ESzCoOfIl70QuepuBs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rc-dynamics-api/default.nix b/distros/noetic/rc-dynamics-api/default.nix index f94e53d481..467ed4761f 100644 --- a/distros/noetic/rc-dynamics-api/default.nix +++ b/distros/noetic/rc-dynamics-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-dynamics-api"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_dynamics_api-release/archive/release/noetic/rc_dynamics_api/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "b69471ceb49102d64a1e21ae0eda8c17caef46508b28fb67400824e75f35ab3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_dynamics_api-release"; + rev = "release/noetic/rc_dynamics_api/0.10.1-1"; + sha256 = "sha256-CgF1DvmihZ7zEt6GzwvcAOi0VMx91Vuo6n2T89jcM5E="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/rc-genicam-api/default.nix b/distros/noetic/rc-genicam-api/default.nix index 4feb02733e..44e9346c25 100644 --- a/distros/noetic/rc-genicam-api/default.nix +++ b/distros/noetic/rc-genicam-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-genicam-api"; version = "2.5.12-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_genicam_api-release/archive/release/noetic/rc_genicam_api/2.5.12-1.tar.gz"; - name = "2.5.12-1.tar.gz"; - sha256 = "05f3bd6a1b968b510f2f21be68adf4c089c32f3d3a2a1b81d6fb1d4f3cb966a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_genicam_api-release"; + rev = "release/noetic/rc_genicam_api/2.5.12-1"; + sha256 = "sha256-YkKXiMMUXT+aUMsQJFQ3PcRm8kWdFZTFd4NM5JLRheA="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/rc-genicam-camera/default.nix b/distros/noetic/rc-genicam-camera/default.nix index 50688379a6..f80e991112 100644 --- a/distros/noetic/rc-genicam-camera/default.nix +++ b/distros/noetic/rc-genicam-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-genicam-camera"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_genicam_camera-release/archive/release/noetic/rc_genicam_camera/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "7c69ed776b4a4c8bb7a46ddd4e4b69cfe0b02824af7d89675ff78500917f0d75"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_genicam_camera-release"; + rev = "release/noetic/rc_genicam_camera/1.3.0-1"; + sha256 = "sha256-SvadPZn8p/Ps2Akqw6I1dVQ4eBQu4+3gm/07jpDGriw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rc-genicam-driver/default.nix b/distros/noetic/rc-genicam-driver/default.nix index 1029c13bce..b6416ecedd 100644 --- a/distros/noetic/rc-genicam-driver/default.nix +++ b/distros/noetic/rc-genicam-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-genicam-driver"; version = "0.6.3-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_genicam_driver_ros-release/archive/release/noetic/rc_genicam_driver/0.6.3-1.tar.gz"; - name = "0.6.3-1.tar.gz"; - sha256 = "efffb85a04740a78ff27ce2556e5cef809371d1e5ad1624455c953bf126ea58b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_genicam_driver_ros-release"; + rev = "release/noetic/rc_genicam_driver/0.6.3-1"; + sha256 = "sha256-+juoW7DS6unNyDU13+ZMIxiHdrBy1aUAJ78xL1PmDzs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rc-hand-eye-calibration-client/default.nix b/distros/noetic/rc-hand-eye-calibration-client/default.nix index 388c4645bc..dc509eb5b6 100644 --- a/distros/noetic/rc-hand-eye-calibration-client/default.nix +++ b/distros/noetic/rc-hand-eye-calibration-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-hand-eye-calibration-client"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/noetic/rc_hand_eye_calibration_client/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "cf366385eea8a1204c6997b1c18bdce707ed6a079e4a9e32b0c25eb2ae901c7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/noetic/rc_hand_eye_calibration_client/3.3.2-1"; + sha256 = "sha256-I+dC+lnTUq9qNVaKFlLKb0nWmRdo9sGmI9Ysy1EkVSw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rc-pick-client/default.nix b/distros/noetic/rc-pick-client/default.nix index 77a094911e..bd7f4a0e0f 100644 --- a/distros/noetic/rc-pick-client/default.nix +++ b/distros/noetic/rc-pick-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-pick-client"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/noetic/rc_pick_client/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "1531a57ccb26a177430ac8d1140ac565215aa7f7c4466abaf75d31426c902727"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/noetic/rc_pick_client/3.3.2-1"; + sha256 = "sha256-vbcKyiWWms+VGMRQW7iPacZKxZPEHAGU0r4CmkY8bdE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rc-reason-clients/default.nix b/distros/noetic/rc-reason-clients/default.nix index 69b9cb28a6..0cf913415c 100644 --- a/distros/noetic/rc-reason-clients/default.nix +++ b/distros/noetic/rc-reason-clients/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-reason-clients"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_reason_clients_ros-release/archive/release/noetic/rc_reason_clients/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "ec48963acb27603b1a8c263587f51a6d75d5043afcfcdfad004c61939a9bb9d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_reason_clients_ros-release"; + rev = "release/noetic/rc_reason_clients/0.3.0-1"; + sha256 = "sha256-Xi3fJ4LQil6Zd0rsZ1cuocX4lrcmUJkhaShsNL+zYII="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rc-reason-msgs/default.nix b/distros/noetic/rc-reason-msgs/default.nix index df2dc4f666..cf75078bcc 100644 --- a/distros/noetic/rc-reason-msgs/default.nix +++ b/distros/noetic/rc-reason-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-reason-msgs"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_reason_clients_ros-release/archive/release/noetic/rc_reason_msgs/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "50a7fbb919cef19e7fc1136fadb1379b05b32ead2bc6eb11c88a5bbfe8dfc5d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_reason_clients_ros-release"; + rev = "release/noetic/rc_reason_msgs/0.3.0-1"; + sha256 = "sha256-uu+5yzSLHPPvfrzC9MLUH+Q1eZcKO3nlc2ceSHXlDSU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rc-silhouettematch-client/default.nix b/distros/noetic/rc-silhouettematch-client/default.nix index 2a448a8336..c44392154d 100644 --- a/distros/noetic/rc-silhouettematch-client/default.nix +++ b/distros/noetic/rc-silhouettematch-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-silhouettematch-client"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/noetic/rc_silhouettematch_client/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "17a9b5d56afef1e0bda6c09e4f47c2c38c9cdccbef4748ea2b0c2a1ea11bc74b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/noetic/rc_silhouettematch_client/3.3.2-1"; + sha256 = "sha256-qbXXttEhKp/my4mMmsa5YNssUJoNHOJOqWgMY3oD4FM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rc-tagdetect-client/default.nix b/distros/noetic/rc-tagdetect-client/default.nix index 987cadf294..0e0d7202a1 100644 --- a/distros/noetic/rc-tagdetect-client/default.nix +++ b/distros/noetic/rc-tagdetect-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-tagdetect-client"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/noetic/rc_tagdetect_client/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "e72dd88a60d98bc935e83cf3957172e0315c82723b699a630e6e878d6702068b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/noetic/rc_tagdetect_client/3.3.2-1"; + sha256 = "sha256-2ate1pj6VFEnEXle4235BJND9YYoYs5NtWWxyHB1OVE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rc-visard-description/default.nix b/distros/noetic/rc-visard-description/default.nix index e9808320c4..83549573d9 100644 --- a/distros/noetic/rc-visard-description/default.nix +++ b/distros/noetic/rc-visard-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-visard-description"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/noetic/rc_visard_description/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "a62f8f4a76e5815a134f1f95ceb64c95d9a91ceefa1ffec8108ebbf843c51a27"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/noetic/rc_visard_description/3.3.2-1"; + sha256 = "sha256-4uDuVtTv4G6Xg3AHZna9JecmNMQrIBrLACOOdR0OoRs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rc-visard-driver/default.nix b/distros/noetic/rc-visard-driver/default.nix index e14c52dc44..1bcde38a29 100644 --- a/distros/noetic/rc-visard-driver/default.nix +++ b/distros/noetic/rc-visard-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-visard-driver"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/noetic/rc_visard_driver/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "31fb020aa5cea7aa83940811b5ea52c940b59b8997b19e4fd713e6a7e0f33ec2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/noetic/rc_visard_driver/3.3.2-1"; + sha256 = "sha256-13pcUqqSU2rWlZCP2QywUfY/o/hHrG0WGrvmOWCFr9I="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rc-visard/default.nix b/distros/noetic/rc-visard/default.nix index 2c60780c84..88f2559e1b 100644 --- a/distros/noetic/rc-visard/default.nix +++ b/distros/noetic/rc-visard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rc-visard"; version = "3.3.2-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rc_visard-release/archive/release/noetic/rc_visard/3.3.2-1.tar.gz"; - name = "3.3.2-1.tar.gz"; - sha256 = "ac396df1f7affd2b17acc2a03fe269e1f8d7d72bb4702953817bd5ac6b1411db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rc_visard-release"; + rev = "release/noetic/rc_visard/3.3.2-1"; + sha256 = "sha256-pdB0aLJNp8TdeE1xR+khVTKl0t3Kdksnt67FPbMHxHM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rcdiscover/default.nix b/distros/noetic/rcdiscover/default.nix index 1b279f009a..7772bca625 100644 --- a/distros/noetic/rcdiscover/default.nix +++ b/distros/noetic/rcdiscover/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rcdiscover"; version = "1.1.4-r1"; - src = fetchurl { - url = "https://github.com/roboception-gbp/rcdiscover-release/archive/release/noetic/rcdiscover/1.1.4-1.tar.gz"; - name = "1.1.4-1.tar.gz"; - sha256 = "77c6f9fdff80705af1ad973d107c1ae7e1ec6e2920687c26e2e2a7f1161c1266"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboception-gbp"; + repo = "rcdiscover-release"; + rev = "release/noetic/rcdiscover/1.1.4-1"; + sha256 = "sha256-IzHfwuLyT18CS/9Qj/yMlO3ghLUflM1FesXkbpqXruE="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/realsense2-camera/default.nix b/distros/noetic/realsense2-camera/default.nix index a24bcf137d..5ec8ab2797 100644 --- a/distros/noetic/realsense2-camera/default.nix +++ b/distros/noetic/realsense2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-realsense2-camera"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/noetic/realsense2_camera/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "a03a1817362e6cdb2634429010226be1b64b64371a0622b588e65ec8bc4fb1e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/noetic/realsense2_camera/2.3.2-1"; + sha256 = "sha256-My96v7R1TsuqQAkUC7ZyVCcfGG1OmhuJGnHJESXvwqY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/realsense2-description/default.nix b/distros/noetic/realsense2-description/default.nix index c0735f3dd7..1cace5a403 100644 --- a/distros/noetic/realsense2-description/default.nix +++ b/distros/noetic/realsense2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-realsense2-description"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/noetic/realsense2_description/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "07386187411d8fbaa4fd63fdd7e00116f73bfa7c40105b7a5bb0199d4e9b3585"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "IntelRealSense"; + repo = "realsense-ros-release"; + rev = "release/noetic/realsense2_description/2.3.2-1"; + sha256 = "sha256-XMrc90iRdG8V56ZFQS8RDqPLXBLjAR33LQXCxkuQo6Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/realtime-tools/default.nix b/distros/noetic/realtime-tools/default.nix index 360a5516b9..2e08e0de43 100644 --- a/distros/noetic/realtime-tools/default.nix +++ b/distros/noetic/realtime-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-realtime-tools"; version = "1.16.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/realtime_tools-release/archive/release/noetic/realtime_tools/1.16.1-1.tar.gz"; - name = "1.16.1-1.tar.gz"; - sha256 = "0082db3f482804a3abc2034b2452fb7777b90b47a7144a78fcd552412bac76ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "realtime_tools-release"; + rev = "release/noetic/realtime_tools/1.16.1-1"; + sha256 = "sha256-ISjU/Pn5myVjhFdt3FPDjx4dkPdjOdk5FdnP1sQyQmc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/remote-rosbag-record/default.nix b/distros/noetic/remote-rosbag-record/default.nix index 6a76ff4da6..372cbd4cf8 100644 --- a/distros/noetic/remote-rosbag-record/default.nix +++ b/distros/noetic/remote-rosbag-record/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-remote-rosbag-record"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/remote_rosbag_record-release/archive/release/noetic/remote_rosbag_record/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "2368a9fc7e072bf4aced606034a3cc0fe54c94e6fb09f522ac242fe7fbadc271"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "remote_rosbag_record-release"; + rev = "release/noetic/remote_rosbag_record/0.0.4-1"; + sha256 = "sha256-jBhblCeYMHjojhhvwM3zrV8yCnMBhHHMsD6MCqx7sOU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/resized-image-transport/default.nix b/distros/noetic/resized-image-transport/default.nix index c1c6a52a14..71bf337083 100644 --- a/distros/noetic/resized-image-transport/default.nix +++ b/distros/noetic/resized-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-resized-image-transport"; version = "1.2.15-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_recognition-release/archive/release/noetic/resized_image_transport/1.2.15-1.tar.gz"; - name = "1.2.15-1.tar.gz"; - sha256 = "9a64a0abf330c236a52bad2b2ffc0e9a2075a6d65d82c56485bf8315670aef6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_recognition-release"; + rev = "release/noetic/resized_image_transport/1.2.15-1"; + sha256 = "sha256-RJV5zmMTKiygVxeQObnXK4bn4Iu2PoRrCwu58yVo9GE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/resource-retriever/default.nix b/distros/noetic/resource-retriever/default.nix index d2c79eceb9..af7bdda247 100644 --- a/distros/noetic/resource-retriever/default.nix +++ b/distros/noetic/resource-retriever/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-resource-retriever"; version = "1.12.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/resource_retriever-release/archive/release/noetic/resource_retriever/1.12.7-1.tar.gz"; - name = "1.12.7-1.tar.gz"; - sha256 = "fb6bb7f68b716ab88f3acd7c94b42aa8f9d1932879a9572e3d05643aac221d9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "resource_retriever-release"; + rev = "release/noetic/resource_retriever/1.12.7-1"; + sha256 = "sha256-3lgELVCPlXE3y8t2/h247oO8rwiqJ+AR3HG0gHgpNN8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rgbd-launch/default.nix b/distros/noetic/rgbd-launch/default.nix index 1a78f4c943..9fe368ca8d 100644 --- a/distros/noetic/rgbd-launch/default.nix +++ b/distros/noetic/rgbd-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rgbd-launch"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rgbd_launch-release/archive/release/noetic/rgbd_launch/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "3068bc034a4ccf0aa8810a9b825b43e4c300e7ed7bb9626ae1ea97ffcda41b40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rgbd_launch-release"; + rev = "release/noetic/rgbd_launch/2.3.0-1"; + sha256 = "sha256-OmHHyZp7fnVkklbADINUokbfVSKPV47GAin5rSiflJA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ridgeback-control/default.nix b/distros/noetic/ridgeback-control/default.nix index df6d41e917..2804da1009 100644 --- a/distros/noetic/ridgeback-control/default.nix +++ b/distros/noetic/ridgeback-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-control"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback-release/archive/release/noetic/ridgeback_control/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "66527dfd93b88a9b621ff58a3f9206a7341c7fb104d7c008aacd8e3dcbe534f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback-release"; + rev = "release/noetic/ridgeback_control/0.3.2-1"; + sha256 = "sha256-ttPoxAvIEjMzVzXH07iiQ0NPgfkVvVCa62E1EBUS3Ww="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ridgeback-description/default.nix b/distros/noetic/ridgeback-description/default.nix index 8964883318..07520e65ac 100644 --- a/distros/noetic/ridgeback-description/default.nix +++ b/distros/noetic/ridgeback-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-description"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback-release/archive/release/noetic/ridgeback_description/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "b1c54aac8759b04ce003d2639ef3ad5058c858db73cf986a7e3cdd8ba7b5d887"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback-release"; + rev = "release/noetic/ridgeback_description/0.3.2-1"; + sha256 = "sha256-08fNaVb8ChCA0Nt02RPiV1HC9r6URu0jlhbSr1GJIlE="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/ridgeback-desktop/default.nix b/distros/noetic/ridgeback-desktop/default.nix index 7a0a1e1849..c62b227a39 100644 --- a/distros/noetic/ridgeback-desktop/default.nix +++ b/distros/noetic/ridgeback-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-desktop"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_desktop-release/archive/release/noetic/ridgeback_desktop/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "e5f1f4ff1bfcbda124424ea9710105417260835334d7a5722aa97ac7c5611d9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_desktop-release"; + rev = "release/noetic/ridgeback_desktop/0.1.3-1"; + sha256 = "sha256-wkTNhcyAIfUpjEwb8rKH0moWumGb9difvre3pv+kfqU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ridgeback-gazebo-plugins/default.nix b/distros/noetic/ridgeback-gazebo-plugins/default.nix index 4a666764c7..899d2b3005 100644 --- a/distros/noetic/ridgeback-gazebo-plugins/default.nix +++ b/distros/noetic/ridgeback-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-gazebo-plugins"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_simulator-release/archive/release/noetic/ridgeback_gazebo_plugins/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "34434c0c65333845d3fb851b854443a1a23972cdbb0c3220f24b9878255db19d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_simulator-release"; + rev = "release/noetic/ridgeback_gazebo_plugins/0.2.0-1"; + sha256 = "sha256-32Wr2O9lkaCZQvPOUcUdmPqcw5KKJ1bgfaXHBcAt9pU="; + }; buildType = "catkin"; buildInputs = [ catkin gazebo_11 std-srvs ]; diff --git a/distros/noetic/ridgeback-gazebo/default.nix b/distros/noetic/ridgeback-gazebo/default.nix index 79b58cad7e..7f03863819 100644 --- a/distros/noetic/ridgeback-gazebo/default.nix +++ b/distros/noetic/ridgeback-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-gazebo"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_simulator-release/archive/release/noetic/ridgeback_gazebo/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "e5259ab3274609715402262563a5a0f5b39994ed94582bd103f898ab4106ea09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_simulator-release"; + rev = "release/noetic/ridgeback_gazebo/0.2.0-1"; + sha256 = "sha256-Qj7scBLf09DK/zdJZOx1lEYPn+ajhtwt348L3fiXs+Q="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/ridgeback-msgs/default.nix b/distros/noetic/ridgeback-msgs/default.nix index 2b24178110..5b60f07159 100644 --- a/distros/noetic/ridgeback-msgs/default.nix +++ b/distros/noetic/ridgeback-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-msgs"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback-release/archive/release/noetic/ridgeback_msgs/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "b861ea515733bd8c57a7facd666157dc9b310d45256fea511e650c83f6640c3c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback-release"; + rev = "release/noetic/ridgeback_msgs/0.3.2-1"; + sha256 = "sha256-9AdMPbHoE4N6jtsXL8GjsODsMhPZ0jg4J2MA95KotOk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ridgeback-navigation/default.nix b/distros/noetic/ridgeback-navigation/default.nix index 5f4437d439..9e6d5e347d 100644 --- a/distros/noetic/ridgeback-navigation/default.nix +++ b/distros/noetic/ridgeback-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-navigation"; version = "0.3.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback-release/archive/release/noetic/ridgeback_navigation/0.3.2-1.tar.gz"; - name = "0.3.2-1.tar.gz"; - sha256 = "1bc1dd7dd3ddcbe355de1f8448ef688204efe9382c0c3b10a0284f11be46c90a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback-release"; + rev = "release/noetic/ridgeback_navigation/0.3.2-1"; + sha256 = "sha256-HPEAtJhVxV4qmSiOQAAsD/JbwE/TK9UhUEvvnFfgw0E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ridgeback-simulator/default.nix b/distros/noetic/ridgeback-simulator/default.nix index 0d259e6d59..332b56f261 100644 --- a/distros/noetic/ridgeback-simulator/default.nix +++ b/distros/noetic/ridgeback-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-simulator"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_simulator-release/archive/release/noetic/ridgeback_simulator/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "3648e6f3dd54de136f714ca4cb018ecfddd68ed0e99c70d4bba38d8c8f47d4db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_simulator-release"; + rev = "release/noetic/ridgeback_simulator/0.2.0-1"; + sha256 = "sha256-ANMl+apHXAevhD6t8csD5lR6hPxof8n3hghzQ+pjq+U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ridgeback-viz/default.nix b/distros/noetic/ridgeback-viz/default.nix index 44ed7d66e7..e573f11013 100644 --- a/distros/noetic/ridgeback-viz/default.nix +++ b/distros/noetic/ridgeback-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ridgeback-viz"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/ridgeback_desktop-release/archive/release/noetic/ridgeback_viz/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "f40b89e9929355928dfa35189b5091ed9eedcdb0aee40dc95a912ba35db2bc37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "ridgeback_desktop-release"; + rev = "release/noetic/ridgeback_viz/0.1.3-1"; + sha256 = "sha256-AvOgkIebvPzXU78zKHIewcdgm3AAee2vpGI86zL6RV8="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/rm-calibration-controllers/default.nix b/distros/noetic/rm-calibration-controllers/default.nix index fdae4a934e..a7d320bd30 100644 --- a/distros/noetic/rm-calibration-controllers/default.nix +++ b/distros/noetic/rm-calibration-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-calibration-controllers"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/rm_calibration_controllers/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "a2d0f9856c66c2674f610b0cc9ddbee9a764853326e9f8bcf18bf4313351723b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/rm_calibration_controllers/0.1.7-1"; + sha256 = "sha256-Om/m3MON3WpO1mdayXD+e99ypi87QKpoZwJP/H2+LXo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-chassis-controllers/default.nix b/distros/noetic/rm-chassis-controllers/default.nix index 514732e2f5..48ada40d5c 100644 --- a/distros/noetic/rm-chassis-controllers/default.nix +++ b/distros/noetic/rm-chassis-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-chassis-controllers"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/rm_chassis_controllers/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "c0163c5f96d0568d3626193dacef22730509ce69e2cb0fbd2b3a52f2487d685f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/rm_chassis_controllers/0.1.7-1"; + sha256 = "sha256-bxpd/ccBHtcuEidBYqBuQ951FnOhZSmYdNcTFy5rJ/0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-common/default.nix b/distros/noetic/rm-common/default.nix index cf79792d91..c53df6e2af 100644 --- a/distros/noetic/rm-common/default.nix +++ b/distros/noetic/rm-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-common"; version = "0.1.15-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_control-release/archive/release/noetic/rm_common/0.1.15-1.tar.gz"; - name = "0.1.15-1.tar.gz"; - sha256 = "e336ecf26b5ee997849217f27680fd0787359ebf1d7c67110ca0513864632019"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_control-release"; + rev = "release/noetic/rm_common/0.1.15-1"; + sha256 = "sha256-XC3GuL6pHX7EFBW7cMRNdndsweWVlItND9Jp92JQ924="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-control/default.nix b/distros/noetic/rm-control/default.nix index 71c7ee87f9..af89aba855 100644 --- a/distros/noetic/rm-control/default.nix +++ b/distros/noetic/rm-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-control"; version = "0.1.15-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_control-release/archive/release/noetic/rm_control/0.1.15-1.tar.gz"; - name = "0.1.15-1.tar.gz"; - sha256 = "74ca0b37276db8be681fb4201d5f08afccacfd3f2816b2d9f876796645704283"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_control-release"; + rev = "release/noetic/rm_control/0.1.15-1"; + sha256 = "sha256-mdY1hW+0QDnEsKa5by5baxvAAK6jde3xHAy1dARpBTc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-controllers/default.nix b/distros/noetic/rm-controllers/default.nix index 56c9bbd6ce..d4f807e3f6 100644 --- a/distros/noetic/rm-controllers/default.nix +++ b/distros/noetic/rm-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-controllers"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/rm_controllers/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "5420592e36da035bd098aa8dd286ee9410602e52cdaf2be6d877d56f384bdd65"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/rm_controllers/0.1.7-1"; + sha256 = "sha256-HfrljPquPHA7g3FBdJJJQRMvReL9Ozh5XqF4SG50XMQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-dbus/default.nix b/distros/noetic/rm-dbus/default.nix index ebf767f1a6..7eb355f662 100644 --- a/distros/noetic/rm-dbus/default.nix +++ b/distros/noetic/rm-dbus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-dbus"; version = "0.1.15-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_control-release/archive/release/noetic/rm_dbus/0.1.15-1.tar.gz"; - name = "0.1.15-1.tar.gz"; - sha256 = "6a2b0380e64504e654f4cd0cbf028adc9a02f8f88d74d4d8924b5a9ae3e8dfc1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_control-release"; + rev = "release/noetic/rm_dbus/0.1.15-1"; + sha256 = "sha256-aHt0cFzAkg5bwLnSZW1Eky6/VgI20XGfWqs9Vs8OXk8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-description/default.nix b/distros/noetic/rm-description/default.nix index c874f097d2..2a756a33cb 100644 --- a/distros/noetic/rm-description/default.nix +++ b/distros/noetic/rm-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-description"; version = "0.1.9-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_description-release/archive/release/noetic/rm_description/0.1.9-1.tar.gz"; - name = "0.1.9-1.tar.gz"; - sha256 = "c947b61f5e4064b3d11ec7321c6780f0688059d999b64a0a297a1e5d23e3b9fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_description-release"; + rev = "release/noetic/rm_description/0.1.9-1"; + sha256 = "sha256-5pcnGWQCNcbmyLUeHj9Bofm7REjHHJixlygVvpsdDa4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-gazebo/default.nix b/distros/noetic/rm-gazebo/default.nix index af372bab76..ace0066984 100644 --- a/distros/noetic/rm-gazebo/default.nix +++ b/distros/noetic/rm-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-gazebo"; version = "0.1.15-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_control-release/archive/release/noetic/rm_gazebo/0.1.15-1.tar.gz"; - name = "0.1.15-1.tar.gz"; - sha256 = "e03de15c8cafe40eb076e07720da1c7c041d6f830af60ca26a033c623de212a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_control-release"; + rev = "release/noetic/rm_gazebo/0.1.15-1"; + sha256 = "sha256-jbEHSGzoN6OXTj+HriD6VHvDqZa/RIDgTl4l7yGUfTg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-gimbal-controllers/default.nix b/distros/noetic/rm-gimbal-controllers/default.nix index d13629b86e..0cc3b1f8b9 100644 --- a/distros/noetic/rm-gimbal-controllers/default.nix +++ b/distros/noetic/rm-gimbal-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-gimbal-controllers"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/rm_gimbal_controllers/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "f4880a42ef60e663d7a8dc33a035fe30ea83cec13a99dcaa05d2c9fb85123bcc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/rm_gimbal_controllers/0.1.7-1"; + sha256 = "sha256-lF5Buq9N49E50nKGOlaV3dkJaKwSE+hXN+6XA2RoPS4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-hw/default.nix b/distros/noetic/rm-hw/default.nix index a5db6f3f57..6a68f0481e 100644 --- a/distros/noetic/rm-hw/default.nix +++ b/distros/noetic/rm-hw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-hw"; version = "0.1.15-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_control-release/archive/release/noetic/rm_hw/0.1.15-1.tar.gz"; - name = "0.1.15-1.tar.gz"; - sha256 = "16717af03af980d47f5e6be6b72ba1344f5f02784bb6036612b78c597ce6c46d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_control-release"; + rev = "release/noetic/rm_hw/0.1.15-1"; + sha256 = "sha256-Bnpd1F3/KeL0uWUjCL9v/f5t2Md4Y9l6KtzJX4vGmMA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-msgs/default.nix b/distros/noetic/rm-msgs/default.nix index fd56876627..1d93e79e4b 100644 --- a/distros/noetic/rm-msgs/default.nix +++ b/distros/noetic/rm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-msgs"; version = "0.1.15-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_control-release/archive/release/noetic/rm_msgs/0.1.15-1.tar.gz"; - name = "0.1.15-1.tar.gz"; - sha256 = "7d7cbbe87911ad07336c5787b5ee11e37e796ea05cf4b55a627469eb4c5757b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_control-release"; + rev = "release/noetic/rm_msgs/0.1.15-1"; + sha256 = "sha256-hHyDSPfPmLi48Ewnre+tJUx3pl0XwzzevXhmDdUeeaE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-orientation-controller/default.nix b/distros/noetic/rm-orientation-controller/default.nix index 8adec3fb7c..ef142af819 100644 --- a/distros/noetic/rm-orientation-controller/default.nix +++ b/distros/noetic/rm-orientation-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-orientation-controller"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/rm_orientation_controller/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "3e68a608f0bfb6b249c99e22f4aa185a2080f18583925526e5f67cea4198ae1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/rm_orientation_controller/0.1.7-1"; + sha256 = "sha256-z7w7B7LTxs3dJhAiuEMX2BAl/un979mJwh8zJtMD2gA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rm-shooter-controllers/default.nix b/distros/noetic/rm-shooter-controllers/default.nix index c15e68d6e0..bc9e856b03 100644 --- a/distros/noetic/rm-shooter-controllers/default.nix +++ b/distros/noetic/rm-shooter-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rm-shooter-controllers"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/rm_shooter_controllers/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "f32ac29822c62086ac88915f2e4d197b55e4314c1787eaa5132712d7505aeb15"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/rm_shooter_controllers/0.1.7-1"; + sha256 = "sha256-bpVf61ILAIWUhc5SU4uardry0tA4wOokhJ26L4Amk9Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robot-body-filter/default.nix b/distros/noetic/robot-body-filter/default.nix index 0464ee29a5..0094998fda 100644 --- a/distros/noetic/robot-body-filter/default.nix +++ b/distros/noetic/robot-body-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-body-filter"; version = "1.2.2-r1"; - src = fetchurl { - url = "https://github.com/peci1/robot_body_filter-release/archive/release/noetic/robot_body_filter/1.2.2-1.tar.gz"; - name = "1.2.2-1.tar.gz"; - sha256 = "ffe794904da49c0f07f1e535350c2c7d6fbb69b44263014ba337dd009878cea6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "robot_body_filter-release"; + rev = "release/noetic/robot_body_filter/1.2.2-1"; + sha256 = "sha256-FOKTaqcAj+/wnxtKFX6UbIEfvQRFz+2iIVBTJBml7m4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pkg-config tf2-eigen tf2-sensor-msgs ]; diff --git a/distros/noetic/robot-calibration-msgs/default.nix b/distros/noetic/robot-calibration-msgs/default.nix index c166eed25d..2b3149ce70 100644 --- a/distros/noetic/robot-calibration-msgs/default.nix +++ b/distros/noetic/robot-calibration-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-calibration-msgs"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/robot_calibration-release/archive/release/noetic/robot_calibration_msgs/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "b90bf5c93a7c5b955b589a4bd5052b9a2c84741a97090d04dd23623c30cc4120"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "robot_calibration-release"; + rev = "release/noetic/robot_calibration_msgs/0.7.2-1"; + sha256 = "sha256-TcMd42tEe9LOT+m4e9F0iC+SoNpLt+YYrfn3fj//p04="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/robot-calibration/default.nix b/distros/noetic/robot-calibration/default.nix index 465977bc61..5a161e8974 100644 --- a/distros/noetic/robot-calibration/default.nix +++ b/distros/noetic/robot-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-calibration"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/robot_calibration-release/archive/release/noetic/robot_calibration/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "774948a55ecaceee2cf1036ad3088b6766f48b339a713b2eaaea3ed5b200c5f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "robot_calibration-release"; + rev = "release/noetic/robot_calibration/0.7.2-1"; + sha256 = "sha256-WDMgwHYSuq8ngMl5Xlb0QJk1O3fwiqa8pwFmK9CW/+w="; + }; buildType = "catkin"; buildInputs = [ catkin eigen ]; diff --git a/distros/noetic/robot-controllers-interface/default.nix b/distros/noetic/robot-controllers-interface/default.nix index 268d0d0e7d..1c977765c9 100644 --- a/distros/noetic/robot-controllers-interface/default.nix +++ b/distros/noetic/robot-controllers-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-controllers-interface"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-release/archive/release/noetic/robot_controllers_interface/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "2aefb653301e9f46d2d82c4a26dd10a4d8c9e28342899429c90490e854122c7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-release"; + rev = "release/noetic/robot_controllers_interface/0.7.0-1"; + sha256 = "sha256-cuYCU0ujvKPSM6Em8bnELqXTMDL5aDKAzlaOu4vTaIY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robot-controllers-msgs/default.nix b/distros/noetic/robot-controllers-msgs/default.nix index d412b2c6d9..efb67de0e8 100644 --- a/distros/noetic/robot-controllers-msgs/default.nix +++ b/distros/noetic/robot-controllers-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-controllers-msgs"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-release/archive/release/noetic/robot_controllers_msgs/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "b715c23f4e9e5732c317cb39f76d0bff7981d28d2671005d9f6aa6353c036ca1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-release"; + rev = "release/noetic/robot_controllers_msgs/0.7.0-1"; + sha256 = "sha256-X7rwbR/YuoiQn9JOtVg/eGRQpqBGiR3+B4i4pICFznk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/robot-controllers/default.nix b/distros/noetic/robot-controllers/default.nix index e23a20c590..160ffb32d8 100644 --- a/distros/noetic/robot-controllers/default.nix +++ b/distros/noetic/robot-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-controllers"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/fetchrobotics-gbp/robot_controllers-release/archive/release/noetic/robot_controllers/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "cd13b537617dbdb7619f16bb991be69f9106df73970c9429dede5db6430ce1ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fetchrobotics-gbp"; + repo = "robot_controllers-release"; + rev = "release/noetic/robot_controllers/0.7.0-1"; + sha256 = "sha256-5nzlD8HXfSOZxRf5rsmQAJ9K29EXFtJ9c/5u+C591ck="; + }; buildType = "catkin"; buildInputs = [ angles catkin ]; diff --git a/distros/noetic/robot-localization/default.nix b/distros/noetic/robot-localization/default.nix index e35e07a50e..7c47afbbc7 100644 --- a/distros/noetic/robot-localization/default.nix +++ b/distros/noetic/robot-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-localization"; version = "2.7.4-r1"; - src = fetchurl { - url = "https://github.com/cra-ros-pkg/robot_localization-release/archive/release/noetic/robot_localization/2.7.4-1.tar.gz"; - name = "2.7.4-1.tar.gz"; - sha256 = "6518a9a73a1c4e5046366b74aa9c0f586089535676b4a644085c633ec6447431"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cra-ros-pkg"; + repo = "robot_localization-release"; + rev = "release/noetic/robot_localization/2.7.4-1"; + sha256 = "sha256-QiK90IIgaNFBQE9mqog3Q6dm8/pTjF09NikDBEPM7ic="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.catkin-pkg roslint ]; diff --git a/distros/noetic/robot-mechanism-controllers/default.nix b/distros/noetic/robot-mechanism-controllers/default.nix index 7690bf813f..f537961a9a 100644 --- a/distros/noetic/robot-mechanism-controllers/default.nix +++ b/distros/noetic/robot-mechanism-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-mechanism-controllers"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/robot_mechanism_controllers/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "74305f5067b74273f7fd18d723134d8616b25231a2aa64db5e97cedd3582a847"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/robot_mechanism_controllers/1.10.18-1"; + sha256 = "sha256-RnXYk4DThTW3YkHJ5Eeq9NNe3Iz+Bjzk1l3dwFKupOU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/robot-nav-rviz-plugins/default.nix b/distros/noetic/robot-nav-rviz-plugins/default.nix index b06e54411b..5126c5a70d 100644 --- a/distros/noetic/robot-nav-rviz-plugins/default.nix +++ b/distros/noetic/robot-nav-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-nav-rviz-plugins"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/robot_nav_rviz_plugins/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "44bd38be8166789fba741d1249b9c768a8ffd8647dd1b8b522c833163ce207a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/robot_nav_rviz_plugins/0.3.0-2"; + sha256 = "sha256-mys+GOTnvNshjsTMKCjQzUqU93GQYfrAhENku9u3wU8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robot-nav-tools/default.nix b/distros/noetic/robot-nav-tools/default.nix index 59c9b8e89d..36ad2870fe 100644 --- a/distros/noetic/robot-nav-tools/default.nix +++ b/distros/noetic/robot-nav-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-nav-tools"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/robot_nav_tools/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "fed2061296698ab2690bf54463010d6e6aa6d6f8f18282100eea75bc8957c9b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/robot_nav_tools/0.3.0-2"; + sha256 = "sha256-o7tUo1g/alr7qtzlh5Ep0sTrbP/zy8ah3EUaeSPGTCo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robot-nav-viz-demos/default.nix b/distros/noetic/robot-nav-viz-demos/default.nix index f7e730623c..cc4c387343 100644 --- a/distros/noetic/robot-nav-viz-demos/default.nix +++ b/distros/noetic/robot-nav-viz-demos/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-nav-viz-demos"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/robot_nav_viz_demos/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "d73d2fb32772b5deae9a2b15d2e9b1d3b773b20dccf79474cde619367175cd6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/robot_nav_viz_demos/0.3.0-2"; + sha256 = "sha256-b7LRToEg7iFc0Y2jigP4affMkXLoTTxdmEO+p/BGg2I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robot-navigation/default.nix b/distros/noetic/robot-navigation/default.nix index 79e824d55e..251ede34e3 100644 --- a/distros/noetic/robot-navigation/default.nix +++ b/distros/noetic/robot-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-navigation"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/DLu/robot_navigation-release/archive/release/noetic/robot_navigation/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "9ac1a0a6351d0fea2c59e819ea8b44834524b6f65db769f8d42381007b1dae8b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "robot_navigation-release"; + rev = "release/noetic/robot_navigation/0.3.0-2"; + sha256 = "sha256-r9dWbJZj1Vlo8q1873frJ2Id63ooJu+QMczpVnA76BE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robot-self-filter/default.nix b/distros/noetic/robot-self-filter/default.nix index 1b183cebe1..195d8ea7d2 100644 --- a/distros/noetic/robot-self-filter/default.nix +++ b/distros/noetic/robot-self-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-self-filter"; version = "0.1.32-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/robot_self_filter-gbp/archive/release/noetic/robot_self_filter/0.1.32-1.tar.gz"; - name = "0.1.32-1.tar.gz"; - sha256 = "e627c0eabb4fe4126ab68e4f6e392792669515ae1cc9ec0c6df2328bae93f09b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "robot_self_filter-gbp"; + rev = "release/noetic/robot_self_filter/0.1.32-1"; + sha256 = "sha256-I/yYxdaB9pYvjxt/txbSOreUWY9h8F02sj5QbG/enWg="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/robot-state-controller/default.nix b/distros/noetic/robot-state-controller/default.nix index 6e1e320a45..2e537ead25 100644 --- a/distros/noetic/robot-state-controller/default.nix +++ b/distros/noetic/robot-state-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-state-controller"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/robot_state_controller/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "402219993ee32c1a0d3b283b78d6a6bb296c055c8ede05a5126cbc464b21cabe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/robot_state_controller/0.1.7-1"; + sha256 = "sha256-2geSWtlcmmreuGS3JynN30tdhtBkCOS3Xzn6tFvJaa8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robot-state-publisher/default.nix b/distros/noetic/robot-state-publisher/default.nix index 0fbc1755f8..92ced3af21 100644 --- a/distros/noetic/robot-state-publisher/default.nix +++ b/distros/noetic/robot-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-state-publisher"; version = "1.15.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/robot_state_publisher-release/archive/release/noetic/robot_state_publisher/1.15.2-1.tar.gz"; - name = "1.15.2-1.tar.gz"; - sha256 = "9939e39eb22755515c60d7d1941f9775c44725dbd10e79c18fc558c4a5b6af94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "robot_state_publisher-release"; + rev = "release/noetic/robot_state_publisher/1.15.2-1"; + sha256 = "sha256-g0fRKSM9DOQ6szXdMpDoLQNiHpVlyoOWKUJRGWYfACo="; + }; buildType = "catkin"; buildInputs = [ catkin eigen urdfdom-headers ]; diff --git a/distros/noetic/robot-upstart/default.nix b/distros/noetic/robot-upstart/default.nix index 446ff90e5f..c998e629ce 100644 --- a/distros/noetic/robot-upstart/default.nix +++ b/distros/noetic/robot-upstart/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot-upstart"; version = "0.4.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/robot_upstart-release/archive/release/noetic/robot_upstart/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "3c22f90aa2a8fb62bfb8826fe47b3a3f10a58f3afa5012825e33272d21d5edb3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "robot_upstart-release"; + rev = "release/noetic/robot_upstart/0.4.2-1"; + sha256 = "sha256-lF+yPJnhr7pjaxwLb7afvr5IlV7qoBidNHEGDJLteQg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robot/default.nix b/distros/noetic/robot/default.nix index dbf50ec5ab..c4b17259e0 100644 --- a/distros/noetic/robot/default.nix +++ b/distros/noetic/robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robot"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/noetic/robot/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "3eeb14c57b97190d861e477f4563f6c0d2ae3fafb1e25e672e13a906dd8b12db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/noetic/robot/1.5.0-1"; + sha256 = "sha256-4j4eUhU10uecGbVJV4kfJ/dO/6BcEndgwOT1FtLvDrw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roboticsgroup-upatras-gazebo-plugins/default.nix b/distros/noetic/roboticsgroup-upatras-gazebo-plugins/default.nix index cdd33320cb..7e863a4dce 100644 --- a/distros/noetic/roboticsgroup-upatras-gazebo-plugins/default.nix +++ b/distros/noetic/roboticsgroup-upatras-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roboticsgroup-upatras-gazebo-plugins"; version = "0.2.0-r2"; - src = fetchurl { - url = "https://github.com/roboticsgroup/roboticsgroup_upatras_gazebo_plugins-release/archive/release/noetic/roboticsgroup_upatras_gazebo_plugins/0.2.0-2.tar.gz"; - name = "0.2.0-2.tar.gz"; - sha256 = "d99b36195316183ec91279bda2938897e29eebea5f4d29236c10e266f8df351e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "roboticsgroup"; + repo = "roboticsgroup_upatras_gazebo_plugins-release"; + rev = "release/noetic/roboticsgroup_upatras_gazebo_plugins/0.2.0-2"; + sha256 = "sha256-9skr5rgzU90ggoYGDTBM/0AXhkgdo3EMZCt8bC8yZLA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robotis-manipulator/default.nix b/distros/noetic/robotis-manipulator/default.nix index 25bc78555d..fa6777a014 100644 --- a/distros/noetic/robotis-manipulator/default.nix +++ b/distros/noetic/robotis-manipulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robotis-manipulator"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/robotis_manipulator-release/archive/release/noetic/robotis_manipulator/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "d768b0269636ce2e41c6b4dce982eee5d2363abde6f5172fbadcd8e3f39a7b29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "robotis_manipulator-release"; + rev = "release/noetic/robotis_manipulator/1.1.1-2"; + sha256 = "sha256-rzLiAlR+Y8+cDY0k/IUvE3d2V2r+GM36RMdch9bzcNo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robotont-description/default.nix b/distros/noetic/robotont-description/default.nix index 287597b139..09edf8d8ab 100644 --- a/distros/noetic/robotont-description/default.nix +++ b/distros/noetic/robotont-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robotont-description"; version = "0.0.8-r2"; - src = fetchurl { - url = "https://github.com/robotont-release/robotont_description-release/archive/release/noetic/robotont_description/0.0.8-2.tar.gz"; - name = "0.0.8-2.tar.gz"; - sha256 = "1b1b713aad635f182614d471ce49065a0dc0747fbd9bc434b7e2656ac9528d92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotont-release"; + repo = "robotont_description-release"; + rev = "release/noetic/robotont_description/0.0.8-2"; + sha256 = "sha256-jT/rmUG7UA79Fx6nxn6Ky5GMlteOcZfwS/vHN6t+ogI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robotont-gazebo/default.nix b/distros/noetic/robotont-gazebo/default.nix index 5a3e3510c8..ba7c572e77 100644 --- a/distros/noetic/robotont-gazebo/default.nix +++ b/distros/noetic/robotont-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robotont-gazebo"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/robotont-release/robotont_gazebo-release/archive/release/noetic/robotont_gazebo/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "6284e77228389def9dc22b96a2adcd1b549c9e4f7218a8c8c037db1a442ea03f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotont-release"; + repo = "robotont_gazebo-release"; + rev = "release/noetic/robotont_gazebo/0.0.2-2"; + sha256 = "sha256-LXgQ3IOlTBrylr12nOhSNdAmYD5+ENGePJ1LA79v+A0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robotont-msgs/default.nix b/distros/noetic/robotont-msgs/default.nix index e48dbd41bb..d978718115 100644 --- a/distros/noetic/robotont-msgs/default.nix +++ b/distros/noetic/robotont-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robotont-msgs"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/robotont-release/robotont_msgs-release/archive/release/noetic/robotont_msgs/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "447b3cf76724d1ffd31b87185b5acad48914a846fbe92028240589d263dcaa40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotont-release"; + repo = "robotont_msgs-release"; + rev = "release/noetic/robotont_msgs/0.0.2-2"; + sha256 = "sha256-A37dFaxRXwDBPU94C/LW59YNeZes/EZdUHOKQEr0n7E="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/robotont-nuc-description/default.nix b/distros/noetic/robotont-nuc-description/default.nix index 5f9cc5bb2d..b83e4044a7 100644 --- a/distros/noetic/robotont-nuc-description/default.nix +++ b/distros/noetic/robotont-nuc-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robotont-nuc-description"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/robotont-release/robotont_nuc_description-release/archive/release/noetic/robotont_nuc_description/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "843dea77d131d0cf8f306ef92b40bc56f6119688502ad0fd3383b088155fae58"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotont-release"; + repo = "robotont_nuc_description-release"; + rev = "release/noetic/robotont_nuc_description/0.0.2-1"; + sha256 = "sha256-PFLNfO56Pkf9tf2YuWVyEHWiiwKCs7OoHEkqdd3oLW0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/robotraconteur/default.nix b/distros/noetic/robotraconteur/default.nix index ef7a6b2e49..c5596b8c7b 100644 --- a/distros/noetic/robotraconteur/default.nix +++ b/distros/noetic/robotraconteur/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-robotraconteur"; version = "0.15.5-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robotraconteur-packaging"; + repo = "robotraconteur-ros-release"; + rev = "release/noetic/robotraconteur/0.15.5-1"; + sha256 = "sha256-jizu6zEKGpXLk8jRm0bXbqV0DbOS+bFHBFQy41rFMuU="; + }; buildType = "cmake"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-babel-fish-test-msgs/default.nix b/distros/noetic/ros-babel-fish-test-msgs/default.nix index 1b2faf3ce7..bf89cb7bcf 100644 --- a/distros/noetic/ros-babel-fish-test-msgs/default.nix +++ b/distros/noetic/ros-babel-fish-test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-babel-fish-test-msgs"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/StefanFabian/ros_babel_fish-release/archive/release/noetic/ros_babel_fish_test_msgs/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "23b8229d1479dc91b0e05ec4f536c4f80eb3a529f9aa64ddbedc3107309d846e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "StefanFabian"; + repo = "ros_babel_fish-release"; + rev = "release/noetic/ros_babel_fish_test_msgs/0.9.3-1"; + sha256 = "sha256-+IMs/suyQngfY9u5HXc+MuV9+iFMljF0rfMuTlobT5g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ros-babel-fish/default.nix b/distros/noetic/ros-babel-fish/default.nix index 63bbd143e8..f49254c294 100644 --- a/distros/noetic/ros-babel-fish/default.nix +++ b/distros/noetic/ros-babel-fish/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-babel-fish"; version = "0.9.3-r1"; - src = fetchurl { - url = "https://github.com/StefanFabian/ros_babel_fish-release/archive/release/noetic/ros_babel_fish/0.9.3-1.tar.gz"; - name = "0.9.3-1.tar.gz"; - sha256 = "a6c044f3285c529be6833c499a7ea5dba2cd99f170c51e9a544b0b1ae0730e03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "StefanFabian"; + repo = "ros_babel_fish-release"; + rev = "release/noetic/ros_babel_fish/0.9.3-1"; + sha256 = "sha256-+xeOjDeg3TplCq9bs36KVK4svNzdUIPrFfutRjE1gCA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-base/default.nix b/distros/noetic/ros-base/default.nix index f825299b43..2a258f4beb 100644 --- a/distros/noetic/ros-base/default.nix +++ b/distros/noetic/ros-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-base"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/noetic/ros_base/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "bde4e754906fb27372d239878115136a17fdd34fb6993c9a945447dfbb56c7cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/noetic/ros_base/1.5.0-1"; + sha256 = "sha256-HCTiEW7+Xx7DxDBd2ZfzBj4hQfT4QRV/HhvmKH1m8YQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-canopen/default.nix b/distros/noetic/ros-canopen/default.nix index b5ddb44d6d..2c65fbdf84 100644 --- a/distros/noetic/ros-canopen/default.nix +++ b/distros/noetic/ros-canopen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-canopen"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/noetic/ros_canopen/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "c7a0d3494c60a140418396cd2a4bb190c3496ee9492f8dd3d3af2ac0df172458"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/noetic/ros_canopen/0.8.5-1"; + sha256 = "sha256-kQMfJsVFsKgnXM9FheiRVd//HZJVC6rSyzs8sndkBKE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-comm/default.nix b/distros/noetic/ros-comm/default.nix index b18d9772ff..5d3a362500 100644 --- a/distros/noetic/ros-comm/default.nix +++ b/distros/noetic/ros-comm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-comm"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/ros_comm/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "c3824ffd06797564baa38682c776aa8e76aadcc44960c706dab34e04aa2e7bc1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/ros_comm/1.15.15-1"; + sha256 = "sha256-LsqblqMkp1ZfzUX152qvtvSqhOnUswTtoAjTcXCwljo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-control-boilerplate/default.nix b/distros/noetic/ros-control-boilerplate/default.nix index d6a508fb69..a552d240ef 100644 --- a/distros/noetic/ros-control-boilerplate/default.nix +++ b/distros/noetic/ros-control-boilerplate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-control-boilerplate"; version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/ros_control_boilerplate-release/archive/release/noetic/ros_control_boilerplate/0.6.1-1.tar.gz"; - name = "0.6.1-1.tar.gz"; - sha256 = "41db741a7cbc512777dc79ee4457457394989c4c367296f68fa4a79c0d9983ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "ros_control_boilerplate-release"; + rev = "release/noetic/ros_control_boilerplate/0.6.1-1"; + sha256 = "sha256-tLRVrWiVrKkanmqGIEpK46aYyEkmMgOQiOv+D9mFLSk="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules gflags ]; diff --git a/distros/noetic/ros-control/default.nix b/distros/noetic/ros-control/default.nix index 9ef9061e3a..2f9be71e6d 100644 --- a/distros/noetic/ros-control/default.nix +++ b/distros/noetic/ros-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-control"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/ros_control/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "0cc79d68db8a2eeec518498db0d6d806e0137c9984e5a4ecd297db5741871245"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/ros_control/0.19.6-1"; + sha256 = "sha256-xFB18rtMUQsbO0s2w8MHeS254KPmaThnBimDiUK4YK0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-controllers-cartesian/default.nix b/distros/noetic/ros-controllers-cartesian/default.nix index 6c84c80fc9..8b1582305f 100644 --- a/distros/noetic/ros-controllers-cartesian/default.nix +++ b/distros/noetic/ros-controllers-cartesian/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-controllers-cartesian"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/noetic/ros_controllers_cartesian/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "c9809ea177dcb158ec15cd20bcd3d8de96a6d235db4b04baa825bf653e7dcf36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/noetic/ros_controllers_cartesian/0.1.5-1"; + sha256 = "sha256-LlTAuMyx/GJd2Rpf38IBGJ7Np4M2/0WsHC3ufyTj2yw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-controllers/default.nix b/distros/noetic/ros-controllers/default.nix index e02b93e534..6eefecce88 100644 --- a/distros/noetic/ros-controllers/default.nix +++ b/distros/noetic/ros-controllers/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ackermann-steering-controller, catkin, diff-drive-controller, effort-controllers, force-torque-sensor-controller, forward-command-controller, gripper-action-controller, imu-sensor-controller, joint-state-controller, joint-trajectory-controller, position-controllers, velocity-controllers }: buildRosPackage { pname = "ros-noetic-ros-controllers"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/ros_controllers/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "a16b7d6c323fb7ba9df1bee367d0d7c827fdc80d767dadcf0087368cf9f97f87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/ros_controllers/0.21.1-1"; + sha256 = "sha256-fAWIfr6fA278zzJhUxFl/I4x3k9jPpoGoc7gDmGdcQA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-core/default.nix b/distros/noetic/ros-core/default.nix index 843849a634..04a2f33c81 100644 --- a/distros/noetic/ros-core/default.nix +++ b/distros/noetic/ros-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-core"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/noetic/ros_core/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "3e4c5d3f2ad1a1ab46f6ba4fd788aa5b4d828e49b07f999789ebf632c5dac6a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/noetic/ros_core/1.5.0-1"; + sha256 = "sha256-Wf/o9p7GSY+ZkdR+bX7Cbhgc5iBIRdjW9usraDstcXY="; + }; buildType = "catkin"; propagatedBuildInputs = [ catkin class-loader cmake-modules common-msgs gencpp geneus genlisp genmsg gennodejs genpy message-generation message-runtime pluginlib ros ros-comm rosbag-migration-rule rosconsole rosconsole-bridge roscpp-core rosgraph-msgs roslisp rospack std-msgs std-srvs ]; diff --git a/distros/noetic/ros-emacs-utils/default.nix b/distros/noetic/ros-emacs-utils/default.nix index aa506e5306..3780be6a84 100644 --- a/distros/noetic/ros-emacs-utils/default.nix +++ b/distros/noetic/ros-emacs-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-emacs-utils"; version = "0.4.17-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/noetic/ros_emacs_utils/0.4.17-1.tar.gz"; - name = "0.4.17-1.tar.gz"; - sha256 = "da988791609e3862b3f42087395d9e21a435df3b40a66b9fa7ac3ca43acb73fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/noetic/ros_emacs_utils/0.4.17-1"; + sha256 = "sha256-pPJNq0I8lx6k3KUVU78xKEJFwhNB2bmg/TlFleSVSTw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-environment/default.nix b/distros/noetic/ros-environment/default.nix index 3634ae3b0a..274fa644f2 100644 --- a/distros/noetic/ros-environment/default.nix +++ b/distros/noetic/ros-environment/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-environment"; version = "1.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_environment-release/archive/release/noetic/ros_environment/1.3.2-1.tar.gz"; - name = "1.3.2-1.tar.gz"; - sha256 = "e662f6de77ecf5636ad97a2f7a61e588a64df62396c44e8c5cd3c14adefdf59d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_environment-release"; + rev = "release/noetic/ros_environment/1.3.2-1"; + sha256 = "sha256-7vkzE71nQ176vZ9j4TT7gF0qi2cs9K6mhHy+wdVH8s4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-ethercat-eml/default.nix b/distros/noetic/ros-ethercat-eml/default.nix index 3ee7ec8b17..7b672e1b53 100644 --- a/distros/noetic/ros-ethercat-eml/default.nix +++ b/distros/noetic/ros-ethercat-eml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-ethercat-eml"; version = "0.4.0-r2"; - src = fetchurl { - url = "https://github.com/shadow-robot/ros_ethercat_eml-release/archive/release/noetic/ros_ethercat_eml/0.4.0-2.tar.gz"; - name = "0.4.0-2.tar.gz"; - sha256 = "82e7e9d697778090cfb63e386c64b3877dd085382dd55b3b05fa3eb48399495f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "shadow-robot"; + repo = "ros_ethercat_eml-release"; + rev = "release/noetic/ros_ethercat_eml/0.4.0-2"; + sha256 = "sha256-55GMou8QkdmJmQxZ5Ur/TDcDMO66gv+88UE+eFcI5/Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-ign-bridge/default.nix b/distros/noetic/ros-ign-bridge/default.nix index 54509e9ecf..2ebeed578a 100644 --- a/distros/noetic/ros-ign-bridge/default.nix +++ b/distros/noetic/ros-ign-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-ign-bridge"; version = "0.111.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_ign-release/archive/release/noetic/ros_ign_bridge/0.111.2-1.tar.gz"; - name = "0.111.2-1.tar.gz"; - sha256 = "e6eb7f2b2aec26fdcd2b60161ce7d7363d533b16fda2fea3358f81703dde7bc5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_ign-release"; + rev = "release/noetic/ros_ign_bridge/0.111.2-1"; + sha256 = "sha256-GgoZQJl6+74xorE92RUNnU90FK6fLulublZuWxoN3/0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ros-ign-image/default.nix b/distros/noetic/ros-ign-image/default.nix index 2725737047..6f9994aa5a 100644 --- a/distros/noetic/ros-ign-image/default.nix +++ b/distros/noetic/ros-ign-image/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-ign-image"; version = "0.111.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_ign-release/archive/release/noetic/ros_ign_image/0.111.2-1.tar.gz"; - name = "0.111.2-1.tar.gz"; - sha256 = "92e81101e840f276e08848f3d9c67ae6a3af0de04cec8318539de71966280446"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_ign-release"; + rev = "release/noetic/ros_ign_image/0.111.2-1"; + sha256 = "sha256-gvUs1apYO+4dY7lO5JGeCPGiW//7DtcCNoXvOr1J8FM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-ign/default.nix b/distros/noetic/ros-ign/default.nix index 1632a1f49e..b639477894 100644 --- a/distros/noetic/ros-ign/default.nix +++ b/distros/noetic/ros-ign/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-ign"; version = "0.111.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_ign-release/archive/release/noetic/ros_ign/0.111.2-1.tar.gz"; - name = "0.111.2-1.tar.gz"; - sha256 = "6dd1335671168ec83292a4d4a936807fb2e3d90e831f879e921c8baffc341a4b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_ign-release"; + rev = "release/noetic/ros_ign/0.111.2-1"; + sha256 = "sha256-sv+7/BkrqVVA95p/7uqcLfoGxiT5tE/L/pnfFmAicF4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-industrial-cmake-boilerplate/default.nix b/distros/noetic/ros-industrial-cmake-boilerplate/default.nix index f3f66ade6e..8ac51d53d6 100644 --- a/distros/noetic/ros-industrial-cmake-boilerplate/default.nix +++ b/distros/noetic/ros-industrial-cmake-boilerplate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-industrial-cmake-boilerplate"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_industrial_cmake_boilerplate-release/archive/release/noetic/ros_industrial_cmake_boilerplate/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "ef75a46d3b9dc1c835ca7b644e0f8ed36681ac0061a4afe78c46342d2c9b2d53"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_industrial_cmake_boilerplate-release"; + rev = "release/noetic/ros_industrial_cmake_boilerplate/0.3.1-1"; + sha256 = "sha256-5lYNEh3gr7khtWvarULqiCl1QfyxrLz5Mv98XArVJho="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/ros-introspection/default.nix b/distros/noetic/ros-introspection/default.nix index 7ef5fa0990..04cf978786 100644 --- a/distros/noetic/ros-introspection/default.nix +++ b/distros/noetic/ros-introspection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-introspection"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/roscompile-release/archive/release/noetic/ros_introspection/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "d19b2656c443929ac3bb3d3da82fdd78c34633dee543ba6b58065fe30098dcdf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "roscompile-release"; + rev = "release/noetic/ros_introspection/1.2.1-1"; + sha256 = "sha256-9ytXGNds/guHnN2+qEvZi8TaE4Va58o8rV1/rEJ1eKQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-numpy/default.nix b/distros/noetic/ros-numpy/default.nix index ecd6ac6fc1..e4427c5ebc 100644 --- a/distros/noetic/ros-numpy/default.nix +++ b/distros/noetic/ros-numpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-numpy"; version = "0.0.5-r2"; - src = fetchurl { - url = "https://github.com/eric-wieser/ros_numpy-release/archive/release/noetic/ros_numpy/0.0.5-2.tar.gz"; - name = "0.0.5-2.tar.gz"; - sha256 = "c5153716c9d662840ff0473a9cc0cae3c23586f5cea8ef7b152f11fe0a51d51d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "eric-wieser"; + repo = "ros_numpy-release"; + rev = "release/noetic/ros_numpy/0.0.5-2"; + sha256 = "sha256-BnA80iEZqTv7HX3WuH6tJyEsoNHGOjqt+6RZBp4485c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-pytest/default.nix b/distros/noetic/ros-pytest/default.nix index d97dbcb056..a6ec1a6223 100644 --- a/distros/noetic/ros-pytest/default.nix +++ b/distros/noetic/ros-pytest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-pytest"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/machinekoder/ros_pytest-release/archive/release/noetic/ros_pytest/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "3a2e581bb9e205709f0613e58d93c6b0400f29e2359f058e81d1f18be5e5f643"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "machinekoder"; + repo = "ros_pytest-release"; + rev = "release/noetic/ros_pytest/0.2.1-1"; + sha256 = "sha256-122nS1CRNw5SrY9isa2Wst3BSJUw/Pw27dtmM/ZX/BE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-realtime/default.nix b/distros/noetic/ros-realtime/default.nix index 2764e78d05..fb6e073271 100644 --- a/distros/noetic/ros-realtime/default.nix +++ b/distros/noetic/ros-realtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-realtime"; version = "1.0.25-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/noetic/ros_realtime/1.0.25-1.tar.gz"; - name = "1.0.25-1.tar.gz"; - sha256 = "0811e1663055633e75b9949b650f0c3c57d0e3a40c476e9980c83ada8ec2566d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/noetic/ros_realtime/1.0.25-1"; + sha256 = "sha256-cSPJq35ndIuCxfW/qa08dpOhEvEk0rlT+bOWNUBVBGc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-tutorials/default.nix b/distros/noetic/ros-tutorials/default.nix index 6356d8ead0..3118b1ceaa 100644 --- a/distros/noetic/ros-tutorials/default.nix +++ b/distros/noetic/ros-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-tutorials"; version = "0.10.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_tutorials-release/archive/release/noetic/ros_tutorials/0.10.2-1.tar.gz"; - name = "0.10.2-1.tar.gz"; - sha256 = "a0c6ae6566e4b340c27826cef30b0706d1d24ac101884b1f3948a26281b23f5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_tutorials-release"; + rev = "release/noetic/ros_tutorials/0.10.2-1"; + sha256 = "sha256-OQcLtuZSAhHNZHn5p9AWSG8CXI+xJ8e1bYy8HpwtRig="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros-type-introspection/default.nix b/distros/noetic/ros-type-introspection/default.nix index 175f3d8f5a..0d46fcf90c 100644 --- a/distros/noetic/ros-type-introspection/default.nix +++ b/distros/noetic/ros-type-introspection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros-type-introspection"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/facontidavide/ros_type_introspection-release/archive/release/noetic/ros_type_introspection/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "10948016cd33a97ecf631bb6acdf6ed500af0be368c4e8bdedba2ad0441e967b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "facontidavide"; + repo = "ros_type_introspection-release"; + rev = "release/noetic/ros_type_introspection/2.1.0-1"; + sha256 = "sha256-sZBFF00eC6WRh+jtaRw+Ci9LYlu6IIq9k8FnAcylIa8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ros/default.nix b/distros/noetic/ros/default.nix index 3fb5367c26..ff008dc8a5 100644 --- a/distros/noetic/ros/default.nix +++ b/distros/noetic/ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ros"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/ros/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "84a51b386e543407cdf8fe3e318adc5dbffeebd7ec9f1eda709b7d64d3ead11f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/ros/1.15.8-1"; + sha256 = "sha256-LwupQJ89RqG5iPdwo6oiUHU7MrkoBDV4i3Gc2n/2uRo="; + }; buildType = "catkin"; propagatedBuildInputs = [ catkin mk rosbash rosboost-cfg rosbuild rosclean roscreate roslang roslib rosmake rosunit ]; diff --git a/distros/noetic/rosapi/default.nix b/distros/noetic/rosapi/default.nix index 898c45f6ad..55090038a1 100644 --- a/distros/noetic/rosapi/default.nix +++ b/distros/noetic/rosapi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosapi"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/noetic/rosapi/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "bf9ce72d57cbb66cb7eb52ed5fe4cdb54e39c1d46418880efbbc2afd75d9c054"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/noetic/rosapi/0.11.16-2"; + sha256 = "sha256-cIXAIsW+W39WHva0irEy7YWxlikWPs+d7W6V+jB9KTs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools ]; diff --git a/distros/noetic/rosatomic/default.nix b/distros/noetic/rosatomic/default.nix index 501cb75f39..8df8fdabb0 100644 --- a/distros/noetic/rosatomic/default.nix +++ b/distros/noetic/rosatomic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosatomic"; version = "1.0.25-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/noetic/rosatomic/1.0.25-1.tar.gz"; - name = "1.0.25-1.tar.gz"; - sha256 = "9ccf553073556f61a80da3937f7832a28a0fa6296dea0cf7e2df86e0d3f42806"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/noetic/rosatomic/1.0.25-1"; + sha256 = "sha256-+xjGLnELF3OhXp1TesY/exuwe42otRu/u1+letSQUnU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosauth/default.nix b/distros/noetic/rosauth/default.nix index 8393977f18..c9083580e3 100644 --- a/distros/noetic/rosauth/default.nix +++ b/distros/noetic/rosauth/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosauth"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/gt-rail-release/rosauth-release/archive/release/noetic/rosauth/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "f00e6e72af902207c80739d19befdd64aa11cfc6256e284507837d11e1c2ba1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "gt-rail-release"; + repo = "rosauth-release"; + rev = "release/noetic/rosauth/1.0.1-1"; + sha256 = "sha256-k6rlgHzOtIixFOZAXYcjZimrp6cFUKE1p7MCPhzpIME="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation openssl ]; diff --git a/distros/noetic/rosbag-migration-rule/default.nix b/distros/noetic/rosbag-migration-rule/default.nix index cfa8880db9..20f19c94a5 100644 --- a/distros/noetic/rosbag-migration-rule/default.nix +++ b/distros/noetic/rosbag-migration-rule/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbag-migration-rule"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosbag_migration_rule-release/archive/release/noetic/rosbag_migration_rule/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "4a014649acb782d64beee309a200e9043582ac3f27492568afe600873a2de41a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosbag_migration_rule-release"; + rev = "release/noetic/rosbag_migration_rule/1.0.1-1"; + sha256 = "sha256-31yh48R6F2uIzYu6RmEGfmuFU/pt/dIFGTUBlfd7vbA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosbag-pandas/default.nix b/distros/noetic/rosbag-pandas/default.nix index 8a8f154538..33b50be3ef 100644 --- a/distros/noetic/rosbag-pandas/default.nix +++ b/distros/noetic/rosbag-pandas/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbag-pandas"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/eurogroep/rosbag_pandas-release/archive/release/noetic/rosbag_pandas/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "d68713817eda408309b0b65a71e30a536e6f887cb75efe98d8427caa16f9ba6e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "eurogroep"; + repo = "rosbag_pandas-release"; + rev = "release/noetic/rosbag_pandas/0.5.4-1"; + sha256 = "sha256-XTybl39xE/YY94CBVaFSIxflVNAezZd9H2E0ve3gTb4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosbag-snapshot-msgs/default.nix b/distros/noetic/rosbag-snapshot-msgs/default.nix index 0e105a60bc..0433da4075 100644 --- a/distros/noetic/rosbag-snapshot-msgs/default.nix +++ b/distros/noetic/rosbag-snapshot-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbag-snapshot-msgs"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosbag_snapshot-release/archive/release/noetic/rosbag_snapshot_msgs/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "753504bb1f1d792be57ea96c9b060f32508b1005d6d7f18311b93e59d8ebca1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosbag_snapshot-release"; + rev = "release/noetic/rosbag_snapshot_msgs/1.0.4-1"; + sha256 = "sha256-SHHdVyr5zYyIyNnHyeJ+/GM8ohYgljDREbpKQAaxz3g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rosbag-snapshot/default.nix b/distros/noetic/rosbag-snapshot/default.nix index f3322eb876..c3c891f0ae 100644 --- a/distros/noetic/rosbag-snapshot/default.nix +++ b/distros/noetic/rosbag-snapshot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbag-snapshot"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosbag_snapshot-release/archive/release/noetic/rosbag_snapshot/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "6faa6bf1c0a94506e8911affaf60852ce7a73c13d3431c94d449a1f895c04fe9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosbag_snapshot-release"; + rev = "release/noetic/rosbag_snapshot/1.0.4-1"; + sha256 = "sha256-edqGPY5C+67t9+vfvrkVCx87Porq5nIAGIlU2aihRRM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosbag-storage/default.nix b/distros/noetic/rosbag-storage/default.nix index 234a0cf428..cf451d21ea 100644 --- a/distros/noetic/rosbag-storage/default.nix +++ b/distros/noetic/rosbag-storage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbag-storage"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosbag_storage/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "5731be7afe941055d31c69d38f3a9d94a2db09f5908fb52c9f0c971b6ab0e5f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosbag_storage/1.15.15-1"; + sha256 = "sha256-X8grKbAuEPh8GQgF7ib2JZnWMb2ieKqDhfu+vOb+2UA="; + }; buildType = "catkin"; buildInputs = [ catkin rostest std-msgs ]; diff --git a/distros/noetic/rosbag/default.nix b/distros/noetic/rosbag/default.nix index c74b08437f..0fff4a1d39 100644 --- a/distros/noetic/rosbag/default.nix +++ b/distros/noetic/rosbag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbag"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosbag/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "5069cdb562126bfae943882e38db3866d629b3b97e64a7b3319e751ae328e9de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosbag/1.15.15-1"; + sha256 = "sha256-bkUF6R3aD0I3Nhk78GRkbqxwXUgNnko5vkk+Q3dECYI="; + }; buildType = "catkin"; buildInputs = [ catkin cpp-common python3Packages.pillow roscpp-serialization ]; diff --git a/distros/noetic/rosbaglive/default.nix b/distros/noetic/rosbaglive/default.nix index 9cbe38c4de..14955e1ff6 100644 --- a/distros/noetic/rosbaglive/default.nix +++ b/distros/noetic/rosbaglive/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbaglive"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/noetic/rosbaglive/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "33ca1e07cc82c0bdf15f8ba6ce3789fe61a4f362223624f2f1ae4187a48f9b1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/noetic/rosbaglive/0.3.0-1"; + sha256 = "sha256-QBKk100Ipgq516JeQSSfRvzpVlgVxmIKx5EfDHWXU5M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosbash-params/default.nix b/distros/noetic/rosbash-params/default.nix index 9b86b79ec6..3af6a1b353 100644 --- a/distros/noetic/rosbash-params/default.nix +++ b/distros/noetic/rosbash-params/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbash-params"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/peci1/rosbash_params-release/archive/release/noetic/rosbash_params/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "6f6a607b2eb9988b213149b16ded7ed2832c834e9ba8541ebd498d0b1a996397"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "rosbash_params-release"; + rev = "release/noetic/rosbash_params/1.1.0-1"; + sha256 = "sha256-UceAkhRQ6CagMVDQ5BbZWHKSEdneE2VI3B5FnnmEkLM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosbash/default.nix b/distros/noetic/rosbash/default.nix index 0bbd6553d2..be30e3f657 100644 --- a/distros/noetic/rosbash/default.nix +++ b/distros/noetic/rosbash/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbash"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/rosbash/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "9e29d79829b5a974db4142d1d8f1bc5ed0e412d85694cf707316c503bce81af5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/rosbash/1.15.8-1"; + sha256 = "sha256-X5ow/+PTwTqdooqPtqmQjbO3ljOch6ePzb70JMGwtuY="; + }; buildType = "catkin"; propagatedBuildInputs = [ catkin rospack ]; diff --git a/distros/noetic/rosboost-cfg/default.nix b/distros/noetic/rosboost-cfg/default.nix index f279589048..e4123cc41f 100644 --- a/distros/noetic/rosboost-cfg/default.nix +++ b/distros/noetic/rosboost-cfg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosboost-cfg"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/rosboost_cfg/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "7560041d65a39dc786a1202318395c866af0b7b17a5eb8839e4c485f7679c7eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/rosboost_cfg/1.15.8-1"; + sha256 = "sha256-vLOHkdYoxXK128ar55W+/BIjNcUAoLoUoS6PzIF/f4U="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/rosbridge-library/default.nix b/distros/noetic/rosbridge-library/default.nix index 4e928c003d..a83dc48418 100644 --- a/distros/noetic/rosbridge-library/default.nix +++ b/distros/noetic/rosbridge-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbridge-library"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/noetic/rosbridge_library/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "3088f6ad0760a950cf1862ce787b98b0e47e2331b9f585d94734936e202af605"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/noetic/rosbridge_library/0.11.16-2"; + sha256 = "sha256-LZdHa91uSZCI4xCobrhmbbSktDrXCWJRg+eKwYhWmIo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools ]; diff --git a/distros/noetic/rosbridge-msgs/default.nix b/distros/noetic/rosbridge-msgs/default.nix index 7b4f0e253e..d70c6dc4db 100644 --- a/distros/noetic/rosbridge-msgs/default.nix +++ b/distros/noetic/rosbridge-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbridge-msgs"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/noetic/rosbridge_msgs/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "17222a92d38c32deb3e38d9722357b8acd0cccc16ce646ee656e8c4db1a30443"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/noetic/rosbridge_msgs/0.11.16-2"; + sha256 = "sha256-xH6vLqsmuMRQDpoUQkxI8ewMPt5iFe3dyGzNgkWdlkI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rosbridge-server/default.nix b/distros/noetic/rosbridge-server/default.nix index f65ee2b39b..d9899880c7 100644 --- a/distros/noetic/rosbridge-server/default.nix +++ b/distros/noetic/rosbridge-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbridge-server"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/noetic/rosbridge_server/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "9726b4b3f01480655e44fbdafa1d96985bdbab22723a80fdbc8737d4c2f7c940"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/noetic/rosbridge_server/0.11.16-2"; + sha256 = "sha256-6B6RomED+NHHu7I281ZFKd3CqVhE2XfmIAqziqRlj20="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/rosbridge-suite/default.nix b/distros/noetic/rosbridge-suite/default.nix index 35be50a763..6c721362dc 100644 --- a/distros/noetic/rosbridge-suite/default.nix +++ b/distros/noetic/rosbridge-suite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbridge-suite"; version = "0.11.16-r2"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/rosbridge_suite-release/archive/release/noetic/rosbridge_suite/0.11.16-2.tar.gz"; - name = "0.11.16-2.tar.gz"; - sha256 = "34365bcf7dd624e5f6ad9d7faf4b98c125f623b663e088388b1d4d7154e73205"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "rosbridge_suite-release"; + rev = "release/noetic/rosbridge_suite/0.11.16-2"; + sha256 = "sha256-5I+jCJEjUkoxuERAkSfsm30eQqxPmxsfwuyLd6ltXRE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosbuild/default.nix b/distros/noetic/rosbuild/default.nix index e7fe52648e..fe389083da 100644 --- a/distros/noetic/rosbuild/default.nix +++ b/distros/noetic/rosbuild/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosbuild"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/rosbuild/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "0c84f212ce86cdfe61726e3bfd304ca257c1ae4d113bd0524c8f9d7dd6529c43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/rosbuild/1.15.8-1"; + sha256 = "sha256-qUgOjQyM/6dlKzeMDXY0ryLrWtsykBJpxj6QuwdcODw="; + }; buildType = "catkin"; buildInputs = [ pkg-config ]; diff --git a/distros/noetic/rosclean/default.nix b/distros/noetic/rosclean/default.nix index 1acdfc156b..c64fe1d97e 100644 --- a/distros/noetic/rosclean/default.nix +++ b/distros/noetic/rosclean/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosclean"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/rosclean/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "6ce03bce22e1009aa43f3f74f99efd6026702e7d775aac15a1800c7305857086"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/rosclean/1.15.8-1"; + sha256 = "sha256-KKH+G2oU6SZzq2PFe3x2dvQ6tfQjdqvM0v3yn0VIeR8="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/roscompile/default.nix b/distros/noetic/roscompile/default.nix index 1cfa6bb81b..33bd141b76 100644 --- a/distros/noetic/roscompile/default.nix +++ b/distros/noetic/roscompile/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roscompile"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/roscompile-release/archive/release/noetic/roscompile/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "1f4081ebd062fcc0ebe0bcb6054ba3e0673bc624a48518964dcccc5411587e82"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "roscompile-release"; + rev = "release/noetic/roscompile/1.2.1-1"; + sha256 = "sha256-ByXxHE2jb+wWplB1Qo+vRu2V/NUnU2FH/sejPcjtEp0="; + }; buildType = "catkin"; buildInputs = [ python3Packages.setuptools ]; diff --git a/distros/noetic/rosconsole-bridge/default.nix b/distros/noetic/rosconsole-bridge/default.nix index c597317b18..99baa9fd04 100644 --- a/distros/noetic/rosconsole-bridge/default.nix +++ b/distros/noetic/rosconsole-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosconsole-bridge"; version = "0.5.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosconsole_bridge-release/archive/release/noetic/rosconsole_bridge/0.5.4-1.tar.gz"; - name = "0.5.4-1.tar.gz"; - sha256 = "5531266ba03ccb439a2191abdfa26ef735e7c58e647c4fc44f880b31a5d921ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosconsole_bridge-release"; + rev = "release/noetic/rosconsole_bridge/0.5.4-1"; + sha256 = "sha256-xRPmNzKQfDog0jI0CcyKI4BKAkiC/z7KvaPhCnW6X+4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosconsole/default.nix b/distros/noetic/rosconsole/default.nix index c7a32b6c30..f3c2de0719 100644 --- a/distros/noetic/rosconsole/default.nix +++ b/distros/noetic/rosconsole/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosconsole"; version = "1.14.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosconsole-release/archive/release/noetic/rosconsole/1.14.3-1.tar.gz"; - name = "1.14.3-1.tar.gz"; - sha256 = "8b0e2f4ebe5f8ca194b7a5ced20ff304746c6041800b891ae88f9a76a898a0eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosconsole-release"; + rev = "release/noetic/rosconsole/1.14.3-1"; + sha256 = "sha256-8d4OczeGu7/mtgPi8/09mjV8kvvj9bdlidF5wOqpewM="; + }; buildType = "catkin"; buildInputs = [ catkin rosunit ]; diff --git a/distros/noetic/roscpp-core/default.nix b/distros/noetic/roscpp-core/default.nix index b2f02bbf67..44219667dc 100644 --- a/distros/noetic/roscpp-core/default.nix +++ b/distros/noetic/roscpp-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roscpp-core"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/noetic/roscpp_core/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "d40d836804305c723cddab20b673c74bcdae047064a5f342b266b162830474e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/noetic/roscpp_core/0.7.2-1"; + sha256 = "sha256-sEN+Hayh83dL3MCMD+Z9YCxhD3XlS2F5+rpZGLWiRQo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roscpp-serialization/default.nix b/distros/noetic/roscpp-serialization/default.nix index a6f7aff3b8..315f402395 100644 --- a/distros/noetic/roscpp-serialization/default.nix +++ b/distros/noetic/roscpp-serialization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roscpp-serialization"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/noetic/roscpp_serialization/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "ddbc65e42b525bdb29ec8795e05470984cec6c90839d16d577e6b752017e355a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/noetic/roscpp_serialization/0.7.2-1"; + sha256 = "sha256-M1ZjNW+1aCPNYL94WflnMtu0THXdFmNTDTH2GmfCNbg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roscpp-traits/default.nix b/distros/noetic/roscpp-traits/default.nix index 72f4bf65e8..1d5c36e41e 100644 --- a/distros/noetic/roscpp-traits/default.nix +++ b/distros/noetic/roscpp-traits/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roscpp-traits"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/noetic/roscpp_traits/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "4393d3b11553d92ae6044533a06583b40ffa8914b08ccf8127d0cb49ee1dbddf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/noetic/roscpp_traits/0.7.2-1"; + sha256 = "sha256-iDOLpaLXkV6D7t0cvgMq62LCoNIdtGYhZn4m6EzzUqg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roscpp-tutorials/default.nix b/distros/noetic/roscpp-tutorials/default.nix index 1cdc3d99c0..f630de87e8 100644 --- a/distros/noetic/roscpp-tutorials/default.nix +++ b/distros/noetic/roscpp-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roscpp-tutorials"; version = "0.10.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_tutorials-release/archive/release/noetic/roscpp_tutorials/0.10.2-1.tar.gz"; - name = "0.10.2-1.tar.gz"; - sha256 = "061c038b00f6b75cf509199821f166e5c6a9a1e13041de1151dd5c69948c4ff5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_tutorials-release"; + rev = "release/noetic/roscpp_tutorials/0.10.2-1"; + sha256 = "sha256-2HfKZCV0nu+7vBwqr5jmTvxa8jJ++QKb5+J3K0F5pmA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/roscpp/default.nix b/distros/noetic/roscpp/default.nix index 36e2e16dc1..016716d9b9 100644 --- a/distros/noetic/roscpp/default.nix +++ b/distros/noetic/roscpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roscpp"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/roscpp/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "901468fbfe45da9a8c1cb139e3871ac96c5dd9077682cabe7acc31b8bf367b5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/roscpp/1.15.15-1"; + sha256 = "sha256-5UR8Qkfs5AlnBhEJVfEsSI0GJfLub7baH8cOZRR0mZM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation pkg-config roslang ]; diff --git a/distros/noetic/roscreate/default.nix b/distros/noetic/roscreate/default.nix index 3f799202d0..1035ad3c6f 100644 --- a/distros/noetic/roscreate/default.nix +++ b/distros/noetic/roscreate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roscreate"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/roscreate/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "0cd12e40b3e5c68ccd1576f6b0f34be6fa0d98744105bb545d26f41b738d5ca6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/roscreate/1.15.8-1"; + sha256 = "sha256-SAFRmCTtzWkiWISEsUnOl3n78NxX3VKIm8gFk1xZTF8="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/rosdiagnostic/default.nix b/distros/noetic/rosdiagnostic/default.nix index df86eb4d76..ffdc5f27c1 100644 --- a/distros/noetic/rosdiagnostic/default.nix +++ b/distros/noetic/rosdiagnostic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosdiagnostic"; version = "1.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/noetic/rosdiagnostic/1.11.0-1.tar.gz"; - name = "1.11.0-1.tar.gz"; - sha256 = "ceb8d907e7841abd95c14e9acba0e253f813187acc3d64e00c3ec821de008f8a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/noetic/rosdiagnostic/1.11.0-1"; + sha256 = "sha256-OBnSkIImT0cNmxuljUP0KmB3pOQGnruKDcLciM4eLZE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosdoc-lite/default.nix b/distros/noetic/rosdoc-lite/default.nix index 6bea6b07ec..1b6b625442 100644 --- a/distros/noetic/rosdoc-lite/default.nix +++ b/distros/noetic/rosdoc-lite/default.nix @@ -7,11 +7,15 @@ 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosdoc_lite-release"; + rev = "release/noetic/rosdoc_lite/0.2.10-1"; + sha256 = "sha256-4v9PL8U5IASfNKTY9nkrs+C6PlfRXeDOKELo+VFoDMo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosee-msg/default.nix b/distros/noetic/rosee-msg/default.nix index 8422028b3d..5212d092d0 100644 --- a/distros/noetic/rosee-msg/default.nix +++ b/distros/noetic/rosee-msg/default.nix @@ -7,11 +7,15 @@ 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ADVRHumanoids"; + repo = "rosee_msg-release"; + rev = "release/noetic/rosee_msg/1.0.2-2"; + sha256 = "sha256-MiMLAVJ6lOeT0ntJritd6RydPoQLD70gNZt6UVZb/7U="; + }; buildType = "catkin"; buildInputs = [ catkin geometry-msgs std-msgs std-srvs ]; diff --git a/distros/noetic/rosemacs/default.nix b/distros/noetic/rosemacs/default.nix index fa32dbf404..e5d20a1544 100644 --- a/distros/noetic/rosemacs/default.nix +++ b/distros/noetic/rosemacs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosemacs"; version = "0.4.17-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/noetic/rosemacs/0.4.17-1.tar.gz"; - name = "0.4.17-1.tar.gz"; - sha256 = "a9e54ab7bcacab7f65d3c929604bedc1557403c26151e34a3c9afaab9b4b2ff4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/noetic/rosemacs/0.4.17-1"; + sha256 = "sha256-17bv+maJ6BGD41+yKflppDwZlIwa1B3WVyMKyE/y12o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roseus-smach/default.nix b/distros/noetic/roseus-smach/default.nix index b1faa2e2b3..b093627ce7 100644 --- a/distros/noetic/roseus-smach/default.nix +++ b/distros/noetic/roseus-smach/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roseus-smach"; version = "1.7.5-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/noetic/roseus_smach/1.7.5-2.tar.gz"; - name = "1.7.5-2.tar.gz"; - sha256 = "3653ba3552f0c9ed994fe7615e914131a9c3d7d586b8c8a1cef7dea81df42ddc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/noetic/roseus_smach/1.7.5-2"; + sha256 = "sha256-oMBE1hwOzAalZJlTz9GMSdxrlUUBMWaeNuxL5rBzQhI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/roseus-tutorials/default.nix b/distros/noetic/roseus-tutorials/default.nix index 1546250e36..b4fbf11981 100644 --- a/distros/noetic/roseus-tutorials/default.nix +++ b/distros/noetic/roseus-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roseus-tutorials"; version = "1.7.5-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/noetic/roseus_tutorials/1.7.5-2.tar.gz"; - name = "1.7.5-2.tar.gz"; - sha256 = "97d658794d311e0d4812d8d0a302b62a76935982fac9af9ca65ce1520e0b8981"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/noetic/roseus_tutorials/1.7.5-2"; + sha256 = "sha256-QLtF5/GIAS/bEDXOGuvyQL1s7nY8E1P66yobu1Ul6s8="; + }; buildType = "catkin"; buildInputs = [ catkin roseus ]; diff --git a/distros/noetic/roseus/default.nix b/distros/noetic/roseus/default.nix index f7fb062592..3234db4487 100644 --- a/distros/noetic/roseus/default.nix +++ b/distros/noetic/roseus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roseus"; version = "1.7.5-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_roseus-release/archive/release/noetic/roseus/1.7.5-2.tar.gz"; - name = "1.7.5-2.tar.gz"; - sha256 = "1d8a329f3b78ab84993338c9516cd1a326b50503e3fac2ca4938ed1664e0dc95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_roseus-release"; + rev = "release/noetic/roseus/1.7.5-2"; + sha256 = "sha256-KKP4LyhjEflR0TpEvt+GIrQ5ZsCY4nxIXR1duskYMLM="; + }; buildType = "catkin"; buildInputs = [ angles catkin coreutils message-generation mk rosbuild rostopic ]; diff --git a/distros/noetic/rosfmt/default.nix b/distros/noetic/rosfmt/default.nix index 634d40b03a..3f93e504a6 100644 --- a/distros/noetic/rosfmt/default.nix +++ b/distros/noetic/rosfmt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosfmt"; version = "7.0.0-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosfmt-release/archive/release/noetic/rosfmt/7.0.0-1.tar.gz"; - name = "7.0.0-1.tar.gz"; - sha256 = "b2c2c4f2436a5a0215d932e2cc308cfa91dde43404cba0af8986624a907b1def"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosfmt-release"; + rev = "release/noetic/rosfmt/7.0.0-1"; + sha256 = "sha256-32W7hu//XsloTL1Yx5yZX05+13QL4sPbKni7WtRyQJo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosgraph-msgs/default.nix b/distros/noetic/rosgraph-msgs/default.nix index d3a3bde691..374373d09b 100644 --- a/distros/noetic/rosgraph-msgs/default.nix +++ b/distros/noetic/rosgraph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosgraph-msgs"; version = "1.11.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm_msgs-release/archive/release/noetic/rosgraph_msgs/1.11.3-1.tar.gz"; - name = "1.11.3-1.tar.gz"; - sha256 = "770d46f9bf622ba92bdc426ba49d80229c0324500aea8f50f8a1b947eba42997"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm_msgs-release"; + rev = "release/noetic/rosgraph_msgs/1.11.3-1"; + sha256 = "sha256-Ded1hlfVTDypiQ6NjmeeIOjd1jYQVkLLMN3zv3wx3Vk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rosgraph/default.nix b/distros/noetic/rosgraph/default.nix index 8dc6bb9c00..18d25242a2 100644 --- a/distros/noetic/rosgraph/default.nix +++ b/distros/noetic/rosgraph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosgraph"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosgraph/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "5cb5109782461519afa1f17e52071c3ff2fe7598d9d68b567bc003144501e0cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosgraph/1.15.15-1"; + sha256 = "sha256-jq4MIInm8uKGXWZ2FiIpc/LXoZFB5giV5YemnFBNE1I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roslang/default.nix b/distros/noetic/roslang/default.nix index 5bcdb3d930..621827cc69 100644 --- a/distros/noetic/roslang/default.nix +++ b/distros/noetic/roslang/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslang"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/roslang/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "920854f983ee43f4eda52a44e2e318f1db47ffd36f74af6cd43c9139c0d5f053"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/roslang/1.15.8-1"; + sha256 = "sha256-eL3uvA8RE4Btk6Ne26hX53MBs8PCNFtCGPJ0Nf/2Zfg="; + }; buildType = "catkin"; propagatedBuildInputs = [ catkin genmsg ]; diff --git a/distros/noetic/roslaunch/default.nix b/distros/noetic/roslaunch/default.nix index ec2d47139f..0007efad80 100644 --- a/distros/noetic/roslaunch/default.nix +++ b/distros/noetic/roslaunch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslaunch"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/roslaunch/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "86d707d175b00b2777f9f5efa4263517334dc32405122b65875d7bc117331901"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/roslaunch/1.15.15-1"; + sha256 = "sha256-ws8jgJKJS3FX2QeOM+gOWvfzWZ2lhCuW4mbDVDPejQ4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roslib/default.nix b/distros/noetic/roslib/default.nix index 2e79198fb0..ed3be0fdd1 100644 --- a/distros/noetic/roslib/default.nix +++ b/distros/noetic/roslib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslib"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/roslib/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "5842542a7518a694e1e339fb3d59d4807bf15382d0393c4dab077d67f1458148"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/roslib/1.15.8-1"; + sha256 = "sha256-ISyKZ9nQph5IURSkqhGrW+TBmjpgvoTPv7B4cVqOImM="; + }; buildType = "catkin"; buildInputs = [ boost python3Packages.setuptools ]; diff --git a/distros/noetic/roslint/default.nix b/distros/noetic/roslint/default.nix index 9e5561f424..a0c4cd32bd 100644 --- a/distros/noetic/roslint/default.nix +++ b/distros/noetic/roslint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslint"; version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslint-release/archive/release/noetic/roslint/0.12.0-1.tar.gz"; - name = "0.12.0-1.tar.gz"; - sha256 = "94a1e257cf7fafc84cfdce9e330aa032ba58c14461cc3f96625605973b5eea43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslint-release"; + rev = "release/noetic/roslint/0.12.0-1"; + sha256 = "sha256-6zqBH9P++1wWPD9BasHzkFfxxbY8AjYyTMsIkC2F/n0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roslisp-common/default.nix b/distros/noetic/roslisp-common/default.nix index 4f56676f01..28888c0640 100644 --- a/distros/noetic/roslisp-common/default.nix +++ b/distros/noetic/roslisp-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslisp-common"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/roslisp_common/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "9d032a748c483285565390cdeb4a534ed9c660c93d65417bed5a52a918e34f5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/roslisp_common/0.2.14-1"; + sha256 = "sha256-miJA/miFnZekOvXqh4+fK+rgDTEwP7Uu899kgwjziqI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roslisp-repl/default.nix b/distros/noetic/roslisp-repl/default.nix index 80d57049f6..10866cb6cf 100644 --- a/distros/noetic/roslisp-repl/default.nix +++ b/distros/noetic/roslisp-repl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslisp-repl"; version = "0.4.17-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/noetic/roslisp_repl/0.4.17-1.tar.gz"; - name = "0.4.17-1.tar.gz"; - sha256 = "53a135a265136bbda3ff95f351383138781e1e76f61f6fe0701c09312ec6ed09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/noetic/roslisp_repl/0.4.17-1"; + sha256 = "sha256-jM7Q1ERvc5aCPUqrrkOOgqtc4RCJk9Rr/OwaxjCeHek="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roslisp-utilities/default.nix b/distros/noetic/roslisp-utilities/default.nix index 97366933bb..617aa840a1 100644 --- a/distros/noetic/roslisp-utilities/default.nix +++ b/distros/noetic/roslisp-utilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslisp-utilities"; version = "0.2.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp_common-release/archive/release/noetic/roslisp_utilities/0.2.14-1.tar.gz"; - name = "0.2.14-1.tar.gz"; - sha256 = "ee93952ae6709d28ea6c880913d02568a3aa20ea92688ba278b530b834321de1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp_common-release"; + rev = "release/noetic/roslisp_utilities/0.2.14-1"; + sha256 = "sha256-L7yZcE2DMZSk8zGy+mCge5pmvHLv1fIscE2PwdYvZho="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roslisp/default.nix b/distros/noetic/roslisp/default.nix index 25041b53ed..90bf2c294b 100644 --- a/distros/noetic/roslisp/default.nix +++ b/distros/noetic/roslisp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslisp"; version = "1.9.24-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roslisp-release/archive/release/noetic/roslisp/1.9.24-1.tar.gz"; - name = "1.9.24-1.tar.gz"; - sha256 = "492d41924b9264c0018534e86d7dce746a595410e01c27708fd1529931c9883b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roslisp-release"; + rev = "release/noetic/roslisp/1.9.24-1"; + sha256 = "sha256-IDP0xaGdzWf3vimDdWw6utA3oVzIH/AmuVH+boFX+NE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/roslz4/default.nix b/distros/noetic/roslz4/default.nix index bff0b7f7b9..b544036a71 100644 --- a/distros/noetic/roslz4/default.nix +++ b/distros/noetic/roslz4/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roslz4"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/roslz4/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "f33d669bd8015db9035539db684e61381e8797dfc668224761ad9c8d35a2b91a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/roslz4/1.15.15-1"; + sha256 = "sha256-GTlKTjjd7t5li7p2x+uraeOzGBt5ZyEc4fmv78W+4/Q="; + }; buildType = "catkin"; buildInputs = [ catkin cpp-common ]; diff --git a/distros/noetic/rosmake/default.nix b/distros/noetic/rosmake/default.nix index 2216fe9189..6d27308830 100644 --- a/distros/noetic/rosmake/default.nix +++ b/distros/noetic/rosmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosmake"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/rosmake/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "03ed121f2231478045cdb983ccbca247f214322acf67d9553d78f78a558c3ffb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/rosmake/1.15.8-1"; + sha256 = "sha256-2IUCC/gQH2T5lHpiErzVXDhOcOBWjNdp6f6+SNKy6iA="; + }; buildType = "catkin"; buildInputs = [ python3Packages.setuptools ]; diff --git a/distros/noetic/rosmaster/default.nix b/distros/noetic/rosmaster/default.nix index 926ead7437..1ef7314327 100644 --- a/distros/noetic/rosmaster/default.nix +++ b/distros/noetic/rosmaster/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosmaster"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosmaster/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "9399c93ec53dc82735d7e0c9a749b81c3489711d05c1dc8c31b45e7e074893fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosmaster/1.15.15-1"; + sha256 = "sha256-VKJjvf/6phO7PWJX9MjG/FmRourbiE4YxCqMvFL1w1A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosmon-core/default.nix b/distros/noetic/rosmon-core/default.nix index b927539c8f..e35278ece2 100644 --- a/distros/noetic/rosmon-core/default.nix +++ b/distros/noetic/rosmon-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosmon-core"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosmon-release/archive/release/noetic/rosmon_core/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "de8c15525cefb38d9727a49a66f71f2da3b4bf31de94bd7057d6a80ab5ec8806"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosmon-release"; + rev = "release/noetic/rosmon_core/2.4.0-1"; + sha256 = "sha256-4yeYCphNEYE+LF7Wjair0JG5DkEzo1XjchpuRRTsEsw="; + }; buildType = "catkin"; buildInputs = [ catkin python3 ]; diff --git a/distros/noetic/rosmon-msgs/default.nix b/distros/noetic/rosmon-msgs/default.nix index 9c869b18af..ac4f4325c6 100644 --- a/distros/noetic/rosmon-msgs/default.nix +++ b/distros/noetic/rosmon-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosmon-msgs"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosmon-release/archive/release/noetic/rosmon_msgs/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "32ee0a1cbb51b6143ae74d61e0d2947dd3d37ab47170862619960c83e5328dd1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosmon-release"; + rev = "release/noetic/rosmon_msgs/2.4.0-1"; + sha256 = "sha256-ji5AQomjE0pDCewcPXS90YPgB16EaNbfEBLDdSx+B1I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosmon/default.nix b/distros/noetic/rosmon/default.nix index 8793c71b39..b38f48464d 100644 --- a/distros/noetic/rosmon/default.nix +++ b/distros/noetic/rosmon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosmon"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosmon-release/archive/release/noetic/rosmon/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "22055a518407348cc4061d41a8fd9eaf35b15c279706187f4e6b7a3ebaabdc9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosmon-release"; + rev = "release/noetic/rosmon/2.4.0-1"; + sha256 = "sha256-ukCFjjYeUVd2YiFoPk1jZE+mRlbOW2OomYGFjiGxth0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosmsg-cpp/default.nix b/distros/noetic/rosmsg-cpp/default.nix index e106a5378f..b0832e7fe4 100644 --- a/distros/noetic/rosmsg-cpp/default.nix +++ b/distros/noetic/rosmsg-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosmsg-cpp"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ctu-vras/rosmsg_cpp-release/archive/release/noetic/rosmsg_cpp/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "55cade697aaddad90380206c883b2a95813bc662810a4adf8ee69c94af140868"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ctu-vras"; + repo = "rosmsg_cpp-release"; + rev = "release/noetic/rosmsg_cpp/1.0.2-1"; + sha256 = "sha256-78DbURdOPEKrEXwGtg/MUxsbNesIKpCn1DjqSh4q8No="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/noetic/rosmsg/default.nix b/distros/noetic/rosmsg/default.nix index 1a3fbf5365..2b9b721b7a 100644 --- a/distros/noetic/rosmsg/default.nix +++ b/distros/noetic/rosmsg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosmsg"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosmsg/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "8a2ab48765aca62967f0846984d30384be97288d99db9450b876ed4400839616"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosmsg/1.15.15-1"; + sha256 = "sha256-HHU35TIPf25C69P3a78BtNzIe2bzCvb781jNzZCQ3E8="; + }; buildType = "catkin"; checkInputs = [ diagnostic-msgs rostest std-msgs std-srvs ]; diff --git a/distros/noetic/rosnode/default.nix b/distros/noetic/rosnode/default.nix index d8346fb01d..f931f8bc60 100644 --- a/distros/noetic/rosnode/default.nix +++ b/distros/noetic/rosnode/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosnode"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosnode/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "1bdf48f757a99ffa6b8c6c4323f17fa89cc5d8ba8a227230479b93c94842014d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosnode/1.15.15-1"; + sha256 = "sha256-fFKDpRWicPj0nenbleM2hmvkv3osyZyT8H6tF2IHAps="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/rosout/default.nix b/distros/noetic/rosout/default.nix index 5198991f70..57773b87d3 100644 --- a/distros/noetic/rosout/default.nix +++ b/distros/noetic/rosout/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosout"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosout/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "f390276aa4c8b6adb30e72f5777d7a21f1bf4ff3d6743ad4a3f38046fc19ced3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosout/1.15.15-1"; + sha256 = "sha256-PcLKUG6yDbgP0mU7tFPFtWrwzUWZM2cCxYSYg3oDywQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rospack/default.nix b/distros/noetic/rospack/default.nix index 6e8d2857c0..01c52c93a8 100644 --- a/distros/noetic/rospack/default.nix +++ b/distros/noetic/rospack/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rospack"; version = "2.6.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rospack-release/archive/release/noetic/rospack/2.6.2-1.tar.gz"; - name = "2.6.2-1.tar.gz"; - sha256 = "1d74ca071fa02049d6f9739aa0e2624afbeef4100c2f8ca76db4fc1c9e13c390"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rospack-release"; + rev = "release/noetic/rospack/2.6.2-1"; + sha256 = "sha256-Lb/4oAU4T1B11g/PWlp/Mr/+LlheL7tUDKEMOuKjnAY="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules gtest ]; diff --git a/distros/noetic/rosparam-shortcuts/default.nix b/distros/noetic/rosparam-shortcuts/default.nix index 249b2709f3..eca9d00a92 100644 --- a/distros/noetic/rosparam-shortcuts/default.nix +++ b/distros/noetic/rosparam-shortcuts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosparam-shortcuts"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/rosparam_shortcuts-release/archive/release/noetic/rosparam_shortcuts/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "620eb7c2013dac4e8b2ebb9704e36e702482639ffa6af293058870c6001d8ab7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "rosparam_shortcuts-release"; + rev = "release/noetic/rosparam_shortcuts/0.4.0-1"; + sha256 = "sha256-p4ZPcva4QcfB3N+ckPK+noos7vSqCC2Its/m29XKvKs="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen roslint ]; diff --git a/distros/noetic/rosparam/default.nix b/distros/noetic/rosparam/default.nix index 17c3fa1499..b04d80b342 100644 --- a/distros/noetic/rosparam/default.nix +++ b/distros/noetic/rosparam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosparam"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosparam/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "bda52834f4e198b757cb9530ba9167cb4d76f821ae72b5c690c45b24d3fa416b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosparam/1.15.15-1"; + sha256 = "sha256-JZ5bUx7SmLYgsTmStmjMn0lq3fvF2Ypup/dvRWDIWCU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rospatlite/default.nix b/distros/noetic/rospatlite/default.nix index 4d825b4182..28e86474eb 100644 --- a/distros/noetic/rospatlite/default.nix +++ b/distros/noetic/rospatlite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rospatlite"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/rospatlite/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "f52f6aa6146511a5551db4f2b648bcd0ebe7908093dfb2a7a431297f380400e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/rospatlite/2.1.21-2"; + sha256 = "sha256-lJ0Bc/iuWngq61cHws7vKIDwQeNfCHy9QkeuR+M0j6c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rospilot/default.nix b/distros/noetic/rospilot/default.nix index db9dc2b60b..f6370c2f39 100644 --- a/distros/noetic/rospilot/default.nix +++ b/distros/noetic/rospilot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rospilot"; version = "1.6.1-r1"; - src = fetchurl { - url = "https://github.com/rospilot/rospilot-release/archive/release/noetic/rospilot/1.6.1-1.tar.gz"; - name = "1.6.1-1.tar.gz"; - sha256 = "85196c13b22f7f490591432bbd4c51aa575f1083af6eaffa34d24b88dbe15f08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rospilot"; + repo = "rospilot-release"; + rev = "release/noetic/rospilot/1.6.1-1"; + sha256 = "sha256-SoInknI7Yxng9nlQ31g8sHZkQK9IMLiuHNbE91Blja4="; + }; buildType = "catkin"; buildInputs = [ catkin ffmpeg libgphoto2 libjpeg_turbo libmicrohttpd message-generation opencv python3Packages.setuptools roscpp roslint ]; diff --git a/distros/noetic/rosping/default.nix b/distros/noetic/rosping/default.nix index 222c3aa56d..75b0555d85 100644 --- a/distros/noetic/rosping/default.nix +++ b/distros/noetic/rosping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosping"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/rosping/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "28c0281b4e9913467cde2e5284b903a6fa4e77d8127630449faf2db9e60262a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/rosping/2.1.21-2"; + sha256 = "sha256-eVlSf1r8y5BCwQXkINIdlyRQxGT3/i7ZUDb6294cIeQ="; + }; buildType = "catkin"; buildInputs = [ catkin mk rosboost-cfg rosbuild rostest ]; diff --git a/distros/noetic/rospy-message-converter/default.nix b/distros/noetic/rospy-message-converter/default.nix index 489a1d1977..347114c585 100644 --- a/distros/noetic/rospy-message-converter/default.nix +++ b/distros/noetic/rospy-message-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rospy-message-converter"; version = "0.5.9-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/rospy_message_converter-release/archive/release/noetic/rospy_message_converter/0.5.9-1.tar.gz"; - name = "0.5.9-1.tar.gz"; - sha256 = "d7b0cbafdd524f06928b315e1d5a079781999f34cc7cff4121f1ce56c82c9cf6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "rospy_message_converter-release"; + rev = "release/noetic/rospy_message_converter/0.5.9-1"; + sha256 = "sha256-/QmKoz7Y/DE3g/dz535r6vkFH/k92V6DebqapX0gqeU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rospy-tutorials/default.nix b/distros/noetic/rospy-tutorials/default.nix index bddad95546..fe5b073850 100644 --- a/distros/noetic/rospy-tutorials/default.nix +++ b/distros/noetic/rospy-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rospy-tutorials"; version = "0.10.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_tutorials-release/archive/release/noetic/rospy_tutorials/0.10.2-1.tar.gz"; - name = "0.10.2-1.tar.gz"; - sha256 = "2f1bd789def2a6591abe28b2497304681f1ccba3748b2044cf724e6552fcd11b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_tutorials-release"; + rev = "release/noetic/rospy_tutorials/0.10.2-1"; + sha256 = "sha256-nBZP15B97SjRN0fHOIIppi2ZofOwPSABs12RSnLPaV0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/noetic/rospy/default.nix b/distros/noetic/rospy/default.nix index 42a67702e2..05c7349e12 100644 --- a/distros/noetic/rospy/default.nix +++ b/distros/noetic/rospy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rospy"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rospy/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "a04589f49ccadb8bb30ef5cf925a1d7c6344f5f96d9470b68c7749ff74477440"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rospy/1.15.15-1"; + sha256 = "sha256-uBkECYznXgesfEI1R7QpBsIrq0ia97OzzYOuZTyMUAs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosrt/default.nix b/distros/noetic/rosrt/default.nix index 5800226186..44631bfa61 100644 --- a/distros/noetic/rosrt/default.nix +++ b/distros/noetic/rosrt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosrt"; version = "1.0.25-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_realtime-release/archive/release/noetic/rosrt/1.0.25-1.tar.gz"; - name = "1.0.25-1.tar.gz"; - sha256 = "dfa4dc7b9c2ebd216827b851179eb4011dc2f845a530e7b0039d7e6bf226a704"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_realtime-release"; + rev = "release/noetic/rosrt/1.0.25-1"; + sha256 = "sha256-sa4sVy7EGPoChDqb9dHWoKXn8ioisLi/5c77xvpTtbQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosserial-arduino/default.nix b/distros/noetic/rosserial-arduino/default.nix index 72989bd075..555841af69 100644 --- a/distros/noetic/rosserial-arduino/default.nix +++ b/distros/noetic/rosserial-arduino/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-arduino"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_arduino/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "46d416adced28af57c50359dc91b2115b3facfea382bd5ec4da291685c565739"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_arduino/0.9.2-1"; + sha256 = "sha256-KDvLcbgd9EH2Zt/DPrnRebku83lNInWA+lqpmWLHffs="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rosserial-chibios/default.nix b/distros/noetic/rosserial-chibios/default.nix index 894cd1fdd7..fbbb52c338 100644 --- a/distros/noetic/rosserial-chibios/default.nix +++ b/distros/noetic/rosserial-chibios/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-chibios"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_chibios/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "d2ded99ec728d90b3bb3d22d5938c8d8e2769c001544c0aef5ea914c69a9c967"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_chibios/0.9.2-1"; + sha256 = "sha256-PrVyJCSdt5hLQEjvi+M1rUT4/qXG3BTi7CnBMWZBhDE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosserial-client/default.nix b/distros/noetic/rosserial-client/default.nix index b6a2b6ef8c..5685cd398a 100644 --- a/distros/noetic/rosserial-client/default.nix +++ b/distros/noetic/rosserial-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-client"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_client/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "4f932635d00221710295d78654ff6dcef7a160d09de9dec4a194045c899d9579"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_client/0.9.2-1"; + sha256 = "sha256-yYy8NE5wzCo9oMDJBIVmciwrImmrUlgkPMlPFwtDmh8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosserial-embeddedlinux/default.nix b/distros/noetic/rosserial-embeddedlinux/default.nix index e907884fa7..18e4a829c5 100644 --- a/distros/noetic/rosserial-embeddedlinux/default.nix +++ b/distros/noetic/rosserial-embeddedlinux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-embeddedlinux"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_embeddedlinux/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "9284acfda80db76bf60c1726c9d6b0508b32d227c12ab0d9826eeb5873827072"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_embeddedlinux/0.9.2-1"; + sha256 = "sha256-RLmjKBVsJWrF8zZBEF6EhkNqODtvUEaXPe7UNpl4Njc="; + }; buildType = "catkin"; buildInputs = [ catkin rosserial-client ]; diff --git a/distros/noetic/rosserial-mbed/default.nix b/distros/noetic/rosserial-mbed/default.nix index 97ccdbf377..1e392e923d 100644 --- a/distros/noetic/rosserial-mbed/default.nix +++ b/distros/noetic/rosserial-mbed/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-mbed"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_mbed/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "95617f93588caeb0f2858cbb1363cbe6970510040368ecf27ed8e65e25e0a40a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_mbed/0.9.2-1"; + sha256 = "sha256-/Xs33h+YotEig1FrRZ2EXL/ubcvDjGP5UBVpu6z3Uyk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rosserial-msgs/default.nix b/distros/noetic/rosserial-msgs/default.nix index a36faaf2de..2fe5aef291 100644 --- a/distros/noetic/rosserial-msgs/default.nix +++ b/distros/noetic/rosserial-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-msgs"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_msgs/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "5fc6ee93f3dac1fdf6256e3db2a2a9db83918cc003fd9908657e1fc22551693a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_msgs/0.9.2-1"; + sha256 = "sha256-e5iVBv7fW9309W/qsqh9RBQQ2p3cqUKEBoUYHL0Yja4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rosserial-python/default.nix b/distros/noetic/rosserial-python/default.nix index 27dfdec4b5..2fc9f7933d 100644 --- a/distros/noetic/rosserial-python/default.nix +++ b/distros/noetic/rosserial-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-python"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_python/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "0e115dc3f3a969b38ce2eb670dd8db6caa9266857dde5c2d2032a8ef3ff83f59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_python/0.9.2-1"; + sha256 = "sha256-9YGVSvqgmV2MzZnnDuGDCTxTSv4pFWH4tn5isVw52+E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosserial-server/default.nix b/distros/noetic/rosserial-server/default.nix index a8572a3b88..a16795ab63 100644 --- a/distros/noetic/rosserial-server/default.nix +++ b/distros/noetic/rosserial-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-server"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_server/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "b6ce6492de950113b015041396436e87ed1ea1b0736b0f2d4bf842383b7531ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_server/0.9.2-1"; + sha256 = "sha256-lvEa12vBFfeWbXquQzRIR8hNWN7cBz4YTcHHz5Q2Djk="; + }; buildType = "catkin"; buildInputs = [ catkin python3 ]; diff --git a/distros/noetic/rosserial-tivac/default.nix b/distros/noetic/rosserial-tivac/default.nix index e51f69662a..1d09bbacc2 100644 --- a/distros/noetic/rosserial-tivac/default.nix +++ b/distros/noetic/rosserial-tivac/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-tivac"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_tivac/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "b124e1b25c3ca19bd0120d06a5a27240648de4be1b7261bcc8403fa034af2f28"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_tivac/0.9.2-1"; + sha256 = "sha256-Fu0x2Bc6qPrTy2m3UdLq3iEOZigcMCPOynR6OWkKq8g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosserial-vex-cortex/default.nix b/distros/noetic/rosserial-vex-cortex/default.nix index c7a8a4083d..df751fbb47 100644 --- a/distros/noetic/rosserial-vex-cortex/default.nix +++ b/distros/noetic/rosserial-vex-cortex/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-vex-cortex"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_vex_cortex/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "8b88193e6ba6f2f6675575989424bf6d9b1e8fdd48d4199d3248b22e6f0629e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_vex_cortex/0.9.2-1"; + sha256 = "sha256-J+ePEd9uGCmuQVsP+GZX+wxlRWQ0/YL7u4Rc9ROg25A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosserial-vex-v5/default.nix b/distros/noetic/rosserial-vex-v5/default.nix index ae871730e2..4d7f554a46 100644 --- a/distros/noetic/rosserial-vex-v5/default.nix +++ b/distros/noetic/rosserial-vex-v5/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-vex-v5"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_vex_v5/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "f165817a10a468231652f5f856aafd5fceff1e90f12ecbcc76ba8039a5362ddd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_vex_v5/0.9.2-1"; + sha256 = "sha256-kous9p6w4CM+Vhp1b2nT+IAxJxHOEeNNymPwVB6Egz8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosserial-windows/default.nix b/distros/noetic/rosserial-windows/default.nix index 104992198f..bf1370a1d5 100644 --- a/distros/noetic/rosserial-windows/default.nix +++ b/distros/noetic/rosserial-windows/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-windows"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_windows/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "d52aa5457e1e5bde4052e4d74e5448cb2410567951116cbda397bd03049d9cfd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_windows/0.9.2-1"; + sha256 = "sha256-/FYpLo9pZZ4gBN1WVtgADe2otJULSyan90EWGTabOU0="; + }; buildType = "catkin"; buildInputs = [ catkin geometry-msgs nav-msgs sensor-msgs std-msgs ]; diff --git a/distros/noetic/rosserial-xbee/default.nix b/distros/noetic/rosserial-xbee/default.nix index d664b77027..ef674828db 100644 --- a/distros/noetic/rosserial-xbee/default.nix +++ b/distros/noetic/rosserial-xbee/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial-xbee"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial_xbee/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "4678e4df53472749250a2ed93c06c2aa6c7128c025b20169c026924b100f5630"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial_xbee/0.9.2-1"; + sha256 = "sha256-b49wpKy2wPmdxibK0VXAJgvCqKvlGuA/+XHp9WTzGwI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosserial/default.nix b/distros/noetic/rosserial/default.nix index 1a72a4fdae..5f2ec7cb7d 100644 --- a/distros/noetic/rosserial/default.nix +++ b/distros/noetic/rosserial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosserial"; version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rosserial-release/archive/release/noetic/rosserial/0.9.2-1.tar.gz"; - name = "0.9.2-1.tar.gz"; - sha256 = "385b70a12c785dfdba5200cb4039804c45a7a1a160d37dd69cb2500ad7dd2135"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rosserial-release"; + rev = "release/noetic/rosserial/0.9.2-1"; + sha256 = "sha256-LCzob4+TfCCfa5P1m/TCOeNcqwJwSq5m1DCm6EzSYGw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rosservice/default.nix b/distros/noetic/rosservice/default.nix index a44adac550..33a2eb1341 100644 --- a/distros/noetic/rosservice/default.nix +++ b/distros/noetic/rosservice/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosservice"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rosservice/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "d206130bf69ed3bbbafa0f2e3a73ad06a9e40c10dba3ccb14a5e5bc1acec1b96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rosservice/1.15.15-1"; + sha256 = "sha256-GXfxUnNxQqn/JS05pHr4BPVRAwxiPbaiwuMjCgogLo4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rostest/default.nix b/distros/noetic/rostest/default.nix index 0e14910a85..9d1f69e19e 100644 --- a/distros/noetic/rostest/default.nix +++ b/distros/noetic/rostest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rostest"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rostest/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "61517f06d9743acb1f14ce403c2b782aff47a4c6fb43c71ee833d425e76a8c4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rostest/1.15.15-1"; + sha256 = "sha256-YxxXJ6lZHS/5dJO2I0yX3bJfSHfUetdAplBuGe1YPV0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rostime/default.nix b/distros/noetic/rostime/default.nix index 7398a48867..03d27e1079 100644 --- a/distros/noetic/rostime/default.nix +++ b/distros/noetic/rostime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rostime"; version = "0.7.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roscpp_core-release/archive/release/noetic/rostime/0.7.2-1.tar.gz"; - name = "0.7.2-1.tar.gz"; - sha256 = "7111aa9956e9e8ec623edd54c59b344c6488b65aed8b1d768a5a7a55b467c47c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roscpp_core-release"; + rev = "release/noetic/rostime/0.7.2-1"; + sha256 = "sha256-XN2+EBVcFjN1L9DNe/b+GFrr6OkJDYDqJGmP0PPUaxQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rostopic/default.nix b/distros/noetic/rostopic/default.nix index c812b114ef..9c72720ff6 100644 --- a/distros/noetic/rostopic/default.nix +++ b/distros/noetic/rostopic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rostopic"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/rostopic/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "21e5d88423c050419d19509d7333cf96c0253f36298330f7bd1b9e3622573aa3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/rostopic/1.15.15-1"; + sha256 = "sha256-oD/uqbOWCOy8G8/O6dCZw/5O1i4dLomtS6BbogsQnpE="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/rostwitter/default.nix b/distros/noetic/rostwitter/default.nix index 31c4e1e00f..d57fe6c8f4 100644 --- a/distros/noetic/rostwitter/default.nix +++ b/distros/noetic/rostwitter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rostwitter"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/rostwitter/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "227fc2677c3b13e7cb28d480ddc7b236f844154fc59d4c34901344566cd51df5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/rostwitter/2.1.21-2"; + sha256 = "sha256-1VqnqAsa4r8TWoUtXSRyVrruIdYtpEExo3yLfOwWwoY="; + }; buildType = "catkin"; buildInputs = [ catkin git mk ]; diff --git a/distros/noetic/rosunit/default.nix b/distros/noetic/rosunit/default.nix index 2c7b8a5b7c..5e60e174c3 100644 --- a/distros/noetic/rosunit/default.nix +++ b/distros/noetic/rosunit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rosunit"; version = "1.15.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros-release/archive/release/noetic/rosunit/1.15.8-1.tar.gz"; - name = "1.15.8-1.tar.gz"; - sha256 = "8a8a32d9a5b42badd7cae613892b2db4a72035923a4e2a369e34e1877b2fa433"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros-release"; + rev = "release/noetic/rosunit/1.15.8-1"; + sha256 = "sha256-73auw4jkBM32QRE3VG7XrRC8cM0Z5boh9zkallWFzPQ="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/roswtf/default.nix b/distros/noetic/roswtf/default.nix index 4575186b27..813d6e9419 100644 --- a/distros/noetic/roswtf/default.nix +++ b/distros/noetic/roswtf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roswtf"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/roswtf/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "68b0c0dae326caf7b051cfac0c5723a2f18c535ba9c4e2d14e123450506e2809"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/roswtf/1.15.15-1"; + sha256 = "sha256-B0dcKXwh6IHHfewK0dCRNaiER3FEanWeUquht2cmiVE="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/roswww/default.nix b/distros/noetic/roswww/default.nix index e9d5882955..7f3251c2c2 100644 --- a/distros/noetic/roswww/default.nix +++ b/distros/noetic/roswww/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-roswww"; version = "0.1.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/roswww-release/archive/release/noetic/roswww/0.1.13-1.tar.gz"; - name = "0.1.13-1.tar.gz"; - sha256 = "21b7ab479ab18b0a1fb19faee08f5391785ffd27fd60bf15dc9d117b8d755b9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "roswww-release"; + rev = "release/noetic/roswww/0.1.13-1"; + sha256 = "sha256-/es7Z0mr7Rhsj4ZaOk8lBfQQvO/Stc4cc4Ros3Or/Rs="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.catkin-pkg ]; diff --git a/distros/noetic/rotate-recovery/default.nix b/distros/noetic/rotate-recovery/default.nix index 50618fc476..17863e45fc 100644 --- a/distros/noetic/rotate-recovery/default.nix +++ b/distros/noetic/rotate-recovery/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, base-local-planner, catkin, cmake-modules, costmap-2d, eigen, geometry-msgs, nav-core, pluginlib, roscpp, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-rotate-recovery"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/rotate_recovery/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "87a081850938a83f23315d8a610537e35a6d45aa0278ca5d502e3b11bc3dba41"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/rotate_recovery/1.17.3-1"; + sha256 = "sha256-ScDwL5S6AZRzW02sAAMMJPKllHpv8aRuqnlrJg0tcT4="; + }; buildType = "catkin"; buildInputs = [ angles base-local-planner catkin cmake-modules ]; diff --git a/distros/noetic/route-network/default.nix b/distros/noetic/route-network/default.nix index 1860b53448..76e7b894cf 100644 --- a/distros/noetic/route-network/default.nix +++ b/distros/noetic/route-network/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-route-network"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/open_street_map-release/archive/release/noetic/route_network/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "aa4bfa6f99b672ea11f480299a2f4d6b35fa70958e6c883f0a2ee7dabe1e4154"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "open_street_map-release"; + rev = "release/noetic/route_network/0.3.0-1"; + sha256 = "sha256-FM0tk26TWaow2CbwP15QmRuB1uTZ3AtchBgADR8skbQ="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/rplidar-ros/default.nix b/distros/noetic/rplidar-ros/default.nix index d940476aa2..9696e54354 100644 --- a/distros/noetic/rplidar-ros/default.nix +++ b/distros/noetic/rplidar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rplidar-ros"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rplidar_ros-release/archive/release/noetic/rplidar_ros/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "0101b1ac6fea66c77b67bffaeebbb6d03840bf25a7aa8262fa2b962d3314fdcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rplidar_ros-release"; + rev = "release/noetic/rplidar_ros/2.0.0-1"; + sha256 = "sha256-a9HQiQEE89UEN9uTuCEif9tix6S7xgbaYS7rx/k7ssw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-action/default.nix b/distros/noetic/rqt-action/default.nix index 024d857aca..acde48ef13 100644 --- a/distros/noetic/rqt-action/default.nix +++ b/distros/noetic/rqt-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-action"; version = "0.4.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_action-release/archive/release/noetic/rqt_action/0.4.9-1.tar.gz"; - name = "0.4.9-1.tar.gz"; - sha256 = "86d32021ce58ab1d2624157c728e664bcb7345bb055b1388f0d2f4b9045af03b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_action-release"; + rev = "release/noetic/rqt_action/0.4.9-1"; + sha256 = "sha256-N5GFkG2yNzCE4tWc23uFMGwFk8D7TEUoLddfyC3UxmQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-bag-plugins/default.nix b/distros/noetic/rqt-bag-plugins/default.nix index b2a98e4575..5140535706 100644 --- a/distros/noetic/rqt-bag-plugins/default.nix +++ b/distros/noetic/rqt-bag-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-bag-plugins"; version = "0.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_bag-release/archive/release/noetic/rqt_bag_plugins/0.5.1-1.tar.gz"; - name = "0.5.1-1.tar.gz"; - sha256 = "b6bfae17347d4d64fa1b40bc3663d4cb4a8fef9de8aa2b1e3138c4394561b6cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_bag-release"; + rev = "release/noetic/rqt_bag_plugins/0.5.1-1"; + sha256 = "sha256-v95eh3z05gE+OVHH88XufYgfN8ZaTDDbXbxRLGeebrg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-bag/default.nix b/distros/noetic/rqt-bag/default.nix index d41384cb9a..554bcfa2b7 100644 --- a/distros/noetic/rqt-bag/default.nix +++ b/distros/noetic/rqt-bag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-bag"; version = "0.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_bag-release/archive/release/noetic/rqt_bag/0.5.1-1.tar.gz"; - name = "0.5.1-1.tar.gz"; - sha256 = "864c0851f8c2a470246555831630a5d7108ad76bde6e9fd5775113b35e722e8d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_bag-release"; + rev = "release/noetic/rqt_bag/0.5.1-1"; + sha256 = "sha256-UZBQhAxdSV6nqNrefZSu8ESMB7yXUqmLxEhfN+O2II0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-common-plugins/default.nix b/distros/noetic/rqt-common-plugins/default.nix index 9d4e7f607f..2d222a237a 100644 --- a/distros/noetic/rqt-common-plugins/default.nix +++ b/distros/noetic/rqt-common-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-common-plugins"; version = "0.4.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_common_plugins-release/archive/release/noetic/rqt_common_plugins/0.4.9-1.tar.gz"; - name = "0.4.9-1.tar.gz"; - sha256 = "76c6b6eef42e7935e220d53c6d52edea82550b947b0dbc0a0526d690bc169a9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_common_plugins-release"; + rev = "release/noetic/rqt_common_plugins/0.4.9-1"; + sha256 = "sha256-8h+ZsJreIcll9ruYG2Iotoh/CU9coSaSUw4Rdc7MDEY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-console/default.nix b/distros/noetic/rqt-console/default.nix index 35d38837be..4402461b11 100644 --- a/distros/noetic/rqt-console/default.nix +++ b/distros/noetic/rqt-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-console"; version = "0.4.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_console-release/archive/release/noetic/rqt_console/0.4.11-1.tar.gz"; - name = "0.4.11-1.tar.gz"; - sha256 = "f2fed22a56e9c85c5092337ad2b1c043f28e548b82ab9d2eb5514089552ffb94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_console-release"; + rev = "release/noetic/rqt_console/0.4.11-1"; + sha256 = "sha256-jtkA9R3kZdHm3Bx4aHpaRpDidtHoXquOEBW1F63sYs8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-controller-manager/default.nix b/distros/noetic/rqt-controller-manager/default.nix index b71745cfcc..39f77334de 100644 --- a/distros/noetic/rqt-controller-manager/default.nix +++ b/distros/noetic/rqt-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-controller-manager"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/rqt_controller_manager/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "86fffa5683360ad7909e1fcd7fe940cc93e0ac25df749ebd39c79c628bf75d5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/rqt_controller_manager/0.19.6-1"; + sha256 = "sha256-UusnF6Q+PwsaevvZd9wTzqW4S5ZMQ1an4K8GCraEfCY="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/rqt-dep/default.nix b/distros/noetic/rqt-dep/default.nix index c76535b836..5c1667b346 100644 --- a/distros/noetic/rqt-dep/default.nix +++ b/distros/noetic/rqt-dep/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-dep"; version = "0.4.12-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_dep-release/archive/release/noetic/rqt_dep/0.4.12-1.tar.gz"; - name = "0.4.12-1.tar.gz"; - sha256 = "173543b28fd652b17aa90d4be483382b1fb6a2c7cc842fa58c3151293eccc445"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_dep-release"; + rev = "release/noetic/rqt_dep/0.4.12-1"; + sha256 = "sha256-P01ewbo5kfc5OfyvO7/+WWlSGgeb0653eAB9HK8vZWc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-drone-teleop/default.nix b/distros/noetic/rqt-drone-teleop/default.nix index 1f41caf312..3155717704 100644 --- a/distros/noetic/rqt-drone-teleop/default.nix +++ b/distros/noetic/rqt-drone-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-drone-teleop"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/noetic/rqt_drone_teleop/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "e52d610e8f680a7e23c9193ec5324db85da8414de03da0a79bf5ce34666d327f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/noetic/rqt_drone_teleop/1.4.2-1"; + sha256 = "sha256-GHlc9pKt0zJ2k/jv0BDD1O+45qtf8GJnP5yBOYfcX/4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-ez-publisher/default.nix b/distros/noetic/rqt-ez-publisher/default.nix index 69b0ffef63..13bd718cc3 100644 --- a/distros/noetic/rqt-ez-publisher/default.nix +++ b/distros/noetic/rqt-ez-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-ez-publisher"; version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/OTL/rqt_ez_publisher-release/archive/release/noetic/rqt_ez_publisher/0.6.1-1.tar.gz"; - name = "0.6.1-1.tar.gz"; - sha256 = "98dc5d29814595ff0c787d0de226df7a6a5e28ffb818669c8b8b550cd67252a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OTL"; + repo = "rqt_ez_publisher-release"; + rev = "release/noetic/rqt_ez_publisher/0.6.1-1"; + sha256 = "sha256-tbgrKNx4TSqsqSMM0pC2XeE0vr5TXzxs9cjdCY17FWk="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.catkin-pkg rostest ]; diff --git a/distros/noetic/rqt-graph/default.nix b/distros/noetic/rqt-graph/default.nix index 9725a64f6f..7726e0dc63 100644 --- a/distros/noetic/rqt-graph/default.nix +++ b/distros/noetic/rqt-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-graph"; version = "0.4.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_graph-release/archive/release/noetic/rqt_graph/0.4.14-1.tar.gz"; - name = "0.4.14-1.tar.gz"; - sha256 = "f9aaccd3cd5c2fced10194e48880281ada1f61ad9bea14db7e7fa1c5c85ed8c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_graph-release"; + rev = "release/noetic/rqt_graph/0.4.14-1"; + sha256 = "sha256-7QjtUKqIpOg+b/IkeGKzwNUDpldBI+8NK44wNJqZAG8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-ground-robot-teleop/default.nix b/distros/noetic/rqt-ground-robot-teleop/default.nix index c0a3086502..0b1f3ac086 100644 --- a/distros/noetic/rqt-ground-robot-teleop/default.nix +++ b/distros/noetic/rqt-ground-robot-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-ground-robot-teleop"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/noetic/rqt_ground_robot_teleop/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "dea8cd9bf3da1bf7f9539c1a63583fdf546cfac5e55133bdda90a9dd5d21e28d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/noetic/rqt_ground_robot_teleop/1.4.2-1"; + sha256 = "sha256-Mh+pl6nPn/3hpX30+tLYOcf+iy/yacJai5LqX/PxzJ0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-gui-cpp/default.nix b/distros/noetic/rqt-gui-cpp/default.nix index 5aa25a8c0d..67b2275e31 100644 --- a/distros/noetic/rqt-gui-cpp/default.nix +++ b/distros/noetic/rqt-gui-cpp/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, nodelet, qt-gui, qt-gui-cpp, qt5, roscpp }: +{ lib, buildRosPackage, fetchurl, catkin, nodelet, qt-gui, qt-gui-cpp, qt5, roscpp, python3Packages }: buildRosPackage { pname = "ros-noetic-rqt-gui-cpp"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/noetic/rqt_gui_cpp/0.5.3-1"; + sha256 = "sha256-Hl+GO6Vq4ftYGSyn94lV1KawBuiGB64zHZrLLScicZU="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; - propagatedBuildInputs = [ nodelet qt-gui qt-gui-cpp roscpp ]; + propagatedBuildInputs = [ nodelet qt-gui qt-gui-cpp roscpp python3Packages.sip_4 ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-gui-py/default.nix b/distros/noetic/rqt-gui-py/default.nix index 6926c16bdf..845a7249a8 100644 --- a/distros/noetic/rqt-gui-py/default.nix +++ b/distros/noetic/rqt-gui-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-gui-py"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/noetic/rqt_gui_py/0.5.3-1"; + sha256 = "sha256-Ksq1yik3Jt0JLGM80wZl24uw4J3wbQP22KFbBZtdHKU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-gui/default.nix b/distros/noetic/rqt-gui/default.nix index 7edc440340..bd38b48de2 100644 --- a/distros/noetic/rqt-gui/default.nix +++ b/distros/noetic/rqt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-gui"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/noetic/rqt_gui/0.5.3-1"; + sha256 = "sha256-8LWZVobGPDEMsp45yFGHB6JfoYe57ROlArBVzSk4oa4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-human-radar/default.nix b/distros/noetic/rqt-human-radar/default.nix index a37acae071..71673ed1ad 100644 --- a/distros/noetic/rqt-human-radar/default.nix +++ b/distros/noetic/rqt-human-radar/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-human-radar"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros4hri/rqt_human_radar-release/archive/release/noetic/rqt_human_radar/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "6a0e5059377c856f35ce5eeb0fb1338ea03e1b31c1ff47fbbaffe843f0df913a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros4hri"; + repo = "rqt_human_radar-release"; + rev = "release/noetic/rqt_human_radar/0.2.1-1"; + sha256 = "sha256-5u+Sf9AsOhFqY5yX9XvyugIk/Ap36wrPgfvK5MkXK58="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp ]; diff --git a/distros/noetic/rqt-image-view/default.nix b/distros/noetic/rqt-image-view/default.nix index 231002de7e..f49d4e539b 100644 --- a/distros/noetic/rqt-image-view/default.nix +++ b/distros/noetic/rqt-image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-image-view"; version = "0.4.16-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_image_view-release/archive/release/noetic/rqt_image_view/0.4.16-1.tar.gz"; - name = "0.4.16-1.tar.gz"; - sha256 = "2c977aaa2f825ace4f70b8514c6b581f9a5023256d9f72ae18ee97484fbdc20e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_image_view-release"; + rev = "release/noetic/rqt_image_view/0.4.16-1"; + sha256 = "sha256-FKgLVFXZvlgp1PGBEGqCdSD3scc7Re70ViuSVMNBfbA="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/noetic/rqt-joint-trajectory-controller/default.nix b/distros/noetic/rqt-joint-trajectory-controller/default.nix index 51bbe532a2..d37587d286 100644 --- a/distros/noetic/rqt-joint-trajectory-controller/default.nix +++ b/distros/noetic/rqt-joint-trajectory-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, control-msgs, controller-manager-msgs, python-qt-binding, python3Packages, qt-gui, rospy, rqt-gui, rqt-gui-py, trajectory-msgs }: buildRosPackage { pname = "ros-noetic-rqt-joint-trajectory-controller"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/rqt_joint_trajectory_controller/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "65cb9aa90ba30ef7f1503bb92679652a08936e4b448f2dd4507a6f2f38c23970"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/rqt_joint_trajectory_controller/0.21.1-1"; + sha256 = "sha256-FDHWjooZIoUrRNYfpqRGxcWUlSB0YbCEho24NrUvrwU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-launch/default.nix b/distros/noetic/rqt-launch/default.nix index e18d04388c..9222b1972f 100644 --- a/distros/noetic/rqt-launch/default.nix +++ b/distros/noetic/rqt-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-launch"; version = "0.4.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_launch-release/archive/release/noetic/rqt_launch/0.4.9-1.tar.gz"; - name = "0.4.9-1.tar.gz"; - sha256 = "0ceffc4030539f905537cbca95f87106c35c838aa3742418bfcac5020a2cc303"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_launch-release"; + rev = "release/noetic/rqt_launch/0.4.9-1"; + sha256 = "sha256-bI2WbkDwnD7Po2XjILoHUCnHjcqZD/B73BsPyLBta8A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-logger-level/default.nix b/distros/noetic/rqt-logger-level/default.nix index a239270802..21f67f76f5 100644 --- a/distros/noetic/rqt-logger-level/default.nix +++ b/distros/noetic/rqt-logger-level/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-logger-level"; version = "0.4.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_logger_level-release/archive/release/noetic/rqt_logger_level/0.4.11-1.tar.gz"; - name = "0.4.11-1.tar.gz"; - sha256 = "4048c4d54ffe875a97ad927ce8b00658a17ea685624dcd0fb6a62b4106dd8ea3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_logger_level-release"; + rev = "release/noetic/rqt_logger_level/0.4.11-1"; + sha256 = "sha256-e8Fr+N0QJcC3uUE5QO2HqL8VgqgIipSH0nkAKr9hGxU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-moveit/default.nix b/distros/noetic/rqt-moveit/default.nix index 7c6fe7d434..1fc3c03afb 100644 --- a/distros/noetic/rqt-moveit/default.nix +++ b/distros/noetic/rqt-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-moveit"; version = "0.5.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_moveit-release/archive/release/noetic/rqt_moveit/0.5.10-1.tar.gz"; - name = "0.5.10-1.tar.gz"; - sha256 = "6c481788f1737b83c47f4696dbaf2202b1305cdb206c9b73778028c3199c4a94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_moveit-release"; + rev = "release/noetic/rqt_moveit/0.5.10-1"; + sha256 = "sha256-zv684ywE1qfK6bcCDcHiNNkC1u18EpLfbC+LxBp2T8Q="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/rqt-msg/default.nix b/distros/noetic/rqt-msg/default.nix index 790197b58e..03cb296350 100644 --- a/distros/noetic/rqt-msg/default.nix +++ b/distros/noetic/rqt-msg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-msg"; version = "0.4.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_msg-release/archive/release/noetic/rqt_msg/0.4.10-1.tar.gz"; - name = "0.4.10-1.tar.gz"; - sha256 = "a9afbaff68d9f0ffa209152355c1511010b312e04d7c8244068f460f165b9f9c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_msg-release"; + rev = "release/noetic/rqt_msg/0.4.10-1"; + sha256 = "sha256-yX7pn/QPWdoo6xHv+7VcgVS5vnjMRYZWiqyuuImm2n4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-multiplot/default.nix b/distros/noetic/rqt-multiplot/default.nix index 3a8ee42a83..bb7316d5ca 100644 --- a/distros/noetic/rqt-multiplot/default.nix +++ b/distros/noetic/rqt-multiplot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-multiplot"; version = "0.0.12-r1"; - src = fetchurl { - url = "https://github.com/anybotics/rqt_multiplot_plugin-release/archive/release/noetic/rqt_multiplot/0.0.12-1.tar.gz"; - name = "0.0.12-1.tar.gz"; - sha256 = "586639723a44f5e5665a45b7acdf77ffbffff04a89256364a67668ed626430ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "rqt_multiplot_plugin-release"; + rev = "release/noetic/rqt_multiplot/0.0.12-1"; + sha256 = "sha256-mFfm63RJfKH7mtT9+C+r55pnjFjLulsU81aBQS6Tfe4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-nav-view/default.nix b/distros/noetic/rqt-nav-view/default.nix index 4f7b3165cf..4bbbd5d21e 100644 --- a/distros/noetic/rqt-nav-view/default.nix +++ b/distros/noetic/rqt-nav-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-nav-view"; version = "0.5.7-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_nav_view-release/archive/release/noetic/rqt_nav_view/0.5.7-1.tar.gz"; - name = "0.5.7-1.tar.gz"; - sha256 = "3538b12e4b1b84a695aeb703b71b249ec02f42961c7d0eeb43399fce5defffcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_nav_view-release"; + rev = "release/noetic/rqt_nav_view/0.5.7-1"; + sha256 = "sha256-EP33l2lVCEe3AF/jxTwus9WHpxFk1R3awJ02+OEjINo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-plot/default.nix b/distros/noetic/rqt-plot/default.nix index c84c444926..8b60ab6603 100644 --- a/distros/noetic/rqt-plot/default.nix +++ b/distros/noetic/rqt-plot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-plot"; version = "0.4.13-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_plot-release/archive/release/noetic/rqt_plot/0.4.13-2.tar.gz"; - name = "0.4.13-2.tar.gz"; - sha256 = "f39e892b46c2c4997bababc291468d8da129d8d766a55a0875bf13ff6ffb98ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_plot-release"; + rev = "release/noetic/rqt_plot/0.4.13-2"; + sha256 = "sha256-xIn09V9PwNShI6KR00H6ZDx7hdH+sXys0gzs1Y4WSnc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-pose-view/default.nix b/distros/noetic/rqt-pose-view/default.nix index 908ec9e705..4995576599 100644 --- a/distros/noetic/rqt-pose-view/default.nix +++ b/distros/noetic/rqt-pose-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-pose-view"; version = "0.5.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_pose_view-release/archive/release/noetic/rqt_pose_view/0.5.11-1.tar.gz"; - name = "0.5.11-1.tar.gz"; - sha256 = "cf7dbeba319b1a3b934ea9e89457dbe292d07e7fb7a01946adb802eb232acb61"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_pose_view-release"; + rev = "release/noetic/rqt_pose_view/0.5.11-1"; + sha256 = "sha256-+peOXjaIt02xZwc8iHNQY7Ur4XIhOIJJiPPZqSvWvVU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-pr2-dashboard/default.nix b/distros/noetic/rqt-pr2-dashboard/default.nix index 6ec98ea9c3..dca21eb218 100644 --- a/distros/noetic/rqt-pr2-dashboard/default.nix +++ b/distros/noetic/rqt-pr2-dashboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-pr2-dashboard"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_pr2_dashboard-release/archive/release/noetic/rqt_pr2_dashboard/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "51ae20c665634bb53dd74bf1400a74c2727e144e4d2574062bebaf3edf012d18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_pr2_dashboard-release"; + rev = "release/noetic/rqt_pr2_dashboard/0.4.0-1"; + sha256 = "sha256-zPKMdCWuTn0LrWu9TZO3nPC5SBl9nwtUcCtHkPmGdTo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-publisher/default.nix b/distros/noetic/rqt-publisher/default.nix index cf43984d36..2d9485dbe6 100644 --- a/distros/noetic/rqt-publisher/default.nix +++ b/distros/noetic/rqt-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-publisher"; version = "0.4.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_publisher-release/archive/release/noetic/rqt_publisher/0.4.10-1.tar.gz"; - name = "0.4.10-1.tar.gz"; - sha256 = "5cbe23d13ab2d2c4286bb3e6d6b2e56396845732c3bf6574e6a129cedc642c07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_publisher-release"; + rev = "release/noetic/rqt_publisher/0.4.10-1"; + sha256 = "sha256-t2UPwH9TS2oRt7n6bkyJY/V9sjaB8TpzxaQDRbu5vs4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-py-common/default.nix b/distros/noetic/rqt-py-common/default.nix index d4ffccccd8..2d92ad407e 100644 --- a/distros/noetic/rqt-py-common/default.nix +++ b/distros/noetic/rqt-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-py-common"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/noetic/rqt_py_common/0.5.3-1"; + sha256 = "sha256-8VsM0C1qh8bIekBZ2gF0gKD3CEHSbvKN31JXUPoRnqo="; + }; buildType = "catkin"; buildInputs = [ catkin genmsg std-msgs ]; diff --git a/distros/noetic/rqt-py-console/default.nix b/distros/noetic/rqt-py-console/default.nix index 4d27940e9f..975051bb0d 100644 --- a/distros/noetic/rqt-py-console/default.nix +++ b/distros/noetic/rqt-py-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-py-console"; version = "0.4.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_py_console-release/archive/release/noetic/rqt_py_console/0.4.10-1.tar.gz"; - name = "0.4.10-1.tar.gz"; - sha256 = "daf9be587966164b916b8a33de9d10d4e78db010228c6fc50ee63f511190874c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_py_console-release"; + rev = "release/noetic/rqt_py_console/0.4.10-1"; + sha256 = "sha256-RdwBBkLlvONSWAyUNQ3qC4/qbu4bEy4shUM7Pie9qUc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-py-trees/default.nix b/distros/noetic/rqt-py-trees/default.nix index b3a801641f..5290967be5 100644 --- a/distros/noetic/rqt-py-trees/default.nix +++ b/distros/noetic/rqt-py-trees/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-py-trees"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/stonier/rqt_py_trees-release/archive/release/noetic/rqt_py_trees/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "4a243cfcf715beaf4d54717872166e67638d4da8530c1eeda1d78e6046619a79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stonier"; + repo = "rqt_py_trees-release"; + rev = "release/noetic/rqt_py_trees/0.4.1-1"; + sha256 = "sha256-YiO1UCtrfRxzegZUahIeeRchXp4WSl0/K3JQihud3Yg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-reconfigure/default.nix b/distros/noetic/rqt-reconfigure/default.nix index 3ab25d488a..d3592fc6a4 100644 --- a/distros/noetic/rqt-reconfigure/default.nix +++ b/distros/noetic/rqt-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-reconfigure"; version = "0.5.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_reconfigure-release/archive/release/noetic/rqt_reconfigure/0.5.5-1.tar.gz"; - name = "0.5.5-1.tar.gz"; - sha256 = "95c072cfd3f2b997083601645e510482b268af1aabb4b0163e697a3cc15a4d94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_reconfigure-release"; + rev = "release/noetic/rqt_reconfigure/0.5.5-1"; + sha256 = "sha256-LVm8RIrhE42jJbfXVhCP3Lz1aGO6J2JaUcNNXZGWGjE="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools roslint ]; diff --git a/distros/noetic/rqt-robot-dashboard/default.nix b/distros/noetic/rqt-robot-dashboard/default.nix index 68f92ff0a8..c849c86585 100644 --- a/distros/noetic/rqt-robot-dashboard/default.nix +++ b/distros/noetic/rqt-robot-dashboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-robot-dashboard"; version = "0.5.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_dashboard-release/archive/release/noetic/rqt_robot_dashboard/0.5.8-1.tar.gz"; - name = "0.5.8-1.tar.gz"; - sha256 = "0f6a57bad9cf5b6fdbbbe7d44fe44dbaf76f8bee2fa096853e029d5a44eba462"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_dashboard-release"; + rev = "release/noetic/rqt_robot_dashboard/0.5.8-1"; + sha256 = "sha256-7ODq7+DY24KZx+EHjrLT1m9eDaiaaN1cFpIMUk5tjnY="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/rqt-robot-monitor/default.nix b/distros/noetic/rqt-robot-monitor/default.nix index 53ac33ae24..9da3108890 100644 --- a/distros/noetic/rqt-robot-monitor/default.nix +++ b/distros/noetic/rqt-robot-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-robot-monitor"; 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.14-1.tar.gz"; - name = "0.5.14-1.tar.gz"; - sha256 = "2b6ea56c5b17fae4955f5ea8061adc9991715efe202a8dcb347442aad4bab6b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_monitor-release"; + rev = "release/noetic/rqt_robot_monitor/0.5.14-1"; + sha256 = "sha256-o8UcpdECMCBChTb200sHsZlrF6SZPkZOZPyqcllFVq4="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/rqt-robot-plugins/default.nix b/distros/noetic/rqt-robot-plugins/default.nix index 52753c10b1..0201426255 100644 --- a/distros/noetic/rqt-robot-plugins/default.nix +++ b/distros/noetic/rqt-robot-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-robot-plugins"; version = "0.5.8-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_plugins-release/archive/release/noetic/rqt_robot_plugins/0.5.8-1.tar.gz"; - name = "0.5.8-1.tar.gz"; - sha256 = "fc3aca0bc6a83c2a629f63f455560aa30b042ffec05c85f273fc24ce3fbb0af2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_plugins-release"; + rev = "release/noetic/rqt_robot_plugins/0.5.8-1"; + sha256 = "sha256-vNlRRUEoWL6SyMJAKWHEdfJxljAwun79XpffeOa5XZs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-robot-steering/default.nix b/distros/noetic/rqt-robot-steering/default.nix index dbcd1f6263..d9d3a6bbec 100644 --- a/distros/noetic/rqt-robot-steering/default.nix +++ b/distros/noetic/rqt-robot-steering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-robot-steering"; version = "0.5.12-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_steering-release/archive/release/noetic/rqt_robot_steering/0.5.12-1.tar.gz"; - name = "0.5.12-1.tar.gz"; - sha256 = "6cb57401673fd0d5d16dcead9fc27e2820d55760883578afc4b7dccb857b5d1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_robot_steering-release"; + rev = "release/noetic/rqt_robot_steering/0.5.12-1"; + sha256 = "sha256-NIDQg6taxI/BcxQUfxYJU/HgQqiKCW2iiVSRhURGd3k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-rosmon/default.nix b/distros/noetic/rqt-rosmon/default.nix index e96da41735..319b9691d8 100644 --- a/distros/noetic/rqt-rosmon/default.nix +++ b/distros/noetic/rqt-rosmon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-rosmon"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/xqms/rosmon-release/archive/release/noetic/rqt_rosmon/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "a396f55c22efecbad5499a7feae65489435d1f093c364a6c577fde1fb34d768f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "xqms"; + repo = "rosmon-release"; + rev = "release/noetic/rqt_rosmon/2.4.0-1"; + sha256 = "sha256-MtQbMc9qsOOZSyNO8sDq3Xl6yHnt/EiV+5wwP6L8Dvs="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/noetic/rqt-runtime-monitor/default.nix b/distros/noetic/rqt-runtime-monitor/default.nix index 8c7b82b54b..7d5467caff 100644 --- a/distros/noetic/rqt-runtime-monitor/default.nix +++ b/distros/noetic/rqt-runtime-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-runtime-monitor"; version = "0.5.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_runtime_monitor-release/archive/release/noetic/rqt_runtime_monitor/0.5.9-1.tar.gz"; - name = "0.5.9-1.tar.gz"; - sha256 = "237206b6bdd8850ce375e7900125b5864646556a68acb107989624cefc5c0d33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_runtime_monitor-release"; + rev = "release/noetic/rqt_runtime_monitor/0.5.9-1"; + sha256 = "sha256-ZlrGaqhPj+H1umIfpqqoYNgsribVuXm5r9TS0Sk1t8s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-rviz/default.nix b/distros/noetic/rqt-rviz/default.nix index 43b3a373e7..e664255053 100644 --- a/distros/noetic/rqt-rviz/default.nix +++ b/distros/noetic/rqt-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-rviz"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_rviz-release/archive/release/noetic/rqt_rviz/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "a654c09013c36efb408a635700dbd62bf8c37da8f9a5c53aaefe790a49fc7ad7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_rviz-release"; + rev = "release/noetic/rqt_rviz/0.7.0-1"; + sha256 = "sha256-cLQ60gEfaxRNz4XGfHoKBMRaEmfD13y6zMBL7bUv84c="; + }; buildType = "catkin"; buildInputs = [ catkin class-loader qt5.qtbase ]; diff --git a/distros/noetic/rqt-service-caller/default.nix b/distros/noetic/rqt-service-caller/default.nix index 39430e8d5b..18523e1a7f 100644 --- a/distros/noetic/rqt-service-caller/default.nix +++ b/distros/noetic/rqt-service-caller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-service-caller"; version = "0.4.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_service_caller-release/archive/release/noetic/rqt_service_caller/0.4.10-1.tar.gz"; - name = "0.4.10-1.tar.gz"; - sha256 = "dbf87bc996e161a0512b4f0627caa1d66ae00bfcbf28ef8ab6fa58de2fa4d9f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_service_caller-release"; + rev = "release/noetic/rqt_service_caller/0.4.10-1"; + sha256 = "sha256-hVR2qSpIxN/uQxteI8s732r1j24WtGIYG7T8UkeJ8gI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-shell/default.nix b/distros/noetic/rqt-shell/default.nix index 897cd166aa..3aff7576a6 100644 --- a/distros/noetic/rqt-shell/default.nix +++ b/distros/noetic/rqt-shell/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-shell"; version = "0.4.11-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_shell-release/archive/release/noetic/rqt_shell/0.4.11-1.tar.gz"; - name = "0.4.11-1.tar.gz"; - sha256 = "b61beef13cb61b57d09f257d91316a884927a9fba44ac4c8b156f54d91e280c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_shell-release"; + rev = "release/noetic/rqt_shell/0.4.11-1"; + sha256 = "sha256-LsaTq+q79TACj9xLoxhdQ4lVtMdpWG6SJILUvfIxDB0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-srv/default.nix b/distros/noetic/rqt-srv/default.nix index a7128e6822..cc18396be9 100644 --- a/distros/noetic/rqt-srv/default.nix +++ b/distros/noetic/rqt-srv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-srv"; version = "0.4.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_srv-release/archive/release/noetic/rqt_srv/0.4.9-1.tar.gz"; - name = "0.4.9-1.tar.gz"; - sha256 = "a6bf6dba3326ed7d75d4f4ac1cedb2e162714721b7bba6141bf27dea2086ebcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_srv-release"; + rev = "release/noetic/rqt_srv/0.4.9-1"; + sha256 = "sha256-/AtH/gBQ0F4EW7o/1m5/tLaqnnx6smzUEImR9KR1HbQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-tf-tree/default.nix b/distros/noetic/rqt-tf-tree/default.nix index 1c13a0f1d7..f81f2b5751 100644 --- a/distros/noetic/rqt-tf-tree/default.nix +++ b/distros/noetic/rqt-tf-tree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-tf-tree"; version = "0.6.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_tf_tree-release/archive/release/noetic/rqt_tf_tree/0.6.3-1.tar.gz"; - name = "0.6.3-1.tar.gz"; - sha256 = "5f07d027e135ff74636fc97216b666aa0ee16aa5f10cd631db1f2226496bb351"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_tf_tree-release"; + rev = "release/noetic/rqt_tf_tree/0.6.3-1"; + sha256 = "sha256-XNVmfDdNCiQhMUFoMSPj8yL/PZ1qV1SSkDRYbjDosSs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-top/default.nix b/distros/noetic/rqt-top/default.nix index 5394a14239..e30880e1e7 100644 --- a/distros/noetic/rqt-top/default.nix +++ b/distros/noetic/rqt-top/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-top"; version = "0.4.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_top-release/archive/release/noetic/rqt_top/0.4.10-1.tar.gz"; - name = "0.4.10-1.tar.gz"; - sha256 = "4bc9f4bfb79ee30f00faf53fc48c2914c179c51782dab97d625a07d5834d7a2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_top-release"; + rev = "release/noetic/rqt_top/0.4.10-1"; + sha256 = "sha256-qhm2j1IxfWIvPK3LQKKtAswufZn33XUy+Cleupta/PY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-topic/default.nix b/distros/noetic/rqt-topic/default.nix index b3ed3fc443..81645af3b5 100644 --- a/distros/noetic/rqt-topic/default.nix +++ b/distros/noetic/rqt-topic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-topic"; version = "0.4.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_topic-release/archive/release/noetic/rqt_topic/0.4.13-1.tar.gz"; - name = "0.4.13-1.tar.gz"; - sha256 = "71b19f1b04cac8826e67b6cea1759cd4ede002eadbfeae9421a675e1bcdba30e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_topic-release"; + rev = "release/noetic/rqt_topic/0.4.13-1"; + sha256 = "sha256-NuRWT7IJ9id+F/xAWLnvtCRG81xXPLRrTfN+O3anFcw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt-web/default.nix b/distros/noetic/rqt-web/default.nix index 5bf37ce46c..e7f868da0f 100644 --- a/distros/noetic/rqt-web/default.nix +++ b/distros/noetic/rqt-web/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt-web"; version = "0.4.10-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/rqt_web-release/archive/release/noetic/rqt_web/0.4.10-1.tar.gz"; - name = "0.4.10-1.tar.gz"; - sha256 = "ab966db5d643bc5912b5f915bd2849ea8d4563b59f44bff9cd25c42ecba61e8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt_web-release"; + rev = "release/noetic/rqt_web/0.4.10-1"; + sha256 = "sha256-b09Uu4YIDZKI4rBfOc8swi6+TaycJ+pR1qOVYk3R6uo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rqt/default.nix b/distros/noetic/rqt/default.nix index 30d0969cc8..2c69c51ab4 100644 --- a/distros/noetic/rqt/default.nix +++ b/distros/noetic/rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rqt"; version = "0.5.3-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rqt-release"; + rev = "release/noetic/rqt/0.5.3-1"; + sha256 = "sha256-Upv5EmuQw6GsKPsr7camVEb/mzP1vbLGQnYCULJTNu4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rslidar-sdk/default.nix b/distros/noetic/rslidar-sdk/default.nix index 1844f35ab6..a7654797df 100644 --- a/distros/noetic/rslidar-sdk/default.nix +++ b/distros/noetic/rslidar-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rslidar-sdk"; version = "1.3.2-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rslidar_sdk-release"; + rev = "release/noetic/rslidar_sdk/1.3.2-1"; + sha256 = "sha256-yGHvc+4i7wsj0xeGZogVgtx8WabkvbAba8FP36REx4s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rt-usb-9axisimu-driver/default.nix b/distros/noetic/rt-usb-9axisimu-driver/default.nix index 25cc268934..a7d46f1797 100644 --- a/distros/noetic/rt-usb-9axisimu-driver/default.nix +++ b/distros/noetic/rt-usb-9axisimu-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rt-usb-9axisimu-driver"; version = "1.0.1-r5"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_usb_9axisimu_driver-release/archive/release/noetic/rt_usb_9axisimu_driver/1.0.1-5.tar.gz"; - name = "1.0.1-5.tar.gz"; - sha256 = "18b1d1c114243756552695909060583ac71c177427b9a4701cb4dadf16557f8f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_usb_9axisimu_driver-release"; + rev = "release/noetic/rt_usb_9axisimu_driver/1.0.1-5"; + sha256 = "sha256-Mq8KbH32cTlyZtFtTyi+RLSQXhupXHtrsjeItyRVA+8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rtabmap-ros/default.nix b/distros/noetic/rtabmap-ros/default.nix index 27a4baeb39..41221ac78c 100644 --- a/distros/noetic/rtabmap-ros/default.nix +++ b/distros/noetic/rtabmap-ros/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, apriltag-ros, catkin, class-loader, compressed-depth-image-transport, compressed-image-transport, costmap-2d, cv-bridge, dynamic-reconfigure, eigen-conversions, find-object-2d, genmsg, geometry-msgs, image-geometry, image-transport, laser-geometry, message-filters, message-generation, message-runtime, move-base-msgs, nav-msgs, nodelet, octomap-msgs, pcl, pcl-conversions, pcl-ros, pluginlib, roscpp, rosgraph-msgs, rospy, rtabmap, rviz, sensor-msgs, std-msgs, std-srvs, stereo-msgs, tf, tf-conversions, tf2-ros, theora-image-transport, visualization-msgs }: buildRosPackage { pname = "ros-noetic-rtabmap-ros"; - version = "0.20.22-r1"; + version = "0.20.23-r1"; - src = fetchurl { - url = "https://github.com/introlab/rtabmap_ros-release/archive/release/noetic/rtabmap_ros/0.20.22-1.tar.gz"; - name = "0.20.22-1.tar.gz"; - sha256 = "1922d8de7460bdcb8a073595f28c50e3be3fae773e41061d5e03a706996751b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "rtabmap_ros-release"; + rev = "release/noetic/rtabmap_ros/0.20.23-1"; + sha256 = "sha256-skW9aDVspz9Qh/TpYw82zCOOhwDHLZdjvnjfTdL40xk="; + }; buildType = "catkin"; buildInputs = [ catkin genmsg message-generation pcl ]; diff --git a/distros/noetic/rtcm-msgs/default.nix b/distros/noetic/rtcm-msgs/default.nix index 3b7f482d28..bf51ba0b94 100644 --- a/distros/noetic/rtcm-msgs/default.nix +++ b/distros/noetic/rtcm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rtcm-msgs"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rtcm_msgs-release/archive/release/noetic/rtcm_msgs/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "e9ba81f5b0d57666b7deaaabe82eec4959267c38725577a603453d5ee9a6e466"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rtcm_msgs-release"; + rev = "release/noetic/rtcm_msgs/1.1.6-1"; + sha256 = "sha256-5yTtIdGostlOwChSlKKL4JivCyK284g0KYZxB6GBtBY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ros-environment ]; diff --git a/distros/noetic/ruckig/default.nix b/distros/noetic/ruckig/default.nix index 26ca12d984..203b1b1270 100644 --- a/distros/noetic/ruckig/default.nix +++ b/distros/noetic/ruckig/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, cmake }: buildRosPackage { pname = "ros-noetic-ruckig"; - version = "0.6.3-r1"; + version = "0.9.2-r1"; - src = fetchurl { - url = "https://github.com/pantor/ruckig-release/archive/release/noetic/ruckig/0.6.3-1.tar.gz"; - name = "0.6.3-1.tar.gz"; - sha256 = "4a2c3b585dc2ec8d9af8c6ae46197e4344f214771c7d55c7c7fb3faca8690329"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pantor"; + repo = "ruckig-release"; + rev = "release/noetic/ruckig/0.9.2-1"; + sha256 = "sha256-xzv0PejVB2frTXtd7fnF72E49MOQaARx6boGHYzyVnQ="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/rviz-animated-view-controller/default.nix b/distros/noetic/rviz-animated-view-controller/default.nix index 8940ba37ae..aefa0329d5 100644 --- a/distros/noetic/rviz-animated-view-controller/default.nix +++ b/distros/noetic/rviz-animated-view-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rviz-animated-view-controller"; version = "0.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros-gbp/rviz_animated_view_controller-release/archive/release/noetic/rviz_animated_view_controller/0.2.0-2.tar.gz"; - name = "0.2.0-2.tar.gz"; - sha256 = "0e034b66239818b2e641e61653fa7b17ce61e191868b0c2e7fe4b84b917ebf9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rviz_animated_view_controller-release"; + rev = "release/noetic/rviz_animated_view_controller/0.2.0-2"; + sha256 = "sha256-oqcLyN8xVxsRPPHmsFMY8KPUdI/mhY1Fkf4/VJXbcok="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rviz-imu-plugin/default.nix b/distros/noetic/rviz-imu-plugin/default.nix index 9b1a999104..d2fd35f12f 100644 --- a/distros/noetic/rviz-imu-plugin/default.nix +++ b/distros/noetic/rviz-imu-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rviz-imu-plugin"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/imu_tools-release/archive/release/noetic/rviz_imu_plugin/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "3897796fc2ba1be442d6a350bf5257ffc679ff5b1f586f6bd48d0aba352ce40e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "imu_tools-release"; + rev = "release/noetic/rviz_imu_plugin/1.2.5-1"; + sha256 = "sha256-x3MyWvIgNSMw0++PQ3gxYa5ZNrzi/Om/5D9vJxtckR4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rviz-plugin-tutorials/default.nix b/distros/noetic/rviz-plugin-tutorials/default.nix index d82dd6050f..4f05c223ba 100644 --- a/distros/noetic/rviz-plugin-tutorials/default.nix +++ b/distros/noetic/rviz-plugin-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rviz-plugin-tutorials"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/noetic/rviz_plugin_tutorials/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "2a8d6d52961928fd5da2cf8203bfbf658ec2df5df6f9ec3c0f055a4358f05e0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/noetic/rviz_plugin_tutorials/0.11.0-1"; + sha256 = "sha256-Vrel7RKeq38VGos5sDdb9GG/Gf5kFFBgWwcD9h9P9PQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rviz-python-tutorial/default.nix b/distros/noetic/rviz-python-tutorial/default.nix index b68eb898d8..2d81678781 100644 --- a/distros/noetic/rviz-python-tutorial/default.nix +++ b/distros/noetic/rviz-python-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rviz-python-tutorial"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/noetic/rviz_python_tutorial/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "a6973338e5b84132cb2d445288ec8c6d84b81964c28e72be3c7010379e8ea599"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/noetic/rviz_python_tutorial/0.11.0-1"; + sha256 = "sha256-UH/hwXMVwHH4qHLwrTjZcPS0Jc0j2eFSwbEepBXPRk4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rviz-satellite/default.nix b/distros/noetic/rviz-satellite/default.nix index 62b02f957c..3403a88c78 100644 --- a/distros/noetic/rviz-satellite/default.nix +++ b/distros/noetic/rviz-satellite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rviz-satellite"; version = "3.0.3-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rviz_satellite-release/archive/release/noetic/rviz_satellite/3.0.3-1.tar.gz"; - name = "3.0.3-1.tar.gz"; - sha256 = "2a3606866be36b75ef6412e20b4a552227d4b6afb4593f4f3d745f1611e41d20"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rviz_satellite-release"; + rev = "release/noetic/rviz_satellite/3.0.3-1"; + sha256 = "sha256-AbKv0N1s6yyvavo96nAiT0AwSX84iN8hU8hg9/2DsIM="; + }; buildType = "catkin"; buildInputs = [ catkin qt5.qtbase ]; diff --git a/distros/noetic/rviz-tool-cursor/default.nix b/distros/noetic/rviz-tool-cursor/default.nix new file mode 100644 index 0000000000..ed8392cb46 --- /dev/null +++ b/distros/noetic/rviz-tool-cursor/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, eigen, pluginlib, qt5, rviz }: +buildRosPackage { + pname = "ros-noetic-rviz-tool-cursor"; + version = "1.0.1-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "rviz_tool_cursor"; + rev = "release/noetic/rviz_tool_cursor/1.0.1-1"; + sha256 = "sha256-3J+tQLxNpmwmXDcYz4KlSLu2iOIZJP6VPVzhXXagDrk="; + }; + + buildType = "catkin"; + buildInputs = [ catkin eigen ]; + propagatedBuildInputs = [ pluginlib qt5.qtbase rviz ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''The rviz_tool_cursor package''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/noetic/rviz-tool-path-display/default.nix b/distros/noetic/rviz-tool-path-display/default.nix new file mode 100644 index 0000000000..8ff88756cd --- /dev/null +++ b/distros/noetic/rviz-tool-path-display/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, pluginlib, qt5, rviz }: +buildRosPackage { + pname = "ros-noetic-rviz-tool-path-display"; + version = "0.1.1-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "rviz_tool_path_display-release"; + rev = "release/noetic/rviz_tool_path_display/0.1.1-1"; + sha256 = "sha256-3DeKRG+z0+0iPbTRTX+EROVSIFAnjBib/znOeEiEG0U="; + }; + + buildType = "catkin"; + buildInputs = [ catkin ]; + propagatedBuildInputs = [ pluginlib qt5.qtbase rviz ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''The rviz_tool_path_display package''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/noetic/rviz-visual-tools/default.nix b/distros/noetic/rviz-visual-tools/default.nix index ffb8cb6f47..0f9585e64e 100644 --- a/distros/noetic/rviz-visual-tools/default.nix +++ b/distros/noetic/rviz-visual-tools/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, eigen-stl-containers, geometry-msgs, graph-msgs, interactive-markers, ogre1_9, qt5, roscpp, roslint, rostest, rosunit, rviz, sensor-msgs, shape-msgs, std-msgs, tf2-eigen, tf2-geometry-msgs, tf2-ros, trajectory-msgs, visualization-msgs }: buildRosPackage { pname = "ros-noetic-rviz-visual-tools"; - version = "3.9.2-r1"; + version = "3.9.3-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/rviz_visual_tools-release/archive/release/noetic/rviz_visual_tools/3.9.2-1.tar.gz"; - name = "3.9.2-1.tar.gz"; - sha256 = "101b764ae0c147d70ab9358db2e89412429794426dc3b8904e1e2fd18fd159db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "rviz_visual_tools-release"; + rev = "release/noetic/rviz_visual_tools/3.9.3-1"; + sha256 = "sha256-SZuYn7IFxXKc3xah/ksL8v0l3CZCrHBwdvshYcHevcA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rviz/default.nix b/distros/noetic/rviz/default.nix index 1f2ef2278e..03d14fa801 100644 --- a/distros/noetic/rviz/default.nix +++ b/distros/noetic/rviz/default.nix @@ -2,25 +2,37 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, assimp, catkin, cmake-modules, eigen, geometry-msgs, image-transport, interactive-markers, laser-geometry, libGL, libGLU, libyamlcpp, map-msgs, media-export, message-filters, message-generation, message-runtime, nav-msgs, ogre1_9, pluginlib, python-qt-binding, qt5, resource-retriever, rosconsole, roscpp, roslib, rospy, rostest, rosunit, sensor-msgs, std-msgs, std-srvs, tf2-geometry-msgs, tf2-ros, tinyxml-2, urdf, urdfdom, urdfdom-headers, visualization-msgs }: -buildRosPackage { - pname = "ros-noetic-rviz"; - version = "1.14.19-r1"; - - src = fetchurl { - url = "https://github.com/ros-gbp/rviz-release/archive/release/noetic/rviz/1.14.19-1.tar.gz"; - name = "1.14.19-1.tar.gz"; - sha256 = "8f59c493ab20bb607a61e49ea37243542a1267b7c9066215602bc5c35d458fad"; - }; - - buildType = "catkin"; - buildInputs = [ catkin cmake-modules eigen message-generation urdfdom urdfdom-headers ]; - checkInputs = [ rostest rosunit ]; - propagatedBuildInputs = [ assimp geometry-msgs image-transport interactive-markers laser-geometry libGL libGLU libyamlcpp map-msgs media-export message-filters message-runtime nav-msgs ogre1_9 pluginlib python-qt-binding qt5.qtbase resource-retriever rosconsole roscpp roslib rospy sensor-msgs std-msgs std-srvs tf2-geometry-msgs tf2-ros tinyxml-2 urdf visualization-msgs ]; - nativeBuildInputs = [ catkin ]; - - meta = { - description = ''3D visualization tool for ROS.''; - license = with lib.licenses; [ bsdOriginal "Creative-Commons" ]; - }; -} +{ lib, buildRosPackage, fetchurl, assimp, catkin, cmake-modules, eigen, geometry-msgs, image-transport, interactive-markers, laser-geometry, libGL, libGLU, libyamlcpp, map-msgs, media-export, message-filters, message-generation, message-runtime, nav-msgs, ogre1_9, pluginlib, python-qt-binding, qt5, resource-retriever, rosconsole, roscpp, roslib, rospy, rostest, rosunit, sensor-msgs, std-msgs, std-srvs, tf2-geometry-msgs, tf2-ros, tinyxml-2, urdf, urdfdom, urdfdom-headers, visualization-msgs, python3 }: +let + python = python3.withPackages(python3Packages: [ + python3Packages.sip_4 + python3Packages.pyqt5 + python-qt-binding + qt5.qtbase + ]); +in + buildRosPackage { + pname = "ros-noetic-rviz"; + version = "1.14.19-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "rviz-release"; + rev = "release/noetic/rviz/1.14.19-1"; + sha256 = "sha256-Oi6jSUrbDPDkPW/nl1gKp5np7yk1VofHwzROt8B8mWg="; + }; + + buildType = "catkin"; + buildInputs = [ catkin cmake-modules eigen message-generation urdfdom urdfdom-headers python ]; + checkInputs = [ rostest rosunit ]; + propagatedBuildInputs = [ assimp geometry-msgs image-transport interactive-markers laser-geometry libGL libGLU libyamlcpp map-msgs media-export message-filters message-runtime nav-msgs ogre1_9 pluginlib python-qt-binding qt5.qtbase resource-retriever rosconsole roscpp roslib rospy sensor-msgs std-msgs std-srvs tf2-geometry-msgs tf2-ros tinyxml-2 urdf visualization-msgs python ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''3D visualization tool for ROS.''; + license = with lib.licenses; [ bsdOriginal "Creative-Commons" ]; + }; + } diff --git a/distros/noetic/rwt-app-chooser/default.nix b/distros/noetic/rwt-app-chooser/default.nix index 6ace3c3d5f..8b864b03c6 100644 --- a/distros/noetic/rwt-app-chooser/default.nix +++ b/distros/noetic/rwt-app-chooser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rwt-app-chooser"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/rwt_app_chooser/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "daf177b82d3c801ef0616c58c07e335b08a066620fc468ab40c18e0c5e66b576"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/rwt_app_chooser/0.1.1-2"; + sha256 = "sha256-WegCiatTcX+C3T3XC9o8gs8enU4JrtfrWn3wWqcnMG4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rwt-image-view/default.nix b/distros/noetic/rwt-image-view/default.nix index 196d412529..37d11eb4df 100644 --- a/distros/noetic/rwt-image-view/default.nix +++ b/distros/noetic/rwt-image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rwt-image-view"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/rwt_image_view/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "f1af2a9ea9b22d1bb9f9541f73ce19e714d82d6c0a262d2d13d752c1f4184ab4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/rwt_image_view/0.1.1-2"; + sha256 = "sha256-Acfcnlp8FhvFUgoTH3qeYFvDWi0kpPNoUSkZo7Gbrts="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/rwt-nav/default.nix b/distros/noetic/rwt-nav/default.nix index 11865dd3b0..101009807a 100644 --- a/distros/noetic/rwt-nav/default.nix +++ b/distros/noetic/rwt-nav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rwt-nav"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/rwt_nav/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "f534ff93678ed6450b339fa932c4742d22ea852275bee69dd4f71e872f0a5492"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/rwt_nav/0.1.1-2"; + sha256 = "sha256-k9qDFDmF82YPdc12pyl6h/38aiqrpnfSkVAKCprsZGk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rwt-plot/default.nix b/distros/noetic/rwt-plot/default.nix index 0386551c7c..3f06e0395e 100644 --- a/distros/noetic/rwt-plot/default.nix +++ b/distros/noetic/rwt-plot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rwt-plot"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/rwt_plot/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "9ad07f82adc4a449ddf4e898c31dc1196868c23cf5c47732b4d7418a85e78e64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/rwt_plot/0.1.1-2"; + sha256 = "sha256-Y/zpc6zAB/LdMAzXeTGZocRIipdrybqeWHmmE++gxaA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rwt-robot-monitor/default.nix b/distros/noetic/rwt-robot-monitor/default.nix index af3db6ee1b..5dcef89182 100644 --- a/distros/noetic/rwt-robot-monitor/default.nix +++ b/distros/noetic/rwt-robot-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rwt-robot-monitor"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/rwt_robot_monitor/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "b7c64d784969afd1de6a4a4061f6f32d620a9eece985773e8c5dfbb7d67b215c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/rwt_robot_monitor/0.1.1-2"; + sha256 = "sha256-xl0AxSjKUZXMad+NyE67gjp1XScSYoorn826yWpGBds="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rwt-speech-recognition/default.nix b/distros/noetic/rwt-speech-recognition/default.nix index 4abbfb4907..7034964ba7 100644 --- a/distros/noetic/rwt-speech-recognition/default.nix +++ b/distros/noetic/rwt-speech-recognition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rwt-speech-recognition"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/rwt_speech_recognition/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "b5fdcff1cf76090761045ed4a5321835c0dea1a51fd1ac54e3a48ef71f480e0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/rwt_speech_recognition/0.1.1-2"; + sha256 = "sha256-1AJnTg63O6+0ZwC6Ulw02490i1FYqBbs8aKv1zGO5cs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rwt-steer/default.nix b/distros/noetic/rwt-steer/default.nix index ba1c36c14a..8a62bc2272 100644 --- a/distros/noetic/rwt-steer/default.nix +++ b/distros/noetic/rwt-steer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rwt-steer"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/rwt_steer/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "ef01c5f7b4513522cfaaa9a29a46804879659b020c16643a624e9b6a254bd751"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/rwt_steer/0.1.1-2"; + sha256 = "sha256-ZBqPWxC1EzA1fHOJQwAn5/WWVxjVHYWqeuIiAul0iKg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rwt-utils-3rdparty/default.nix b/distros/noetic/rwt-utils-3rdparty/default.nix index 572e566cb3..2d9c0b6bb3 100644 --- a/distros/noetic/rwt-utils-3rdparty/default.nix +++ b/distros/noetic/rwt-utils-3rdparty/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rwt-utils-3rdparty"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/rwt_utils_3rdparty/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "f3ec7faa0955de68a7bd6bf197af4ff6ff680a69591bcba13617b380ca8b7056"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/rwt_utils_3rdparty/0.1.1-2"; + sha256 = "sha256-PlVplDJ/EAKAUxhoxQRs3L8sbc+XIB3zLS14qk6DZzM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/rx-service-tools/default.nix b/distros/noetic/rx-service-tools/default.nix index 739f01178b..d52439a9a9 100644 --- a/distros/noetic/rx-service-tools/default.nix +++ b/distros/noetic/rx-service-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-rx-service-tools"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rx_service_tools-release/archive/release/noetic/rx_service_tools/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "4bab469592a818690220bfbcee55ee63d3f48b4376bc5bdd088e3d958a9dd61a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rx_service_tools-release"; + rev = "release/noetic/rx_service_tools/1.0.2-1"; + sha256 = "sha256-AvI2p13mSrM75a59AikYEVByVELPM0c/8c+BncqC460="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/safety-limiter-msgs/default.nix b/distros/noetic/safety-limiter-msgs/default.nix index a61cfd6e0f..4254ed97eb 100644 --- a/distros/noetic/safety-limiter-msgs/default.nix +++ b/distros/noetic/safety-limiter-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-safety-limiter-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/noetic/safety_limiter_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "c2d48a00e5386a9f6f6f867c8346fe87d1f738b9190e750c0eb85b2ab7160718"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/noetic/safety_limiter_msgs/0.12.0-1"; + sha256 = "sha256-g35ZIz6QoDjeH6DFPBITZqO4xSuxyVSb1+pcu4o1LHc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/safety-limiter/default.nix b/distros/noetic/safety-limiter/default.nix index b096ee2a8b..4c97be8293 100644 --- a/distros/noetic/safety-limiter/default.nix +++ b/distros/noetic/safety-limiter/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, diagnostic-updater, dynamic-reconfigure, eigen, geometry-msgs, nav-msgs, neonavigation-common, pcl, pcl-conversions, pcl-ros, roscpp, roslint, rostest, safety-limiter-msgs, sensor-msgs, std-msgs, tf2-geometry-msgs, tf2-ros, tf2-sensor-msgs, xmlrpcpp }: buildRosPackage { pname = "ros-noetic-safety-limiter"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/safety_limiter/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "436d52843815d224364857e9c4b261a361d02ead03bc990788a9a97a431cd2a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/safety_limiter/0.12.0-1"; + sha256 = "sha256-i9WvYayzwrPfLkvojqlvs1gAY3ilZNIjzmVJtF03ABI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sainsmart-relay-usb/default.nix b/distros/noetic/sainsmart-relay-usb/default.nix index adc053f4b1..d560cad2f3 100644 --- a/distros/noetic/sainsmart-relay-usb/default.nix +++ b/distros/noetic/sainsmart-relay-usb/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sainsmart-relay-usb"; version = "0.0.4-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/sainsmart_relay_usb-release/archive/release/noetic/sainsmart_relay_usb/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "5c1f7343e76f28546dc20762d166ea06b37a9090c845ade3eef101254c095503"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "sainsmart_relay_usb-release"; + rev = "release/noetic/sainsmart_relay_usb/0.0.4-1"; + sha256 = "sha256-Fzb/XLmZfDK4mzsj7j2KjD62n6l4kVABp14CzMML4Xo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sbg-driver/default.nix b/distros/noetic/sbg-driver/default.nix index fa54646fd7..1bd8ffe18d 100644 --- a/distros/noetic/sbg-driver/default.nix +++ b/distros/noetic/sbg-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sbg-driver"; version = "3.1.1-r7"; - src = fetchurl { - url = "https://github.com/SBG-Systems/sbg_ros_driver-release/archive/release/noetic/sbg_driver/3.1.1-7.tar.gz"; - name = "3.1.1-7.tar.gz"; - sha256 = "4be93a16debf3e9d4a33389e9f9897a43200b94667b286a6a6dca1660de00514"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SBG-Systems"; + repo = "sbg_ros_driver-release"; + rev = "release/noetic/sbg_driver/3.1.1-7"; + sha256 = "sha256-JA2fWJxDT+voGEzlNo8hJF5Dq+vLNn5WPnQDumXPQN0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/sbpl-lattice-planner/default.nix b/distros/noetic/sbpl-lattice-planner/default.nix index 11e184743c..5f3270a659 100644 --- a/distros/noetic/sbpl-lattice-planner/default.nix +++ b/distros/noetic/sbpl-lattice-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sbpl-lattice-planner"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/noetic/sbpl_lattice_planner/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "418218d25809274f917a61e97ac8fedee565b61154fd28e76adb7301b57b4e13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/noetic/sbpl_lattice_planner/0.4.1-1"; + sha256 = "sha256-LCu/QPPISrsm6YOB2QZFlmlRckCldfWUyAvnQvf0wjw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/sbpl-recovery/default.nix b/distros/noetic/sbpl-recovery/default.nix index 1a15cbe5cf..6c27ba2d0d 100644 --- a/distros/noetic/sbpl-recovery/default.nix +++ b/distros/noetic/sbpl-recovery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sbpl-recovery"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/noetic/sbpl_recovery/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "bf115900248cdd509016fd0b15199fb39053ad16859e2d5d1b8156d1d7a2712c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/noetic/sbpl_recovery/0.4.1-1"; + sha256 = "sha256-Ac8w2QX3CHY+2sqXFhnQRcmCYAVgKJIc62mllFFwdno="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sbpl/default.nix b/distros/noetic/sbpl/default.nix index 0f9a475571..f55d2136e6 100644 --- a/distros/noetic/sbpl/default.nix +++ b/distros/noetic/sbpl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sbpl"; version = "1.3.1-r3"; - src = fetchurl { - url = "https://github.com/ros-gbp/sbpl-release/archive/release/noetic/sbpl/1.3.1-3.tar.gz"; - name = "1.3.1-3.tar.gz"; - sha256 = "b9a0c52ebc5d5e5beace383c1fc2be3d1be1596135b3857c7812ebbffde9d706"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "sbpl-release"; + rev = "release/noetic/sbpl/1.3.1-3"; + sha256 = "sha256-cgcPFOXOMnw5oAxDkyMNOhxfemMesoM4xzpW+ZQlqAc="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/scaled-controllers/default.nix b/distros/noetic/scaled-controllers/default.nix index cc58ea0fc2..f541d8c1f3 100644 --- a/distros/noetic/scaled-controllers/default.nix +++ b/distros/noetic/scaled-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-scaled-controllers"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_scaled_controllers-release/archive/release/noetic/scaled_controllers/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "1add0c6dc6c3eb45c4479cd4bc0ee0abf9c73fb7a0e6a2091abf1a046deb1e6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_scaled_controllers-release"; + rev = "release/noetic/scaled_controllers/0.1.0-1"; + sha256 = "sha256-aMcK8c5WS85vYboHV04KmtAEM3bx0yExlt73qAmWd38="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/scaled-joint-trajectory-controller/default.nix b/distros/noetic/scaled-joint-trajectory-controller/default.nix index bd6690c82e..2dfd13e8a0 100644 --- a/distros/noetic/scaled-joint-trajectory-controller/default.nix +++ b/distros/noetic/scaled-joint-trajectory-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-scaled-joint-trajectory-controller"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_scaled_controllers-release/archive/release/noetic/scaled_joint_trajectory_controller/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "7bb6b907dfa16866d5f79b1513ad5efc39ff5ef0c0555ef74cb5b433700bb5a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_scaled_controllers-release"; + rev = "release/noetic/scaled_joint_trajectory_controller/0.1.0-1"; + sha256 = "sha256-YnCM6WrVoaKXHEQeg4iorgy5G+NPAFzOSIiUXPFZbvM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/scan-to-cloud-converter/default.nix b/distros/noetic/scan-to-cloud-converter/default.nix index c934b16b42..65c757ec31 100644 --- a/distros/noetic/scan-to-cloud-converter/default.nix +++ b/distros/noetic/scan-to-cloud-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-scan-to-cloud-converter"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/noetic/scan_to_cloud_converter/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "005fe4afd4fcd083d4dab47ef1cc4d0eb151b02829ae642921eab81068cbe276"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/noetic/scan_to_cloud_converter/0.3.3-1"; + sha256 = "sha256-PbqPH8KR7i6Einlcettf0P73PN7E67K96puohcJPUn4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/scan-tools/default.nix b/distros/noetic/scan-tools/default.nix index e8e7ba8b36..ed2f9a53e7 100644 --- a/distros/noetic/scan-tools/default.nix +++ b/distros/noetic/scan-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-scan-tools"; version = "0.3.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/scan_tools-release/archive/release/noetic/scan_tools/0.3.3-1.tar.gz"; - name = "0.3.3-1.tar.gz"; - sha256 = "31cb07d1a7024f28b127689d2c323ff38b1293cc629dab21f068d706424e3bfa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "scan_tools-release"; + rev = "release/noetic/scan_tools/0.3.3-1"; + sha256 = "sha256-srfyjN+cxm9kXrXUE7QtjRqaF7Ehi8SQ0rmaa04TDZg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/scenario-test-tools/default.nix b/distros/noetic/scenario-test-tools/default.nix index f034a65cde..e80788ee7b 100644 --- a/distros/noetic/scenario-test-tools/default.nix +++ b/distros/noetic/scenario-test-tools/default.nix @@ -5,13 +5,17 @@ { 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.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/scenario_test_tools/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "42aa31678a2331204cb7c62f41c5ed7530a07a942cbe96f97fae790c271655be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/scenario_test_tools/0.6.31-1"; + sha256 = "sha256-3cOKiFKv7cMhcnsIPTGob5B9oSymi5nr0pLbh0zANjY="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/schunk-description/default.nix b/distros/noetic/schunk-description/default.nix index 12202afb25..489a7280d0 100644 --- a/distros/noetic/schunk-description/default.nix +++ b/distros/noetic/schunk-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-schunk-description"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/noetic/schunk_description/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "b5d737097256f33d41fb8b196aca9c0b1121ddf0d50337a1ddfd71f0c283b10f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/noetic/schunk_description/0.6.14-1"; + sha256 = "sha256-MPm9rEUUfG8qh+5ypZoBVfwFsPxdjq1cCcga2Pvc9Ds="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-libm5api/default.nix b/distros/noetic/schunk-libm5api/default.nix index 292315d693..5245ce58a8 100644 --- a/distros/noetic/schunk-libm5api/default.nix +++ b/distros/noetic/schunk-libm5api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-schunk-libm5api"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/noetic/schunk_libm5api/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "e3fad08c1926bc24a510f7801c58b823c8790f8114f06747bbb7b6f3f033ce28"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/noetic/schunk_libm5api/0.6.14-1"; + sha256 = "sha256-eQ+DYSbflkN+8LXihVVjqF9boMNqKhB8p1T69P5R7Do="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-modular-robotics/default.nix b/distros/noetic/schunk-modular-robotics/default.nix index 9418fa233a..34018f163d 100644 --- a/distros/noetic/schunk-modular-robotics/default.nix +++ b/distros/noetic/schunk-modular-robotics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-schunk-modular-robotics"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/noetic/schunk_modular_robotics/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "9ddd2547360ffa6cc22bb481892941d8d8d0acfb8374ca95582bff6a5ba56665"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/noetic/schunk_modular_robotics/0.6.14-1"; + sha256 = "sha256-Z+6LdOA56MdhIkPLmMNsNbeiQ3LYvICqOiwFj7fQdn4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-powercube-chain/default.nix b/distros/noetic/schunk-powercube-chain/default.nix index 5ff84b76ed..71b9d1ff42 100644 --- a/distros/noetic/schunk-powercube-chain/default.nix +++ b/distros/noetic/schunk-powercube-chain/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-schunk-powercube-chain"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/noetic/schunk_powercube_chain/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "e96c4d110b2514e7b1374c5943958f9985714c686b223d494d16db0b06ced4c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/noetic/schunk_powercube_chain/0.6.14-1"; + sha256 = "sha256-Bqgv2EXXzyTj4bgp8Pyf6AeyfOJABpGhtH/ln7pomEg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-sdh/default.nix b/distros/noetic/schunk-sdh/default.nix index c66fd3e1ba..0bebc41948 100644 --- a/distros/noetic/schunk-sdh/default.nix +++ b/distros/noetic/schunk-sdh/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-schunk-sdh"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/noetic/schunk_sdh/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "49ae4d8f97483a7b2349425c265470e6a00b4b7ed6eb138db59de12a73ecd496"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/noetic/schunk_sdh/0.6.14-1"; + sha256 = "sha256-8nQDbkqJKaA7ggj7AOw/fUX/uxHwbwve34BoP5yyZdc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/noetic/schunk-simulated-tactile-sensors/default.nix b/distros/noetic/schunk-simulated-tactile-sensors/default.nix index 9c58976db9..8154f7bd66 100644 --- a/distros/noetic/schunk-simulated-tactile-sensors/default.nix +++ b/distros/noetic/schunk-simulated-tactile-sensors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-schunk-simulated-tactile-sensors"; version = "0.6.14-r1"; - src = fetchurl { - url = "https://github.com/ipa320/schunk_modular_robotics-release/archive/release/noetic/schunk_simulated_tactile_sensors/0.6.14-1.tar.gz"; - name = "0.6.14-1.tar.gz"; - sha256 = "acd19245c4b759137b30bf8b5df6542f58e406565615e59c3b7f5113badead76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "schunk_modular_robotics-release"; + rev = "release/noetic/schunk_simulated_tactile_sensors/0.6.14-1"; + sha256 = "sha256-P3bjg82EBGfPHnC31BV6ZxuoS42QWa2Fo10SNMCOjAE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-svh-description/default.nix b/distros/noetic/schunk-svh-description/default.nix index 146100a373..a8a0ab01ef 100644 --- a/distros/noetic/schunk-svh-description/default.nix +++ b/distros/noetic/schunk-svh-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-noetic-schunk-svh-description"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/noetic/schunk_svh_description/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "825c5a9f973bd2839f1a66035c5b4d4b71526aaa3c282a5d19e192a19f8c0303"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/noetic/schunk_svh_description/0.1.2-1"; + sha256 = "sha256-B66wDcyoS7o/aA8DvF7nLWMxMpRegtzLTZMSkCBrg0I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-svh-driver/default.nix b/distros/noetic/schunk-svh-driver/default.nix index 499591e729..68296da34d 100644 --- a/distros/noetic/schunk-svh-driver/default.nix +++ b/distros/noetic/schunk-svh-driver/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, combined-robot-hw, controller-manager, dynamic-reconfigure, hardware-interface, joint-limits-interface, joint-state-controller, joint-state-publisher, joint-trajectory-controller, pluginlib, python-qt-binding, python3Packages, qt-gui, robot-state-publisher, roscpp, rospy, rqt-gui, rqt-gui-py, schunk-svh-description, schunk-svh-library, schunk-svh-msgs, sensor-msgs, std-msgs, urdf, xacro }: buildRosPackage { pname = "ros-noetic-schunk-svh-driver"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/noetic/schunk_svh_driver/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "8bdc688fd5e1079cd452e209fd89cda0f8cd0d2142191076287733d475d4d75f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/noetic/schunk_svh_driver/0.1.2-1"; + sha256 = "sha256-qosALExQVYdRQaj657KTX38ilU2FjoEqG6JN9ODh+EA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-svh-library/default.nix b/distros/noetic/schunk-svh-library/default.nix index 052c64bf4f..3a57230796 100644 --- a/distros/noetic/schunk-svh-library/default.nix +++ b/distros/noetic/schunk-svh-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-schunk-svh-library"; version = "1.0.1-r4"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_library-release/archive/release/noetic/schunk_svh_library/1.0.1-4.tar.gz"; - name = "1.0.1-4.tar.gz"; - sha256 = "32ac7237f3b5768e70d76f0c1621c5edc5d5f11c4a9864bfafcc991611581295"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_library-release"; + rev = "release/noetic/schunk_svh_library/1.0.1-4"; + sha256 = "sha256-n1ECtIIlm0bPzlzsul/AH8CHSn5tXYbNJqbiCC9AuSs="; + }; buildType = "cmake"; buildInputs = [ boost cmake ]; diff --git a/distros/noetic/schunk-svh-msgs/default.nix b/distros/noetic/schunk-svh-msgs/default.nix index 874650b294..8c35e20cd9 100644 --- a/distros/noetic/schunk-svh-msgs/default.nix +++ b/distros/noetic/schunk-svh-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, message-generation, message-runtime, std-msgs, std-srvs }: buildRosPackage { pname = "ros-noetic-schunk-svh-msgs"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/noetic/schunk_svh_msgs/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "2da832fcb7f410e868a3ae6b67f683e15f2cb781f2bacc435fa102f554b28562"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/noetic/schunk_svh_msgs/0.1.2-1"; + sha256 = "sha256-DpPiWtr6MuTdY80T5I46q+rFwrBd9Ga9fQTQcBUw5H8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-svh-simulation/default.nix b/distros/noetic/schunk-svh-simulation/default.nix index 23bdcb3c10..1bdc86adae 100644 --- a/distros/noetic/schunk-svh-simulation/default.nix +++ b/distros/noetic/schunk-svh-simulation/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, schunk-svh-description }: buildRosPackage { pname = "ros-noetic-schunk-svh-simulation"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/noetic/schunk_svh_simulation/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "a53eedb734132bca34bce7138bc5957a52dfc9ded76b592c498e11180366731a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/noetic/schunk_svh_simulation/0.1.2-1"; + sha256 = "sha256-hTd7wkmrf1v4iU79uwDDTVV/tFKJOWzOSDkbsBa6Sow="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/schunk-svh/default.nix b/distros/noetic/schunk-svh/default.nix index beabd98a2c..6f7881c5a4 100644 --- a/distros/noetic/schunk-svh/default.nix +++ b/distros/noetic/schunk-svh/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, schunk-svh-description, schunk-svh-driver, schunk-svh-msgs }: buildRosPackage { pname = "ros-noetic-schunk-svh"; - version = "0.1.1-r1"; + version = "0.1.2-r1"; - src = fetchurl { - url = "https://github.com/fzi-forschungszentrum-informatik/schunk_svh_ros_driver-release/archive/release/noetic/schunk_svh/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "3c554daf2600576102e050236e6e63173feeb5b04cbecd3c19a34c92dacdf704"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "fzi-forschungszentrum-informatik"; + repo = "schunk_svh_ros_driver-release"; + rev = "release/noetic/schunk_svh/0.1.2-1"; + sha256 = "sha256-vE7M/QBiVMbPyF8B4P0jVnmVOn7JTumZFaFxc52HacU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sdc21x0/default.nix b/distros/noetic/sdc21x0/default.nix index c5f1c276ae..99bf898f96 100644 --- a/distros/noetic/sdc21x0/default.nix +++ b/distros/noetic/sdc21x0/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-sdc21x0"; - version = "1.1.6-r1"; + version = "1.1.7-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/mir_robot-release/archive/release/noetic/sdc21x0/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "e4a6afed0cad7c3501694b7f34e4553539ad6043cd1751ae375eab477e46a2e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "mir_robot-release"; + rev = "release/noetic/sdc21x0/1.1.7-1"; + sha256 = "sha256-U257QqtRLphBz4ZEp3akKHTQZvxA5HOSJkzSrKI+Y+Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/sdhlibrary-cpp/default.nix b/distros/noetic/sdhlibrary-cpp/default.nix index 170cc350dc..413c5f8d0c 100644 --- a/distros/noetic/sdhlibrary-cpp/default.nix +++ b/distros/noetic/sdhlibrary-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sdhlibrary-cpp"; version = "0.2.10-r1"; - src = fetchurl { - url = "https://github.com/ipab-slmc/SDHLibrary-CPP-release/archive/release/noetic/sdhlibrary_cpp/0.2.10-1.tar.gz"; - name = "0.2.10-1.tar.gz"; - sha256 = "ffc04d5df500d974febd8575389ff9a96c149290190befe111345aa5fb08fe7f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipab-slmc"; + repo = "SDHLibrary-CPP-release"; + rev = "release/noetic/sdhlibrary_cpp/0.2.10-1"; + sha256 = "sha256-4Fg1zDkpoUwidBGO5S2wWcxswKYv0F01dLW2eu9LdAY="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/self-test/default.nix b/distros/noetic/self-test/default.nix index e7141779d5..a053f5c000 100644 --- a/distros/noetic/self-test/default.nix +++ b/distros/noetic/self-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-self-test"; version = "1.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/noetic/self_test/1.11.0-1.tar.gz"; - name = "1.11.0-1.tar.gz"; - sha256 = "4821b7e88addf297e02ff2eb431284e1fc8ddd30e4b1e54bf9f76b409e5a3e4f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/noetic/self_test/1.11.0-1"; + sha256 = "sha256-v8ry7qWdDbT5BH+CW0LbmvSOI0/hxJJq/XkGJFrPGwc="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/semantic-point-annotator/default.nix b/distros/noetic/semantic-point-annotator/default.nix index 28d96268d7..fd43abca0d 100644 --- a/distros/noetic/semantic-point-annotator/default.nix +++ b/distros/noetic/semantic-point-annotator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-semantic-point-annotator"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_navigation-release/archive/release/noetic/semantic_point_annotator/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "c87f87e059bee66848d92f71e78ec1dbf239f5ed7a8425b6a8a115848070031b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_navigation-release"; + rev = "release/noetic/semantic_point_annotator/0.2.0-1"; + sha256 = "sha256-9+6GYoYZeL4ym1bXrqX4rQTnv4myh40cxiEmAE6escg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sensor-filters/default.nix b/distros/noetic/sensor-filters/default.nix index 9bf8ebdd00..7a069d5a88 100644 --- a/distros/noetic/sensor-filters/default.nix +++ b/distros/noetic/sensor-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sensor-filters"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ctu-vras/sensor_filters-release/archive/release/noetic/sensor_filters/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "38cd48bd09b52a40608b6ed9cc01fa58b4bfef4c51d7a403539bae72e18e4c92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ctu-vras"; + repo = "sensor_filters-release"; + rev = "release/noetic/sensor_filters/1.0.3-1"; + sha256 = "sha256-7zG/cp/Skv0mGkPQfp/ZwSEfOe7pWa8mfIKmXBdmBTs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sensor-msgs/default.nix b/distros/noetic/sensor-msgs/default.nix index a28fd9ef9c..e2c7537513 100644 --- a/distros/noetic/sensor-msgs/default.nix +++ b/distros/noetic/sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sensor-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/sensor_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "25dfebaba7e08b4eab9bb670d3d9884a2bdd94e3976cd65ccbb8fc948c22b058"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/sensor_msgs/1.13.1-1"; + sha256 = "sha256-K49LddL5s/6G2jWccadDmNeqEBO0iqYLZV69azAP+FU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools ]; diff --git a/distros/noetic/septentrio-gnss-driver/default.nix b/distros/noetic/septentrio-gnss-driver/default.nix index 93b12de6de..35f4ef2a5d 100644 --- a/distros/noetic/septentrio-gnss-driver/default.nix +++ b/distros/noetic/septentrio-gnss-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-septentrio-gnss-driver"; version = "1.2.3-r1"; - src = fetchurl { - url = "https://github.com/septentrio-users/septentrio_gnss_driver-release/archive/release/noetic/septentrio_gnss_driver/1.2.3-1.tar.gz"; - name = "1.2.3-1.tar.gz"; - sha256 = "39bf69095947dc7bb56e516115125e080aa568fbb5b65009f23df2b44c981dc1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "septentrio-users"; + repo = "septentrio_gnss_driver-release"; + rev = "release/noetic/septentrio_gnss_driver/1.2.3-1"; + sha256 = "sha256-l8gWw/6QWUgcxGhCFwHKBpRwASdfyI5E+lHNGAUvPNY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/serial/default.nix b/distros/noetic/serial/default.nix index efcc11d72a..07ddc5940e 100644 --- a/distros/noetic/serial/default.nix +++ b/distros/noetic/serial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-serial"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/wjwwood/serial-release/archive/release/noetic/serial/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "9dded001cf674418e67b3c69ad0df7105ca299f5b368a9e8ec6894c7324a5ec2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wjwwood"; + repo = "serial-release"; + rev = "release/noetic/serial/1.2.1-1"; + sha256 = "sha256-/FAxK2r1ZPZM1fLmXmpgiYBEX+n8be3bqKfNxHtXmEE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/service-tools/default.nix b/distros/noetic/service-tools/default.nix index ddfab42a0e..8439cc6f43 100644 --- a/distros/noetic/service-tools/default.nix +++ b/distros/noetic/service-tools/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, rospy, rosservice }: buildRosPackage { pname = "ros-noetic-service-tools"; - version = "0.6.30-r2"; + version = "0.6.31-r1"; - src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/service_tools/0.6.30-2.tar.gz"; - name = "0.6.30-2.tar.gz"; - sha256 = "dcc3f3e70d087d07828ff5c61f374967a58a8301541ef8cef3811305533f73f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ipa320"; + repo = "cob_command_tools-release"; + rev = "release/noetic/service_tools/0.6.31-1"; + sha256 = "sha256-h8g4kUc46m1vtJzRMBxzoOSx6CnQXy4pGd6cDAsj49o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sesame-ros/default.nix b/distros/noetic/sesame-ros/default.nix index 6109aac345..ab02c46c24 100644 --- a/distros/noetic/sesame-ros/default.nix +++ b/distros/noetic/sesame-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sesame-ros"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/sesame_ros/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "265fe6c7e55e6aa36a0fd730df7a9d701f86338c97eec080d7d30c454f7ca3cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/sesame_ros/2.1.21-2"; + sha256 = "sha256-EpspKr9VI2xV8itzAFXYY591j7qkkybGfvvnHuIbch0="; + }; buildType = "catkin"; buildInputs = [ catkin catkin-virtualenv libffi message-generation openssl ]; diff --git a/distros/noetic/settlerlib/default.nix b/distros/noetic/settlerlib/default.nix index 69ba0ca4c7..1f26485573 100644 --- a/distros/noetic/settlerlib/default.nix +++ b/distros/noetic/settlerlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-settlerlib"; version = "0.10.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/calibration-release/archive/release/noetic/settlerlib/0.10.15-1.tar.gz"; - name = "0.10.15-1.tar.gz"; - sha256 = "c33ad16a8254c5b646874efcedcc894821ca38121916a103b29d357101ba2810"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "calibration-release"; + rev = "release/noetic/settlerlib/0.10.15-1"; + sha256 = "sha256-IzwM4117RXEovzFCq3mnkGXIf4tsZBejilCBvy7eNdY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/shape-msgs/default.nix b/distros/noetic/shape-msgs/default.nix index bd878f503d..8e83f3ae9f 100644 --- a/distros/noetic/shape-msgs/default.nix +++ b/distros/noetic/shape-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-shape-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/shape_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "19b5b1b4c54b987382ffd74d4538de2c81c32f1d59469244f9addae3575cdfdd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/shape_msgs/1.13.1-1"; + sha256 = "sha256-3QwXpk3G6lgX+i636Izg3jZd/h+4xanyvi3+hWOyZ90="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/sick-safetyscanners/default.nix b/distros/noetic/sick-safetyscanners/default.nix index 6f155349a4..3c180ff7ce 100644 --- a/distros/noetic/sick-safetyscanners/default.nix +++ b/distros/noetic/sick-safetyscanners/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sick-safetyscanners"; version = "1.0.8-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_safetyscanners-release/archive/release/noetic/sick_safetyscanners/1.0.8-1.tar.gz"; - name = "1.0.8-1.tar.gz"; - sha256 = "df3f4bb715a9a522000f0d6a238afddd63781cae0d8046319ecc5c2b170d2ef0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_safetyscanners-release"; + rev = "release/noetic/sick_safetyscanners/1.0.8-1"; + sha256 = "sha256-PTS57R5b3reGqfNwKbRXVGH8m5lygAwU9eTkdKtH3Y0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/sick-scan/default.nix b/distros/noetic/sick-scan/default.nix index 5a16ea5aee..fad87068a4 100644 --- a/distros/noetic/sick-scan/default.nix +++ b/distros/noetic/sick-scan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sick-scan"; version = "1.10.1-r1"; - src = fetchurl { - url = "https://github.com/SICKAG/sick_scan-release/archive/release/noetic/sick_scan/1.10.1-1.tar.gz"; - name = "1.10.1-1.tar.gz"; - sha256 = "733a8d4deaf6e4faa9977a175e435ec3c490c348606a411b13a5c4e733a5171e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SICKAG"; + repo = "sick_scan-release"; + rev = "release/noetic/sick_scan/1.10.1-1"; + sha256 = "sha256-P3F9nPsS/g2r9i3AtygCdNt+DZAxjjVPeOk33yMyRTg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/sick-tim/default.nix b/distros/noetic/sick-tim/default.nix index 11ca777656..7558a2836c 100644 --- a/distros/noetic/sick-tim/default.nix +++ b/distros/noetic/sick-tim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sick-tim"; version = "0.0.17-r1"; - src = fetchurl { - url = "https://github.com/uos-gbp/sick_tim-release/archive/release/noetic/sick_tim/0.0.17-1.tar.gz"; - name = "0.0.17-1.tar.gz"; - sha256 = "9bd217db019fea42671703198dc50adffe67b1ad94c7902244fea03e20de606a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "uos-gbp"; + repo = "sick_tim-release"; + rev = "release/noetic/sick_tim/0.0.17-1"; + sha256 = "sha256-BpL2J53RqWWL3YAhZxl99C0rj4RP5bRGbxp+RAPIoLA="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/simple-grasping/default.nix b/distros/noetic/simple-grasping/default.nix index ab12a732c4..8d402a3ab1 100644 --- a/distros/noetic/simple-grasping/default.nix +++ b/distros/noetic/simple-grasping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-simple-grasping"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/simple_grasping-release/archive/release/noetic/simple_grasping/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "57d79f160a4eff3aa4cfb842248b85c9dcc8c5ff2a28154348133f7ca54ac2cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "simple_grasping-release"; + rev = "release/noetic/simple_grasping/0.4.0-1"; + sha256 = "sha256-EGllvPx8vCsQJEPfg73wA1grw7WDAOkILY2T3nf1F6w="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation ]; diff --git a/distros/noetic/simple-message/default.nix b/distros/noetic/simple-message/default.nix index ad3becfd68..345474b4b3 100644 --- a/distros/noetic/simple-message/default.nix +++ b/distros/noetic/simple-message/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-simple-message"; version = "0.7.3-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/industrial_core-release/archive/release/noetic/simple_message/0.7.3-1.tar.gz"; - name = "0.7.3-1.tar.gz"; - sha256 = "5479552dd7252d441288fdf0cd59aeee88dfda365388dd3f0aa2844e279a78e0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "industrial_core-release"; + rev = "release/noetic/simple_message/0.7.3-1"; + sha256 = "sha256-e3VzIL53EqPr6HAracyGAzAxkhG4qoQDU15xOYAE/64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/simulators/default.nix b/distros/noetic/simulators/default.nix index 3e35553762..3250239857 100644 --- a/distros/noetic/simulators/default.nix +++ b/distros/noetic/simulators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-simulators"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/noetic/simulators/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "d8c22690d65b57f67296923ab30e2ef65dad64627905247d52533c920285ee17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/noetic/simulators/1.5.0-1"; + sha256 = "sha256-XPf536ZAVXqHAxJUQ7dCj3fbnYhJB4+Z9S3snxwqt8I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/single-joint-position-action/default.nix b/distros/noetic/single-joint-position-action/default.nix index d6deb20edb..c1957f252c 100644 --- a/distros/noetic/single-joint-position-action/default.nix +++ b/distros/noetic/single-joint-position-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-single-joint-position-action"; version = "1.10.18-r1"; - src = fetchurl { - url = "https://github.com/pr2-gbp/pr2_controllers-release/archive/release/noetic/single_joint_position_action/1.10.18-1.tar.gz"; - name = "1.10.18-1.tar.gz"; - sha256 = "e69860f0edc1f6aad505b4d4796f59fe477d47193b329072b1f1c80fbe6f35ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "pr2-gbp"; + repo = "pr2_controllers-release"; + rev = "release/noetic/single_joint_position_action/1.10.18-1"; + sha256 = "sha256-xc68WcIBVKnNKoSx3fj2xDoHWxYJ0PAU9jLqxqzHp/0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/slam-gmapping/default.nix b/distros/noetic/slam-gmapping/default.nix index e8fda80a76..e7aad7bb6f 100644 --- a/distros/noetic/slam-gmapping/default.nix +++ b/distros/noetic/slam-gmapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slam-gmapping"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/slam_gmapping-release/archive/release/noetic/slam_gmapping/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "f630ba8630dc41063e8ad975fa03c709592592a115ebaf857d0541343721c49c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "slam_gmapping-release"; + rev = "release/noetic/slam_gmapping/1.4.2-1"; + sha256 = "sha256-4YLypSEaqdDk+RLuRs2KTHo3ItSVm18ttlg+jYhPx0M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/slam-karto/default.nix b/distros/noetic/slam-karto/default.nix index e5eca94859..d648288843 100644 --- a/distros/noetic/slam-karto/default.nix +++ b/distros/noetic/slam-karto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slam-karto"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/slam_karto-release/archive/release/noetic/slam_karto/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "2b4eeea947a52bb8535d381a64e896efe9f954f22c3c69ae99f3f9abf2d94a31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "slam_karto-release"; + rev = "release/noetic/slam_karto/0.8.1-1"; + sha256 = "sha256-fbQW4B9N+XFFFGgd7nOSL5K1j7WZmvf95ame1KdBmuQ="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/slam-toolbox-msgs/default.nix b/distros/noetic/slam-toolbox-msgs/default.nix index da06e852e7..1d8a6d06f2 100644 --- a/distros/noetic/slam-toolbox-msgs/default.nix +++ b/distros/noetic/slam-toolbox-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slam-toolbox-msgs"; version = "1.5.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/slam_toolbox-release/archive/release/noetic/slam_toolbox_msgs/1.5.7-1.tar.gz"; - name = "1.5.7-1.tar.gz"; - sha256 = "b4cbb8c199c530efb3a49c31ef1c350902a5eb6fb4441f81ec0e858a33633aca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "slam_toolbox-release"; + rev = "release/noetic/slam_toolbox_msgs/1.5.7-1"; + sha256 = "sha256-O6oLOyd1TCF8sJzYd/9pDFLApdj1UYASS5YZ+wl3Yn4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/slam-toolbox-rviz/default.nix b/distros/noetic/slam-toolbox-rviz/default.nix index 19770bcb42..3adca8375d 100644 --- a/distros/noetic/slam-toolbox-rviz/default.nix +++ b/distros/noetic/slam-toolbox-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slam-toolbox-rviz"; version = "1.5.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/slam_toolbox-release/archive/release/noetic/slam_toolbox_rviz/1.5.7-1.tar.gz"; - name = "1.5.7-1.tar.gz"; - sha256 = "6e386f21987e672b991209e1be7a2e87e9c7c129abc9266f9d9b051f2bfaa723"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "slam_toolbox-release"; + rev = "release/noetic/slam_toolbox_rviz/1.5.7-1"; + sha256 = "sha256-/WUb/nswpJv8P+5dtYOd8F0l5PoUKqOCp3yF53Mk+Mc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/slam-toolbox/default.nix b/distros/noetic/slam-toolbox/default.nix index af71f6ba09..9cfb7d2b57 100644 --- a/distros/noetic/slam-toolbox/default.nix +++ b/distros/noetic/slam-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slam-toolbox"; version = "1.5.7-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/slam_toolbox-release/archive/release/noetic/slam_toolbox/1.5.7-1.tar.gz"; - name = "1.5.7-1.tar.gz"; - sha256 = "fcfc8ef223c1b4af185e100df124b08fdd1d6493ab72c3d1f26efbc041c11246"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "slam_toolbox-release"; + rev = "release/noetic/slam_toolbox/1.5.7-1"; + sha256 = "sha256-HDe7kv/a0PLZexCeR+J9EmAgQjP6zPqZZGPaRdo/Gro="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/slic/default.nix b/distros/noetic/slic/default.nix index cc3a5232a9..5b5bd9858d 100644 --- a/distros/noetic/slic/default.nix +++ b/distros/noetic/slic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slic"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/slic/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "8e168ce461db9a27d3c703ba4559602761db0e4ea423454f890a1234719a2cdf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/slic/2.1.21-2"; + sha256 = "sha256-dpLmpMrnH5aTuLH1zyaX5GxQ1yZwMP62D3K4iN0DyaM="; + }; buildType = "cmake"; buildInputs = [ cacert cmake cmake-modules git openssl ]; diff --git a/distros/noetic/slider-publisher/default.nix b/distros/noetic/slider-publisher/default.nix index 820ad6bdd4..98fd55b43b 100644 --- a/distros/noetic/slider-publisher/default.nix +++ b/distros/noetic/slider-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slider-publisher"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/oKermorgant/slider_publisher-release/archive/release/noetic/slider_publisher/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "c625745bc79b0ccb639536e058b81b0b04d4df513d1b1f0aea66cd6dc4621935"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "oKermorgant"; + repo = "slider_publisher-release"; + rev = "release/noetic/slider_publisher/1.1.1-1"; + sha256 = "sha256-VNxWb+MmxhWvrl79hiTibFWSHximeqBasbcJbGkVNUQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/slime-ros/default.nix b/distros/noetic/slime-ros/default.nix index 9781ec57d4..8583bccc57 100644 --- a/distros/noetic/slime-ros/default.nix +++ b/distros/noetic/slime-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slime-ros"; version = "0.4.17-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/noetic/slime_ros/0.4.17-1.tar.gz"; - name = "0.4.17-1.tar.gz"; - sha256 = "c2005a984956b348a191f10d362ce48b3e0d4526b8c72ae31a1e7f8372918e87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/noetic/slime_ros/0.4.17-1"; + sha256 = "sha256-Fb6mw5TgFwQTjAi9hMqX0coIKx6MWWrD0ySKQfN48Hk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/slime-wrapper/default.nix b/distros/noetic/slime-wrapper/default.nix index 5fab3b62a0..f4af2fa22c 100644 --- a/distros/noetic/slime-wrapper/default.nix +++ b/distros/noetic/slime-wrapper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-slime-wrapper"; version = "0.4.17-r1"; - src = fetchurl { - url = "https://github.com/code-iai-release/ros_emacs_utils-release/archive/release/noetic/slime_wrapper/0.4.17-1.tar.gz"; - name = "0.4.17-1.tar.gz"; - sha256 = "f4989e9033e3059e52d388718bc808a4c7c613ab02a5ecf8cae01addec9c2631"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "code-iai-release"; + repo = "ros_emacs_utils-release"; + rev = "release/noetic/slime_wrapper/0.4.17-1"; + sha256 = "sha256-aCxnd/kx4RTdt0150mJ9QBl88An1T8V6UeLl0r3sKTk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/smacc-msgs/default.nix b/distros/noetic/smacc-msgs/default.nix index 31d576cb5d..6b7733b5c4 100644 --- a/distros/noetic/smacc-msgs/default.nix +++ b/distros/noetic/smacc-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-smacc-msgs"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/robosoft-ai/smacc-release/archive/release/noetic/smacc_msgs/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "79cd5d5de9e4efc08814cd8dd19e8fd8ae6c603d50ab01f1e35473e92cb0fa0b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robosoft-ai"; + repo = "smacc-release"; + rev = "release/noetic/smacc_msgs/0.9.7-1"; + sha256 = "sha256-pEJajW0INB3m/slKx3L6wzbP3rOE1oSsyLTF6YxfAwU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/smacc/default.nix b/distros/noetic/smacc/default.nix index c247da57d0..3d5bddb5d8 100644 --- a/distros/noetic/smacc/default.nix +++ b/distros/noetic/smacc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-smacc"; version = "0.9.7-r1"; - src = fetchurl { - url = "https://github.com/robosoft-ai/smacc-release/archive/release/noetic/smacc/0.9.7-1.tar.gz"; - name = "0.9.7-1.tar.gz"; - sha256 = "da4e51832b39e106ecbdcaf2d9713a4b98df60d64cd5af35dc482f65f5302701"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "robosoft-ai"; + repo = "smacc-release"; + rev = "release/noetic/smacc/0.9.7-1"; + sha256 = "sha256-06jpVa+V/B0PCTSPOqiEyqIVfYymIjMZqp/Tcvo08s0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/smach-msgs/default.nix b/distros/noetic/smach-msgs/default.nix index 721fa9b21e..08a617fe07 100644 --- a/distros/noetic/smach-msgs/default.nix +++ b/distros/noetic/smach-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-smach-msgs"; version = "2.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/executive_smach-release/archive/release/noetic/smach_msgs/2.5.0-1.tar.gz"; - name = "2.5.0-1.tar.gz"; - sha256 = "d1c9f8fe63b55bc6eae336803b302e2fe633207190ae0acbe9dad7937f06ee09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "executive_smach-release"; + rev = "release/noetic/smach_msgs/2.5.0-1"; + sha256 = "sha256-k16JWCPU8G+MdgOyOW9SlvZqhHLN1IYfELl+aIvVkR0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/smach-ros/default.nix b/distros/noetic/smach-ros/default.nix index 2a734c94b3..7bf5dbfbe0 100644 --- a/distros/noetic/smach-ros/default.nix +++ b/distros/noetic/smach-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-smach-ros"; version = "2.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/executive_smach-release/archive/release/noetic/smach_ros/2.5.0-1.tar.gz"; - name = "2.5.0-1.tar.gz"; - sha256 = "ac699a54b8e7e66e57d38bf28b77d2e9a07e19b0822bc889d1bea33caeff5011"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "executive_smach-release"; + rev = "release/noetic/smach_ros/2.5.0-1"; + sha256 = "sha256-hCrnm4/MP4W27Uc3w4BeX4p8McDGmHJYXwN8k2X4264="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/smach-viewer/default.nix b/distros/noetic/smach-viewer/default.nix index 1d49c91c20..9a6af8960a 100644 --- a/distros/noetic/smach-viewer/default.nix +++ b/distros/noetic/smach-viewer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-smach-viewer"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/jbohren/executive_smach_visualization-release/archive/release/noetic/smach_viewer/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "71891f3197da569f747a513c39a0024d6a70a3abb66da479986960e529b15599"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "jbohren"; + repo = "executive_smach_visualization-release"; + rev = "release/noetic/smach_viewer/4.0.1-1"; + sha256 = "sha256-m5J2XvHQJtRmsIpME/SdYR4YrVQ+xpd2o9gbLmUx2TI="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/smach/default.nix b/distros/noetic/smach/default.nix index c8f1cd01f8..9e38980376 100644 --- a/distros/noetic/smach/default.nix +++ b/distros/noetic/smach/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-smach"; version = "2.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/executive_smach-release/archive/release/noetic/smach/2.5.0-1.tar.gz"; - name = "2.5.0-1.tar.gz"; - sha256 = "2f73fdda99db7352dc49494f238cf137c2c5803c52ed458ec3ef3fa02adb984b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "executive_smach-release"; + rev = "release/noetic/smach/2.5.0-1"; + sha256 = "sha256-t9f/FshiYSWRQ7RXt+Z89dj88IPrWbvuiFFb0MO5dTg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/smclib/default.nix b/distros/noetic/smclib/default.nix index e457557d38..e44b2b163e 100644 --- a/distros/noetic/smclib/default.nix +++ b/distros/noetic/smclib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-smclib"; version = "1.8.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/bond_core-release/archive/release/noetic/smclib/1.8.6-1.tar.gz"; - name = "1.8.6-1.tar.gz"; - sha256 = "7a0fe1a46821a1fc84021ad2592661cfc9a4bfe0179a5d896558b7c1a7a00cde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "bond_core-release"; + rev = "release/noetic/smclib/1.8.6-1"; + sha256 = "sha256-ro5DUUBXMblrINdzD7SjeQDlfnVQYLP/lQV1PRabvIs="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/snmp-ros/default.nix b/distros/noetic/snmp-ros/default.nix index 85500c752a..9e19e1aed4 100644 --- a/distros/noetic/snmp-ros/default.nix +++ b/distros/noetic/snmp-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-snmp-ros"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/ctu-vras/snmp_ros-release/archive/release/noetic/snmp_ros/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "ddd3dda2ea56537f872a58d7334919e986055d73f764bb4f4c26faa9426a8489"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ctu-vras"; + repo = "snmp_ros-release"; + rev = "release/noetic/snmp_ros/1.0.2-1"; + sha256 = "sha256-Pk40w3RXhaUM1qTP5wrbrn3BF0XCP3TWZUVR9PyEarc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/snowbot-operating-system/default.nix b/distros/noetic/snowbot-operating-system/default.nix index 5d18a51d28..e195201bfb 100644 --- a/distros/noetic/snowbot-operating-system/default.nix +++ b/distros/noetic/snowbot-operating-system/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-snowbot-operating-system"; version = "0.0.5-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/snowbot_release/archive/release/noetic/snowbot_operating_system/0.0.5-1.tar.gz"; - name = "0.0.5-1.tar.gz"; - sha256 = "e8927e8d01db9f934bb23f1ccb99d19b0ff796bab8855ff23b8c643c0bf58e29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "snowbot_release"; + rev = "release/noetic/snowbot_operating_system/0.0.5-1"; + sha256 = "sha256-GLIthTAuyBcsrH/jceuFso5nD1MDyhQh9EvmsSH6dpY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sob-layer/default.nix b/distros/noetic/sob-layer/default.nix index 6e3152460e..98be6687d5 100644 --- a/distros/noetic/sob-layer/default.nix +++ b/distros/noetic/sob-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sob-layer"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/dorezyuk/sob_layer-release/archive/release/noetic/sob_layer/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "299f36006f303aaadc08ae0c47f92ccb4890517ae524e3290939dd1035cdf68b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "dorezyuk"; + repo = "sob_layer-release"; + rev = "release/noetic/sob_layer/0.1.1-1"; + sha256 = "sha256-RyEeDSKqEXCdoc/gnkGJi/tmtx890I+15K7zxfrpRIU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/socketcan-bridge/default.nix b/distros/noetic/socketcan-bridge/default.nix index 52af467cbc..c0dc2da7d5 100644 --- a/distros/noetic/socketcan-bridge/default.nix +++ b/distros/noetic/socketcan-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-socketcan-bridge"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/noetic/socketcan_bridge/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "2cd955e1bc167097328167d7d7c82c47ef382feec380bfd483bd0910860e0dc7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/noetic/socketcan_bridge/0.8.5-1"; + sha256 = "sha256-TROokf77eTUmXExRuRlqkfntVP7pHuGrmI6hqVLosnc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/socketcan-interface/default.nix b/distros/noetic/socketcan-interface/default.nix index 5fe72e7551..a9cf08daaa 100644 --- a/distros/noetic/socketcan-interface/default.nix +++ b/distros/noetic/socketcan-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-socketcan-interface"; version = "0.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ros_canopen-release/archive/release/noetic/socketcan_interface/0.8.5-1.tar.gz"; - name = "0.8.5-1.tar.gz"; - sha256 = "fa0431b6e832e6c4b5ddb2b009ec74c4cd4b851ca2615d5058e2715eae529ab0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ros_canopen-release"; + rev = "release/noetic/socketcan_interface/0.8.5-1"; + sha256 = "sha256-U9+/4Xc3B/6kk6iMvN9fcMp6Dra0p7kJibdjmoUZjg4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/soem/default.nix b/distros/noetic/soem/default.nix index a6126a29c2..4dbd4ceedf 100644 --- a/distros/noetic/soem/default.nix +++ b/distros/noetic/soem/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-soem"; version = "1.4.1003-r1"; - src = fetchurl { - url = "https://github.com/mgruhler/soem-gbp/archive/release/noetic/soem/1.4.1003-1.tar.gz"; - name = "1.4.1003-1.tar.gz"; - sha256 = "f16d0ecd3ce7b6739fb573459214670abcd5f101454fc1225369aa7fe86b2806"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mgruhler"; + repo = "soem-gbp"; + rev = "release/noetic/soem/1.4.1003-1"; + sha256 = "sha256-kz+EHVji3/7AgG21sBsyFBuZ/fh+avgpi+LVvIDpJjs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/sophus/default.nix b/distros/noetic/sophus/default.nix index 56bcb01690..30ac151881 100644 --- a/distros/noetic/sophus/default.nix +++ b/distros/noetic/sophus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sophus"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/sophus-release/archive/release/noetic/sophus/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "ef6951ab8dbffc56d6898d916e5421f44195bc7dce4fe4982f26796d790c72c0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "sophus-release"; + rev = "release/noetic/sophus/1.2.1-1"; + sha256 = "sha256-/fr0tgRRgBcz7eJIMTxzab4H3swd8AtsTXDhkUUPPDo="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/sot-core/default.nix b/distros/noetic/sot-core/default.nix index 677f51e75c..5e2eb1a126 100644 --- a/distros/noetic/sot-core/default.nix +++ b/distros/noetic/sot-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sot-core"; version = "4.11.8-r2"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/sot-core-ros-release/archive/release/noetic/sot-core/4.11.8-2.tar.gz"; - name = "4.11.8-2.tar.gz"; - sha256 = "25755415739bccf0aef6a54f3d3debe086c678a3d0279d994410ba7c30941560"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "sot-core-ros-release"; + rev = "release/noetic/sot-core/4.11.8-2"; + sha256 = "sha256-DMVG7sapODq31159tBAp1lF3XCFXHuHvid4zM6S/dn0="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen ]; diff --git a/distros/noetic/sot-dynamic-pinocchio/default.nix b/distros/noetic/sot-dynamic-pinocchio/default.nix index d40ecfd275..d70cc84efa 100644 --- a/distros/noetic/sot-dynamic-pinocchio/default.nix +++ b/distros/noetic/sot-dynamic-pinocchio/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sot-dynamic-pinocchio"; version = "3.6.5-r2"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/sot-dynamic-pinocchio-ros-release/archive/release/noetic/sot-dynamic-pinocchio/3.6.5-2.tar.gz"; - name = "3.6.5-2.tar.gz"; - sha256 = "63cd61e5a2137b3106754d21e12aedbe8e58a7d5f2e3df83a3a363e9b263f923"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "sot-dynamic-pinocchio-ros-release"; + rev = "release/noetic/sot-dynamic-pinocchio/3.6.5-2"; + sha256 = "sha256-LXK+xaNNEtJfZF7KBzh1mvwjkogRNz/5VpYS8RAdVzQ="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/noetic/sot-tools/default.nix b/distros/noetic/sot-tools/default.nix index 7161d3edad..01934bcf13 100644 --- a/distros/noetic/sot-tools/default.nix +++ b/distros/noetic/sot-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sot-tools"; version = "2.3.5-r2"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/sot-tools-ros-release/archive/release/noetic/sot-tools/2.3.5-2.tar.gz"; - name = "2.3.5-2.tar.gz"; - sha256 = "c64b0c42c6e70468f454c85f0b4cf10162c716224148fad0909dc62e3de78698"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "sot-tools-ros-release"; + rev = "release/noetic/sot-tools/2.3.5-2"; + sha256 = "sha256-vp+7vv4avmvUl8BdlCYnsCxkq88phbAjvdhq90gfe1U="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/noetic/spacenav-node/default.nix b/distros/noetic/spacenav-node/default.nix index 4bf9374e3a..f21647267b 100644 --- a/distros/noetic/spacenav-node/default.nix +++ b/distros/noetic/spacenav-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-spacenav-node"; version = "1.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/joystick_drivers-release/archive/release/noetic/spacenav_node/1.15.1-1.tar.gz"; - name = "1.15.1-1.tar.gz"; - sha256 = "8ef279005e45b2f083cf23b15ccf1ab440e601f7bf2ae194deda441c20396a9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "joystick_drivers-release"; + rev = "release/noetic/spacenav_node/1.15.1-1"; + sha256 = "sha256-yOi02IrhCc33VsQX0QO4nm0HAZnDJoaOTNWIsVezA0k="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/sparse-bundle-adjustment/default.nix b/distros/noetic/sparse-bundle-adjustment/default.nix index e238b5e08c..c2a733f51e 100644 --- a/distros/noetic/sparse-bundle-adjustment/default.nix +++ b/distros/noetic/sparse-bundle-adjustment/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sparse-bundle-adjustment"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/sparse_bundle_adjustment-release/archive/release/noetic/sparse_bundle_adjustment/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "581e17cae309101f374d611037a3016e97b24cac93b027c699ee088680bd9558"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "sparse_bundle_adjustment-release"; + rev = "release/noetic/sparse_bundle_adjustment/0.4.4-1"; + sha256 = "sha256-875J1dmacTFSy9Vsc5exd/cQL747NpnDqFiz+zdnezI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/spatio-temporal-voxel-layer/default.nix b/distros/noetic/spatio-temporal-voxel-layer/default.nix index 6a2589b6a5..742bdabd9e 100644 --- a/distros/noetic/spatio-temporal-voxel-layer/default.nix +++ b/distros/noetic/spatio-temporal-voxel-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-spatio-temporal-voxel-layer"; version = "1.4.5-r1"; - src = fetchurl { - url = "https://github.com/SteveMacenski/spatio_temporal_voxel_layer-release/archive/release/noetic/spatio_temporal_voxel_layer/1.4.5-1.tar.gz"; - name = "1.4.5-1.tar.gz"; - sha256 = "5f3f5d2b3ccc4907ad9166531fc8a6acbe53ee3396b0cb3c1738ba13273091c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SteveMacenski"; + repo = "spatio_temporal_voxel_layer-release"; + rev = "release/noetic/spatio_temporal_voxel_layer/1.4.5-1"; + sha256 = "sha256-qsF/hMXSQEVDZT5/vkUi/11dQruckKZisTODMeXj094="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/speech-recognition-msgs/default.nix b/distros/noetic/speech-recognition-msgs/default.nix index e2c8642051..3e50e237a2 100644 --- a/distros/noetic/speech-recognition-msgs/default.nix +++ b/distros/noetic/speech-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-speech-recognition-msgs"; version = "4.3.2-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common_msgs-release/archive/release/noetic/speech_recognition_msgs/4.3.2-1.tar.gz"; - name = "4.3.2-1.tar.gz"; - sha256 = "4f1067d8b1b1cc7cf174a5b917e532c83fe65b55efa809a4f4bf6eb42abd7e1a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common_msgs-release"; + rev = "release/noetic/speech_recognition_msgs/4.3.2-1"; + sha256 = "sha256-WNuuQYGPvzHOlLCdSn9WNNEygxfJGFEbXa8bTDBAH5M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/speed-scaling-interface/default.nix b/distros/noetic/speed-scaling-interface/default.nix index 83fb9ee2b9..f7afa9d47f 100644 --- a/distros/noetic/speed-scaling-interface/default.nix +++ b/distros/noetic/speed-scaling-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-speed-scaling-interface"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_scaled_controllers-release/archive/release/noetic/speed_scaling_interface/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "7aaf59e25c54244b9c6d30dd863fb9151bb011de66a47bc1baeb8836142d302b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_scaled_controllers-release"; + rev = "release/noetic/speed_scaling_interface/0.1.0-1"; + sha256 = "sha256-OfoHqjr37QumzWq8tBJgBPqbaA4yXDN/kI6JBfVCoS8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/speed-scaling-state-controller/default.nix b/distros/noetic/speed-scaling-state-controller/default.nix index be1917d0b1..b2e2ea87fa 100644 --- a/distros/noetic/speed-scaling-state-controller/default.nix +++ b/distros/noetic/speed-scaling-state-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-speed-scaling-state-controller"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_scaled_controllers-release/archive/release/noetic/speed_scaling_state_controller/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "742012d1c84cb0431ec1bad62f6ae3eb3ed7a95e6755adcad66c580e8ed2285d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_scaled_controllers-release"; + rev = "release/noetic/speed_scaling_state_controller/0.1.0-1"; + sha256 = "sha256-LQzmbPK2YP+cx6MepxteuUjH1xBKImkgbuWvZVWOG5g="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/spinnaker-camera-driver/default.nix b/distros/noetic/spinnaker-camera-driver/default.nix index 1bb014ecd1..3c3f02bb02 100644 --- a/distros/noetic/spinnaker-camera-driver/default.nix +++ b/distros/noetic/spinnaker-camera-driver/default.nix @@ -5,13 +5,17 @@ { 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.3-r1"; + version = "0.2.5-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/flir_camera_driver-release/archive/release/noetic/spinnaker_camera_driver/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "2a8560cf47e4b405439333bfea119075f8a617c341056e47e5868685466b7b4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "flir_camera_driver-release"; + rev = "release/noetic/spinnaker_camera_driver/0.2.5-1"; + sha256 = "sha256-SBvtToquRNpAP0UMsvldj2i1YaTb7d3ShQfvvj0WIN8="; + }; buildType = "catkin"; buildInputs = [ catkin curl dpkg ]; diff --git a/distros/noetic/sr-hand-detector/default.nix b/distros/noetic/sr-hand-detector/default.nix index 809ff2caeb..4964194766 100644 --- a/distros/noetic/sr-hand-detector/default.nix +++ b/distros/noetic/sr-hand-detector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-sr-hand-detector"; version = "0.0.9-r1"; - src = fetchurl { - url = "https://github.com/shadow-robot/sr_hand_detector-release/archive/release/noetic/sr_hand_detector/0.0.9-1.tar.gz"; - name = "0.0.9-1.tar.gz"; - sha256 = "354b8355e441f1149d5dc9ede3ec74a32a1120d3289c6d3d6dbe1ff5449954bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "shadow-robot"; + repo = "sr_hand_detector-release"; + rev = "release/noetic/sr_hand_detector/0.0.9-1"; + sha256 = "sha256-swRXG+amquySclSFyf41oEp+AUfPCqvKFX2/tGWcuck="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/srdfdom/default.nix b/distros/noetic/srdfdom/default.nix index ba6e95740e..dc3439e7bd 100644 --- a/distros/noetic/srdfdom/default.nix +++ b/distros/noetic/srdfdom/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-srdfdom"; version = "0.6.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/srdfdom-release/archive/release/noetic/srdfdom/0.6.3-1.tar.gz"; - name = "0.6.3-1.tar.gz"; - sha256 = "f21aba31b1d90ee63d349ec7a681050a27ab611a86381bfec8794046440fe78e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "srdfdom-release"; + rev = "release/noetic/srdfdom/0.6.3-1"; + sha256 = "sha256-1KW8twq9SZrNP1tnatNhSSYcGgIduPY8wnaRYD7bShY="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules console-bridge ]; diff --git a/distros/noetic/stag-ros/default.nix b/distros/noetic/stag-ros/default.nix index f62ff43f35..fc73e2d747 100644 --- a/distros/noetic/stag-ros/default.nix +++ b/distros/noetic/stag-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-stag-ros"; version = "0.3.9-r3"; - src = fetchurl { - url = "https://github.com/usrl-uofsc/stag_ros-release/archive/release/noetic/stag_ros/0.3.9-3.tar.gz"; - name = "0.3.9-3.tar.gz"; - sha256 = "5829fb232d80c8e092afc90f5ec25b6d912bf08674703e6288cbd59d58eb39b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "usrl-uofsc"; + repo = "stag_ros-release"; + rev = "release/noetic/stag_ros/0.3.9-3"; + sha256 = "sha256-X4HySzTU+463mekd2MhZKaPZc7jk5jiejYX9ZQ4YEpQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/stage-ros/default.nix b/distros/noetic/stage-ros/default.nix index 6cf1effce0..4295ee149b 100644 --- a/distros/noetic/stage-ros/default.nix +++ b/distros/noetic/stage-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-stage-ros"; version = "1.8.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/stage_ros-release/archive/release/noetic/stage_ros/1.8.0-1.tar.gz"; - name = "1.8.0-1.tar.gz"; - sha256 = "eb77956a339447194a8b45177863165109b0ff1718486ef406f50a9abafe2609"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "stage_ros-release"; + rev = "release/noetic/stage_ros/1.8.0-1"; + sha256 = "sha256-8N+wPzN7yC0rVdaTnq/17aCyQfsbCgLafRrgfPjgous="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/stage/default.nix b/distros/noetic/stage/default.nix index 72a058bbbe..4c4cb09ad4 100644 --- a/distros/noetic/stage/default.nix +++ b/distros/noetic/stage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-stage"; version = "4.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/stage-release/archive/release/noetic/stage/4.3.0-1.tar.gz"; - name = "4.3.0-1.tar.gz"; - sha256 = "3fc7830e9adb6c52dec23b0836191f375d18a7b8943c42f63e8e4aa027b854c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "stage-release"; + rev = "release/noetic/stage/4.3.0-1"; + sha256 = "sha256-I4psU8+xrEh2p3KAHkSjbhAYz+hzq7GOzqJ2/D6qwEE="; + }; buildType = "cmake"; buildInputs = [ cmake libtool pkg-config ]; diff --git a/distros/noetic/static-transform-mux/default.nix b/distros/noetic/static-transform-mux/default.nix index 3834fc319d..25331a26dd 100644 --- a/distros/noetic/static-transform-mux/default.nix +++ b/distros/noetic/static-transform-mux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-static-transform-mux"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/peci1/static_transform_mux-release/archive/release/noetic/static_transform_mux/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "f21262353f684f756a1f1ebb9e88e7d335f767843d908267d532fab94ce7e2f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "static_transform_mux-release"; + rev = "release/noetic/static_transform_mux/1.1.0-1"; + sha256 = "sha256-ExTQbRpJhwknQMuBV4fSvNU0epTxEVZ/Z+RG9aqDWF4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/statistics-msgs/default.nix b/distros/noetic/statistics-msgs/default.nix index 35270119fb..7aa3bf84f4 100644 --- a/distros/noetic/statistics-msgs/default.nix +++ b/distros/noetic/statistics-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-statistics-msgs"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/noetic/statistics_msgs/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "60160deb991195902301215019f99958f7132c20abea524d794edba6efad78f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/noetic/statistics_msgs/0.15.1-1"; + sha256 = "sha256-VdNo4JuO12qSvH5sLJy0Qbr6RMTNr8e9Uztaka3Nf+4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/std-msgs/default.nix b/distros/noetic/std-msgs/default.nix index 4ee242ad0d..d018becb6a 100644 --- a/distros/noetic/std-msgs/default.nix +++ b/distros/noetic/std-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-std-msgs"; version = "0.5.13-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/std_msgs-release/archive/release/noetic/std_msgs/0.5.13-1.tar.gz"; - name = "0.5.13-1.tar.gz"; - sha256 = "3739ca3b5da2427b549056936fb36dddc712e910aeb2b3c5afaa61ab0df48bf3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "std_msgs-release"; + rev = "release/noetic/std_msgs/0.5.13-1"; + sha256 = "sha256-0Cb5uqwYfYAiMzIEdnwzrIWALdQPlTOWFJFIL5GvEGI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/std-srvs/default.nix b/distros/noetic/std-srvs/default.nix index 7e1619eb4b..0686308108 100644 --- a/distros/noetic/std-srvs/default.nix +++ b/distros/noetic/std-srvs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-std-srvs"; version = "1.11.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm_msgs-release/archive/release/noetic/std_srvs/1.11.3-1.tar.gz"; - name = "1.11.3-1.tar.gz"; - sha256 = "32f4449a495c1d4ca4da3a02eaea03a665d85ae83bd713fe5652d6a9170f66c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm_msgs-release"; + rev = "release/noetic/std_srvs/1.11.3-1"; + sha256 = "sha256-buTLeRNFF7lh5fD2tBqfm5b1XbMeM8HbqVsEU1sPfXg="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/steering-functions/default.nix b/distros/noetic/steering-functions/default.nix index d9061bd9e7..8482870542 100644 --- a/distros/noetic/steering-functions/default.nix +++ b/distros/noetic/steering-functions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-steering-functions"; version = "0.1.1-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "steering_functions-release"; + rev = "release/noetic/steering_functions/0.1.1-1"; + sha256 = "sha256-+w+22INXNz8L6kUVuda9BjzfpQrOFbmEUCtQWKiyCso="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/stereo-image-proc/default.nix b/distros/noetic/stereo-image-proc/default.nix index 166ecdbbd5..34b9784630 100644 --- a/distros/noetic/stereo-image-proc/default.nix +++ b/distros/noetic/stereo-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-stereo-image-proc"; version = "1.17.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_pipeline-release/archive/release/noetic/stereo_image_proc/1.17.0-1.tar.gz"; - name = "1.17.0-1.tar.gz"; - sha256 = "36398fab41a1537f4359f0ff615493a66c6b660bc8facbb4a3c9e2fd72ce9d9e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_pipeline-release"; + rev = "release/noetic/stereo_image_proc/1.17.0-1"; + sha256 = "sha256-P9fh2peVg7/E2+MbuzL1XZN+doUn0EapdQXf1PYwHEA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/stereo-msgs/default.nix b/distros/noetic/stereo-msgs/default.nix index cc14bfbd74..1512eaf7c3 100644 --- a/distros/noetic/stereo-msgs/default.nix +++ b/distros/noetic/stereo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-stereo-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/stereo_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "45adcc388073457745abb5d1ef461e132435cc1c8aa67644c142532836e9ac0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/stereo_msgs/1.13.1-1"; + sha256 = "sha256-BfbhYkxECLz1r7uKvpuEHd/m4laXgrmOIGeRyO+iDDM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/swri-cli-tools/default.nix b/distros/noetic/swri-cli-tools/default.nix index a184bb3d89..e62b15a3ff 100644 --- a/distros/noetic/swri-cli-tools/default.nix +++ b/distros/noetic/swri-cli-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-cli-tools"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_cli_tools/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "35b20dcb0abcac1bffda2f72b7151ce45ea9a46d3fa375f53b44a310ac653a14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_cli_tools/2.15.2-1"; + sha256 = "sha256-3asCd86nJsg2n4zW4jIF7TqSG5Uu4Ux2FB6QZBUz35I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-console-util/default.nix b/distros/noetic/swri-console-util/default.nix index 6bd6361874..d8a1199022 100644 --- a/distros/noetic/swri-console-util/default.nix +++ b/distros/noetic/swri-console-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-console-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_console_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "a11c68708782868b4908759254507795fabfccc32fc61ce30be9813702723690"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_console_util/2.15.2-1"; + sha256 = "sha256-gGsi0JXxItBxE9WrEBpaI6r54Azf2RsyVNtzohyqb5I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-console/default.nix b/distros/noetic/swri-console/default.nix index 155d20a5f0..ce57e45c5a 100644 --- a/distros/noetic/swri-console/default.nix +++ b/distros/noetic/swri-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-console"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/swri_console-release/archive/release/noetic/swri_console/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "a4d06a2b1af47088c200a94adcc12a38c7108e63cacc3e354fac93782e983ff8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "swri_console-release"; + rev = "release/noetic/swri_console/1.1.0-1"; + sha256 = "sha256-oF/7iUjp8cjtvWmnqqqXSRNn636RlQM7unl7lVMNVC4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-dbw-interface/default.nix b/distros/noetic/swri-dbw-interface/default.nix index 29df363137..a6aefe1d4b 100644 --- a/distros/noetic/swri-dbw-interface/default.nix +++ b/distros/noetic/swri-dbw-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-dbw-interface"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_dbw_interface/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "425c4701169a6488a1194c203aecbccab0df86efed20514d33262a1bfe2e7993"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_dbw_interface/2.15.2-1"; + sha256 = "sha256-GY2AZ5E2A+EBPNMbIXo5X57FEqqNDnJd7uFDH0hsIBg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-geometry-util/default.nix b/distros/noetic/swri-geometry-util/default.nix index c9587431d9..413db4944e 100644 --- a/distros/noetic/swri-geometry-util/default.nix +++ b/distros/noetic/swri-geometry-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-geometry-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_geometry_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "629c6d619c9feec388641c26dae35e196fa12270dc9e38b59aed22f58561909d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_geometry_util/2.15.2-1"; + sha256 = "sha256-ulx0FAyLOffwXUd7UwL2ZdQ/l2H8YzZbDAo2YTYduso="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/swri-image-util/default.nix b/distros/noetic/swri-image-util/default.nix index bc6fc1cf06..cef0332774 100644 --- a/distros/noetic/swri-image-util/default.nix +++ b/distros/noetic/swri-image-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-image-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_image_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "a5f902c36520303143781a5c53f544d5ef15f66cc5ad06f411f1f66b7c3d0eb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_image_util/2.15.2-1"; + sha256 = "sha256-DqneoCYHs4y5VhYcpSEpWx76hugZZL3N+EzTSu4GSqs="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config swri-nodelet ]; diff --git a/distros/noetic/swri-math-util/default.nix b/distros/noetic/swri-math-util/default.nix index 55b5f5972e..73b5de68bf 100644 --- a/distros/noetic/swri-math-util/default.nix +++ b/distros/noetic/swri-math-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-math-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_math_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "a4e5b19bcae98a22ea9d831b53b25c3ec7978b25a6594cf781e6eecdb58d8687"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_math_util/2.15.2-1"; + sha256 = "sha256-Vz20syGZfrKA+Ib0b8BJM/nTaOfN6CxtEVArXkT8dwE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-nodelet/default.nix b/distros/noetic/swri-nodelet/default.nix index aea5c8e0c1..df58a5153f 100644 --- a/distros/noetic/swri-nodelet/default.nix +++ b/distros/noetic/swri-nodelet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-nodelet"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_nodelet/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "e4569638c2b3528c9aa8837dd4eaaafd9ae571cd292684f14733198bb7879001"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_nodelet/2.15.2-1"; + sha256 = "sha256-42wkVD2H/SaGulcMEROawfekpN0/oMKtb9AXq+nYV8s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-opencv-util/default.nix b/distros/noetic/swri-opencv-util/default.nix index f2d7090c6e..6911896c2d 100644 --- a/distros/noetic/swri-opencv-util/default.nix +++ b/distros/noetic/swri-opencv-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-opencv-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_opencv_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "88191075c951b11757814bb2515d9ea440c0635ce26ef71510951a03ecb17bdb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_opencv_util/2.15.2-1"; + sha256 = "sha256-M2CNQviWLd4XNqcjlH9HhDDKf2wfAdDqr9vuU13Fy1U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-prefix-tools/default.nix b/distros/noetic/swri-prefix-tools/default.nix index 62b5ac9aaf..ad1bf1f2b0 100644 --- a/distros/noetic/swri-prefix-tools/default.nix +++ b/distros/noetic/swri-prefix-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-prefix-tools"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_prefix_tools/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "48a69316dd816101ba5a6303d6505f665d94745d126727c27d6a2deef163e818"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_prefix_tools/2.15.2-1"; + sha256 = "sha256-ECnNCSdWXUqA2/lfsR/Y9wKpWyK9AjwLi00GNnwpufc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-profiler-msgs/default.nix b/distros/noetic/swri-profiler-msgs/default.nix index bc98d19fdf..6a6737f103 100644 --- a/distros/noetic/swri-profiler-msgs/default.nix +++ b/distros/noetic/swri-profiler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-profiler-msgs"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/swri_profiler-release/archive/release/noetic/swri_profiler_msgs/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "35a376263f5039048c1f516706afde60a4d29eae23774874ce4dd74ff67519f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "swri_profiler-release"; + rev = "release/noetic/swri_profiler_msgs/0.2.2-1"; + sha256 = "sha256-Z/lTDATfvF26DGIF+IYW6N54P1NYKD1MdxEMT95muqI="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation std-msgs ]; diff --git a/distros/noetic/swri-profiler-tools/default.nix b/distros/noetic/swri-profiler-tools/default.nix index 6e8cd02d4b..0185162bf5 100644 --- a/distros/noetic/swri-profiler-tools/default.nix +++ b/distros/noetic/swri-profiler-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-profiler-tools"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/swri_profiler-release/archive/release/noetic/swri_profiler_tools/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "c32f6430968ef94fac3e9ea20a83e225b0251e32077f25c7c4e62bf16bdde88d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "swri_profiler-release"; + rev = "release/noetic/swri_profiler_tools/0.2.2-1"; + sha256 = "sha256-sz4KZc9NYkFu55vuBmgV0ee6zqCb6Tu1X1iqT+FLNOw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-profiler/default.nix b/distros/noetic/swri-profiler/default.nix index af348f6908..571e5b9d43 100644 --- a/distros/noetic/swri-profiler/default.nix +++ b/distros/noetic/swri-profiler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-profiler"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/swri_profiler-release/archive/release/noetic/swri_profiler/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "ed7a03d7ad37030a214da68b742c54dbc0830dd1c022d878066ab3785c636c08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "swri_profiler-release"; + rev = "release/noetic/swri_profiler/0.2.2-1"; + sha256 = "sha256-qOoJ03sjU2FSyX6zdrg6vEvMcnN0mZvpcf32l4w02PQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-roscpp/default.nix b/distros/noetic/swri-roscpp/default.nix index 8bd7870657..948e09220e 100644 --- a/distros/noetic/swri-roscpp/default.nix +++ b/distros/noetic/swri-roscpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-roscpp"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_roscpp/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "8249abbba7bcc983cc8cb7c527873080b7cd7c7e51499b30177c8dca65ca4da8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_roscpp/2.15.2-1"; + sha256 = "sha256-iYDok1TQuOKAmykFkMTedTrobmTiHAbtj+N12OeYUO4="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/swri-rospy/default.nix b/distros/noetic/swri-rospy/default.nix index 7de4d55ef6..bc29d5e275 100644 --- a/distros/noetic/swri-rospy/default.nix +++ b/distros/noetic/swri-rospy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-rospy"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_rospy/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "fbedbd28cd710df0e01abdb494abf562ece6cff23f172489fac0ebaf5b46fecc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_rospy/2.15.2-1"; + sha256 = "sha256-hKaYVmqoLehCXumz+nQeu3Nz0BfOrNoo66viKbSYEVU="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/swri-route-util/default.nix b/distros/noetic/swri-route-util/default.nix index 567c06b684..39e143c618 100644 --- a/distros/noetic/swri-route-util/default.nix +++ b/distros/noetic/swri-route-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-route-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_route_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "8d3b7bb7e6356611a443e919aca5be5159ab4f1f5254bdd1e4e482a50474ae40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_route_util/2.15.2-1"; + sha256 = "sha256-lrQIIIUIuVjLP6gk1VxgIA8xBP5Js+mP4aBo0ibaSxo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-serial-util/default.nix b/distros/noetic/swri-serial-util/default.nix index 5a33b67992..2fce6e1059 100644 --- a/distros/noetic/swri-serial-util/default.nix +++ b/distros/noetic/swri-serial-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-serial-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_serial_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "dd1362d27361c7ce27bd26a51d8b44342ff55ba446db0ba309e689a926ab50d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_serial_util/2.15.2-1"; + sha256 = "sha256-W2FJeVbiBdrXM4VEOzQ+h/c44E/8Gf2UDMPMdDh5of4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-string-util/default.nix b/distros/noetic/swri-string-util/default.nix index 75106aa1d4..31077abf26 100644 --- a/distros/noetic/swri-string-util/default.nix +++ b/distros/noetic/swri-string-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-string-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_string_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "e6a8cea407bfe527a0eca5c37b759a4d2d74d55eb6c784a57cdacae8f3219b3a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_string_util/2.15.2-1"; + sha256 = "sha256-sN8iZWwiqUE8TuvICjQ5xN89AEaml2Vhg7s/Igd1NQ4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-system-util/default.nix b/distros/noetic/swri-system-util/default.nix index 582bdc1760..d0a6ba69b2 100644 --- a/distros/noetic/swri-system-util/default.nix +++ b/distros/noetic/swri-system-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-system-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_system_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "a1a3dc26cefd19d3797fd561ea86a4bdb222affe1002cae62d1ca40770587cdc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_system_util/2.15.2-1"; + sha256 = "sha256-v5BrSgBtdAueJdUcyFQBMubVeED0xYd3kYvjqTlNexo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/swri-transform-util/default.nix b/distros/noetic/swri-transform-util/default.nix index 78d0b7b446..caf72404ee 100644 --- a/distros/noetic/swri-transform-util/default.nix +++ b/distros/noetic/swri-transform-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-transform-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_transform_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "b13f9b412a95b3f02362ff166edbb3dcb90ddc1582d49de1962b1de983b526ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_transform_util/2.15.2-1"; + sha256 = "sha256-2p3MOalmCs2ZG8zRynSO91R1iscd+UTfXl3D3yMGJdM="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config python3Packages.setuptools ]; diff --git a/distros/noetic/swri-yaml-util/default.nix b/distros/noetic/swri-yaml-util/default.nix index ef285fed08..cf05a1546a 100644 --- a/distros/noetic/swri-yaml-util/default.nix +++ b/distros/noetic/swri-yaml-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-swri-yaml-util"; version = "2.15.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/marti_common-release/archive/release/noetic/swri_yaml_util/2.15.2-1.tar.gz"; - name = "2.15.2-1.tar.gz"; - sha256 = "f5c313869382f93b4beb71385bc63d0ac04ae1bd545bd67c1c02015bededc1a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "marti_common-release"; + rev = "release/noetic/swri_yaml_util/2.15.2-1"; + sha256 = "sha256-3pfyGTUKsQ/+qxn6ekxKD007itkeaUMFKF25MfMpGjA="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/system-fingerprint/default.nix b/distros/noetic/system-fingerprint/default.nix index 5a20a513e0..822d11d203 100644 --- a/distros/noetic/system-fingerprint/default.nix +++ b/distros/noetic/system-fingerprint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-system-fingerprint"; version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/MetroRobots/ros_system_fingerprint-release/archive/release/noetic/system_fingerprint/0.6.1-1.tar.gz"; - name = "0.6.1-1.tar.gz"; - sha256 = "f50e5c06fc1645fb25f6ec6826a616dcf35d91acdfe6c3157e3b597102182bd9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MetroRobots"; + repo = "ros_system_fingerprint-release"; + rev = "release/noetic/system_fingerprint/0.6.1-1"; + sha256 = "sha256-sJWVOPQ+N77gZp34owWx+v8yuz2dIE4Lb/Zhkueinos="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tablet-socket-msgs/default.nix b/distros/noetic/tablet-socket-msgs/default.nix index 679e9907cb..1595a44b75 100644 --- a/distros/noetic/tablet-socket-msgs/default.nix +++ b/distros/noetic/tablet-socket-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tablet-socket-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/tablet_socket_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "65f6bd52a23f56ee5ff3e096b3d56feb572123ab4e9961e3616df395ba59e949"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/tablet_socket_msgs/1.14.0-1"; + sha256 = "sha256-K81PQWc5f4ipaEOUnZgJcmABZiUzdI1Jg96O6a9fVkA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/taskflow/default.nix b/distros/noetic/taskflow/default.nix index 0f2181972f..5c9882f67d 100644 --- a/distros/noetic/taskflow/default.nix +++ b/distros/noetic/taskflow/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-taskflow"; version = "3.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/taskflow-release/archive/release/noetic/taskflow/3.0.0-3.tar.gz"; - name = "3.0.0-3.tar.gz"; - sha256 = "bdf5cfccf688ea15ba7f65fb48f2e2ead80e9ba5e3df5014f50a2b445edf5d78"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "taskflow-release"; + rev = "release/noetic/taskflow/3.0.0-3"; + sha256 = "sha256-qXjvGJYzXO2AmJpuyKgiPsxBn2BdXbYHHycIXeQyKtg="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/teb-local-planner/default.nix b/distros/noetic/teb-local-planner/default.nix index e61d2dc3a4..4deb54d834 100644 --- a/distros/noetic/teb-local-planner/default.nix +++ b/distros/noetic/teb-local-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-teb-local-planner"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/rst-tu-dortmund/teb_local_planner-release/archive/release/noetic/teb_local_planner/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "c435f9715885fbe7e9ae79250d8fd829949c76818d2a10c7a3182bf69656ef31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rst-tu-dortmund"; + repo = "teb_local_planner-release"; + rev = "release/noetic/teb_local_planner/0.9.1-1"; + sha256 = "sha256-BVX39bC/UcEh0JzuSYVRLGLiAThrxtb+btawCdgQwjU="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules message-generation tf2-eigen tf2-geometry-msgs ]; diff --git a/distros/noetic/teleop-legged-robots/default.nix b/distros/noetic/teleop-legged-robots/default.nix index 6d01b823bd..d90681a7bb 100644 --- a/distros/noetic/teleop-legged-robots/default.nix +++ b/distros/noetic/teleop-legged-robots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-teleop-legged-robots"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/SoftServeSAG/teleop_legged_robots-release/archive/release/noetic/teleop_legged_robots/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "565acd4d3fa25edaffae1697a70179fc2b3e56d89b219dabff45229e42a90d99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "SoftServeSAG"; + repo = "teleop_legged_robots-release"; + rev = "release/noetic/teleop_legged_robots/1.1.2-1"; + sha256 = "sha256-TTdOolQrx0eIplFQXi3BHPo56lOYXCVYFKWuThYggJY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/teleop-tools-msgs/default.nix b/distros/noetic/teleop-tools-msgs/default.nix index b531f4ce3c..33ff234a6a 100644 --- a/distros/noetic/teleop-tools-msgs/default.nix +++ b/distros/noetic/teleop-tools-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-teleop-tools-msgs"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/noetic/teleop_tools_msgs/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "8cc7640ebe831d44cbfed52384248636cb2dd9e54c142f70d5fa847143d521e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/noetic/teleop_tools_msgs/0.4.0-1"; + sha256 = "sha256-rrylntQijuAVz3SEfgg1G7WQKFosg+AJLJuOiixm7zo="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/teleop-tools/default.nix b/distros/noetic/teleop-tools/default.nix index 5f39ad638f..a833dec185 100644 --- a/distros/noetic/teleop-tools/default.nix +++ b/distros/noetic/teleop-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-teleop-tools"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_tools-release/archive/release/noetic/teleop_tools/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "f662b3bbf0d8350707ba9ca3547375564a8c2f5394e64663edc0368e0ee044b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_tools-release"; + rev = "release/noetic/teleop_tools/0.4.0-1"; + sha256 = "sha256-cglVJ5ak3cSL7dWxzhDSYgzDdpUalHCfF+z3/ln0zAA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/teleop-twist-joy/default.nix b/distros/noetic/teleop-twist-joy/default.nix index a5afc72e04..7a7363fb8d 100644 --- a/distros/noetic/teleop-twist-joy/default.nix +++ b/distros/noetic/teleop-twist-joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-teleop-twist-joy"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_twist_joy-release/archive/release/noetic/teleop_twist_joy/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "86330180ab0c8a15456eb72ec998798f841e1fcab88a9dd87c5c9a2a16037a2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_twist_joy-release"; + rev = "release/noetic/teleop_twist_joy/0.1.3-1"; + sha256 = "sha256-7hNsyJOqpGjAJufLvI+K2teBHZfVDfeKBX5eOTYoJY0="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch roslint rostest ]; diff --git a/distros/noetic/teleop-twist-keyboard/default.nix b/distros/noetic/teleop-twist-keyboard/default.nix index 5c7dd3d13a..61fd6fa920 100644 --- a/distros/noetic/teleop-twist-keyboard/default.nix +++ b/distros/noetic/teleop-twist-keyboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-teleop-twist-keyboard"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/teleop_twist_keyboard-release/archive/release/noetic/teleop_twist_keyboard/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "1b2851ee341bc46c65c51b2c4063e293d03f15ea95fcd524f02dbb6fc99088de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "teleop_twist_keyboard-release"; + rev = "release/noetic/teleop_twist_keyboard/1.0.0-1"; + sha256 = "sha256-HWSbDb6AaeUM+9e6kvAiT2Uh1NxEcd/2cEQjkseYn10="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tello-driver/default.nix b/distros/noetic/tello-driver/default.nix index ff7609bd3f..8e76454ee2 100644 --- a/distros/noetic/tello-driver/default.nix +++ b/distros/noetic/tello-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tello-driver"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/JdeRobot/drones-release/archive/release/noetic/tello_driver/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "54774c8bb9bc3b962475b47a5ccd8d6b7b93b2d22140169a9ba0691c4f1dfb05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "JdeRobot"; + repo = "drones-release"; + rev = "release/noetic/tello_driver/1.4.2-1"; + sha256 = "sha256-5SCNHLUDo5i/DMiohHpQ9Fkg7xnn6+eU8kpNQPP4cZI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tesseract-collision/default.nix b/distros/noetic/tesseract-collision/default.nix index fdaa51da6a..66129eb479 100644 --- a/distros/noetic/tesseract-collision/default.nix +++ b/distros/noetic/tesseract-collision/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-collision"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_collision/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "7f85f240dd0ff1434db1bcf4d63ccc71afc0baa99fcfbcb862c3e6c599ec0337"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_collision/0.13.1-1"; + sha256 = "sha256-FrtqR2bflcpCls9PUgHtzJOWYQUpgGqA0DOaQMblWog="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-common/default.nix b/distros/noetic/tesseract-common/default.nix index b86b60ac7d..9bb9d7f8b0 100644 --- a/distros/noetic/tesseract-common/default.nix +++ b/distros/noetic/tesseract-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-common"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_common/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "677e179fdba277e75cf228e28217e0007e28758f070d51b9fb864c26dfd587e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_common/0.13.1-1"; + sha256 = "sha256-sP6U1vl2/Q9GnuueAP5hE00NLA7nv/yzXMvxdI+pWnY="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-environment/default.nix b/distros/noetic/tesseract-environment/default.nix index a146f01159..cf423b6216 100644 --- a/distros/noetic/tesseract-environment/default.nix +++ b/distros/noetic/tesseract-environment/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-environment"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_environment/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "beddaed978f6a8196a93294c6af6f580d7423793859b74c9ce30b256e7d7142a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_environment/0.13.1-1"; + sha256 = "sha256-h3lwjQpzPOZD1obob0h5CEtFupfCyNiWz2VLWrNwWFA="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-geometry/default.nix b/distros/noetic/tesseract-geometry/default.nix index 7047675432..83a41959e4 100644 --- a/distros/noetic/tesseract-geometry/default.nix +++ b/distros/noetic/tesseract-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-geometry"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_geometry/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "aeb1d3e2b62c507e96322c46b9199c4edcde6d9374cd3b4349a8c21112ac9ff9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_geometry/0.13.1-1"; + sha256 = "sha256-lJUS7+aNbbcKv1HI6CjNFlC4lKWiB7cwUMkZF+qItyM="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-kinematics/default.nix b/distros/noetic/tesseract-kinematics/default.nix index e53802ee20..0364b7bfb2 100644 --- a/distros/noetic/tesseract-kinematics/default.nix +++ b/distros/noetic/tesseract-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-kinematics"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_kinematics/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "df2694129a3f671504011d8de2a6ee0544027aff42289ea9e880d084763f56aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_kinematics/0.13.1-1"; + sha256 = "sha256-lmK3sOynl4xIpYuDQlESvpTwZTbTh5KTOnFAYJZuRRg="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-scene-graph/default.nix b/distros/noetic/tesseract-scene-graph/default.nix index d05bca4031..a336cf1e86 100644 --- a/distros/noetic/tesseract-scene-graph/default.nix +++ b/distros/noetic/tesseract-scene-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-scene-graph"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_scene_graph/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "de5d652a6b5f6dda855da0a8507b7424127f1e89630835ddef8fbc88329ef0db"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_scene_graph/0.13.1-1"; + sha256 = "sha256-FR9NzbUEzjbg+BAJw3xR/yMk3odgZQ1p7LnXIsR+H2w="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-srdf/default.nix b/distros/noetic/tesseract-srdf/default.nix index 462170d194..358f72b540 100644 --- a/distros/noetic/tesseract-srdf/default.nix +++ b/distros/noetic/tesseract-srdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-srdf"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_srdf/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "cd42b66672df6a8762b723cc1010edcadded1ff9501aceddab2b623693b357b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_srdf/0.13.1-1"; + sha256 = "sha256-SQtgO465GMX00wn8qwAfiuo7Zygcw+lscjZ1TvE6J1k="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-state-solver/default.nix b/distros/noetic/tesseract-state-solver/default.nix index 5b4778b4ea..123d7b0395 100644 --- a/distros/noetic/tesseract-state-solver/default.nix +++ b/distros/noetic/tesseract-state-solver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-state-solver"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_state_solver/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "aca48c45bce6b7bd112c65bd35265fd24dc5bc7fec3e2175881434e0cf089747"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_state_solver/0.13.1-1"; + sha256 = "sha256-epssxTH0YJJvP4Qm3aYFk3hUApCHx8bQE4IJQzl96h4="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-support/default.nix b/distros/noetic/tesseract-support/default.nix index 01aea2d09e..ccc9b406bf 100644 --- a/distros/noetic/tesseract-support/default.nix +++ b/distros/noetic/tesseract-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-support"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_support/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "0936264ac05cde9e7b6fe227800a102fa3c5081cc97419ceefbe67921a80f147"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_support/0.13.1-1"; + sha256 = "sha256-y1073V4r2h3V4isF/u5a1jui4F1L0Pck4t4B6jSqfLc="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate tesseract-common ]; diff --git a/distros/noetic/tesseract-urdf/default.nix b/distros/noetic/tesseract-urdf/default.nix index 14523e946a..da5271a8be 100644 --- a/distros/noetic/tesseract-urdf/default.nix +++ b/distros/noetic/tesseract-urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-urdf"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_urdf/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "8c525b3c18a39cf78c5c46fc83c7925c011866b9076497d4e76025c5e942b29f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_urdf/0.13.1-1"; + sha256 = "sha256-8ct+WBD3e+IUg+u7/W8NF4NNYDsG4cSPx6oI2Oev8Sk="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/tesseract-visualization/default.nix b/distros/noetic/tesseract-visualization/default.nix index b4b78938cb..090d426e10 100644 --- a/distros/noetic/tesseract-visualization/default.nix +++ b/distros/noetic/tesseract-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tesseract-visualization"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_visualization/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "aebab2138cc877f5927cb92b82ffadebe043058c1faa32c2955fcff2a31c1f35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "tesseract-release"; + rev = "release/noetic/tesseract_visualization/0.13.1-1"; + sha256 = "sha256-VIR0IYHpVQcpDcXBCVU3l36AnBHpWxPY+yQv8Unq3gA="; + }; buildType = "cmake"; buildInputs = [ cmake ros-industrial-cmake-boilerplate ]; diff --git a/distros/noetic/test-diagnostic-aggregator/default.nix b/distros/noetic/test-diagnostic-aggregator/default.nix index 57964932ca..5a7e9b1489 100644 --- a/distros/noetic/test-diagnostic-aggregator/default.nix +++ b/distros/noetic/test-diagnostic-aggregator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-test-diagnostic-aggregator"; version = "1.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/diagnostics-release/archive/release/noetic/test_diagnostic_aggregator/1.11.0-1.tar.gz"; - name = "1.11.0-1.tar.gz"; - sha256 = "58d23a932e321247efdb4ee7634e6b6eeeca0d9b9340b7c70411060caba63d84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "diagnostics-release"; + rev = "release/noetic/test_diagnostic_aggregator/1.11.0-1"; + sha256 = "sha256-Z/OK9qETXGCXXBRcWNzZNJoqPW525QvDStU3i3GLCU8="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/test-mavros/default.nix b/distros/noetic/test-mavros/default.nix index 954696b627..9bc63311e7 100644 --- a/distros/noetic/test-mavros/default.nix +++ b/distros/noetic/test-mavros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-test-mavros"; version = "1.15.0-r1"; - src = fetchurl { - url = "https://github.com/mavlink/mavros-release/archive/release/noetic/test_mavros/1.15.0-1.tar.gz"; - name = "1.15.0-1.tar.gz"; - sha256 = "5ab4b3c0e926ca0f2da43738870443718a7d71e34a98b7c633b9fb701eb40d8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "mavlink"; + repo = "mavros-release"; + rev = "release/noetic/test_mavros/1.15.0-1"; + sha256 = "sha256-SLJvU/TPVXD77MF+r2MOJWMFr78zX4+NHRa7kIOzt0w="; + }; buildType = "catkin"; buildInputs = [ angles catkin cmake-modules ]; diff --git a/distros/noetic/test-osm/default.nix b/distros/noetic/test-osm/default.nix index f728705a5e..5e7828d8f2 100644 --- a/distros/noetic/test-osm/default.nix +++ b/distros/noetic/test-osm/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-test-osm"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/open_street_map-release/archive/release/noetic/test_osm/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "27f71706cc1daaa3259f46375968d732e637b4b16b6147a22371670c73aee3b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "open_street_map-release"; + rev = "release/noetic/test_osm/0.3.0-1"; + sha256 = "sha256-OghAwD6XP37Rgcw4xovzBFONLsBLg8jyV/hfJ/MDnQk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf-conversions/default.nix b/distros/noetic/tf-conversions/default.nix index 0aa494d3b3..9ff5fc4588 100644 --- a/distros/noetic/tf-conversions/default.nix +++ b/distros/noetic/tf-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf-conversions"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/noetic/tf_conversions/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "812795f7af1b22c8e82405f9832587653abcc3250b4606e910df0f0c38b304d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/noetic/tf_conversions/1.13.2-1"; + sha256 = "sha256-1JIzYBtLJ9QGr0ZPLkz9Ut2mDfyqmviviefcJ6zFC6Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf-remapper-cpp/default.nix b/distros/noetic/tf-remapper-cpp/default.nix index 9ebac8dada..03ffa5e783 100644 --- a/distros/noetic/tf-remapper-cpp/default.nix +++ b/distros/noetic/tf-remapper-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf-remapper-cpp"; version = "1.1.1-r1"; - src = fetchurl { - url = "https://github.com/peci1/tf_remapper_cpp-release/archive/release/noetic/tf_remapper_cpp/1.1.1-1.tar.gz"; - name = "1.1.1-1.tar.gz"; - sha256 = "ca712c9318d7ad39dbfa3f8c7736fe7e9600a399177a4a0b6e5c707bbe51e6c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "tf_remapper_cpp-release"; + rev = "release/noetic/tf_remapper_cpp/1.1.1-1"; + sha256 = "sha256-gPTx/WRgemtvKvNrCviawV3/lxdKSGSZADICFHMss9k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf/default.nix b/distros/noetic/tf/default.nix index 72680d0403..a5e2a714fc 100644 --- a/distros/noetic/tf/default.nix +++ b/distros/noetic/tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry-release/archive/release/noetic/tf/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "e80444520026246b20a25f86f897cac53af73b3019b478d0abacaae5c46f480d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry-release"; + rev = "release/noetic/tf/1.13.2-1"; + sha256 = "sha256-0wsoGfnxEeQ1vv1xZBs0QsqhEXsOdmZvOvfcH677XU0="; + }; buildType = "catkin"; buildInputs = [ angles catkin message-generation rostime ]; diff --git a/distros/noetic/tf2-2d/default.nix b/distros/noetic/tf2-2d/default.nix index 77c72f312d..21d6c91d56 100644 --- a/distros/noetic/tf2-2d/default.nix +++ b/distros/noetic/tf2-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-2d"; version = "0.6.4-r1"; - src = fetchurl { - url = "https://github.com/locusrobotics/tf2_2d-release/archive/release/noetic/tf2_2d/0.6.4-1.tar.gz"; - name = "0.6.4-1.tar.gz"; - sha256 = "e6391d874cb244f062336064435ca13899bd50f71657ad6b3f928b0f85aa212a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "locusrobotics"; + repo = "tf2_2d-release"; + rev = "release/noetic/tf2_2d/0.6.4-1"; + sha256 = "sha256-fzb/KTasnwpnYHrHv+LYFIZ+HiS+a+zTiZ6t1CBuUMk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf2-bullet/default.nix b/distros/noetic/tf2-bullet/default.nix index 1d7569157d..8d1cdcb840 100644 --- a/distros/noetic/tf2-bullet/default.nix +++ b/distros/noetic/tf2-bullet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-bullet"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_bullet/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "f47f0a21eccf4d95cfad04a7e26b6641c7ad9278751e57e1f751124a357d3318"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_bullet/0.7.6-1"; + sha256 = "sha256-/4t69kkZ7FTEPyqHQguSp063/HZM/gt1kaUrije0jEA="; + }; buildType = "catkin"; buildInputs = [ catkin pkg-config ]; diff --git a/distros/noetic/tf2-eigen/default.nix b/distros/noetic/tf2-eigen/default.nix index 9c27f16403..e3b911c568 100644 --- a/distros/noetic/tf2-eigen/default.nix +++ b/distros/noetic/tf2-eigen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-eigen"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_eigen/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "541e32b2e1d4f1bd17a59974fda4bd38d007b4f4c82cfa022bf0b0972cb45606"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_eigen/0.7.6-1"; + sha256 = "sha256-mnj+R28+Wpu9orbD6Z9nIpBjeJ8uA9KQo1/8A11rlxM="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/tf2-geometry-msgs/default.nix b/distros/noetic/tf2-geometry-msgs/default.nix index 8cb970ec29..7450ec6f46 100644 --- a/distros/noetic/tf2-geometry-msgs/default.nix +++ b/distros/noetic/tf2-geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-geometry-msgs"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_geometry_msgs/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "0a95161adcce88b73ad19ce5987c66cc6718b22b97e5a24911cc67204d4db02c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_geometry_msgs/0.7.6-1"; + sha256 = "sha256-wUzJ6Tqql5eU8iL/w1lSUwZ5h43JcQUDAkmjJ8ue3C4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf2-kdl/default.nix b/distros/noetic/tf2-kdl/default.nix index c410314a83..f1c3c86c90 100644 --- a/distros/noetic/tf2-kdl/default.nix +++ b/distros/noetic/tf2-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-kdl"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_kdl/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "78bda9fac5cf7f76b53b4058cba45ee2ba714cedc6ada646049d1bee0df1dd67"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_kdl/0.7.6-1"; + sha256 = "sha256-hBpeiPyelBr8j/B7H9w8JN4aCfPQVKLVqp3RYDCQcBo="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/tf2-msgs/default.nix b/distros/noetic/tf2-msgs/default.nix index b616a2325e..609aa27e82 100644 --- a/distros/noetic/tf2-msgs/default.nix +++ b/distros/noetic/tf2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-msgs"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_msgs/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "eee7164069d9f5950cc1196f5dfc26c455cdccbe84980a1a43fbccb4b383f723"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_msgs/0.7.6-1"; + sha256 = "sha256-vM04W6xWq802JCrG1Aiiah+ufLrL7R54nzwV2BDbzi4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf2-py/default.nix b/distros/noetic/tf2-py/default.nix index 86e7daf447..99ca36faed 100644 --- a/distros/noetic/tf2-py/default.nix +++ b/distros/noetic/tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-py"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_py/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "ad94eb1bf317274039dac8eb17981af2864cc5949e24ba762564abafca263d53"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_py/0.7.6-1"; + sha256 = "sha256-3oA7k8UHUCkbP6XzZ69/vZJ12YiZUjGyXWUjyZQzeAU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf2-ros/default.nix b/distros/noetic/tf2-ros/default.nix index 86d5ea9c2b..daa2322ab8 100644 --- a/distros/noetic/tf2-ros/default.nix +++ b/distros/noetic/tf2-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-ros"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_ros/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "6cb6ebf52c8de736ee197bbe05f77f453e30d160e4eaedde9f66ff716f8f084a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_ros/0.7.6-1"; + sha256 = "sha256-sEe79LiUwwmlwrALXZyAnWxzEyzz3A4rfzpTkBO//Vg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf2-sensor-msgs/default.nix b/distros/noetic/tf2-sensor-msgs/default.nix index 1fa5f56e01..eca2a36e1b 100644 --- a/distros/noetic/tf2-sensor-msgs/default.nix +++ b/distros/noetic/tf2-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-sensor-msgs"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_sensor_msgs/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "67977cf9d6c45ce1ddcd0959beafc53858075c35d7ff4b54af24c744cd84ad2c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_sensor_msgs/0.7.6-1"; + sha256 = "sha256-Yil8ztT/p3d42S6ltN93n9BZPhNi+bZQgHsqDXYcVnM="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/tf2-server/default.nix b/distros/noetic/tf2-server/default.nix index 702e174f9c..2301cc1dc8 100644 --- a/distros/noetic/tf2-server/default.nix +++ b/distros/noetic/tf2-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-server"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/peci1/tf2_server-release/archive/release/noetic/tf2_server/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "0ec115bae4a412ef6d2ffb78be3ac3eaf93d84afba296b398c3253447f5c120d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "tf2_server-release"; + rev = "release/noetic/tf2_server/1.1.2-1"; + sha256 = "sha256-Bk1jD2C+gN84sGwA8PxNNfJ1COrPn1nqfYtl8DAVzxc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation python3Packages.setuptools ]; diff --git a/distros/noetic/tf2-tools/default.nix b/distros/noetic/tf2-tools/default.nix index fa91d348af..7415c765d1 100644 --- a/distros/noetic/tf2-tools/default.nix +++ b/distros/noetic/tf2-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-tools"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2_tools/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "b8f321481b85e2ce16643ba0356f417858bc08e8bd70954645d3db89a8bf67cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2_tools/0.7.6-1"; + sha256 = "sha256-EE4PW9bQ5iFHtQW9qBYJ7wN5r42EYqBgQ1a8n5lN+iI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tf2-web-republisher/default.nix b/distros/noetic/tf2-web-republisher/default.nix index 85e8f5379a..eb4f99db30 100644 --- a/distros/noetic/tf2-web-republisher/default.nix +++ b/distros/noetic/tf2-web-republisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2-web-republisher"; version = "0.3.2-r3"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/tf2_web_republisher-release/archive/release/noetic/tf2_web_republisher/0.3.2-3.tar.gz"; - name = "0.3.2-3.tar.gz"; - sha256 = "30a3d8b8ec4d7c65ac4bb5cbffd2e9faf8c9b1d66ceaf9fd0aa1d175b320f93d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "tf2_web_republisher-release"; + rev = "release/noetic/tf2_web_republisher/0.3.2-3"; + sha256 = "sha256-SWlALJIr/iyDp2Qh1Vw6fk7oq1AHzE3I3b2ysTWrbWU="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/tf2/default.nix b/distros/noetic/tf2/default.nix index 8febdec173..fd9f830dc1 100644 --- a/distros/noetic/tf2/default.nix +++ b/distros/noetic/tf2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tf2"; version = "0.7.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry2-release/archive/release/noetic/tf2/0.7.6-1.tar.gz"; - name = "0.7.6-1.tar.gz"; - sha256 = "1c195dcff3720e85819e47b753ce85e26cee5da9fb7c41533cc03782333fafe5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry2-release"; + rev = "release/noetic/tf2/0.7.6-1"; + sha256 = "sha256-wxtpJcU7170GGkfCR06Qqh2am19oNAB2m7DWZFh8bKI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/theora-image-transport/default.nix b/distros/noetic/theora-image-transport/default.nix index bf0e711ccb..d7fe7b828a 100644 --- a/distros/noetic/theora-image-transport/default.nix +++ b/distros/noetic/theora-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-theora-image-transport"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/image_transport_plugins-release/archive/release/noetic/theora_image_transport/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "0118b37d2c05543c66294cb79f2065613fc1b6f869f3284de12420b701bd1b08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/noetic/theora_image_transport/1.14.0-1"; + sha256 = "sha256-hqhP4uGkoPiGxJ5gmvMtICK8g2ijJMnbA1tO2+j3Xew="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/thunder-line-follower-pmr3100/default.nix b/distros/noetic/thunder-line-follower-pmr3100/default.nix index 9e89c0d9b4..76d24d1b92 100644 --- a/distros/noetic/thunder-line-follower-pmr3100/default.nix +++ b/distros/noetic/thunder-line-follower-pmr3100/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-thunder-line-follower-pmr3100"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ThundeRatz/thunder_line_follower_pmr3100-release/archive/release/noetic/thunder_line_follower_pmr3100/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "56789b16ded81ee822de841792ecb2d3271008642660ad77580d8de9d088760a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ThundeRatz"; + repo = "thunder_line_follower_pmr3100-release"; + rev = "release/noetic/thunder_line_follower_pmr3100/0.1.1-1"; + sha256 = "sha256-du66a7yIEOjyY0h/T5t9rMsUZ9GtYx+uy82/qf2vCbE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tile-map/default.nix b/distros/noetic/tile-map/default.nix index 7d26e8bf97..c463b1cacf 100644 --- a/distros/noetic/tile-map/default.nix +++ b/distros/noetic/tile-map/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tile-map"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/swri-robotics-gbp/mapviz-release/archive/release/noetic/tile_map/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "2c4ecc0cd98353b953027598473433fa7e37f5516fc4cab995098980ca4e18af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "swri-robotics-gbp"; + repo = "mapviz-release"; + rev = "release/noetic/tile_map/1.4.2-1"; + sha256 = "sha256-avDvm2BvpzVJJJ88DPTJesFdIznBLyQRyZ12ycmBt7A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/timestamp-tools/default.nix b/distros/noetic/timestamp-tools/default.nix index 4d34e7a947..8a82530374 100644 --- a/distros/noetic/timestamp-tools/default.nix +++ b/distros/noetic/timestamp-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-timestamp-tools"; version = "1.6.9-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/driver_common-release/archive/release/noetic/timestamp_tools/1.6.9-1.tar.gz"; - name = "1.6.9-1.tar.gz"; - sha256 = "f8808b257a0c8b9e3129c98bb341817ba9e1f162ad88c9a385625c7cd30e9e73"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "driver_common-release"; + rev = "release/noetic/timestamp_tools/1.6.9-1"; + sha256 = "sha256-LQqf9uiKPH4v3b6YSMCfWhpPcVhVynk2fwx4aq7/PyQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/tof-radar-controller/default.nix b/distros/noetic/tof-radar-controller/default.nix index 822ec27c95..c56c7ba7b2 100644 --- a/distros/noetic/tof-radar-controller/default.nix +++ b/distros/noetic/tof-radar-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tof-radar-controller"; version = "0.1.7-r1"; - src = fetchurl { - url = "https://github.com/rm-controls/rm_controllers-release/archive/release/noetic/tof_radar_controller/0.1.7-1.tar.gz"; - name = "0.1.7-1.tar.gz"; - sha256 = "c9db3b3a51ce4383ee6b10e320fde6ed04f80403548803e789178705d63df505"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rm-controls"; + repo = "rm_controllers-release"; + rev = "release/noetic/tof_radar_controller/0.1.7-1"; + sha256 = "sha256-Kzu/eddWPQX1CDQDSWUfnIgzhQj2G9FGV4Sb0h8/0g8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/topic-tools/default.nix b/distros/noetic/topic-tools/default.nix index f06d4ffe7b..7e346c1888 100644 --- a/distros/noetic/topic-tools/default.nix +++ b/distros/noetic/topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-topic-tools"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/topic_tools/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "26f4b99054bb27c00a260bea2dfab7f99f09f1daba977edb8a5df2e58609c7cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/topic_tools/1.15.15-1"; + sha256 = "sha256-huyMZYOlJ96JOh7FHIYto7nHmrY5J1RX885Lv+E7Vvs="; + }; buildType = "catkin"; buildInputs = [ catkin cpp-common message-generation rostest rosunit ]; diff --git a/distros/noetic/trac-ik-examples/default.nix b/distros/noetic/trac-ik-examples/default.nix index e6a8ba52cd..3321f4634a 100644 --- a/distros/noetic/trac-ik-examples/default.nix +++ b/distros/noetic/trac-ik-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-trac-ik-examples"; version = "1.6.6-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/noetic/trac_ik_examples/1.6.6-1.tar.gz"; - name = "1.6.6-1.tar.gz"; - sha256 = "7e165764159a0cd77fa86d802a164a901bb79057257d9e3183782dd350f624ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/noetic/trac_ik_examples/1.6.6-1"; + sha256 = "sha256-UR1JHuV3cggT3ciKoVwJX38+Kv9Blv+FyqnMlSrseVo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/trac-ik-kinematics-plugin/default.nix b/distros/noetic/trac-ik-kinematics-plugin/default.nix index f2855e5fae..cf2f1cd06e 100644 --- a/distros/noetic/trac-ik-kinematics-plugin/default.nix +++ b/distros/noetic/trac-ik-kinematics-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-trac-ik-kinematics-plugin"; version = "1.6.6-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/noetic/trac_ik_kinematics_plugin/1.6.6-1.tar.gz"; - name = "1.6.6-1.tar.gz"; - sha256 = "5edc36fd48484fee5af8fc5d54a089505d17d1dbd9e20cbfbaa76a62afbf22f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/noetic/trac_ik_kinematics_plugin/1.6.6-1"; + sha256 = "sha256-/pvYkZUaWOE6NZSPe6LeDnVx9VcLYdX/jNal0osi+YU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/trac-ik-lib/default.nix b/distros/noetic/trac-ik-lib/default.nix index 56168c8d7c..106dd34be9 100644 --- a/distros/noetic/trac-ik-lib/default.nix +++ b/distros/noetic/trac-ik-lib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-trac-ik-lib"; version = "1.6.6-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/noetic/trac_ik_lib/1.6.6-1.tar.gz"; - name = "1.6.6-1.tar.gz"; - sha256 = "3fc21184382c87e093b56e09b23d7683e216ed6fac1e807a6ce118712916ef04"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/noetic/trac_ik_lib/1.6.6-1"; + sha256 = "sha256-IpG2BG6MvK1xTe8DA+c1m62JnmWHmj8l9inLJOqHlEU="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules eigen pkg-config ]; diff --git a/distros/noetic/trac-ik-python/default.nix b/distros/noetic/trac-ik-python/default.nix index 8b80e80f2b..7ead75ce46 100644 --- a/distros/noetic/trac-ik-python/default.nix +++ b/distros/noetic/trac-ik-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-trac-ik-python"; version = "1.6.6-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/noetic/trac_ik_python/1.6.6-1.tar.gz"; - name = "1.6.6-1.tar.gz"; - sha256 = "fc8d13dfbc13c7b9513a9edd3f4b552c75e5b72d702d4a8b9475af6617719773"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/noetic/trac_ik_python/1.6.6-1"; + sha256 = "sha256-MjZN/QZDjpxlSMbQ7FVi2xBKPBOoJ9xji49+BW4XWdU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/trac-ik/default.nix b/distros/noetic/trac-ik/default.nix index 0ec0287ea8..7cb8f7bf72 100644 --- a/distros/noetic/trac-ik/default.nix +++ b/distros/noetic/trac-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-trac-ik"; version = "1.6.6-r1"; - src = fetchurl { - url = "https://github.com/traclabs/trac_ik-release/archive/release/noetic/trac_ik/1.6.6-1.tar.gz"; - name = "1.6.6-1.tar.gz"; - sha256 = "14bc7e8cc907b126ef1c5aadf458709569f07d2f3a9831a75f47ced763996e52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "traclabs"; + repo = "trac_ik-release"; + rev = "release/noetic/trac_ik/1.6.6-1"; + sha256 = "sha256-GloFBotEVdW5XrvYNvEYy64etH+T3hirJxXxWOhMG64="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/track-odometry/default.nix b/distros/noetic/track-odometry/default.nix index 2dd055cb2f..85ee170188 100644 --- a/distros/noetic/track-odometry/default.nix +++ b/distros/noetic/track-odometry/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, eigen, geometry-msgs, message-filters, nav-msgs, neonavigation-common, roscpp, roslint, rostest, sensor-msgs, std-msgs, tf2, tf2-geometry-msgs, tf2-ros, trajectory-msgs }: buildRosPackage { pname = "ros-noetic-track-odometry"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/track_odometry/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "da7e3bec9c601e76bf1ea39cb24b28768d188ba90816c2bf82cdc08e7159afee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/track_odometry/0.12.0-1"; + sha256 = "sha256-H21kc3o0Bb4XxCkeAWmtpw+KEmjR0LyjVT/zYYChys0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/trajectory-msgs/default.nix b/distros/noetic/trajectory-msgs/default.nix index 52ed925f9b..413623c5f8 100644 --- a/distros/noetic/trajectory-msgs/default.nix +++ b/distros/noetic/trajectory-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-trajectory-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/trajectory_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "4d6c3b972523840d4add843ddec7a00ec69e6dedb1a5b56af6d4b3b121715360"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/trajectory_msgs/1.13.1-1"; + sha256 = "sha256-ihqSCEr/m57g2YsjZ2zGAm4lH5RbE7gXUiri17vJEpw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/trajectory-tracker-msgs/default.nix b/distros/noetic/trajectory-tracker-msgs/default.nix index 6f8d000ed4..ba6571ecc4 100644 --- a/distros/noetic/trajectory-tracker-msgs/default.nix +++ b/distros/noetic/trajectory-tracker-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, nav-msgs, roscpp, roslint, rosunit, std-msgs }: buildRosPackage { pname = "ros-noetic-trajectory-tracker-msgs"; - version = "0.8.0-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_msgs-release/archive/release/noetic/trajectory_tracker_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "4bd4fe7f2414137d70ce6abcc7217a92b96e27bb1a2c0a3415d8b81190175d7d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_msgs-release"; + rev = "release/noetic/trajectory_tracker_msgs/0.12.0-1"; + sha256 = "sha256-CSySzmjxiIBKd3AmpwkHd2xHu5eURVuUnXSwHm95taY="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/trajectory-tracker-rviz-plugins/default.nix b/distros/noetic/trajectory-tracker-rviz-plugins/default.nix index 20ff9a869e..f38d5bbcae 100644 --- a/distros/noetic/trajectory-tracker-rviz-plugins/default.nix +++ b/distros/noetic/trajectory-tracker-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-trajectory-tracker-rviz-plugins"; version = "0.11.6-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation_rviz_plugins-release/archive/release/noetic/trajectory_tracker_rviz_plugins/0.11.6-1.tar.gz"; - name = "0.11.6-1.tar.gz"; - sha256 = "74cefaa38f778b4300bc792456ff65dfc5741afa6a8a6d5aee8d56a75591107b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation_rviz_plugins-release"; + rev = "release/noetic/trajectory_tracker_rviz_plugins/0.11.6-1"; + sha256 = "sha256-B82uDHEztq8cpGy2+hlPDaV++lB0T2p2BJZwgVI70q8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/trajectory-tracker/default.nix b/distros/noetic/trajectory-tracker/default.nix index 8aef9e391c..2d1055e033 100644 --- a/distros/noetic/trajectory-tracker/default.nix +++ b/distros/noetic/trajectory-tracker/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, eigen, geometry-msgs, interactive-markers, nav-msgs, neonavigation-common, roscpp, roslint, rostest, std-srvs, tf2, tf2-geometry-msgs, tf2-ros, trajectory-tracker-msgs }: buildRosPackage { pname = "ros-noetic-trajectory-tracker"; - version = "0.11.7-r1"; + version = "0.12.0-r1"; - src = fetchurl { - url = "https://github.com/at-wat/neonavigation-release/archive/release/noetic/trajectory_tracker/0.11.7-1.tar.gz"; - name = "0.11.7-1.tar.gz"; - sha256 = "d437cb6ea37f6d72214cb14bd9479801cbda4fbb584f2b0125f17e158fde6e6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "at-wat"; + repo = "neonavigation-release"; + rev = "release/noetic/trajectory_tracker/0.12.0-1"; + sha256 = "sha256-UBO1/K5nFuiwjKolZI1jlUGgdNDUwPktF+vykeLJG8A="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/transmission-interface/default.nix b/distros/noetic/transmission-interface/default.nix index bd7eeb2544..3121f4c0fb 100644 --- a/distros/noetic/transmission-interface/default.nix +++ b/distros/noetic/transmission-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-transmission-interface"; version = "0.19.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_control-release/archive/release/noetic/transmission_interface/0.19.6-1.tar.gz"; - name = "0.19.6-1.tar.gz"; - sha256 = "755e35de9c948073f5f97bcef76dfc4f9d851e6d1f18b892acf3ea8355315485"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_control-release"; + rev = "release/noetic/transmission_interface/0.19.6-1"; + sha256 = "sha256-jorp8CX/2un3FnNPhyya3f6QGp6NFKjlL/o1a+5GqLQ="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules ]; diff --git a/distros/noetic/tsid/default.nix b/distros/noetic/tsid/default.nix index 451ccbf8e3..7dacbc3c86 100644 --- a/distros/noetic/tsid/default.nix +++ b/distros/noetic/tsid/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-tsid"; version = "1.6.2-r2"; - src = fetchurl { - url = "https://github.com/stack-of-tasks/tsid-ros-release/archive/release/noetic/tsid/1.6.2-2.tar.gz"; - name = "1.6.2-2.tar.gz"; - sha256 = "a3f670afcb35a69415fe784584e853e309771c4954bbf36b90019f900bfa2409"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "stack-of-tasks"; + repo = "tsid-ros-release"; + rev = "release/noetic/tsid/1.6.2-2"; + sha256 = "sha256-Dze2KvE6Jk8GBedbnTgD2Qro+yV/OonJ4A/dFdKIJFo="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/noetic/turtle-actionlib/default.nix b/distros/noetic/turtle-actionlib/default.nix index a8068c4eb0..ed88ae62a4 100644 --- a/distros/noetic/turtle-actionlib/default.nix +++ b/distros/noetic/turtle-actionlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtle-actionlib"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_tutorials-release/archive/release/noetic/turtle_actionlib/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "80636aed6293e6c3fc13678ebf58bce00b1b8f2f7f067d9252e2e1f227bb4781"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_tutorials-release"; + rev = "release/noetic/turtle_actionlib/0.2.0-1"; + sha256 = "sha256-6hC8H1Ulk1quLoBloDa1cY87X6j+z4hCwRQkrN8xxjk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/turtle-tf/default.nix b/distros/noetic/turtle-tf/default.nix index ed6986aa1d..9af60111ae 100644 --- a/distros/noetic/turtle-tf/default.nix +++ b/distros/noetic/turtle-tf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtle-tf"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry_tutorials-release/archive/release/noetic/turtle_tf/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "647812c3fbed1534f79012e4c22e5701fe2d1b8dc0e3f838e96420e803fc313f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/noetic/turtle_tf/0.2.3-1"; + sha256 = "sha256-mm+mu28PNvjmav8NDsiiFBpYUax8rJ/rvAykWq6QM7w="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtle-tf2/default.nix b/distros/noetic/turtle-tf2/default.nix index 71f4ec9bc6..a5bd6b3574 100644 --- a/distros/noetic/turtle-tf2/default.nix +++ b/distros/noetic/turtle-tf2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtle-tf2"; version = "0.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/geometry_tutorials-release/archive/release/noetic/turtle_tf2/0.2.3-1.tar.gz"; - name = "0.2.3-1.tar.gz"; - sha256 = "540a3c37186add6323b4c91fe7baff1671158b1b70edd2ed7f57e3903265e362"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/noetic/turtle_tf2/0.2.3-1"; + sha256 = "sha256-2YqUGLInXdesWtJIFoIoOEO6btqsGreMyRvsFRbMlUk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-autorace-2020/default.nix b/distros/noetic/turtlebot3-autorace-2020/default.nix index 0c2d80fc17..f7d529ffbb 100644 --- a/distros/noetic/turtlebot3-autorace-2020/default.nix +++ b/distros/noetic/turtlebot3-autorace-2020/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-autorace-2020"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace_2020_release/archive/release/noetic/turtlebot3_autorace_2020/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "0e67c30118a051aacb31f028ee65edee4aea5955ae5bc7a23bec053e7b4b11c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace_2020_release"; + rev = "release/noetic/turtlebot3_autorace_2020/1.1.1-2"; + sha256 = "sha256-RwUE4dGpOKvtyf33kJ/osG3AmpWG1Cdd38NO2gTq9hQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-autorace-camera/default.nix b/distros/noetic/turtlebot3-autorace-camera/default.nix index 1af70caa0a..09859a052b 100644 --- a/distros/noetic/turtlebot3-autorace-camera/default.nix +++ b/distros/noetic/turtlebot3-autorace-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-autorace-camera"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace_2020_release/archive/release/noetic/turtlebot3_autorace_camera/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "677cf80fe061c8cc01ba31bcb80ffa83907efd5954e4068878bca8a0fe2eb992"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace_2020_release"; + rev = "release/noetic/turtlebot3_autorace_camera/1.1.1-2"; + sha256 = "sha256-IxFFJdII6nzyCVHxr/PZJi+VytYgdDXdJKuiCbWWj3k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-autorace-core/default.nix b/distros/noetic/turtlebot3-autorace-core/default.nix index ff9029effe..765fa2e86f 100644 --- a/distros/noetic/turtlebot3-autorace-core/default.nix +++ b/distros/noetic/turtlebot3-autorace-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-autorace-core"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace_2020_release/archive/release/noetic/turtlebot3_autorace_core/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "d9bf36bac1fd76e308b7fd9f10c304d07ae8da5ba825d64cec0f631918b861bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace_2020_release"; + rev = "release/noetic/turtlebot3_autorace_core/1.1.1-2"; + sha256 = "sha256-H2ftAP4BNYnDiqZuOCsw4V0VzsQ9+xGb5MyQE52NoQs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-autorace-detect/default.nix b/distros/noetic/turtlebot3-autorace-detect/default.nix index f07b51371b..5a4f5398c1 100644 --- a/distros/noetic/turtlebot3-autorace-detect/default.nix +++ b/distros/noetic/turtlebot3-autorace-detect/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-autorace-detect"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace_2020_release/archive/release/noetic/turtlebot3_autorace_detect/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "c25b137bb7dac2770de0f40d5b0667edf6f7f125de329dbc0af2f1dd8bafc6d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace_2020_release"; + rev = "release/noetic/turtlebot3_autorace_detect/1.1.1-2"; + sha256 = "sha256-PN0Hc6lwr6DuW/+MSm0LhW/NdZYaNP1LCO9s/1UhAc4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-autorace-driving/default.nix b/distros/noetic/turtlebot3-autorace-driving/default.nix index 8b382d75d6..e5e24a1cd1 100644 --- a/distros/noetic/turtlebot3-autorace-driving/default.nix +++ b/distros/noetic/turtlebot3-autorace-driving/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-autorace-driving"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace_2020_release/archive/release/noetic/turtlebot3_autorace_driving/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "03f25a6f2c271f2e7c7757818cdb9f9923a5cf22d6c5edc2131e5eb59cc68e1a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace_2020_release"; + rev = "release/noetic/turtlebot3_autorace_driving/1.1.1-2"; + sha256 = "sha256-cslPS4KeV/oso/3gRrybMvT2uHLyS432yb02uA4X0c0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-autorace-msgs/default.nix b/distros/noetic/turtlebot3-autorace-msgs/default.nix index 3de8e4fedc..c3cae6d488 100644 --- a/distros/noetic/turtlebot3-autorace-msgs/default.nix +++ b/distros/noetic/turtlebot3-autorace-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-autorace-msgs"; version = "1.1.1-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_autorace_2020_release/archive/release/noetic/turtlebot3_autorace_msgs/1.1.1-2.tar.gz"; - name = "1.1.1-2.tar.gz"; - sha256 = "0be60a38d898e2c517a0ce6fba2360255125adbaf9593d1abf76382dcb63bc21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_autorace_2020_release"; + rev = "release/noetic/turtlebot3_autorace_msgs/1.1.1-2"; + sha256 = "sha256-juuWuMtg5/KzKvogbVfVrStuCVlGZ0F/3yM9AbOF/Dc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/turtlebot3-bringup/default.nix b/distros/noetic/turtlebot3-bringup/default.nix index 3d73e51145..108f36c9f4 100644 --- a/distros/noetic/turtlebot3-bringup/default.nix +++ b/distros/noetic/turtlebot3-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-bringup"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/noetic/turtlebot3_bringup/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "f830143605731f35de4462ccb31cd2fa78d3e7fff6c370042185f32333b4aab8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/noetic/turtlebot3_bringup/1.2.5-1"; + sha256 = "sha256-JUAzSvBDO5X4y1IglkIhT8RpbGjIjvkOv1Hv0KOaRT8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-description/default.nix b/distros/noetic/turtlebot3-description/default.nix index 20433deda9..e6705499be 100644 --- a/distros/noetic/turtlebot3-description/default.nix +++ b/distros/noetic/turtlebot3-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-description"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/noetic/turtlebot3_description/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "b422283952d188f4abbdf83309e54003f3f62d2befbc211641db85a32656960b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/noetic/turtlebot3_description/1.2.5-1"; + sha256 = "sha256-aYpo45uD6TsqM3/ItbjfhRABXraZMZfLcxpgAwfC/NM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-example/default.nix b/distros/noetic/turtlebot3-example/default.nix index 1b54490bd2..4c032c9fcf 100644 --- a/distros/noetic/turtlebot3-example/default.nix +++ b/distros/noetic/turtlebot3-example/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-example"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/noetic/turtlebot3_example/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "2af50c6d5cf49106fbe1621db7065e770dff1d781b106f477b25f8294645166c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/noetic/turtlebot3_example/1.2.5-1"; + sha256 = "sha256-s+01xzaIyoB+ZYqvDup3zPc64trqrP7YVEwwQfBEpgE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/turtlebot3-fake/default.nix b/distros/noetic/turtlebot3-fake/default.nix index cac362cec7..fcee035bc3 100644 --- a/distros/noetic/turtlebot3-fake/default.nix +++ b/distros/noetic/turtlebot3-fake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-fake"; version = "1.3.2-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_simulations-release/archive/release/noetic/turtlebot3_fake/1.3.2-2.tar.gz"; - name = "1.3.2-2.tar.gz"; - sha256 = "092140ac011b733db80dd95dfdff2a6fbc4cb5423811ab72c1262be5089d4532"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/noetic/turtlebot3_fake/1.3.2-2"; + sha256 = "sha256-k2Oo4SH8RFCFB+EJq5pu/h5ADYDLii9RzVkj47Zoep8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-gazebo/default.nix b/distros/noetic/turtlebot3-gazebo/default.nix index 892c415913..bc992ddf1d 100644 --- a/distros/noetic/turtlebot3-gazebo/default.nix +++ b/distros/noetic/turtlebot3-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-gazebo"; version = "1.3.2-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_simulations-release/archive/release/noetic/turtlebot3_gazebo/1.3.2-2.tar.gz"; - name = "1.3.2-2.tar.gz"; - sha256 = "97f6e5a041d1edd6a549e8c696331ece95e96f285ae4dd595d29cf8a4c1d29a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/noetic/turtlebot3_gazebo/1.3.2-2"; + sha256 = "sha256-eyDNkPH3zZEUUCqFCy0/hQW/ufKcgF7C8rVTyMNMWuY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-msgs/default.nix b/distros/noetic/turtlebot3-msgs/default.nix index 0fd04cab7a..d005bba54e 100644 --- a/distros/noetic/turtlebot3-msgs/default.nix +++ b/distros/noetic/turtlebot3-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-msgs"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_msgs-release/archive/release/noetic/turtlebot3_msgs/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "768e46ad69aff6599a5a5527993d47906a574a825b499a3a6fa8fabacf6763b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_msgs-release"; + rev = "release/noetic/turtlebot3_msgs/1.0.1-1"; + sha256 = "sha256-TuKkhqY+h2teOgQsMu4wZ+onxN+V+kMDigJAUNrLiiw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/turtlebot3-navigation/default.nix b/distros/noetic/turtlebot3-navigation/default.nix index 0c3a867d24..a06ec6d200 100644 --- a/distros/noetic/turtlebot3-navigation/default.nix +++ b/distros/noetic/turtlebot3-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-navigation"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/noetic/turtlebot3_navigation/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "5ec6cd07d0b55b7eac47c60b3b27751eb39b1773e0242daeb05e7822995a53a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/noetic/turtlebot3_navigation/1.2.5-1"; + sha256 = "sha256-CdHx+SA0zxRVGqbt5ZBOrh/gFc5Y11kM1jTu6q0vAMU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-simulations/default.nix b/distros/noetic/turtlebot3-simulations/default.nix index f6121f6518..edb4e4af8c 100644 --- a/distros/noetic/turtlebot3-simulations/default.nix +++ b/distros/noetic/turtlebot3-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-simulations"; version = "1.3.2-r2"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3_simulations-release/archive/release/noetic/turtlebot3_simulations/1.3.2-2.tar.gz"; - name = "1.3.2-2.tar.gz"; - sha256 = "aa1474452ef725257bb52b83f2bce1284a5cabccdbb070b2b920732c522cc78e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3_simulations-release"; + rev = "release/noetic/turtlebot3_simulations/1.3.2-2"; + sha256 = "sha256-3whDHJxK9b6qeoSdk7sdQroNBwRbo+QdLg1Zt2GOyU4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-slam/default.nix b/distros/noetic/turtlebot3-slam/default.nix index 8b44c971cd..33568a6559 100644 --- a/distros/noetic/turtlebot3-slam/default.nix +++ b/distros/noetic/turtlebot3-slam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-slam"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/noetic/turtlebot3_slam/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "4620134599a31d904486d5f1fb9bb6b188bf27bd1d6332c224f65131c8a6e4e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/noetic/turtlebot3_slam/1.2.5-1"; + sha256 = "sha256-KaUBzMvaTytc+uhLSg5u7jdW7re6DmbBPiO8vlwgRcA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3-teleop/default.nix b/distros/noetic/turtlebot3-teleop/default.nix index 58204c3758..c430dc1d8a 100644 --- a/distros/noetic/turtlebot3-teleop/default.nix +++ b/distros/noetic/turtlebot3-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3-teleop"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/noetic/turtlebot3_teleop/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "46949ab39e9f1bab51923b857d7178260bfa49870d41ee64bd2aed75935f3bf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/noetic/turtlebot3_teleop/1.2.5-1"; + sha256 = "sha256-B8g7xfr12HA8mza+W03grdMy2vAg9zAyjQ3f5B4rcLo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlebot3/default.nix b/distros/noetic/turtlebot3/default.nix index 95bfe9d164..8e8f773507 100644 --- a/distros/noetic/turtlebot3/default.nix +++ b/distros/noetic/turtlebot3/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlebot3"; version = "1.2.5-r1"; - src = fetchurl { - url = "https://github.com/ROBOTIS-GIT-release/turtlebot3-release/archive/release/noetic/turtlebot3/1.2.5-1.tar.gz"; - name = "1.2.5-1.tar.gz"; - sha256 = "da6560f64cd517b240645aa5def7d0e983e0d47b23c672b60ad181f5ebd4f688"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ROBOTIS-GIT-release"; + repo = "turtlebot3-release"; + rev = "release/noetic/turtlebot3/1.2.5-1"; + sha256 = "sha256-SU4ybJCdTW15hpQ0GnGfnmgggYfL4fQna7krrMH3kYc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/turtlesim/default.nix b/distros/noetic/turtlesim/default.nix index 595c40a03c..cfb894e374 100644 --- a/distros/noetic/turtlesim/default.nix +++ b/distros/noetic/turtlesim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-turtlesim"; version = "0.10.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_tutorials-release/archive/release/noetic/turtlesim/0.10.2-1.tar.gz"; - name = "0.10.2-1.tar.gz"; - sha256 = "f5e1c21ee45163443ccc76bdae473e39b1f1015e2289ab13e6a7391c59bd33fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_tutorials-release"; + rev = "release/noetic/turtlesim/0.10.2-1"; + sha256 = "sha256-Ql+/zC+9bCpyo8XVWim+24ysmBK0+Ah8qwmKJHmt4z8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/twist-controller/default.nix b/distros/noetic/twist-controller/default.nix index adeb39c9c8..c714b057fd 100644 --- a/distros/noetic/twist-controller/default.nix +++ b/distros/noetic/twist-controller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-twist-controller"; version = "0.1.5-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_ROS_controllers_cartesian-release/archive/release/noetic/twist_controller/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "1ce2d703821975d1535d64e9e5c182991f4e004fa5ebca3613468eb1521c3494"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_controllers_cartesian-release"; + rev = "release/noetic/twist_controller/0.1.5-1"; + sha256 = "sha256-9ZeNKdV61DwK8A4FzIF2BhS/N6mso+lQk0SA+KP4xcQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/twist-mux-msgs/default.nix b/distros/noetic/twist-mux-msgs/default.nix index e5b138d045..7bc740dc38 100644 --- a/distros/noetic/twist-mux-msgs/default.nix +++ b/distros/noetic/twist-mux-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-twist-mux-msgs"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/twist_mux_msgs-release/archive/release/noetic/twist_mux_msgs/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "782864dff4f4c569eab485e232f3e00785b6c7dc1b6dc1702f6492ab577b73de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "twist_mux_msgs-release"; + rev = "release/noetic/twist_mux_msgs/2.1.0-1"; + sha256 = "sha256-nFTjNHn8Nj72WiOy79WlpfEU1l66Ra/e7n67sfL4Dn0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/twist-mux/default.nix b/distros/noetic/twist-mux/default.nix index 3fe39ccc80..fb5069827a 100644 --- a/distros/noetic/twist-mux/default.nix +++ b/distros/noetic/twist-mux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-twist-mux"; version = "3.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/twist_mux-release/archive/release/noetic/twist_mux/3.1.3-1.tar.gz"; - name = "3.1.3-1.tar.gz"; - sha256 = "71e3e5b1d10125f0fed59a044ff37eddc799ed27c0a944fe319dbe0cece79844"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "twist_mux-release"; + rev = "release/noetic/twist_mux/3.1.3-1"; + sha256 = "sha256-00ma5idqDTHO75R9MbC9kYLfuA8EqlHl5iHsY82DQ9M="; + }; buildType = "catkin"; buildInputs = [ catkin rostest ]; diff --git a/distros/noetic/twist-recovery/default.nix b/distros/noetic/twist-recovery/default.nix index b4e62659e3..b9abb2187e 100644 --- a/distros/noetic/twist-recovery/default.nix +++ b/distros/noetic/twist-recovery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-twist-recovery"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation_experimental-release/archive/release/noetic/twist_recovery/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "d13f9a52e05f8bd2a504d76a1147695378622cf1f3b0eaff84fe6607f6f36f4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation_experimental-release"; + rev = "release/noetic/twist_recovery/0.4.1-1"; + sha256 = "sha256-EMYjWtNdy2B0Bi+/9gPUIt83b4S9KaysbmcxGWoffOI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ubiquity-motor/default.nix b/distros/noetic/ubiquity-motor/default.nix index fd3d155527..820b32bffb 100644 --- a/distros/noetic/ubiquity-motor/default.nix +++ b/distros/noetic/ubiquity-motor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ubiquity-motor"; version = "0.14.0-r1"; - src = fetchurl { - 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"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UbiquityRobotics-release"; + repo = "ubiquity_motor-release"; + rev = "release/noetic/ubiquity_motor/0.14.0-1"; + sha256 = "sha256-gaY+2VGkoHAPeWH6fq+MzFCLaK15dXCeTe4Yv1uQzOM="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roscpp ]; diff --git a/distros/noetic/ublox-gps/default.nix b/distros/noetic/ublox-gps/default.nix index 7382d3667f..3f471fb059 100644 --- a/distros/noetic/ublox-gps/default.nix +++ b/distros/noetic/ublox-gps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ublox-gps"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/KumarRobotics/ublox-release/archive/release/noetic/ublox_gps/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "b71af92497d916723093c3d7b5d12427d6907df0b7615a0c4462922fe4090853"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KumarRobotics"; + repo = "ublox-release"; + rev = "release/noetic/ublox_gps/1.5.0-1"; + sha256 = "sha256-cOV6LUh53kzyrwCUI63aDm9zqHfMlGgG8Fo4NIqWEHk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ublox-msgs/default.nix b/distros/noetic/ublox-msgs/default.nix index a0f640fc4d..f7be6c3d7c 100644 --- a/distros/noetic/ublox-msgs/default.nix +++ b/distros/noetic/ublox-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ublox-msgs"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/KumarRobotics/ublox-release/archive/release/noetic/ublox_msgs/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "9fc88ab1605cd2996a97bcbe81ad844a8e8d51d4827f67d4c1ab0a72784d881d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KumarRobotics"; + repo = "ublox-release"; + rev = "release/noetic/ublox_msgs/1.5.0-1"; + sha256 = "sha256-Pti1Oh0+JtLsCL2TvUdFUTE1KrqThw6cBTkUqTpP6V8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ublox-serialization/default.nix b/distros/noetic/ublox-serialization/default.nix index fcb4c64329..5e5df16787 100644 --- a/distros/noetic/ublox-serialization/default.nix +++ b/distros/noetic/ublox-serialization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ublox-serialization"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/KumarRobotics/ublox-release/archive/release/noetic/ublox_serialization/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "20074e162992ec6207586b72344c2ab8dab07cad30d63af6e705a25a8fb01378"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KumarRobotics"; + repo = "ublox-release"; + rev = "release/noetic/ublox_serialization/1.5.0-1"; + sha256 = "sha256-5+/6oF8J4m3RAg7K0wKJoWtSuSmTqTejU22h4+n/hTM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ublox/default.nix b/distros/noetic/ublox/default.nix index 228c1afa68..8cf4f6eb2f 100644 --- a/distros/noetic/ublox/default.nix +++ b/distros/noetic/ublox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ublox"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/KumarRobotics/ublox-release/archive/release/noetic/ublox/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "264d5744cdc540b4320713806a0e33004b691071eeeb3d742ec49e0e4a1268e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "KumarRobotics"; + repo = "ublox-release"; + rev = "release/noetic/ublox/1.5.0-1"; + sha256 = "sha256-HS8LAMK2ydxUm81nYipqV8xMyLFyie20IEByw7bTKC4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ubnt-airos-tools/default.nix b/distros/noetic/ubnt-airos-tools/default.nix index 058c40bc75..94a8dff9c6 100644 --- a/distros/noetic/ubnt-airos-tools/default.nix +++ b/distros/noetic/ubnt-airos-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ubnt-airos-tools"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/peci1/ubnt_airos_tools-release/archive/release/noetic/ubnt_airos_tools/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "0d3c3165ab336d758910fe23f2f9706b8069bbfb00ec7ed9d1e068f3cd0929b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "peci1"; + repo = "ubnt_airos_tools-release"; + rev = "release/noetic/ubnt_airos_tools/1.1.0-1"; + sha256 = "sha256-H+ccLukZAsvAUznsxYrEULJHVeOs5OSQp0+idv1O+v8="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/udp-com/default.nix b/distros/noetic/udp-com/default.nix index a70ad48511..d4fbc8f35e 100644 --- a/distros/noetic/udp-com/default.nix +++ b/distros/noetic/udp-com/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-udp-com"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/flynneva/udp_com-release/archive/release/noetic/udp_com/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "aac456e8ac59b6a472358d527eebd3be84021964c48e602adf85d9a1100a9909"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "flynneva"; + repo = "udp_com-release"; + rev = "release/noetic/udp_com/1.1.2-1"; + sha256 = "sha256-/+NB3JgSv1jewDwinkKvkUoa/+BT6++94bgZcIpyYk8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ueye-cam/default.nix b/distros/noetic/ueye-cam/default.nix index a17e8589f8..51cf3a81dc 100644 --- a/distros/noetic/ueye-cam/default.nix +++ b/distros/noetic/ueye-cam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ueye-cam"; version = "1.0.19-r1"; - src = fetchurl { - url = "https://github.com/anqixu/ueye_cam-release/archive/release/noetic/ueye_cam/1.0.19-1.tar.gz"; - name = "1.0.19-1.tar.gz"; - sha256 = "b4123e716d5d400cbbd6b76e33b70fc469246e2fc77602926b07841b915e1dd3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anqixu"; + repo = "ueye_cam-release"; + rev = "release/noetic/ueye_cam/1.0.19-1"; + sha256 = "sha256-cEbjJuENEhshE+PEvSS1fCP4+B/EKYIr5xm9WImUVC4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/um6/default.nix b/distros/noetic/um6/default.nix index 9803f07990..c56bfa17a1 100644 --- a/distros/noetic/um6/default.nix +++ b/distros/noetic/um6/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-um6"; version = "1.1.3-r4"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/um6-release/archive/release/noetic/um6/1.1.3-4.tar.gz"; - name = "1.1.3-4.tar.gz"; - sha256 = "1545b3debade76db6e2955bc6769c6e1eb23c8f4f1d2f6e0a28aee3dbbb97c2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "um6-release"; + rev = "release/noetic/um6/1.1.3-4"; + sha256 = "sha256-Jq7xl6e/7pAf8wyE+Ykf3vGDB2nDYEyc3Z2zV8tYeBE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roslint ]; diff --git a/distros/noetic/um7/default.nix b/distros/noetic/um7/default.nix index b35c49ecbd..597ba7824a 100644 --- a/distros/noetic/um7/default.nix +++ b/distros/noetic/um7/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-um7"; version = "0.0.7-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/um7-release/archive/release/noetic/um7/0.0.7-1.tar.gz"; - name = "0.0.7-1.tar.gz"; - sha256 = "5d5a3f21139972a21ef808586bf3239794e197067c2523dc7c8cf8c4f6a22adc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "um7-release"; + rev = "release/noetic/um7/0.0.7-1"; + sha256 = "sha256-YWxUBWOI1Vn2U184XPqCVLb0y4wDmZD1bqxjIKouXbE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/unique-id/default.nix b/distros/noetic/unique-id/default.nix index 003cd79322..148869633c 100644 --- a/distros/noetic/unique-id/default.nix +++ b/distros/noetic/unique-id/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-unique-id"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/unique_identifier-release/archive/release/noetic/unique_id/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "3bc1d8eace40dc0a1346ca7740c67962aba40ad3d6dabc095370e5b97b33d88f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "unique_identifier-release"; + rev = "release/noetic/unique_id/1.0.6-1"; + sha256 = "sha256-Utf63NtbxEw1gmgIlpLsrswjQvw973ZfBGJ2cbCPYd8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/unique-identifier/default.nix b/distros/noetic/unique-identifier/default.nix index 419dd0c55a..241bdf2e5e 100644 --- a/distros/noetic/unique-identifier/default.nix +++ b/distros/noetic/unique-identifier/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-unique-identifier"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/unique_identifier-release/archive/release/noetic/unique_identifier/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "8e57df192afc4bee7a46c3f9e80251bf4b8c555f96b36154ea15474ab1d2848f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "unique_identifier-release"; + rev = "release/noetic/unique_identifier/1.0.6-1"; + sha256 = "sha256-PxqzwB/Ek35RtgN1JvHsoYwcdlCUsfSpayNNJEjqqtk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/universal-robots/default.nix b/distros/noetic/universal-robots/default.nix index 27115cbfb0..5ba37fc4e8 100644 --- a/distros/noetic/universal-robots/default.nix +++ b/distros/noetic/universal-robots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-universal-robots"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/universal_robots/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "4cc451e00668ff15d6ed79e99ff8ecc123d81d2c1cd2d0886fb78902a83f1546"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/universal_robots/1.3.1-1"; + sha256 = "sha256-IpROXEJ8yu4Nv8+ARV6bxFwZMcfwK+8bxsMdebHa9DI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur-calibration/default.nix b/distros/noetic/ur-calibration/default.nix new file mode 100644 index 0000000000..c51f5b9c62 --- /dev/null +++ b/distros/noetic/ur-calibration/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, eigen, libyamlcpp, roscpp, rosunit, ur-client-library, ur-robot-driver }: +buildRosPackage { + pname = "ros-noetic-ur-calibration"; + version = "2.1.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_Driver-release"; + rev = "release/noetic/ur_calibration/2.1.2-1"; + sha256 = "sha256-Zp6pj1kBgPWeOk59VARXax7RwKKItJZXSMX9c7VdO3A="; + }; + + buildType = "catkin"; + buildInputs = [ catkin ]; + checkInputs = [ rosunit ]; + propagatedBuildInputs = [ eigen libyamlcpp roscpp ur-client-library ur-robot-driver ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Package for extracting the factory calibration from a UR robot and change it such that it can be used by ur_description to gain a correct URDF''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/noetic/ur-client-library/default.nix b/distros/noetic/ur-client-library/default.nix index 7cd03dd8cd..c85e1bb237 100644 --- a/distros/noetic/ur-client-library/default.nix +++ b/distros/noetic/ur-client-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur-client-library"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/UniversalRobots/Universal_Robots_Client_Library-release/archive/release/noetic/ur_client_library/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "91529e5d1ca25f4b60bd6c83f09cb3e1657c0c87e2fb8e2bdc11461304248ac2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_Client_Library-release"; + rev = "release/noetic/ur_client_library/1.3.1-1"; + sha256 = "sha256-AYfd94IM+Etv+B7ZUeZWVMNr98mHHmGlCi5CUh8hhWo="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/ur-dashboard-msgs/default.nix b/distros/noetic/ur-dashboard-msgs/default.nix new file mode 100644 index 0000000000..9b07a50275 --- /dev/null +++ b/distros/noetic/ur-dashboard-msgs/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, message-generation, message-runtime, std-msgs }: +buildRosPackage { + pname = "ros-noetic-ur-dashboard-msgs"; + version = "2.1.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_Driver-release"; + rev = "release/noetic/ur_dashboard_msgs/2.1.2-1"; + sha256 = "sha256-Fi3SqrgCS/j3gEVgRGKf6JRyPfu66O+xaPCNLFZo7Ak="; + }; + + buildType = "catkin"; + buildInputs = [ catkin message-generation ]; + propagatedBuildInputs = [ actionlib-msgs message-runtime std-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Messages around the UR Dashboard server.''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/noetic/ur-description/default.nix b/distros/noetic/ur-description/default.nix index 67782b7bc7..40634cb7fb 100644 --- a/distros/noetic/ur-description/default.nix +++ b/distros/noetic/ur-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur-description"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur_description/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "845fa20c6d5eba1e14b1bd069bac23247dbcf0c49505f5a9023c6b9019888b5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur_description/1.3.1-1"; + sha256 = "sha256-oBfwM4xdLzEP2wgCWkIfMCPQDILmVaxIayQJOLucr5I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur-gazebo/default.nix b/distros/noetic/ur-gazebo/default.nix index 4706af1538..812d99a92c 100644 --- a/distros/noetic/ur-gazebo/default.nix +++ b/distros/noetic/ur-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur-gazebo"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur_gazebo/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "78eead524cf56d0c372c723c91219a95ad2fe1fa672f611d0740c17d2acd305f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur_gazebo/1.3.1-1"; + sha256 = "sha256-Vu37y39DoI9TCxE0DAIUkgZBSShKb+uw3glc/7TKZlw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur-msgs/default.nix b/distros/noetic/ur-msgs/default.nix index e116f57f4c..82d30c085c 100644 --- a/distros/noetic/ur-msgs/default.nix +++ b/distros/noetic/ur-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur-msgs"; version = "1.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/ur_msgs-release/archive/release/noetic/ur_msgs/1.3.4-1.tar.gz"; - name = "1.3.4-1.tar.gz"; - sha256 = "7cc9a63f7604f5bf88f11a0b1fad291ad18714070b9a3bb5f272833523ed6761"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "ur_msgs-release"; + rev = "release/noetic/ur_msgs/1.3.4-1"; + sha256 = "sha256-pO62WDlSmq6jTyravoCaS4ZXGrP+9blXSh3buP4yT/g="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ur-robot-driver/default.nix b/distros/noetic/ur-robot-driver/default.nix new file mode 100644 index 0000000000..44f2bee132 --- /dev/null +++ b/distros/noetic/ur-robot-driver/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, actionlib, boost, cartesian-trajectory-controller, catkin, control-msgs, controller-manager, controller-manager-msgs, force-torque-sensor-controller, geometry-msgs, hardware-interface, industrial-robot-status-controller, industrial-robot-status-interface, joint-state-controller, joint-trajectory-controller, kdl-parser, pass-through-controllers, pluginlib, robot-state-publisher, roscpp, rostest, scaled-joint-trajectory-controller, sensor-msgs, socat, speed-scaling-interface, speed-scaling-state-controller, std-srvs, tf, tf2-geometry-msgs, tf2-msgs, trajectory-msgs, twist-controller, ur-client-library, ur-dashboard-msgs, ur-description, ur-msgs, velocity-controllers }: +buildRosPackage { + pname = "ros-noetic-ur-robot-driver"; + version = "2.1.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "UniversalRobots"; + repo = "Universal_Robots_ROS_Driver-release"; + rev = "release/noetic/ur_robot_driver/2.1.2-1"; + sha256 = "sha256-FuyNLO/SFkuG8Njqn6tJxljYcHvJJvEFsMivKBrwB4Q="; + }; + + buildType = "catkin"; + buildInputs = [ boost catkin industrial-robot-status-interface ]; + checkInputs = [ rostest ]; + propagatedBuildInputs = [ actionlib cartesian-trajectory-controller control-msgs controller-manager controller-manager-msgs force-torque-sensor-controller geometry-msgs hardware-interface industrial-robot-status-controller joint-state-controller joint-trajectory-controller kdl-parser pass-through-controllers pluginlib robot-state-publisher roscpp scaled-joint-trajectory-controller sensor-msgs socat speed-scaling-interface speed-scaling-state-controller std-srvs tf tf2-geometry-msgs tf2-msgs trajectory-msgs twist-controller ur-client-library ur-dashboard-msgs ur-description ur-msgs velocity-controllers ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''The new driver for Universal Robots UR3, UR5 and UR10 robots with CB3 controllers and the e-series.''; + license = with lib.licenses; [ asl20 "BSD-2-Clause" "Zlib" ]; + }; +} diff --git a/distros/noetic/ur10-moveit-config/default.nix b/distros/noetic/ur10-moveit-config/default.nix index a279f045cb..68aad50a64 100644 --- a/distros/noetic/ur10-moveit-config/default.nix +++ b/distros/noetic/ur10-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur10-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur10_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "2483e9b23c0f97c08a23977e0b54b6835acd302d887c874a3ce000e0661673ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur10_moveit_config/1.3.1-1"; + sha256 = "sha256-31mRsM0p44A/uTtBd62BSaq1qRk67vBcSYsznBaZKYM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur10e-moveit-config/default.nix b/distros/noetic/ur10e-moveit-config/default.nix index 0ae5852e7a..9a341ac1af 100644 --- a/distros/noetic/ur10e-moveit-config/default.nix +++ b/distros/noetic/ur10e-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur10e-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur10e_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "8b58cb6b4f5569b432181724c80e0e7f361544a27008ec5107e9be66c1c990ea"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur10e_moveit_config/1.3.1-1"; + sha256 = "sha256-fotsAd1d3BkdGh2exf0RMd6dpz+gWz4+3jopJ9ncWaY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur16e-moveit-config/default.nix b/distros/noetic/ur16e-moveit-config/default.nix index 2abad6f687..9eb702132a 100644 --- a/distros/noetic/ur16e-moveit-config/default.nix +++ b/distros/noetic/ur16e-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur16e-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur16e_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "f9ae63ce7e19f11694bf5f61e632d9432d4a1f8252dc9be5123d75a27cf1622a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur16e_moveit_config/1.3.1-1"; + sha256 = "sha256-Y776LP9vxgAXu8XirAfMlk6GhJ6rgslxj+mwttl4llo="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur3-moveit-config/default.nix b/distros/noetic/ur3-moveit-config/default.nix index 6ad359d5ba..b447283952 100644 --- a/distros/noetic/ur3-moveit-config/default.nix +++ b/distros/noetic/ur3-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur3-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur3_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "f0a364d80079493419f1ddba701d1721aefdec55a33895fecf5f6aca4606feb4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur3_moveit_config/1.3.1-1"; + sha256 = "sha256-dKboWdVHZC8TgG3dunucIICDNcZE5AoIbtiwBoiot+k="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur3e-moveit-config/default.nix b/distros/noetic/ur3e-moveit-config/default.nix index b0a9cce2ee..562094f46d 100644 --- a/distros/noetic/ur3e-moveit-config/default.nix +++ b/distros/noetic/ur3e-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur3e-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur3e_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "17db54b170c9cb42bb056b4a87eb2065d016710f38dab60e24f2c88bc5f6be71"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur3e_moveit_config/1.3.1-1"; + sha256 = "sha256-6HTWo5SUP9sC0loTDwC8yaIvaqy9JDtuK1Yd+uwJyCI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur5-moveit-config/default.nix b/distros/noetic/ur5-moveit-config/default.nix index cca515487b..e02ae8826a 100644 --- a/distros/noetic/ur5-moveit-config/default.nix +++ b/distros/noetic/ur5-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur5-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur5_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "e177072d4e44ccaf806b14d64266ee9250cf28adbc09e9bd3167c399252a14bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur5_moveit_config/1.3.1-1"; + sha256 = "sha256-bWM9jAE0cjwfFEgOkiG2ibkd/ThaSI1fE3Fr37cUOXI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ur5e-moveit-config/default.nix b/distros/noetic/ur5e-moveit-config/default.nix index 929d15800c..3eade37c6d 100644 --- a/distros/noetic/ur5e-moveit-config/default.nix +++ b/distros/noetic/ur5e-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ur5e-moveit-config"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros-industrial-release/universal_robot-release/archive/release/noetic/ur5e_moveit_config/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "b5ac25154673cdf8c1901c52b472b25e1571e2a38c9f27b0e9c99ec38791c40e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-industrial-release"; + repo = "universal_robot-release"; + rev = "release/noetic/ur5e_moveit_config/1.3.1-1"; + sha256 = "sha256-LfhgoS0LUs/f806LCqGBzxP4B00ZvLhTtwEbuiy1AQ8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/urdf-geometry-parser/default.nix b/distros/noetic/urdf-geometry-parser/default.nix index 749b4607df..af69d4d921 100644 --- a/distros/noetic/urdf-geometry-parser/default.nix +++ b/distros/noetic/urdf-geometry-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-urdf-geometry-parser"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf_geometry_parser-release/archive/release/noetic/urdf_geometry_parser/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "95fe96e01800c4d342fd516366dc6591dcd8cab13a120ec5a61293bbcbde4235"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf_geometry_parser-release"; + rev = "release/noetic/urdf_geometry_parser/0.1.0-1"; + sha256 = "sha256-l2eoHl6UawX0I4fffoKC1lmzTpiArHETSfqpwcaYBgs="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/urdf-parser-plugin/default.nix b/distros/noetic/urdf-parser-plugin/default.nix index eb95ba0d02..a4ce0a2627 100644 --- a/distros/noetic/urdf-parser-plugin/default.nix +++ b/distros/noetic/urdf-parser-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-urdf-parser-plugin"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf-release/archive/release/noetic/urdf_parser_plugin/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "dbcd40e7d574614908247854c7e3819cc0de375257f7e9e375596d6829e50603"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf-release"; + rev = "release/noetic/urdf_parser_plugin/1.13.2-1"; + sha256 = "sha256-DShxAFWFuiNgRTPwyuqtwkAAXIR75aD+kWQX7VUVJWc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/urdf-sim-tutorial/default.nix b/distros/noetic/urdf-sim-tutorial/default.nix index 49bb744b1e..75209b88ec 100644 --- a/distros/noetic/urdf-sim-tutorial/default.nix +++ b/distros/noetic/urdf-sim-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-urdf-sim-tutorial"; version = "0.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf_sim_tutorial-release/archive/release/noetic/urdf_sim_tutorial/0.5.1-1.tar.gz"; - name = "0.5.1-1.tar.gz"; - sha256 = "e3d91a593655e47ed8dea7296e26bc63d7d30d425dc6ee10511dc25fea71132d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf_sim_tutorial-release"; + rev = "release/noetic/urdf_sim_tutorial/0.5.1-1"; + sha256 = "sha256-nAkWplAk41sX0ydSGvp7wjX513FH/EHSvrIFnReRIkY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/urdf-tutorial/default.nix b/distros/noetic/urdf-tutorial/default.nix index 9c373761b8..eae630e0b7 100644 --- a/distros/noetic/urdf-tutorial/default.nix +++ b/distros/noetic/urdf-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-urdf-tutorial"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf_tutorial-release/archive/release/noetic/urdf_tutorial/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "1140907900dc413b980ce0180c93d84ec04d285530632b83d71f1fa2c63229e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf_tutorial-release"; + rev = "release/noetic/urdf_tutorial/0.5.0-1"; + sha256 = "sha256-a3DIFk+iNu2YPvRZltEvEVrBh5GbvsAV2LMa0ArMCoo="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/urdf/default.nix b/distros/noetic/urdf/default.nix index 4670bcbe3a..08533ffcd4 100644 --- a/distros/noetic/urdf/default.nix +++ b/distros/noetic/urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-urdf"; version = "1.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdf-release/archive/release/noetic/urdf/1.13.2-1.tar.gz"; - name = "1.13.2-1.tar.gz"; - sha256 = "4ea6bd9d92f2a2a0f25a41409d4b38b90d2fd137fa1fabbad4462a9af9a94588"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdf-release"; + rev = "release/noetic/urdf/1.13.2-1"; + sha256 = "sha256-IWaVoJMDw+51StqYwMxLLFa+l1d/X1CbQoHPi5crAso="; + }; buildType = "catkin"; buildInputs = [ catkin cmake-modules urdf-parser-plugin ]; diff --git a/distros/noetic/urdfdom-py/default.nix b/distros/noetic/urdfdom-py/default.nix index 98cf213d1e..1c99193f8f 100644 --- a/distros/noetic/urdfdom-py/default.nix +++ b/distros/noetic/urdfdom-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-urdfdom-py"; version = "0.4.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urdfdom_py-release/archive/release/noetic/urdfdom_py/0.4.6-1.tar.gz"; - name = "0.4.6-1.tar.gz"; - sha256 = "fbaedbb3631b3c3e1573db77770ab2e40ff9eeb74a7564ab8a1fbb8df5bb6ead"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urdfdom_py-release"; + rev = "release/noetic/urdfdom_py/0.4.6-1"; + sha256 = "sha256-Q8wZfX5ll7vzWYT5TXEhnxu6RGf1//b6ZmUeOgapEKM="; + }; buildType = "catkin"; buildInputs = [ catkin python3Packages.setuptools ]; diff --git a/distros/noetic/urg-c/default.nix b/distros/noetic/urg-c/default.nix index 12430ba992..f8a8d05920 100644 --- a/distros/noetic/urg-c/default.nix +++ b/distros/noetic/urg-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-urg-c"; version = "1.0.405-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urg_c-release/archive/release/noetic/urg_c/1.0.405-1.tar.gz"; - name = "1.0.405-1.tar.gz"; - sha256 = "c2af896d06b72140f91876cdc806f1d43015c872b50693a0303ec93b0d7a3750"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urg_c-release"; + rev = "release/noetic/urg_c/1.0.405-1"; + sha256 = "sha256-wEtV8auslEcnhmACa0SvoVopTV4FKwss35VKw95wxP0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/urg-node/default.nix b/distros/noetic/urg-node/default.nix index 34eaacf846..2138ed9dc9 100644 --- a/distros/noetic/urg-node/default.nix +++ b/distros/noetic/urg-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-urg-node"; version = "0.1.18-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/urg_node-release/archive/release/noetic/urg_node/0.1.18-1.tar.gz"; - name = "0.1.18-1.tar.gz"; - sha256 = "e0ac11a6cd9056155458a6ceb1b639adcf289bab7933f2236bb0cdbfae305d6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "urg_node-release"; + rev = "release/noetic/urg_node/0.1.18-1"; + sha256 = "sha256-sGUjNvOfcAt2vDn73QWWnr97ccvyARR7PUAyl25Gty8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/urg-stamped/default.nix b/distros/noetic/urg-stamped/default.nix index 725be4fc72..67b5325fe4 100644 --- a/distros/noetic/urg-stamped/default.nix +++ b/distros/noetic/urg-stamped/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, roscpp, roslint, rostest, rosunit, sensor-msgs }: buildRosPackage { pname = "ros-noetic-urg-stamped"; - version = "0.0.15-r1"; + version = "0.0.16-r1"; - src = fetchurl { - url = "https://github.com/seqsense/urg_stamped-release/archive/release/noetic/urg_stamped/0.0.15-1.tar.gz"; - name = "0.0.15-1.tar.gz"; - sha256 = "cae8956075f55f70673051c9f5d8241d8645a73c7473e35adc208f7cc957ca88"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "seqsense"; + repo = "urg_stamped-release"; + rev = "release/noetic/urg_stamped/0.0.16-1"; + sha256 = "sha256-74V11Qe+5NQd9N55zWdrpHRNPPTUmskQ5CMnjC3vlCM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/usb-cam-controllers/default.nix b/distros/noetic/usb-cam-controllers/default.nix index 4370cff35c..e6876f37c7 100644 --- a/distros/noetic/usb-cam-controllers/default.nix +++ b/distros/noetic/usb-cam-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-usb-cam-controllers"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/usb_cam_hardware-release/archive/release/noetic/usb_cam_controllers/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "d03a18132591acb321d86163fae2362d7477e9c6a7a33e6faad6f7cc385065af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "usb_cam_hardware-release"; + rev = "release/noetic/usb_cam_controllers/0.2.1-1"; + sha256 = "sha256-OQHcjMLTqtgEMSP8tSq8HvUdGkoo9Sva8aLbAvPM0JQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/usb-cam-hardware-interface/default.nix b/distros/noetic/usb-cam-hardware-interface/default.nix index bbb803eb27..b6227ebaf2 100644 --- a/distros/noetic/usb-cam-hardware-interface/default.nix +++ b/distros/noetic/usb-cam-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-usb-cam-hardware-interface"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/usb_cam_hardware-release/archive/release/noetic/usb_cam_hardware_interface/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "84813dd3d8819a31ffb19ccde2f66513203667ced7f254addb2cd9f75e4a9930"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "usb_cam_hardware-release"; + rev = "release/noetic/usb_cam_hardware_interface/0.2.1-1"; + sha256 = "sha256-FwQrsReNysrqa3g5zWxRrkwl706Ehs8c2E7T/OWB+tU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/usb-cam-hardware/default.nix b/distros/noetic/usb-cam-hardware/default.nix index ea61bf4546..a62b089534 100644 --- a/distros/noetic/usb-cam-hardware/default.nix +++ b/distros/noetic/usb-cam-hardware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-usb-cam-hardware"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/yoshito-n-students/usb_cam_hardware-release/archive/release/noetic/usb_cam_hardware/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "fe91fb847b79fe425a444a31d35f306c884e5cfbe20c2be3a661a6b6ce75d339"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yoshito-n-students"; + repo = "usb_cam_hardware-release"; + rev = "release/noetic/usb_cam_hardware/0.2.1-1"; + sha256 = "sha256-OgHMPUZ00xYb/H3T0Xb2uJyi5MlwbJ5+HoqBNkM4ug0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/usb-cam/default.nix b/distros/noetic/usb-cam/default.nix index 5308cf3ac7..d865422725 100644 --- a/distros/noetic/usb-cam/default.nix +++ b/distros/noetic/usb-cam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-usb-cam"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/usb_cam-release/archive/release/noetic/usb_cam/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "7b03e9cd278dce5cd3c97057c87beb4f13da3089055efab56cb8f7dac80397c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "usb_cam-release"; + rev = "release/noetic/usb_cam/0.3.6-1"; + sha256 = "sha256-f9BE3cZ4E5uz9WjHVPTiw8Cnt/80lDBjgYU1e/hdI6U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/uuid-msgs/default.nix b/distros/noetic/uuid-msgs/default.nix index 46fde9772a..d806c299b9 100644 --- a/distros/noetic/uuid-msgs/default.nix +++ b/distros/noetic/uuid-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-uuid-msgs"; version = "1.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros-geographic-info/unique_identifier-release/archive/release/noetic/uuid_msgs/1.0.6-1.tar.gz"; - name = "1.0.6-1.tar.gz"; - sha256 = "4299d106f055e2a4e80f4ae9c7e94acab1ea1ccf9c8efb041514ee115276cc98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-geographic-info"; + repo = "unique_identifier-release"; + rev = "release/noetic/uuid_msgs/1.0.6-1"; + sha256 = "sha256-I2wvd92JL9cbXsWyCd2Vnm0TXQQbqeTXJrTopF6F0rk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/variant-msgs/default.nix b/distros/noetic/variant-msgs/default.nix index 8ae533b3a7..65653212f5 100644 --- a/distros/noetic/variant-msgs/default.nix +++ b/distros/noetic/variant-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-variant-msgs"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/anybotics/variant-release/archive/release/noetic/variant_msgs/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "c7de9af40e55b59fd26cae171cc0dbed26e6bf560188c6f5380c3a84890da468"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "variant-release"; + rev = "release/noetic/variant_msgs/0.1.6-1"; + sha256 = "sha256-o1hU5/p2HzoYGy8ZR6skvbO7Qv7tRgQ5+X30RkVS4kw="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/variant-topic-tools/default.nix b/distros/noetic/variant-topic-tools/default.nix index 164e8d83b3..b29e287fd4 100644 --- a/distros/noetic/variant-topic-tools/default.nix +++ b/distros/noetic/variant-topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-variant-topic-tools"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/anybotics/variant-release/archive/release/noetic/variant_topic_tools/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "cddba6c96739c4a1dbe1459d3c4848312f103b6ab6aeca8fc4e1933dd3dbbc7e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "variant-release"; + rev = "release/noetic/variant_topic_tools/0.1.6-1"; + sha256 = "sha256-aXS5Fb1EdHRYRVJoyxvJJH5PFfvjfPPlo24AgSwYjeY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/variant/default.nix b/distros/noetic/variant/default.nix index 88aa9891df..5a41370b19 100644 --- a/distros/noetic/variant/default.nix +++ b/distros/noetic/variant/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-variant"; version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/anybotics/variant-release/archive/release/noetic/variant/0.1.6-1.tar.gz"; - name = "0.1.6-1.tar.gz"; - sha256 = "ad47d1ea0cd6cc8d5ab48855e69d24b6f521e1d5efa6f639e94a4169faf2b8aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "anybotics"; + repo = "variant-release"; + rev = "release/noetic/variant/0.1.6-1"; + sha256 = "sha256-D6v8UCyLn/joFMxRRW2ABqZ5Wwl+S0ThszFILC/Vs8E="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/vector-map-msgs/default.nix b/distros/noetic/vector-map-msgs/default.nix index 00f3d69728..5851057613 100644 --- a/distros/noetic/vector-map-msgs/default.nix +++ b/distros/noetic/vector-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-vector-map-msgs"; version = "1.14.0-r1"; - src = fetchurl { - url = "https://github.com/autoware-ai/messages-release/archive/release/noetic/vector_map_msgs/1.14.0-1.tar.gz"; - name = "1.14.0-1.tar.gz"; - sha256 = "870df6369942aa12d4c13eca898c481571bb2464d0333c56258e2f2498c8eded"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "autoware-ai"; + repo = "messages-release"; + rev = "release/noetic/vector_map_msgs/1.14.0-1"; + sha256 = "sha256-p+DObvasMzVjl44apS0+ZwczFdtdmsggTOyIDTiYhGE="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/velocity-controllers/default.nix b/distros/noetic/velocity-controllers/default.nix index 0543f62d83..7f4d2a7037 100644 --- a/distros/noetic/velocity-controllers/default.nix +++ b/distros/noetic/velocity-controllers/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, angles, catkin, control-msgs, control-toolbox, controller-interface, forward-command-controller, hardware-interface, pluginlib, realtime-tools, roscpp, std-msgs, urdf }: buildRosPackage { pname = "ros-noetic-velocity-controllers"; - version = "0.21.0-r1"; + version = "0.21.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_controllers-release/archive/release/noetic/velocity_controllers/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "5b88737c78dae005d51d4cd2fd9260d4cf8518bc8ee34d5169e1b139d1063be5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_controllers-release"; + rev = "release/noetic/velocity_controllers/0.21.1-1"; + sha256 = "sha256-sU9q6W9mK8DdcgkguHQIsH+L1ZB/0J+KD6VN7pBPyXU="; + }; buildType = "catkin"; buildInputs = [ angles catkin pluginlib ]; diff --git a/distros/noetic/velodyne-description/default.nix b/distros/noetic/velodyne-description/default.nix index 766e75a322..39763892d3 100644 --- a/distros/noetic/velodyne-description/default.nix +++ b/distros/noetic/velodyne-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne-description"; version = "1.0.13-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/velodyne_simulator-release/archive/release/noetic/velodyne_description/1.0.13-1.tar.gz"; - name = "1.0.13-1.tar.gz"; - sha256 = "8339606e5fe26361eaff3b11de9a3573053ec589a80b56235d448c9d5f28eee2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "velodyne_simulator-release"; + rev = "release/noetic/velodyne_description/1.0.13-1"; + sha256 = "sha256-DEoikvGnQRius0OoSSdXyDcU8Rm6tCHA+ByDiijt0+M="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/velodyne-driver/default.nix b/distros/noetic/velodyne-driver/default.nix index 1cb4f2ca87..08bab0fb0c 100644 --- a/distros/noetic/velodyne-driver/default.nix +++ b/distros/noetic/velodyne-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne-driver"; version = "1.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/noetic/velodyne_driver/1.7.0-1.tar.gz"; - name = "1.7.0-1.tar.gz"; - sha256 = "e409444fad24c80117381fc5f0445b0ab30b0a32c13ccbff331e666f15ed1fa6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/noetic/velodyne_driver/1.7.0-1"; + sha256 = "sha256-nPihykwW0Z+iulXU7gUJF6R1nG+p6evzDGksmjVktA4="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/velodyne-gazebo-plugins/default.nix b/distros/noetic/velodyne-gazebo-plugins/default.nix index 830fb92a70..3974e30c90 100644 --- a/distros/noetic/velodyne-gazebo-plugins/default.nix +++ b/distros/noetic/velodyne-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne-gazebo-plugins"; version = "1.0.13-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/velodyne_simulator-release/archive/release/noetic/velodyne_gazebo_plugins/1.0.13-1.tar.gz"; - name = "1.0.13-1.tar.gz"; - sha256 = "0f5d1abda7b2692281380e50b0446399718898b4ac4f49ec35253f411eafb812"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "velodyne_simulator-release"; + rev = "release/noetic/velodyne_gazebo_plugins/1.0.13-1"; + sha256 = "sha256-L5IN+BvQ38y1lX91dD7v8We1MonA9i21PQRAj+zv7C8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/velodyne-laserscan/default.nix b/distros/noetic/velodyne-laserscan/default.nix index b5e6b6c6f8..4e62dacdcf 100644 --- a/distros/noetic/velodyne-laserscan/default.nix +++ b/distros/noetic/velodyne-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne-laserscan"; version = "1.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/noetic/velodyne_laserscan/1.7.0-1.tar.gz"; - name = "1.7.0-1.tar.gz"; - sha256 = "341bf6a4773deb0266a8afb12db34c069c9d03e2ebc34fdd269c367d2064a35c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/noetic/velodyne_laserscan/1.7.0-1"; + sha256 = "sha256-ONEJiugJYB5jylkNY0IAN96pzvHduV+dHZa+UE3eD2E="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/velodyne-msgs/default.nix b/distros/noetic/velodyne-msgs/default.nix index fa57045380..a6f527a9cd 100644 --- a/distros/noetic/velodyne-msgs/default.nix +++ b/distros/noetic/velodyne-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne-msgs"; version = "1.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/noetic/velodyne_msgs/1.7.0-1.tar.gz"; - name = "1.7.0-1.tar.gz"; - sha256 = "508ef5d08d4d2168dae0e7adf55eeae4f6090c01c05280d0bf1d9f2f31a1ee0f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/noetic/velodyne_msgs/1.7.0-1"; + sha256 = "sha256-y5yYjCecg58/npbTLJ5nri+Svd9LssEhlSm3Jp8Lz2Y="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/velodyne-pcl/default.nix b/distros/noetic/velodyne-pcl/default.nix index b6831eeace..90140cfca6 100644 --- a/distros/noetic/velodyne-pcl/default.nix +++ b/distros/noetic/velodyne-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne-pcl"; version = "1.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/noetic/velodyne_pcl/1.7.0-1.tar.gz"; - name = "1.7.0-1.tar.gz"; - sha256 = "d4dae03da906b8fa5814d3c20b469e637a6046d89d5130567474c1f4e9dadbe8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/noetic/velodyne_pcl/1.7.0-1"; + sha256 = "sha256-svqh78z1EDXZzkkTOTOOKC8/+oANCO7Ue7eSgpGurQQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/velodyne-pointcloud/default.nix b/distros/noetic/velodyne-pointcloud/default.nix index 7395b14c40..d4cf2f2e4e 100644 --- a/distros/noetic/velodyne-pointcloud/default.nix +++ b/distros/noetic/velodyne-pointcloud/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne-pointcloud"; version = "1.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/noetic/velodyne_pointcloud/1.7.0-1.tar.gz"; - name = "1.7.0-1.tar.gz"; - sha256 = "b8425f2244f94b610459ede15bdb228eb842e4cd84a6ae10aed6dd67962b6de7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/noetic/velodyne_pointcloud/1.7.0-1"; + sha256 = "sha256-/qMBykOXNewqBLR/+1JFoMN+NLbkP6XwPinxyV5zOGI="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/velodyne-simulator/default.nix b/distros/noetic/velodyne-simulator/default.nix index b9cc87d642..382a812486 100644 --- a/distros/noetic/velodyne-simulator/default.nix +++ b/distros/noetic/velodyne-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne-simulator"; version = "1.0.13-r1"; - src = fetchurl { - url = "https://github.com/DataspeedInc-release/velodyne_simulator-release/archive/release/noetic/velodyne_simulator/1.0.13-1.tar.gz"; - name = "1.0.13-1.tar.gz"; - sha256 = "351499b7b1b40189628a8b7083d2313a509127005c01a4396a3d1ea1f4599632"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DataspeedInc-release"; + repo = "velodyne_simulator-release"; + rev = "release/noetic/velodyne_simulator/1.0.13-1"; + sha256 = "sha256-oF1JWozzAYqx/fbMitOq7lpOTvKoDs8dNvxuCFaFxc8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/velodyne/default.nix b/distros/noetic/velodyne/default.nix index 85e8a27814..1fe05fe655 100644 --- a/distros/noetic/velodyne/default.nix +++ b/distros/noetic/velodyne/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-velodyne"; version = "1.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/velodyne-release/archive/release/noetic/velodyne/1.7.0-1.tar.gz"; - name = "1.7.0-1.tar.gz"; - sha256 = "3bee8e89bc6438c14fa690e18dd43db01a78ab2a5e445252700579f220b3cefc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "velodyne-release"; + rev = "release/noetic/velodyne/1.7.0-1"; + sha256 = "sha256-FZbD57R0o7nR2xCxtN5z2KjXu5QsJEBRULA6ban0EI0="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/video-stream-opencv/default.nix b/distros/noetic/video-stream-opencv/default.nix index 8d4b27fddc..441e9bb803 100644 --- a/distros/noetic/video-stream-opencv/default.nix +++ b/distros/noetic/video-stream-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-video-stream-opencv"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers/video_stream_opencv-release/archive/release/noetic/video_stream_opencv/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "10cb5b891a17f5305a8e1f2e6706eec0da6b7c15cfbed31ccfcb35074583be9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers"; + repo = "video_stream_opencv-release"; + rev = "release/noetic/video_stream_opencv/1.1.6-1"; + sha256 = "sha256-mmYU4wI52SzjtL5nXKOY5jdySp1hq1esfqPUm8h1fPY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/view-controller-msgs/default.nix b/distros/noetic/view-controller-msgs/default.nix index b16ebcc4ff..f7d1fb62ec 100644 --- a/distros/noetic/view-controller-msgs/default.nix +++ b/distros/noetic/view-controller-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-view-controller-msgs"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/view_controller_msgs-release/archive/release/noetic/view_controller_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "2157172387b8868d01b73a0cf00fb1425748b9707b54b40f97eb1ef40505aadf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "view_controller_msgs-release"; + rev = "release/noetic/view_controller_msgs/0.2.0-1"; + sha256 = "sha256-HVswly+YiZAEVU8VXD/fq/u/HBI7ZG71PHm4e3OD1vM="; + }; buildType = "catkin"; buildInputs = [ catkin genmsg message-generation ]; diff --git a/distros/noetic/virtual-force-publisher/default.nix b/distros/noetic/virtual-force-publisher/default.nix index aedd7c5c5d..e83336f703 100644 --- a/distros/noetic/virtual-force-publisher/default.nix +++ b/distros/noetic/virtual-force-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-virtual-force-publisher"; version = "2.2.12-r1"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_common-release/archive/release/noetic/virtual_force_publisher/2.2.12-1.tar.gz"; - name = "2.2.12-1.tar.gz"; - sha256 = "5dacad62f81a05fffab95f19dd5ebf306902d484eae537467c45ec348267ce64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_common-release"; + rev = "release/noetic/virtual_force_publisher/2.2.12-1"; + sha256 = "sha256-dG82XAJu9RwjPifnBPv4urgsJdnqiQd1UCWssNU5oXY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/vision-msgs/default.nix b/distros/noetic/vision-msgs/default.nix index 1001d30525..ae64dd6347 100644 --- a/distros/noetic/vision-msgs/default.nix +++ b/distros/noetic/vision-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-vision-msgs"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/Kukanani/vision_msgs-release/archive/release/noetic/vision_msgs/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "aa7c87e6b6bd88fe1f2f7626d97fe0940afee038a5c7bbd95d6d29c5859c0507"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "Kukanani"; + repo = "vision_msgs-release"; + rev = "release/noetic/vision_msgs/0.0.2-1"; + sha256 = "sha256-8Tiv90snAIFQmaGAm4irOj0OgvduBdu0pMkZ5NpcnX4="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/vision-opencv/default.nix b/distros/noetic/vision-opencv/default.nix index 5f450cd036..55ddee9ec8 100644 --- a/distros/noetic/vision-opencv/default.nix +++ b/distros/noetic/vision-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-vision-opencv"; version = "1.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/vision_opencv-release/archive/release/noetic/vision_opencv/1.16.2-1.tar.gz"; - name = "1.16.2-1.tar.gz"; - sha256 = "2f6b0d514c98c13cc41c36e833d26423379efe0a035a7390589b0c13c6d4c2e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "vision_opencv-release"; + rev = "release/noetic/vision_opencv/1.16.2-1"; + sha256 = "sha256-/AFXYFsm63KZL9Sbyp0kIWCeuUBqitKeTY+hLpkrJAY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/vision-visp/default.nix b/distros/noetic/vision-visp/default.nix index 3906ca7816..d4b669492d 100644 --- a/distros/noetic/vision-visp/default.nix +++ b/distros/noetic/vision-visp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-vision-visp"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/noetic/vision_visp/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "71f50138e21889a4baefa0522297f16ac8a680cce8dd6106d57a619530f09184"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/noetic/vision_visp/0.13.1-1"; + sha256 = "sha256-CaWh0OhA24QRCQKMuyMUR6orqxMJhoBh7lROTYRvtcg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/visp-auto-tracker/default.nix b/distros/noetic/visp-auto-tracker/default.nix index 94130c8ab2..fae9126477 100644 --- a/distros/noetic/visp-auto-tracker/default.nix +++ b/distros/noetic/visp-auto-tracker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visp-auto-tracker"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/noetic/visp_auto_tracker/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "b5792efe8fff571166a20087a56b195e41893ee5ee4ced8d761a6cbe9513f2d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/noetic/visp_auto_tracker/0.13.1-1"; + sha256 = "sha256-ao31/7CGJRNEdwV90bFj4MzSvFlzYK++4OFW9HWExfQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/visp-bridge/default.nix b/distros/noetic/visp-bridge/default.nix index 08685040f4..dc282519aa 100644 --- a/distros/noetic/visp-bridge/default.nix +++ b/distros/noetic/visp-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visp-bridge"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/noetic/visp_bridge/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "aa9ff1c9a82b8fb3f8fbcd27a43ffb4acafdf563da02fbe20c81b1d06605e3f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/noetic/visp_bridge/0.13.1-1"; + sha256 = "sha256-ilGOn5lEKk+au6RUDrlJE6dWIvZCgwvzQlhuSfTY8kA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/visp-camera-calibration/default.nix b/distros/noetic/visp-camera-calibration/default.nix index c60dace169..01307997b6 100644 --- a/distros/noetic/visp-camera-calibration/default.nix +++ b/distros/noetic/visp-camera-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visp-camera-calibration"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/noetic/visp_camera_calibration/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "b97dd9ee9c9b87ce05f1f44fa28501c9c473851f452b8efdea0c8c70911e8fcd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/noetic/visp_camera_calibration/0.13.1-1"; + sha256 = "sha256-Y6p4CmBsnWXP6u7pfQymLdNg4+g+K62eRIM1xmt+Mnc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/visp-hand2eye-calibration/default.nix b/distros/noetic/visp-hand2eye-calibration/default.nix index d44dc4ac7a..67dddb4a36 100644 --- a/distros/noetic/visp-hand2eye-calibration/default.nix +++ b/distros/noetic/visp-hand2eye-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visp-hand2eye-calibration"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/noetic/visp_hand2eye_calibration/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "3cbffcd182369a51b8133ef457d5847f9631e652ef6aeb25f616ab149bddc710"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/noetic/visp_hand2eye_calibration/0.13.1-1"; + sha256 = "sha256-6ygPdFBekWOK2KeJM/NfT9nv2XrEn08MtTKDqk4Wd3Y="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/visp-tracker/default.nix b/distros/noetic/visp-tracker/default.nix index 5f7c32290d..e5f5216d92 100644 --- a/distros/noetic/visp-tracker/default.nix +++ b/distros/noetic/visp-tracker/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visp-tracker"; version = "0.13.1-r1"; - src = fetchurl { - url = "https://github.com/lagadic/vision_visp-release/archive/release/noetic/visp_tracker/0.13.1-1.tar.gz"; - name = "0.13.1-1.tar.gz"; - sha256 = "3d3fb96f7aa1b07bbe21cc8c5f181ee6bdc48867dc46ad05bf2ee58abe67e77f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "lagadic"; + repo = "vision_visp-release"; + rev = "release/noetic/visp_tracker/0.13.1-1"; + sha256 = "sha256-XUMiho/jIDuCNGlzEkBEtv/hVNH1d5l7eUiRG1uMr/Q="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/visualization-marker-tutorials/default.nix b/distros/noetic/visualization-marker-tutorials/default.nix index 47d175d939..c3aa68fdee 100644 --- a/distros/noetic/visualization-marker-tutorials/default.nix +++ b/distros/noetic/visualization-marker-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visualization-marker-tutorials"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/noetic/visualization_marker_tutorials/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "403a4658fd70b1faa9b6650839f28751383d1cd57fd7787fc4bee4bf7171fe1c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/noetic/visualization_marker_tutorials/0.11.0-1"; + sha256 = "sha256-4JRxG3IZFH10fxMDdGmma0hwIdYpUVQ/8zN2IHg7Vk8="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/visualization-msgs/default.nix b/distros/noetic/visualization-msgs/default.nix index f55fce0d4c..062d14147c 100644 --- a/distros/noetic/visualization-msgs/default.nix +++ b/distros/noetic/visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visualization-msgs"; version = "1.13.1-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/common_msgs-release/archive/release/noetic/visualization_msgs/1.13.1-1.tar.gz"; - name = "1.13.1-1.tar.gz"; - sha256 = "8b797706ed360a8918380e718f3b05702bcb85fd55d6cdec6ad4721e75dc84a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "common_msgs-release"; + rev = "release/noetic/visualization_msgs/1.13.1-1"; + sha256 = "sha256-pHC77YKKSGZr5ltf1aSuhMvmRU4dDnftx7R1XlfBlGA="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/visualization-rwt/default.nix b/distros/noetic/visualization-rwt/default.nix index 01a8727b9f..3a9614db4e 100644 --- a/distros/noetic/visualization-rwt/default.nix +++ b/distros/noetic/visualization-rwt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visualization-rwt"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/tork-a/visualization_rwt-release/archive/release/noetic/visualization_rwt/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "9f7696b756cb58f68b4bef7f5c615a2e152b0f94b351c4bd82997faec77afa02"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "visualization_rwt-release"; + rev = "release/noetic/visualization_rwt/0.1.1-2"; + sha256 = "sha256-qDGh7WzFmQYV/+UuebOZU5C7cNH3xxDvxmem7/aJ2Mg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/visualization-tutorials/default.nix b/distros/noetic/visualization-tutorials/default.nix index e233ba3a02..45f190db8a 100644 --- a/distros/noetic/visualization-tutorials/default.nix +++ b/distros/noetic/visualization-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-visualization-tutorials"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/visualization_tutorials-release/archive/release/noetic/visualization_tutorials/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "595fcd50bd39b8cfa6ddcafd6e3365d6ed515d8a0cebbeb05603c29400c62cb9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "visualization_tutorials-release"; + rev = "release/noetic/visualization_tutorials/0.11.0-1"; + sha256 = "sha256-pxezit9eNzvfgVPOc3WOHAhtbHH2Vx1lPupxWXkQLDM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/viz/default.nix b/distros/noetic/viz/default.nix index cfe3610b77..a4bea884e1 100644 --- a/distros/noetic/viz/default.nix +++ b/distros/noetic/viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-viz"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/metapackages-release/archive/release/noetic/viz/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "209f316e6ef4b39c724afba3239dec4e8493a7904c676a9fc46291ffa2330b9d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "metapackages-release"; + rev = "release/noetic/viz/1.5.0-1"; + sha256 = "sha256-4tn/ulwgITJCMhfSs6YMF3PpaCf+v+iJVGCYUbSbiHE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/vl53l1x/default.nix b/distros/noetic/vl53l1x/default.nix index c37c7981f6..3141725ac2 100644 --- a/distros/noetic/vl53l1x/default.nix +++ b/distros/noetic/vl53l1x/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-vl53l1x"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/okalachev/vl53l1x_ros-release/archive/release/noetic/vl53l1x/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "c4b77b41f388eb88ecf0bcd729ae30b6fb7ccadab59add42914a60eacca896a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "okalachev"; + repo = "vl53l1x_ros-release"; + rev = "release/noetic/vl53l1x/1.0.0-1"; + sha256 = "sha256-Cojkizq4TxodpUybeWi2ddEtU+uJggu5FEN8cqTGwqA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/voice-text/default.nix b/distros/noetic/voice-text/default.nix index 744e8a970c..fa2cb92297 100644 --- a/distros/noetic/voice-text/default.nix +++ b/distros/noetic/voice-text/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-voice-text"; version = "2.1.21-r2"; - src = fetchurl { - url = "https://github.com/tork-a/jsk_3rdparty-release/archive/release/noetic/voice_text/2.1.21-2.tar.gz"; - name = "2.1.21-2.tar.gz"; - sha256 = "05ae739b61950cd2321e45c980c4308fa4f8c9d8cee4a7e8bea67256ace289cc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tork-a"; + repo = "jsk_3rdparty-release"; + rev = "release/noetic/voice_text/2.1.21-2"; + sha256 = "sha256-TubVoWptXJ3zWf0T4dptIwTpNFmkLhohbsozmajtsd0="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation roscpp ]; diff --git a/distros/noetic/volta-base/default.nix b/distros/noetic/volta-base/default.nix index e7d4d3bf50..8cb05de743 100644 --- a/distros/noetic/volta-base/default.nix +++ b/distros/noetic/volta-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-volta-base"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/noetic/volta_base/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "f998233bf5ce9413d482b454c939f5150200d9c18345f2b202645b354fc2bee9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/noetic/volta_base/1.2.0-1"; + sha256 = "sha256-f2ApjQAJzjhiLkJsCXSRyxuOBG/l50iEUMN1PmaVgyw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/volta-control/default.nix b/distros/noetic/volta-control/default.nix index 6b0b394010..374fa8c7af 100644 --- a/distros/noetic/volta-control/default.nix +++ b/distros/noetic/volta-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-volta-control"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/noetic/volta_control/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "9a306c8e0223a09f8e40133929368358859632f9e1bc163f3c2ba9b5682dc374"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/noetic/volta_control/1.2.0-1"; + sha256 = "sha256-aeRbLAbbFCOPHJtDqEIZaunBwC7E5fZfwPVfQf9zgHk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/volta-description/default.nix b/distros/noetic/volta-description/default.nix index 43ee38694d..4a7651ba41 100644 --- a/distros/noetic/volta-description/default.nix +++ b/distros/noetic/volta-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-volta-description"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/noetic/volta_description/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "43d343a5bdb749a9652a37a2c33b05948199ecddff189420a2bff5478a9b685c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/noetic/volta_description/1.2.0-1"; + sha256 = "sha256-Llh4WxmmNdTxJC8KHCBxkiTtKzJ3iSsOqvHzYzCT968="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/volta-localization/default.nix b/distros/noetic/volta-localization/default.nix index 5094b2848f..25eb9efe9c 100644 --- a/distros/noetic/volta-localization/default.nix +++ b/distros/noetic/volta-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-volta-localization"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/noetic/volta_localization/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "b8bbe97255fb5b6bca58879cb9edc7921309051792bce9c2dc35127cb6617263"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/noetic/volta_localization/1.2.0-1"; + sha256 = "sha256-wFv9TIYF+zZ4LhPhcKmyJ/Lgar3+hL7vKguGosWW6lQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/volta-msgs/default.nix b/distros/noetic/volta-msgs/default.nix index f9c53838ac..99a355ae18 100644 --- a/distros/noetic/volta-msgs/default.nix +++ b/distros/noetic/volta-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-volta-msgs"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/noetic/volta_msgs/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "33c96cedf001dac8cc8c39cf1a8939eadad9de0d4b500c8632dd457e42683bba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/noetic/volta_msgs/1.2.0-1"; + sha256 = "sha256-oTH7TNzWgeJeYwx3RRnL/gQoFWbTMVLyFIzZ81oKTtk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/volta-navigation/default.nix b/distros/noetic/volta-navigation/default.nix index 5a1003dcfa..41aa9e8b40 100644 --- a/distros/noetic/volta-navigation/default.nix +++ b/distros/noetic/volta-navigation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-volta-navigation"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/noetic/volta_navigation/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "d42b673b3a6f6830b05c7e584ff4bd07a166784316544e0598797a46d42d3dd0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/noetic/volta_navigation/1.2.0-1"; + sha256 = "sha256-DmHX/096kGBJE0SPg7t2d0ih1o8tsxnDpZy4YF/nMnQ="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/volta-rules/default.nix b/distros/noetic/volta-rules/default.nix index 40cd8791c0..5a5b70f7a6 100644 --- a/distros/noetic/volta-rules/default.nix +++ b/distros/noetic/volta-rules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-volta-rules"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/noetic/volta_rules/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "f43412c9f11c1bfe36166b924c6a82751da164299b69bf254a5b7dcd9da5160c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/noetic/volta_rules/1.2.0-1"; + sha256 = "sha256-9uenWaSE32Emdo5jaVMXtfOcjC7T172ViJpVwzRQokc="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/volta-teleoperator/default.nix b/distros/noetic/volta-teleoperator/default.nix index 7cd02ff588..b3110291bf 100644 --- a/distros/noetic/volta-teleoperator/default.nix +++ b/distros/noetic/volta-teleoperator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-volta-teleoperator"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/botsync-gbp/volta-release/archive/release/noetic/volta_teleoperator/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "a3714334e6d6694ea0af0a5c4d41adb229a27be19b38579f52fa6703228e6110"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "botsync-gbp"; + repo = "volta-release"; + rev = "release/noetic/volta_teleoperator/1.2.0-1"; + sha256 = "sha256-K+lAcBfuB7B/8QUOfF3JKe5MSPRSmfpymPWWG9bn+6s="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/voxel-grid/default.nix b/distros/noetic/voxel-grid/default.nix index 77024e3715..e5f10a9e88 100644 --- a/distros/noetic/voxel-grid/default.nix +++ b/distros/noetic/voxel-grid/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, roscpp, rosunit }: buildRosPackage { pname = "ros-noetic-voxel-grid"; - version = "1.17.2-r1"; + version = "1.17.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/navigation-release/archive/release/noetic/voxel_grid/1.17.2-1.tar.gz"; - name = "1.17.2-1.tar.gz"; - sha256 = "e7c58b56a3b31f78d302aaeeaeba39d9e03a505f053d550b9e3253c8d344aff9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "navigation-release"; + rev = "release/noetic/voxel_grid/1.17.3-1"; + sha256 = "sha256-KTOn6ZJOHrFntFaxiPJXe6mRjWTun6JAXEMVcLBfres="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/vrpn-client-ros/default.nix b/distros/noetic/vrpn-client-ros/default.nix index 70ec13994b..c613a708af 100644 --- a/distros/noetic/vrpn-client-ros/default.nix +++ b/distros/noetic/vrpn-client-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-vrpn-client-ros"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/vrpn_client_ros-release/archive/release/noetic/vrpn_client_ros/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "5ddc73e572937b826c76963d36a8118b5670c45ff4f7324ef62d1c83205ab4e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "vrpn_client_ros-release"; + rev = "release/noetic/vrpn_client_ros/0.2.2-1"; + sha256 = "sha256-ITmpgU8fS0E7LnQgj0wl+8RVyq4hydk+Keqm69lxG1U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/vrpn/default.nix b/distros/noetic/vrpn/default.nix index baf814add6..b4646b2911 100644 --- a/distros/noetic/vrpn/default.nix +++ b/distros/noetic/vrpn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-vrpn"; version = "7.34.0-r2"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/vrpn-release/archive/release/noetic/vrpn/7.34.0-2.tar.gz"; - name = "7.34.0-2.tar.gz"; - sha256 = "babe397ffaa7b299d71ef36febe6389d952b280e24b64e82b775bfe4dd945bdd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "vrpn-release"; + rev = "release/noetic/vrpn/7.34.0-2"; + sha256 = "sha256-IGs3hSZDF+0jG0TXBDQPEcvVS/6UU7eG2hqu53BxFPg="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/warehouse-ros-sqlite/default.nix b/distros/noetic/warehouse-ros-sqlite/default.nix index 9c5edea7aa..ff65674d9a 100644 --- a/distros/noetic/warehouse-ros-sqlite/default.nix +++ b/distros/noetic/warehouse-ros-sqlite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-warehouse-ros-sqlite"; version = "0.9.0-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/warehouse_ros_sqlite-release/archive/release/noetic/warehouse_ros_sqlite/0.9.0-1.tar.gz"; - name = "0.9.0-1.tar.gz"; - sha256 = "55c1b940c50612b756897cd167512990caad3e2f26b79f7f20574fb0e49616fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "warehouse_ros_sqlite-release"; + rev = "release/noetic/warehouse_ros_sqlite/0.9.0-1"; + sha256 = "sha256-z5/KIpwAXQ1Jg6wVi1hiN+SivA/IgdCfbeK4Bl1EcfY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/warehouse-ros/default.nix b/distros/noetic/warehouse-ros/default.nix index 17b2c33601..2319bbc1bb 100644 --- a/distros/noetic/warehouse-ros/default.nix +++ b/distros/noetic/warehouse-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-warehouse-ros"; version = "0.9.5-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/warehouse_ros-release/archive/release/noetic/warehouse_ros/0.9.5-1.tar.gz"; - name = "0.9.5-1.tar.gz"; - sha256 = "f3ea5eab008525e1e38cdbaffb5b43fa4db549a217abda35e8fb39111281ba91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "warehouse_ros-release"; + rev = "release/noetic/warehouse_ros/0.9.5-1"; + sha256 = "sha256-8aBMYtKJlumdTSjtOsEop3STuiCIgk6UZGICrWG2zJg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/warthog-control/default.nix b/distros/noetic/warthog-control/default.nix index 1eced2df11..8d6d985371 100644 --- a/distros/noetic/warthog-control/default.nix +++ b/distros/noetic/warthog-control/default.nix @@ -5,13 +5,17 @@ { 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-warthog-control"; - version = "0.1.5-r1"; + version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog-release/archive/release/noetic/warthog_control/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "a66851ba35de067f79cb3ac0cdc0d944ea22e6eaf5cacd5169310c83ef297767"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog-release"; + rev = "release/noetic/warthog_control/0.1.6-1"; + sha256 = "sha256-uHVkhvkbpHdqBvylKnBn0N7u65tbzMV/Maczqnaea2E="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/warthog-description/default.nix b/distros/noetic/warthog-description/default.nix index d2ddd59b67..01b8e82185 100644 --- a/distros/noetic/warthog-description/default.nix +++ b/distros/noetic/warthog-description/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, robot-state-publisher, roslaunch, urdf, xacro }: buildRosPackage { pname = "ros-noetic-warthog-description"; - version = "0.1.5-r1"; + version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog-release/archive/release/noetic/warthog_description/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "0a96a612f1fd8bfbae68dc7f0af5e83c51376a70fbca626f843e263edff53b6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog-release"; + rev = "release/noetic/warthog_description/0.1.6-1"; + sha256 = "sha256-VjHhwfqvd3RzPx0/t5s7zzwDILcZUNLfQ2Wzdjbll70="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/warthog-desktop/default.nix b/distros/noetic/warthog-desktop/default.nix index 1f63eed8b4..b38b4183de 100644 --- a/distros/noetic/warthog-desktop/default.nix +++ b/distros/noetic/warthog-desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-warthog-desktop"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog_desktop-release/archive/release/noetic/warthog_desktop/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "fecbfe2eb0135fb7526514b54ca070cba8b283af47ee4615ba0cea9ad797a7ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog_desktop-release"; + rev = "release/noetic/warthog_desktop/0.1.1-1"; + sha256 = "sha256-aajHMpN2BaXAgDcNV0Sfr5qRovXqZyZnY4wR2a9n4Nw="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/warthog-gazebo/default.nix b/distros/noetic/warthog-gazebo/default.nix index d776525ba8..226e449697 100644 --- a/distros/noetic/warthog-gazebo/default.nix +++ b/distros/noetic/warthog-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-warthog-gazebo"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog_simulator-release/archive/release/noetic/warthog_gazebo/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "2d0a7d1869c0d46e0c2a643211ac031ae61e713a3ebec5fd2a77da3b022f4946"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog_simulator-release"; + rev = "release/noetic/warthog_gazebo/0.2.2-1"; + sha256 = "sha256-yob3+P6Bg5MlFISzlyS6k0lgJDoN+Zq59JdAdEjRsDQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/warthog-msgs/default.nix b/distros/noetic/warthog-msgs/default.nix index a26af6c241..db447c72a8 100644 --- a/distros/noetic/warthog-msgs/default.nix +++ b/distros/noetic/warthog-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-warthog-msgs"; - version = "0.1.5-r1"; + version = "0.1.6-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog-release/archive/release/noetic/warthog_msgs/0.1.5-1.tar.gz"; - name = "0.1.5-1.tar.gz"; - sha256 = "01b26477c554dcdd53815449008cbea17ee04597760ac1ffe26ef589c6998c06"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog-release"; + rev = "release/noetic/warthog_msgs/0.1.6-1"; + sha256 = "sha256-tnkTcKoV3KOKMXbJSAofKWSssEwdPirpM3gVTYfXB9M="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/warthog-simulator/default.nix b/distros/noetic/warthog-simulator/default.nix index 761335c2ed..a5c19091f9 100644 --- a/distros/noetic/warthog-simulator/default.nix +++ b/distros/noetic/warthog-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-warthog-simulator"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog_simulator-release/archive/release/noetic/warthog_simulator/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "3fde1ac9ee9f62b32da70e40a5afffa77382bb8b2471083f91e69ed9d1566189"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog_simulator-release"; + rev = "release/noetic/warthog_simulator/0.2.2-1"; + sha256 = "sha256-EInTf4WSk6cmFaouzRRac4kX4vUhFIXU2r5gvT4iQ+c="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/warthog-viz/default.nix b/distros/noetic/warthog-viz/default.nix index 96586c8f5e..2834d7f4c2 100644 --- a/distros/noetic/warthog-viz/default.nix +++ b/distros/noetic/warthog-viz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-warthog-viz"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/warthog_desktop-release/archive/release/noetic/warthog_viz/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "112112b5b7354b1ffe38e4944c13333d4a2d8865f46c18b85b9f030ad1162585"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "warthog_desktop-release"; + rev = "release/noetic/warthog_viz/0.1.1-1"; + sha256 = "sha256-p1w59p3XcIBH/bSsVVCjOY8E6f+wvbuwvnmQ4jTglo4="; + }; buildType = "catkin"; buildInputs = [ catkin roslaunch ]; diff --git a/distros/noetic/web-video-server/default.nix b/distros/noetic/web-video-server/default.nix index 8b749e491a..b19a66c5dd 100644 --- a/distros/noetic/web-video-server/default.nix +++ b/distros/noetic/web-video-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-web-video-server"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/RobotWebTools-release/web_video_server-release/archive/release/noetic/web_video_server/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "7ae5dbf920030dd13a5d7d6010ba398db9efad78a6b382630f7095db0467e467"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "RobotWebTools-release"; + repo = "web_video_server-release"; + rev = "release/noetic/web_video_server/0.2.2-1"; + sha256 = "sha256-Y3UgRPY8mOWOn5x573wnsZxJXI9EXrOC55HCJKztwVY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/webkit-dependency/default.nix b/distros/noetic/webkit-dependency/default.nix index d72ea6f35f..583eeb58f4 100644 --- a/distros/noetic/webkit-dependency/default.nix +++ b/distros/noetic/webkit-dependency/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-webkit-dependency"; version = "1.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/webkit_dependency-release/archive/release/noetic/webkit_dependency/1.1.2-1.tar.gz"; - name = "1.1.2-1.tar.gz"; - sha256 = "09e635d456e54c6b42660c88062afe706b9d2bad7810d59b031eaf5cd701a7f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "webkit_dependency-release"; + rev = "release/noetic/webkit_dependency/1.1.2-1"; + sha256 = "sha256-EQorv4sv/h7CBEYdsR+bw1fHoJX8Nhk0yyMxOct57cU="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/webots-ros/default.nix b/distros/noetic/webots-ros/default.nix index f137f7df5c..6262662b61 100644 --- a/distros/noetic/webots-ros/default.nix +++ b/distros/noetic/webots-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-webots-ros"; version = "2023.0.0-r1"; - src = fetchurl { - url = "https://github.com/cyberbotics/webots_ros-release/archive/release/noetic/webots_ros/2023.0.0-1.tar.gz"; - name = "2023.0.0-1.tar.gz"; - sha256 = "05ebb7d96c29c12d054743870411fe330a77e5f48373baab922a9e4dbbd05a22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "cyberbotics"; + repo = "webots_ros-release"; + rev = "release/noetic/webots_ros/2023.0.0-1"; + sha256 = "sha256-wkK7ziiWtHL0KFaov94f+qAFNwyRWkZryiu1zMjR0Zk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/wfov-camera-msgs/default.nix b/distros/noetic/wfov-camera-msgs/default.nix index 43272d34a2..e4dee04cbd 100644 --- a/distros/noetic/wfov-camera-msgs/default.nix +++ b/distros/noetic/wfov-camera-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-wfov-camera-msgs"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/pointgrey_camera_driver-release/archive/release/noetic/wfov_camera_msgs/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "15a433e1d9cd61751a4e471c109f2fc7ecb9bcf803ab4a7ed2e1b61d01153f1a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "pointgrey_camera_driver-release"; + rev = "release/noetic/wfov_camera_msgs/0.15.1-1"; + sha256 = "sha256-OLtmNzJao1aW/eJYTo86X5P1MwAxJLbEpTEylvNx8do="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/wge100-camera-firmware/default.nix b/distros/noetic/wge100-camera-firmware/default.nix index abe5260364..66006dc9f6 100644 --- a/distros/noetic/wge100-camera-firmware/default.nix +++ b/distros/noetic/wge100-camera-firmware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-wge100-camera-firmware"; version = "1.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/noetic/wge100_camera_firmware/1.8.5-1.tar.gz"; - name = "1.8.5-1.tar.gz"; - sha256 = "c0e7fa0887305d507bbacd2e2f07628eeec1bbbda8e762d5c1601b5105c85714"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "wge100_driver-release"; + rev = "release/noetic/wge100_camera_firmware/1.8.5-1"; + sha256 = "sha256-1SrOXU2SXa8PZ08hr3lBf7PVv6MMnx0PaplkZXpgaaI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/wge100-camera/default.nix b/distros/noetic/wge100-camera/default.nix index db592cc74e..6ddbd1f8d8 100644 --- a/distros/noetic/wge100-camera/default.nix +++ b/distros/noetic/wge100-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-wge100-camera"; version = "1.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/noetic/wge100_camera/1.8.5-1.tar.gz"; - name = "1.8.5-1.tar.gz"; - sha256 = "6a3dd6522dd3395d1b917bfa9a6dc78c0a1653740f9f33b3247e0fed1e61b0b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "wge100_driver-release"; + rev = "release/noetic/wge100_camera/1.8.5-1"; + sha256 = "sha256-x6F+lyigUl13PI82qkXW0LyUe9YB5zeJujpOU+wvEIc="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation rostest ]; diff --git a/distros/noetic/wge100-driver/default.nix b/distros/noetic/wge100-driver/default.nix index 79cbd53612..5f86a617c3 100644 --- a/distros/noetic/wge100-driver/default.nix +++ b/distros/noetic/wge100-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-wge100-driver"; version = "1.8.5-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/noetic/wge100_driver/1.8.5-1.tar.gz"; - name = "1.8.5-1.tar.gz"; - sha256 = "d0cbcb4b363ae9f65e3ab5b088d1aad0258046ebd1ec3f910999fc36dc4327ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "wge100_driver-release"; + rev = "release/noetic/wge100_driver/1.8.5-1"; + sha256 = "sha256-5jCJ35Sa4EqUG7sjS99rsr7MoRwXYB6rFXDpzGefuYk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/wifi-ddwrt/default.nix b/distros/noetic/wifi-ddwrt/default.nix index e1a0216273..65d6e4203d 100644 --- a/distros/noetic/wifi-ddwrt/default.nix +++ b/distros/noetic/wifi-ddwrt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-wifi-ddwrt"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/wifi_ddwrt-release/archive/release/noetic/wifi_ddwrt/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "067188231f50e4d113d92c4993b57981f8b065e914d3f3bd44da8bcd976c4ef6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "wifi_ddwrt-release"; + rev = "release/noetic/wifi_ddwrt/0.2.2-1"; + sha256 = "sha256-1N3MARRADUBUnj9lkJoMhxLMbc/qXOH5TbNni9c3mFk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/willow-maps/default.nix b/distros/noetic/willow-maps/default.nix index 944778f0ae..945666fd3c 100644 --- a/distros/noetic/willow-maps/default.nix +++ b/distros/noetic/willow-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-willow-maps"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/willow_maps-release/archive/release/noetic/willow_maps/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "da7a3de20a1d6b8bc738f90a7fbc63a821cc607ab52b4f3d8dc0083a14e0e58e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "willow_maps-release"; + rev = "release/noetic/willow_maps/1.0.3-1"; + sha256 = "sha256-IIn8UQEUNVNd+OCgqtSbqflAXMrQItZZjwiSGzuJKd4="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/wireless-msgs/default.nix b/distros/noetic/wireless-msgs/default.nix index b28b5d0755..a9ff0c0f6d 100644 --- a/distros/noetic/wireless-msgs/default.nix +++ b/distros/noetic/wireless-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-wireless-msgs"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/wireless-release/archive/release/noetic/wireless_msgs/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "cd789f90673d73feda7f30fe6af06aa73459e4a6a7a6dff711fb6f493481b6f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "wireless-release"; + rev = "release/noetic/wireless_msgs/0.1.1-2"; + sha256 = "sha256-TZJIhudGUEey1U/FfWaRu/ON7O4eZY8zACqCPRJNeYk="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/wireless-watcher/default.nix b/distros/noetic/wireless-watcher/default.nix index e2fc136322..c9dbd3c46d 100644 --- a/distros/noetic/wireless-watcher/default.nix +++ b/distros/noetic/wireless-watcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-wireless-watcher"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/clearpath-gbp/wireless-release/archive/release/noetic/wireless_watcher/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "c3a1b64ac33660df0fd8becf86c5207e081d8c3c4c74ae7185b6568663cd8117"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "clearpath-gbp"; + repo = "wireless-release"; + rev = "release/noetic/wireless_watcher/0.1.1-2"; + sha256 = "sha256-x+DGAY9zrogalssgS9kX41yPsZxZI46FIMN1q/eCwkk="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/ws281x/default.nix b/distros/noetic/ws281x/default.nix index 67c67b5cdc..645d64c7c4 100644 --- a/distros/noetic/ws281x/default.nix +++ b/distros/noetic/ws281x/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ws281x"; version = "0.0.11-r1"; - src = fetchurl { - url = "https://github.com/CopterExpress/ros_led-release/archive/release/noetic/ws281x/0.0.11-1.tar.gz"; - name = "0.0.11-1.tar.gz"; - sha256 = "0071b29514f6c0f6ccc254eda7e8ccf2e5f853124cab97bf156f92bcd07a6318"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "CopterExpress"; + repo = "ros_led-release"; + rev = "release/noetic/ws281x/0.0.11-1"; + sha256 = "sha256-izc3WIENufDJGluuKyE19SEX0vEez8E5kP2svi5yL/I="; + }; buildType = "catkin"; buildInputs = [ catkin ros-environment ]; diff --git a/distros/noetic/wu-ros-tools/default.nix b/distros/noetic/wu-ros-tools/default.nix index 62d14deedf..47cbb8f674 100644 --- a/distros/noetic/wu-ros-tools/default.nix +++ b/distros/noetic/wu-ros-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-wu-ros-tools"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/wu-robotics/wu_ros_tools/archive/release/noetic/wu_ros_tools/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "7040e992f4f0d0c5a52568a1d1e3792c0114a331ebbf8db9267dfe57ba07b892"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "wu-robotics"; + repo = "wu_ros_tools"; + rev = "release/noetic/wu_ros_tools/0.3.0-1"; + sha256 = "sha256-cNFm8HuE5hjr8cPWZqxqgC7iKMfouY2gOlF6vmuxL9o="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xacro/default.nix b/distros/noetic/xacro/default.nix index 1127ca11d4..6fee99dea8 100644 --- a/distros/noetic/xacro/default.nix +++ b/distros/noetic/xacro/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xacro"; version = "1.14.14-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/xacro-release/archive/release/noetic/xacro/1.14.14-1.tar.gz"; - name = "1.14.14-1.tar.gz"; - sha256 = "84db0afd7ffb8014545b42729cc0691bf09d9a285b2a71f52a1221149b63e2fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "xacro-release"; + rev = "release/noetic/xacro/1.14.14-1"; + sha256 = "sha256-vNWKb22Tgy7WOQLkr0ZH3jbGSA5Qrm80b2pnLzc4fLI="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/noetic/xmlrpcpp/default.nix b/distros/noetic/xmlrpcpp/default.nix index 4f5f7e04a7..fda37bb933 100644 --- a/distros/noetic/xmlrpcpp/default.nix +++ b/distros/noetic/xmlrpcpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xmlrpcpp"; version = "1.15.15-r1"; - src = fetchurl { - url = "https://github.com/ros-gbp/ros_comm-release/archive/release/noetic/xmlrpcpp/1.15.15-1.tar.gz"; - name = "1.15.15-1.tar.gz"; - sha256 = "09db3eca369508843cdc060d5212d15257b02d752631a0ea594bbcde0804d285"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-gbp"; + repo = "ros_comm-release"; + rev = "release/noetic/xmlrpcpp/1.15.15-1"; + sha256 = "sha256-eDSUoqbidUvgEdyrePYjx91o4FAARkHEHLyeOW5QNYI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xpp-examples/default.nix b/distros/noetic/xpp-examples/default.nix index 468405f93e..da38510c6c 100644 --- a/distros/noetic/xpp-examples/default.nix +++ b/distros/noetic/xpp-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xpp-examples"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/noetic/xpp_examples/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "bc63e0be9668cb5153caae1ad556d3222cac96d45e9d7c9e4b200a85da89dbca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/noetic/xpp_examples/1.0.10-1"; + sha256 = "sha256-PpyjBX1+7MvPo3hOUsOdgnSi84MgcGAJYxkUIHyIfsA="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xpp-hyq/default.nix b/distros/noetic/xpp-hyq/default.nix index 323f651704..d2eb7b1e77 100644 --- a/distros/noetic/xpp-hyq/default.nix +++ b/distros/noetic/xpp-hyq/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xpp-hyq"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/noetic/xpp_hyq/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "b62b282e59bc70fb9fde91beb6451de651efdb0012083c065ede1693d0aebcdb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/noetic/xpp_hyq/1.0.10-1"; + sha256 = "sha256-MlgPqAXIWfZ+S/1u17CCaqUkw3Yi6bsTVA86CTvdUaY="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xpp-msgs/default.nix b/distros/noetic/xpp-msgs/default.nix index 8f0b6c779c..26f85a6228 100644 --- a/distros/noetic/xpp-msgs/default.nix +++ b/distros/noetic/xpp-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xpp-msgs"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/noetic/xpp_msgs/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "cfb69281c6c51f4ca2bbdc100148ff2cfc10a19962ecae957dd66968c7837317"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/noetic/xpp_msgs/1.0.10-1"; + sha256 = "sha256-as6DQ6JwbUTT3pJpV7Uf0k6+mM2q0M+gjGsQShT+NNM="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xpp-quadrotor/default.nix b/distros/noetic/xpp-quadrotor/default.nix index df4407f5ba..82f5cbd9ee 100644 --- a/distros/noetic/xpp-quadrotor/default.nix +++ b/distros/noetic/xpp-quadrotor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xpp-quadrotor"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/noetic/xpp_quadrotor/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "8a031860f897dd32e79b6220ba09faeab92299afb05b4dfa86c686f644a4fa09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/noetic/xpp_quadrotor/1.0.10-1"; + sha256 = "sha256-IzqI3I16uhtlIMIfOrzGhD8+YdeJA5psofm0JmMrW9I="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xpp-states/default.nix b/distros/noetic/xpp-states/default.nix index ee368917b8..3f840e55a4 100644 --- a/distros/noetic/xpp-states/default.nix +++ b/distros/noetic/xpp-states/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xpp-states"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/noetic/xpp_states/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "cda3dc0aa390e9aec9fdcf29f5f22dd0bcb5cb1850d8a11904c47627cd2acaf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/noetic/xpp_states/1.0.10-1"; + sha256 = "sha256-6tRWtoNGYmKG79eGQPk28C00gV9Wl7AXN+SxcezJ05U="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xpp-vis/default.nix b/distros/noetic/xpp-vis/default.nix index 2c3dec148c..d2fb5ed7eb 100644 --- a/distros/noetic/xpp-vis/default.nix +++ b/distros/noetic/xpp-vis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xpp-vis"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/noetic/xpp_vis/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "b421fcd1fc81fd9db475406fcf042fc59f6de51bdac34b282e46c430926bd37f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/noetic/xpp_vis/1.0.10-1"; + sha256 = "sha256-AHVyk9igM9Bt87Es87HfMaDs530HGaX05Obv1uehiJg="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xpp/default.nix b/distros/noetic/xpp/default.nix index 5104ece883..181b4fc6c0 100644 --- a/distros/noetic/xpp/default.nix +++ b/distros/noetic/xpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xpp"; version = "1.0.10-r1"; - src = fetchurl { - url = "https://github.com/leggedrobotics/xpp-release/archive/release/noetic/xpp/1.0.10-1.tar.gz"; - name = "1.0.10-1.tar.gz"; - sha256 = "f7501d7db91d3ceabafed99e6f47332c578efd2bc2575cfa000bf3991a1235c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "leggedrobotics"; + repo = "xpp-release"; + rev = "release/noetic/xpp/1.0.10-1"; + sha256 = "sha256-o7pRgC0V4tObF34zu4ZKDWHct3z5D7NrnySs9PjnyYE="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xsens-mti-driver/default.nix b/distros/noetic/xsens-mti-driver/default.nix index 28532226bd..9113427798 100644 --- a/distros/noetic/xsens-mti-driver/default.nix +++ b/distros/noetic/xsens-mti-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xsens-mti-driver"; version = "0.2021.4-r1"; - src = fetchurl { - url = "https://github.com/nobleo/xsens_mti_driver-release/archive/release/noetic/xsens_mti_driver/0.2021.4-1.tar.gz"; - name = "0.2021.4-1.tar.gz"; - sha256 = "841720213947785b0b411b43b9c18967ccdc93b25db700ee22a95a3a89053d84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "xsens_mti_driver-release"; + rev = "release/noetic/xsens_mti_driver/0.2021.4-1"; + sha256 = "sha256-HztoB95azdiMIm5XbAPjQh4dTj27DgG9g1RjoAwa5aI="; + }; buildType = "catkin"; buildInputs = [ catkin ]; diff --git a/distros/noetic/xv-11-laser-driver/default.nix b/distros/noetic/xv-11-laser-driver/default.nix index c17f832ab8..8a7d864dfd 100644 --- a/distros/noetic/xv-11-laser-driver/default.nix +++ b/distros/noetic/xv-11-laser-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-xv-11-laser-driver"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/rohbotics/xv_11_laser_driver-release/archive/release/noetic/xv_11_laser_driver/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "50a7aa9f11a48f38be60f8fc05c4a8496de0f7df8488816cb89ca4712f829924"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rohbotics"; + repo = "xv_11_laser_driver-release"; + rev = "release/noetic/xv_11_laser_driver/0.3.0-1"; + sha256 = "sha256-xd8dH35fK1pMgD4JhX69dVG7ofLih5D/yYoha5A2M4M="; + }; buildType = "catkin"; buildInputs = [ catkin roscpp sensor-msgs ]; diff --git a/distros/noetic/ypspur-ros/default.nix b/distros/noetic/ypspur-ros/default.nix index b3b0aa70d6..426c0fcb61 100644 --- a/distros/noetic/ypspur-ros/default.nix +++ b/distros/noetic/ypspur-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ypspur-ros"; version = "0.3.5-r1"; - src = fetchurl { - url = "https://github.com/openspur/ypspur_ros-release/archive/release/noetic/ypspur_ros/0.3.5-1.tar.gz"; - name = "0.3.5-1.tar.gz"; - sha256 = "ed60ad59fb73ba811bd1703436c47aab4cd43bd30d9233787f5bbca1442670f1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "openspur"; + repo = "ypspur_ros-release"; + rev = "release/noetic/ypspur_ros/0.3.5-1"; + sha256 = "sha256-XiPZVLAKSJXxNRrJQnS+2VJu8ynlm5hRbAYYVWSj10U="; + }; buildType = "catkin"; buildInputs = [ catkin message-generation ]; diff --git a/distros/noetic/ypspur/default.nix b/distros/noetic/ypspur/default.nix index b388d59538..1e4f2da775 100644 --- a/distros/noetic/ypspur/default.nix +++ b/distros/noetic/ypspur/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-ypspur"; version = "1.20.2-r1"; - src = fetchurl { - url = "https://github.com/openspur/yp-spur-release/archive/release/noetic/ypspur/1.20.2-1.tar.gz"; - name = "1.20.2-1.tar.gz"; - sha256 = "3b6048cde6a08aaa82eaea43e86ddcd1e1c2dfe9e68dcc3dfee93e45d215ea4d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "openspur"; + repo = "yp-spur-release"; + rev = "release/noetic/ypspur/1.20.2-1"; + sha256 = "sha256-6X3eQ6hN+LQ1a4j6LumjyVGeUZogRwfhGDy9709Sl+8="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/noetic/zbar-ros/default.nix b/distros/noetic/zbar-ros/default.nix index 5b27953708..7672d2b1dc 100644 --- a/distros/noetic/zbar-ros/default.nix +++ b/distros/noetic/zbar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-noetic-zbar-ros"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros-drivers-gbp/zbar_ros-release/archive/release/noetic/zbar_ros/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "75e34b3033a0ff405b0a6e1c306813e89f0e2cb2351c754c4dd6206fd2540f55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros-drivers-gbp"; + repo = "zbar_ros-release"; + rev = "release/noetic/zbar_ros/0.3.0-1"; + sha256 = "sha256-J0VRvJf2Gp1KWe/TUJ3mZzLw/N8chmXsA3anbPO6hlQ="; + }; buildType = "catkin"; buildInputs = [ catkin roslint ]; diff --git a/distros/rolling/acado-vendor/default.nix b/distros/rolling/acado-vendor/default.nix index 0a6fda4241..7667d2a742 100644 --- a/distros/rolling/acado-vendor/default.nix +++ b/distros/rolling/acado-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-acado-vendor"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/acado_vendor-release/archive/release/rolling/acado_vendor/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "15243e297634178d1bf5ca1fcd2e38e2baa42741c18e9b1df6aea095350cd915"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "acado_vendor-release"; + rev = "release/rolling/acado_vendor/1.0.0-3"; + sha256 = "sha256-8gA7ZwANcFmzyoc3egAGyB3xpAQlHrs4nK6U1/KanwA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ackermann-msgs/default.nix b/distros/rolling/ackermann-msgs/default.nix index 78b5a19e58..5fa4a94561 100644 --- a/distros/rolling/ackermann-msgs/default.nix +++ b/distros/rolling/ackermann-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ackermann-msgs"; version = "2.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ackermann_msgs-release/archive/release/rolling/ackermann_msgs/2.0.2-2.tar.gz"; - name = "2.0.2-2.tar.gz"; - sha256 = "990103ad9f6ff0976f7239c51a781ccdddf1b1d9b292635e0a1fd545d97f15fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ackermann_msgs-release"; + rev = "release/rolling/ackermann_msgs/2.0.2-2"; + sha256 = "sha256-zn0jbHQ6PrAlpzAwpr3Tu01dOE8TVcs0XYlTXL0x8wg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/action-msgs/default.nix b/distros/rolling/action-msgs/default.nix index dd9fbd867d..294dc34ed7 100644 --- a/distros/rolling/action-msgs/default.nix +++ b/distros/rolling/action-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-action-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/rolling/action_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "d76dd2eb790fb5cea37582916c4998af33f89640ba05d19d5c09678c43603c09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/rolling/action_msgs/1.3.1-1"; + sha256 = "sha256-y9zo3GXijYh8Ph3BpEjmIjIVuS1wl/ntWlV4ueLWNrY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-core-generators ]; diff --git a/distros/rolling/action-tutorials-cpp/default.nix b/distros/rolling/action-tutorials-cpp/default.nix index fa717470e6..df114d1ddb 100644 --- a/distros/rolling/action-tutorials-cpp/default.nix +++ b/distros/rolling/action-tutorials-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-action-tutorials-cpp"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/action_tutorials_cpp/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "a2145af647d2b67d19a8e837027113906c8173a74edeb62546294d3d48e2c408"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/action_tutorials_cpp/0.23.0-1"; + sha256 = "sha256-v5bDx+a9hqDFJUL/NOCa5mAgFtRR/h0qJYoKAw1WfTM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/action-tutorials-interfaces/default.nix b/distros/rolling/action-tutorials-interfaces/default.nix index 4e0b50f02e..6ba99e7307 100644 --- a/distros/rolling/action-tutorials-interfaces/default.nix +++ b/distros/rolling/action-tutorials-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-action-tutorials-interfaces"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/action_tutorials_interfaces/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "5fe85567386b022407c807845f2890426a0166886d2b7cf6edfa9287d2390384"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/action_tutorials_interfaces/0.23.0-1"; + sha256 = "sha256-8DReCwIyCIgtecbv42WiKR2ALJxX/834iKKyMknu3K8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/action-tutorials-py/default.nix b/distros/rolling/action-tutorials-py/default.nix index ec58e76825..9856b15d1b 100644 --- a/distros/rolling/action-tutorials-py/default.nix +++ b/distros/rolling/action-tutorials-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-action-tutorials-py"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/action_tutorials_py/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "69f1fc8b7c77f166721b3676ac76e57d595fcfb4e310658207a215d648597228"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/action_tutorials_py/0.23.0-1"; + sha256 = "sha256-pSzsKfmyXSiTKsRtIEcYM0T/PXsMsl8pQZpG5CDwgE8="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/actionlib-msgs/default.nix b/distros/rolling/actionlib-msgs/default.nix index 9e1dd0fa46..793594da4f 100644 --- a/distros/rolling/actionlib-msgs/default.nix +++ b/distros/rolling/actionlib-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-actionlib-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/actionlib_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "4714dec45a8dfe7a81518893ccb68fbc6f3d20309bdb683019be52405c1ef987"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/actionlib_msgs/4.6.1-1"; + sha256 = "sha256-1oxpFxv1ehjbkiXfXah58J41CEvK5gs5K+y8oeXqCGM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/adaptive-component/default.nix b/distros/rolling/adaptive-component/default.nix index be90e659ee..9bde665ea0 100644 --- a/distros/rolling/adaptive-component/default.nix +++ b/distros/rolling/adaptive-component/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-adaptive-component"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/adaptive_component-release/archive/release/rolling/adaptive_component/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "b64cfa5f13820d57ede023be9f44179577ca83f73a2c70426de8c1480e2c8d22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "adaptive_component-release"; + rev = "release/rolling/adaptive_component/0.2.1-1"; + sha256 = "sha256-W7/vGlSCfAW+RH7nsv4Po+MFZLDvwzuq/iSATbF9jaQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/admittance-controller/default.nix b/distros/rolling/admittance-controller/default.nix index cb4c7aeb49..c525ba8b9b 100644 --- a/distros/rolling/admittance-controller/default.nix +++ b/distros/rolling/admittance-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, control-msgs, control-toolbox, controller-interface, controller-manager, filters, generate-parameter-library, geometry-msgs, hardware-interface, joint-trajectory-controller, kinematics-interface, kinematics-interface-kdl, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, tf2, tf2-eigen, tf2-geometry-msgs, tf2-kdl, tf2-ros, trajectory-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, control-msgs, control-toolbox, controller-interface, controller-manager, filters, generate-parameter-library, geometry-msgs, hardware-interface, joint-trajectory-controller, kinematics-interface, kinematics-interface-kdl, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, tf2, tf2-eigen, tf2-geometry-msgs, tf2-kdl, tf2-ros, trajectory-msgs }: buildRosPackage { pname = "ros-rolling-admittance-controller"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/admittance_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "791ae44b516dce3cee0c0611ed25520d90a23020c492589283df7913f74ab7b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/admittance_controller/3.1.0-1"; + sha256 = "sha256-Et8D/rF6FkmsHUdjy6WV0iQFThojbYDhgOBoOq1x/B4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock control-msgs controller-manager hardware-interface kinematics-interface-kdl ros2-control-test-assets ]; - propagatedBuildInputs = [ control-msgs control-toolbox controller-interface filters generate-parameter-library geometry-msgs hardware-interface joint-trajectory-controller kinematics-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools tf2 tf2-eigen tf2-geometry-msgs tf2-kdl tf2-ros trajectory-msgs ]; + propagatedBuildInputs = [ backward-ros control-msgs control-toolbox controller-interface filters generate-parameter-library geometry-msgs hardware-interface joint-trajectory-controller kinematics-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools tf2 tf2-eigen tf2-geometry-msgs tf2-kdl tf2-ros trajectory-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/ament-acceleration/default.nix b/distros/rolling/ament-acceleration/default.nix index db411a908b..b28e2623eb 100644 --- a/distros/rolling/ament-acceleration/default.nix +++ b/distros/rolling/ament-acceleration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-acceleration"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_acceleration-release/archive/release/rolling/ament_acceleration/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "f2da5c28cbca53bb53d41e7f9b562fac015255b683bfcc4078b37c9038d1c502"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_acceleration-release"; + rev = "release/rolling/ament_acceleration/0.2.0-1"; + sha256 = "sha256-tnkilfsTlrhC8xcFlu9E8VIt8hGsNKCcdD53KV8JRac="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-clang-format/default.nix b/distros/rolling/ament-clang-format/default.nix index 26ced57e3d..1bebdaf8f6 100644 --- a/distros/rolling/ament-clang-format/default.nix +++ b/distros/rolling/ament-clang-format/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-clang-format"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_clang_format/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "c905376b4e23ec571674faeeaa0d48a47c61e5da4010d0d95d79e2a50cc92be8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_clang_format/0.13.2-1"; + sha256 = "sha256-1ETvWHzf/6eEAU7B0/B5o9nqHbyctflQFYDnlnZU+L0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-clang-tidy/default.nix b/distros/rolling/ament-clang-tidy/default.nix index 0e74032fc5..809ad2a23b 100644 --- a/distros/rolling/ament-clang-tidy/default.nix +++ b/distros/rolling/ament-clang-tidy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-clang-tidy"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_clang_tidy/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "2be5d5de9dbc8733b3fac0415a7296f2b1d1248d0c2eaf2a5e5de98a7e0d83a0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_clang_tidy/0.13.2-1"; + sha256 = "sha256-cYAf4FBgdUByA8nuR9rLfWcix3iCCC7VHPT90OYBwz8="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-cmake-auto/default.nix b/distros/rolling/ament-cmake-auto/default.nix index 102d227aa0..1b06288536 100644 --- a/distros/rolling/ament-cmake-auto/default.nix +++ b/distros/rolling/ament-cmake-auto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-auto"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_auto/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "9177866202cf75f35e79f65eb08cf7b0420b1d6afcd5af1ad7109c6f882d8beb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_auto/1.5.2-1"; + sha256 = "sha256-Mg52k7zFFsYRR1yD5IvCVnxtWQ0ax4SyjtjRxgPmKQE="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake ament-cmake-gtest ]; diff --git a/distros/rolling/ament-cmake-catch2/default.nix b/distros/rolling/ament-cmake-catch2/default.nix index 09a6aac5a6..f668b04064 100644 --- a/distros/rolling/ament-cmake-catch2/default.nix +++ b/distros/rolling/ament-cmake-catch2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-catch2"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_catch2-release/archive/release/rolling/ament_cmake_catch2/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "fcfed64be4aaa8759f2ff2e7eadec3b2fb816db9201ff8e9ac064b687537066b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_catch2-release"; + rev = "release/rolling/ament_cmake_catch2/1.2.0-2"; + sha256 = "sha256-tO+yhq78V4z0Tiq3cso46p8Nv2iIiy1GtgvMFrerMPI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-clang-format/default.nix b/distros/rolling/ament-cmake-clang-format/default.nix index 7f00315594..27b8c34000 100644 --- a/distros/rolling/ament-cmake-clang-format/default.nix +++ b/distros/rolling/ament-cmake-clang-format/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-clang-format"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_clang_format/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "8043b4d12686379632df7125a9afbae639a51297c09fb968615c4bb3d2a63d91"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_clang_format/0.13.2-1"; + sha256 = "sha256-32fFU/UCEIgcpjPkRC+tGPUw7C7h1NHcOLfct5n8peI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-clang-tidy/default.nix b/distros/rolling/ament-cmake-clang-tidy/default.nix index aef95dca2e..75212ddfb8 100644 --- a/distros/rolling/ament-cmake-clang-tidy/default.nix +++ b/distros/rolling/ament-cmake-clang-tidy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-clang-tidy"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_clang_tidy/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "9914b3ca7d7350c5dfd92e317e301ee0092c42c882b2a74a6f185008c2553f2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_clang_tidy/0.13.2-1"; + sha256 = "sha256-PpxXw4cMhNta0Ft9WGXvvovtZ1FC9YLlSuRuXzpAg1U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-copyright/default.nix b/distros/rolling/ament-cmake-copyright/default.nix index 316f277df4..881bb84e1f 100644 --- a/distros/rolling/ament-cmake-copyright/default.nix +++ b/distros/rolling/ament-cmake-copyright/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-copyright"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_copyright/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "d67f9fcf49beb0320c5d62a3c002d89ced236482999daa6cfd2849f9693f8f35"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_copyright/0.13.2-1"; + sha256 = "sha256-pNkgUBJ3NBg+sFG6TVH7CDao8YTwP4nKUSMby+wZmok="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-core/default.nix b/distros/rolling/ament-cmake-core/default.nix index 98f4b18448..3a10e1195a 100644 --- a/distros/rolling/ament-cmake-core/default.nix +++ b/distros/rolling/ament-cmake-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-core"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_core/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "6761aa2a5425777b1f5021de50b6bb0260a9e7d237450a1a17a5b6848a01410f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_core/1.5.2-1"; + sha256 = "sha256-5rKvMTkBK0flPRBUkAv3q14iZW/l5MKXDbKx3Tm4DII="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-package cmake python3Packages.catkin-pkg ]; diff --git a/distros/rolling/ament-cmake-cppcheck/default.nix b/distros/rolling/ament-cmake-cppcheck/default.nix index 2e7a6e8f0f..fbd64af17e 100644 --- a/distros/rolling/ament-cmake-cppcheck/default.nix +++ b/distros/rolling/ament-cmake-cppcheck/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-cppcheck"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_cppcheck/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "bff2f22335f9572a8307ffa64288dc4bf732bb45844f31ac496d319915ceaeef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_cppcheck/0.13.2-1"; + sha256 = "sha256-3Llnl7qg+TySznjCaFXl9/boJ/uGrq5XyJnF/FC7HA4="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-copyright ament-cmake-lint-cmake ]; diff --git a/distros/rolling/ament-cmake-cpplint/default.nix b/distros/rolling/ament-cmake-cpplint/default.nix index cfab2bfe4b..a032be24d5 100644 --- a/distros/rolling/ament-cmake-cpplint/default.nix +++ b/distros/rolling/ament-cmake-cpplint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-cpplint"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_cpplint/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "8ededf4ab25ecb8a8e27e7d033963c8bd073e1cb1823f0911c1692c7d35b24eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_cpplint/0.13.2-1"; + sha256 = "sha256-Sg4UunMWOdk5/FGZijXCSJjnr0R4yGDFGH4BgqWCiAU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-export-definitions/default.nix b/distros/rolling/ament-cmake-export-definitions/default.nix index 58c33cbcdc..00248e75ea 100644 --- a/distros/rolling/ament-cmake-export-definitions/default.nix +++ b/distros/rolling/ament-cmake-export-definitions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-export-definitions"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_export_definitions/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "4a2c940f22f262dbf670ab684e9bacb12ab4696e3187c8976023ceb3dd0877e4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_export_definitions/1.5.2-1"; + sha256 = "sha256-uN/eEHNws519LtWQ3lBfJUvcSXY0tCDb+m6aeyRQKok="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-export-dependencies/default.nix b/distros/rolling/ament-cmake-export-dependencies/default.nix index 073f5b952d..9ef7c77398 100644 --- a/distros/rolling/ament-cmake-export-dependencies/default.nix +++ b/distros/rolling/ament-cmake-export-dependencies/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-export-dependencies"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_export_dependencies/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "bd008e1603da5918066794d9f0d2ba99784a72a6d65e67f0ff6faa8bab61a82d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_export_dependencies/1.5.2-1"; + sha256 = "sha256-Ht+Rmkf7mGL6J2XCRbgIzog/LkSZCPtRmshmq4O/rDE="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-libraries ]; diff --git a/distros/rolling/ament-cmake-export-include-directories/default.nix b/distros/rolling/ament-cmake-export-include-directories/default.nix index 93982af2d6..74256427f9 100644 --- a/distros/rolling/ament-cmake-export-include-directories/default.nix +++ b/distros/rolling/ament-cmake-export-include-directories/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-export-include-directories"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_export_include_directories/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "1df94d449d8c3c27bd4ce476f06e634045946e64ad9d5c8500566a5992b82f97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_export_include_directories/1.5.2-1"; + sha256 = "sha256-8baA8y+09qVrl8r8sFpTlUyoc50MDFKpD2Gnq+Im2/4="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-export-interfaces/default.nix b/distros/rolling/ament-cmake-export-interfaces/default.nix index d6953da4b6..77369d2668 100644 --- a/distros/rolling/ament-cmake-export-interfaces/default.nix +++ b/distros/rolling/ament-cmake-export-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-export-interfaces"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_export_interfaces/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "feefa776a0ab9014cefc66a81f62119cc0c5ae3971c959a829c7549580299dd9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_export_interfaces/1.5.2-1"; + sha256 = "sha256-vQjbPh3rqPJ83FSv729lkoDZORg7gaecMQGNSTC1uFs="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-libraries ]; diff --git a/distros/rolling/ament-cmake-export-libraries/default.nix b/distros/rolling/ament-cmake-export-libraries/default.nix index 2a0af19b15..bc4dec65d5 100644 --- a/distros/rolling/ament-cmake-export-libraries/default.nix +++ b/distros/rolling/ament-cmake-export-libraries/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-export-libraries"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_export_libraries/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "cf99d4d2e3f8c41b2c0b4ee632305052a4dd5dd014847db877062a7d887db0c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_export_libraries/1.5.2-1"; + sha256 = "sha256-TnbEFYkekkdo/wgFWgIYT8OQzdxhho0UXzd7nUgykMQ="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-export-link-flags/default.nix b/distros/rolling/ament-cmake-export-link-flags/default.nix index 0d1c44e07f..d61f2c8944 100644 --- a/distros/rolling/ament-cmake-export-link-flags/default.nix +++ b/distros/rolling/ament-cmake-export-link-flags/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-export-link-flags"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_export_link_flags/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "b42510631d8e38d01a4dce61c087c2f82c3e41079aa84cf47647acf941ea83c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_export_link_flags/1.5.2-1"; + sha256 = "sha256-qrr5AqdiyOkAxTz4G5h+rWgPTa1+7xhgUItY2ByoMfA="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-export-targets/default.nix b/distros/rolling/ament-cmake-export-targets/default.nix index 0f3357e7be..50e5e1adf1 100644 --- a/distros/rolling/ament-cmake-export-targets/default.nix +++ b/distros/rolling/ament-cmake-export-targets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-export-targets"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_export_targets/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "dc9a6b387fb07bcce4041f07c8534574356d3d7bc32bb4f621f283514ca6beb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_export_targets/1.5.2-1"; + sha256 = "sha256-+GtQyBwJXT1sljUHiG9j51H7eeLLm8FGRFr1PR2tfwg="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-libraries ]; diff --git a/distros/rolling/ament-cmake-flake8/default.nix b/distros/rolling/ament-cmake-flake8/default.nix index 98340de713..a4e352140c 100644 --- a/distros/rolling/ament-cmake-flake8/default.nix +++ b/distros/rolling/ament-cmake-flake8/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-flake8"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_flake8/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "b2909bf32f057b73c4e350581b62751bc105ca4a40eb96cd61c1f00590407b6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_flake8/0.13.2-1"; + sha256 = "sha256-9UPg2uM3XBKUO/DR2N7OWvfz7EV/ILNg27tfPKJymws="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-gen-version-h/default.nix b/distros/rolling/ament-cmake-gen-version-h/default.nix index b3deab59ca..ec1b6b40e5 100644 --- a/distros/rolling/ament-cmake-gen-version-h/default.nix +++ b/distros/rolling/ament-cmake-gen-version-h/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-gen-version-h"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_gen_version_h/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "a07bc6809779fe6cc3dae6007463dd1491a5f5dfe9519f39b29a9ab4ff685a40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_gen_version_h/1.5.2-1"; + sha256 = "sha256-LJR00uEa99+So+qYeyLzkUfGvxDa+LAMQNIn0cuK7C0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-package ]; diff --git a/distros/rolling/ament-cmake-gmock/default.nix b/distros/rolling/ament-cmake-gmock/default.nix index c9ee9080d2..873f7f6490 100644 --- a/distros/rolling/ament-cmake-gmock/default.nix +++ b/distros/rolling/ament-cmake-gmock/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-gmock"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_gmock/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "57e315c2b2f5673be4dda618b645a6e32ac4b834ee5163d3771ed6eb40331ec8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_gmock/1.5.2-1"; + sha256 = "sha256-7EFKEKJXJGHE51/DtI9JcGYxtKHJJlP6RYO9lcTbztQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-google-benchmark/default.nix b/distros/rolling/ament-cmake-google-benchmark/default.nix index a00000ea90..6b6aa03cb0 100644 --- a/distros/rolling/ament-cmake-google-benchmark/default.nix +++ b/distros/rolling/ament-cmake-google-benchmark/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-google-benchmark"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_google_benchmark/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "2329142f23d41bf40d8959582a0ed8d2d0ccc3ac85238f37aa5c724a4ff919c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_google_benchmark/1.5.2-1"; + sha256 = "sha256-wnhiHO1RTloVVd5d6jhGW14Wt+BYcxYv7+L4gVvRcJc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ament-cmake-export-dependencies ament-cmake-python ]; diff --git a/distros/rolling/ament-cmake-gtest/default.nix b/distros/rolling/ament-cmake-gtest/default.nix index 4c68ec8f29..9d3efe3845 100644 --- a/distros/rolling/ament-cmake-gtest/default.nix +++ b/distros/rolling/ament-cmake-gtest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-gtest"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_gtest/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "3e1e8a8b1814698e2efe7fa56816b4138e4f0596d5bfc955533a92ab310aa51c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_gtest/1.5.2-1"; + sha256 = "sha256-YjEJGij/2FdFo/J7+jMyopE+9EQFloeBruZUbtjWKvk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-include-directories/default.nix b/distros/rolling/ament-cmake-include-directories/default.nix index 629ba58e0c..e10697eb8f 100644 --- a/distros/rolling/ament-cmake-include-directories/default.nix +++ b/distros/rolling/ament-cmake-include-directories/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-include-directories"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_include_directories/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "fc4ed7718fbc251a5a84384d2cbd3a4f713ae56583d05b2ffaeac70ac8579db1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_include_directories/1.5.2-1"; + sha256 = "sha256-gsM2S1oUXe+viZzuQKmI8e5knEN7jEn9Ji38D5QI3AY="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-libraries/default.nix b/distros/rolling/ament-cmake-libraries/default.nix index 3ba772151d..c70cd073c3 100644 --- a/distros/rolling/ament-cmake-libraries/default.nix +++ b/distros/rolling/ament-cmake-libraries/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-libraries"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_libraries/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "16dba8daabeca2b331b9839195b37e118ee5b84a05c054576f1e5200dd47613a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_libraries/1.5.2-1"; + sha256 = "sha256-eddJQdSPbqaWQxko+wUpdXU2YrXV+fpT5xPCmOfssfo="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-lint-cmake/default.nix b/distros/rolling/ament-cmake-lint-cmake/default.nix index fc3fb2002b..ee626f80e4 100644 --- a/distros/rolling/ament-cmake-lint-cmake/default.nix +++ b/distros/rolling/ament-cmake-lint-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-lint-cmake"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_lint_cmake/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "fa793fe7b58f3ad2ed34f29f3343e0ba82c3c10ab4b5ee49ddee072262f417ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_lint_cmake/0.13.2-1"; + sha256 = "sha256-x+WGq3Y3M6bAhc/E36BchTJe+GORAbYiEfHayWL+lZE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-mypy/default.nix b/distros/rolling/ament-cmake-mypy/default.nix index 6deb21a22f..a30792bcc6 100644 --- a/distros/rolling/ament-cmake-mypy/default.nix +++ b/distros/rolling/ament-cmake-mypy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-mypy"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_mypy/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "0071504e419be08c567a7f618a1ef6260842ed804b6d5cb134a9767010578d9f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_mypy/0.13.2-1"; + sha256 = "sha256-kLTzXiFvy0RdkZn/n8He31wWUUHhUZZ39s3+uh5PER0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-nose/default.nix b/distros/rolling/ament-cmake-nose/default.nix index 08507892dc..9c3b971a0c 100644 --- a/distros/rolling/ament-cmake-nose/default.nix +++ b/distros/rolling/ament-cmake-nose/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-nose"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_nose/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "c9f43136695a499a19c37a4415baa4b7f8f0f9e59748366d2839356aa6d62508"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_nose/1.5.2-1"; + sha256 = "sha256-ehQgK/uoy/0LPvDNwQLGKY7hFcUYXTCJSpRAxAHZqVk="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test python3Packages.nose ]; diff --git a/distros/rolling/ament-cmake-pclint/default.nix b/distros/rolling/ament-cmake-pclint/default.nix index f9fe7a7358..5eff960360 100644 --- a/distros/rolling/ament-cmake-pclint/default.nix +++ b/distros/rolling/ament-cmake-pclint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-pclint"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_pclint/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "c50004c06c7c270e26cb816c2c10179246f74b3f214443e501d814b02bca17f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_pclint/0.13.2-1"; + sha256 = "sha256-rwzi3l3+/moBy38PtROA88W8cxk543PTUISbdpdT0Ng="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-pep257/default.nix b/distros/rolling/ament-cmake-pep257/default.nix index 47ad5d07dc..5717f86db2 100644 --- a/distros/rolling/ament-cmake-pep257/default.nix +++ b/distros/rolling/ament-cmake-pep257/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-pep257"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_pep257/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "8f9ca19b4358f005c534b16e559af99e48a8130c859b835c1ac8e5af3e2e64c7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_pep257/0.13.2-1"; + sha256 = "sha256-QUF4D0P76n7d2dsb0h/Ogp8fvG0jCBVT2ZQ9E6K20YY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-pycodestyle/default.nix b/distros/rolling/ament-cmake-pycodestyle/default.nix index e64535d5c8..23ad5f7367 100644 --- a/distros/rolling/ament-cmake-pycodestyle/default.nix +++ b/distros/rolling/ament-cmake-pycodestyle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-pycodestyle"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_pycodestyle/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "4fae75e0906ff5531bf6a408fc85a1e4dbe96fffec737bdd267a554fa9a82842"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_pycodestyle/0.13.2-1"; + sha256 = "sha256-b5CdQp6dbCarOuNGckAnN+/s1Nqv4xcTcrXv4e7WUis="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-pyflakes/default.nix b/distros/rolling/ament-cmake-pyflakes/default.nix index afc1e453ec..2f9d563a44 100644 --- a/distros/rolling/ament-cmake-pyflakes/default.nix +++ b/distros/rolling/ament-cmake-pyflakes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-pyflakes"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_pyflakes/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "1f6472256971b35fc0cab810118b080f87abbeb5277122fc14ddbe57ff067964"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_pyflakes/0.13.2-1"; + sha256 = "sha256-9LZmZE2JHfrx0XMkCyC/NlfhraVt1wufe+zhWXCDRDM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-pytest/default.nix b/distros/rolling/ament-cmake-pytest/default.nix index d7ac6ed294..c81534dcfb 100644 --- a/distros/rolling/ament-cmake-pytest/default.nix +++ b/distros/rolling/ament-cmake-pytest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-pytest"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_pytest/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "25847621b270c3ec92b8aac8180d6209a806cdfb29a096648f199a7e897f09da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_pytest/1.5.2-1"; + sha256 = "sha256-pZxjDT85cd3UOU0MLofAnygK+AZfOaJ7HlMqOUoQcus="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test pythonPackages.pytest ]; diff --git a/distros/rolling/ament-cmake-python/default.nix b/distros/rolling/ament-cmake-python/default.nix index c344e9c4c1..8339460efd 100644 --- a/distros/rolling/ament-cmake-python/default.nix +++ b/distros/rolling/ament-cmake-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-python"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_python/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "7987c0e07ddbc01f5dc6516a0151a46102c75bd609143c615ea0efe57a5dce89"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_python/1.5.2-1"; + sha256 = "sha256-VLl5DLaTmd2h7PxVzehK58vo89CgnjGmgH1mIUGXpgg="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-ros/default.nix b/distros/rolling/ament-cmake-ros/default.nix index 5b8b415efb..d3a48e7fc3 100644 --- a/distros/rolling/ament-cmake-ros/default.nix +++ b/distros/rolling/ament-cmake-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-ros"; version = "0.11.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_ros-release/archive/release/rolling/ament_cmake_ros/0.11.1-1.tar.gz"; - name = "0.11.1-1.tar.gz"; - sha256 = "d34c94656d13223c236f16c120c72e40fc4e70aa15f5bac900e1b237a9dc5317"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_ros-release"; + rev = "release/rolling/ament_cmake_ros/0.11.1-1"; + sha256 = "sha256-Ui3k36A3SgoqJ3zmO24ZLEmBim4jJDmey0pnqXz4q7s="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/ament-cmake-target-dependencies/default.nix b/distros/rolling/ament-cmake-target-dependencies/default.nix index 07cf1821ad..4ebd328353 100644 --- a/distros/rolling/ament-cmake-target-dependencies/default.nix +++ b/distros/rolling/ament-cmake-target-dependencies/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-target-dependencies"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_target_dependencies/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "c6cef3e177c9b1b1e0ee35c615895dc35e8d7891552102a6084ec9b30eff446d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_target_dependencies/1.5.2-1"; + sha256 = "sha256-ofsSAAu3jfBd9LpqeE9YMdGdGKYSv8ZV8jGrm42xuAc="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-include-directories ament-cmake-libraries ]; diff --git a/distros/rolling/ament-cmake-test/default.nix b/distros/rolling/ament-cmake-test/default.nix index eb0fad443e..552f50489b 100644 --- a/distros/rolling/ament-cmake-test/default.nix +++ b/distros/rolling/ament-cmake-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-test"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_test/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "8ef4741bc4e302cc5804536a79d8b63f73ef2cb5984bd936d1f64a2488a6dac6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_test/1.5.2-1"; + sha256 = "sha256-hsxTkURe7/Sx474wYIukzODSRGNXOBDQo2GX34c6swU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/rolling/ament-cmake-uncrustify/default.nix b/distros/rolling/ament-cmake-uncrustify/default.nix index b844faec81..910b0b7c6a 100644 --- a/distros/rolling/ament-cmake-uncrustify/default.nix +++ b/distros/rolling/ament-cmake-uncrustify/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-uncrustify"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_uncrustify/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "ccd276df53adbf54ad2b500b4a377b36d33a718a6c7c6bf2ef9cd1d0ebe0d33e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_uncrustify/0.13.2-1"; + sha256 = "sha256-4I97bSeRM+U2A6YCy8LwXrWKnygKISb6QGDAnVjgKVs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-version/default.nix b/distros/rolling/ament-cmake-version/default.nix index 7b448e6ca7..c7ca5b6f52 100644 --- a/distros/rolling/ament-cmake-version/default.nix +++ b/distros/rolling/ament-cmake-version/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-version"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake_version/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "976f1e813b61db317ffdd5bbd5755ede267f5843409668f85800408d26962526"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake_version/1.5.2-1"; + sha256 = "sha256-bXmzjV0wbjrbihNoq8TsT9ueAaUjpDJipClg2K8UUCE="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake-xmllint/default.nix b/distros/rolling/ament-cmake-xmllint/default.nix index 59dc8144a9..af4ba16c8e 100644 --- a/distros/rolling/ament-cmake-xmllint/default.nix +++ b/distros/rolling/ament-cmake-xmllint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake-xmllint"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cmake_xmllint/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "d72f26a834b0948ff9a44c415f7c6a95713ab7f08f074bbc7f03972c089e7c1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cmake_xmllint/0.13.2-1"; + sha256 = "sha256-wIc2dkUFRRd9WLow+Tba2sW+6ObMi5JAA67nZun5f2s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ament-cmake/default.nix b/distros/rolling/ament-cmake/default.nix index 8f9b1d381a..013cb78078 100644 --- a/distros/rolling/ament-cmake/default.nix +++ b/distros/rolling/ament-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cmake"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/rolling/ament_cmake/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "1a5eb48d960d2597283ad4196aa1278e19a7568a2b8632e01f76c848a73475ef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake-release"; + rev = "release/rolling/ament_cmake/1.5.2-1"; + sha256 = "sha256-tL7bh3zlcNlSdcylb4B0pBWjCziIfZVQwsuvnDfiJyA="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-export-definitions ament-cmake-export-dependencies ament-cmake-export-include-directories ament-cmake-export-interfaces ament-cmake-export-libraries ament-cmake-export-link-flags ament-cmake-export-targets ament-cmake-gen-version-h ament-cmake-libraries ament-cmake-python ament-cmake-target-dependencies ament-cmake-test ament-cmake-version cmake ]; diff --git a/distros/rolling/ament-copyright/default.nix b/distros/rolling/ament-copyright/default.nix index 712600fbba..0652592a04 100644 --- a/distros/rolling/ament-copyright/default.nix +++ b/distros/rolling/ament-copyright/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-copyright"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_copyright/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "6bf576f3e700d635a7825e874fb688cf0bcc4e56d21dc2f4821a227ef45c6963"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_copyright/0.13.2-1"; + sha256 = "sha256-wEHVuQjZfQipR7Sp+ekSKJnkujQnWMFiU4EyB+eEVP0="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-cppcheck/default.nix b/distros/rolling/ament-cppcheck/default.nix index 9506e45654..41df915577 100644 --- a/distros/rolling/ament-cppcheck/default.nix +++ b/distros/rolling/ament-cppcheck/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cppcheck"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cppcheck/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "19078b4655fa023b8d27ee3325a5de27eadde69fe674df9432031053603cc3d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cppcheck/0.13.2-1"; + sha256 = "sha256-ieAZn045dg3+o5NsNixzDW1UniLIIK53GnnNyzoHZvM="; + }; buildType = "ament_python"; propagatedBuildInputs = [ cppcheck ]; diff --git a/distros/rolling/ament-cpplint/default.nix b/distros/rolling/ament-cpplint/default.nix index 3cf357217d..60429c67cd 100644 --- a/distros/rolling/ament-cpplint/default.nix +++ b/distros/rolling/ament-cpplint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-cpplint"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_cpplint/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "bd5d0374ceff373cbc0f8e6b9064fd0f59ae0e3f87085d5c133f24e7fbf5253e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_cpplint/0.13.2-1"; + sha256 = "sha256-vGcJQrLD6q3PtUrmqzUqbxeEiSyUndTQJH5H79XXebI="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-download/default.nix b/distros/rolling/ament-download/default.nix index 15ad5371ce..389902dc6f 100644 --- a/distros/rolling/ament-download/default.nix +++ b/distros/rolling/ament-download/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-download"; version = "0.0.5-r2"; - src = fetchurl { - url = "https://github.com/samsung-ros/ament_download-release/archive/release/rolling/ament_download/0.0.5-2.tar.gz"; - name = "0.0.5-2.tar.gz"; - sha256 = "fda97acd7ecc5366b35398b05675e51f4b56caaec4a9db91748dfb98fea5e28d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "samsung-ros"; + repo = "ament_download-release"; + rev = "release/rolling/ament_download/0.0.5-2"; + sha256 = "sha256-6V9DhJraMIbNz3xeSeczpOFyaWgBqKsz2vQV4jFl6qk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ament-flake8/default.nix b/distros/rolling/ament-flake8/default.nix index 7a9b44741d..c4f8c55eb6 100644 --- a/distros/rolling/ament-flake8/default.nix +++ b/distros/rolling/ament-flake8/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-flake8"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_flake8/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "29d0611320850f0d837194b39f17911a0fc8459bd81114b550fe578b22cfce6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_flake8/0.13.2-1"; + sha256 = "sha256-ELl8a4v6rqRcbvQ5tD4dvK0FPyrT2qk/6YIkNeGPwJ8="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-lint python3Packages.flake8 ]; diff --git a/distros/rolling/ament-index-cpp/default.nix b/distros/rolling/ament-index-cpp/default.nix index 5a8bc022bc..9fbafe96f0 100644 --- a/distros/rolling/ament-index-cpp/default.nix +++ b/distros/rolling/ament-index-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-index-cpp"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_index-release/archive/release/rolling/ament_index_cpp/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "afd42192b947610d3d92a173c21fa552bc8657a09d6499cb7af57fa3036cd0ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_index-release"; + rev = "release/rolling/ament_index_cpp/1.5.1-1"; + sha256 = "sha256-f2gIzUoNJrxUg3iXIuMX4rTdXp6mvMhc8YyKAkTyiSg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ament-index-python/default.nix b/distros/rolling/ament-index-python/default.nix index 16d9d6c172..868c67915e 100644 --- a/distros/rolling/ament-index-python/default.nix +++ b/distros/rolling/ament-index-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-index-python"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_index-release/archive/release/rolling/ament_index_python/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "3233db49afe8a80a5940ad52fb49c6fa8b23937f879782055388a3eb65609930"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_index-release"; + rev = "release/rolling/ament_index_python/1.5.1-1"; + sha256 = "sha256-ZRFHhz836YsF1xof5ESLnQ/iEGCm9uzw061ZnVLmi3U="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-lint-auto/default.nix b/distros/rolling/ament-lint-auto/default.nix index c59f2737cd..6ee5eeae67 100644 --- a/distros/rolling/ament-lint-auto/default.nix +++ b/distros/rolling/ament-lint-auto/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-lint-auto"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_lint_auto/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "10453194a36e63e7be2dde33954fe282d0b6fc49bf81e36e8c2de31435f2e1da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_lint_auto/0.13.2-1"; + sha256 = "sha256-6Szhqn1rajPvtX73+TtjjjPaf3ON4YZ82AFGRFtZWJ8="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake-core ament-cmake-test ]; diff --git a/distros/rolling/ament-lint-cmake/default.nix b/distros/rolling/ament-lint-cmake/default.nix index 7eb81eb02d..fff4b4053f 100644 --- a/distros/rolling/ament-lint-cmake/default.nix +++ b/distros/rolling/ament-lint-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-lint-cmake"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_lint_cmake/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "2bd10d822ed64b06ef6e8292ef1c5fdf599ee1fa307c35d6a82045d6477b88d9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_lint_cmake/0.13.2-1"; + sha256 = "sha256-0IOPVV917xfxe4Pg6uJsA3UOEtUGcMsq8DIgiq6mpec="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-lint-common/default.nix b/distros/rolling/ament-lint-common/default.nix index 7171eedfef..9baeb271bf 100644 --- a/distros/rolling/ament-lint-common/default.nix +++ b/distros/rolling/ament-lint-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-lint-common"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_lint_common/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "492ec005c3d860ec7d8baa7791bde147a5d8915d94c489a6397da403d3e4a98b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_lint_common/0.13.2-1"; + sha256 = "sha256-BciATA3VADUdmQJ171lwXWx9KsGHFT53K+kKBhn/bnE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-export-dependencies ]; diff --git a/distros/rolling/ament-lint/default.nix b/distros/rolling/ament-lint/default.nix index 46639eb4ff..7cda704125 100644 --- a/distros/rolling/ament-lint/default.nix +++ b/distros/rolling/ament-lint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-lint"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_lint/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "940ae9c6b11aa2d6c90e43584045dc3c629d122bc047212afb75ed98561ae93d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_lint/0.13.2-1"; + sha256 = "sha256-M1dKvWyQ0wIeWA7bdNoLCJZKy08cxe/WBjeDGijb8Ic="; + }; buildType = "ament_python"; diff --git a/distros/rolling/ament-mypy/default.nix b/distros/rolling/ament-mypy/default.nix index f4088f3a3a..20490de52e 100644 --- a/distros/rolling/ament-mypy/default.nix +++ b/distros/rolling/ament-mypy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-mypy"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_mypy/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "890400ab4c4c98cc7536b07cc79aed251f37dd31f7d482cc352b82f7be85169c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_mypy/0.13.2-1"; + sha256 = "sha256-6KG7iYHgS+BfLDEewPWEJtjd4iVXd+faIXu1H2kiQ7w="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/rolling/ament-nodl/default.nix b/distros/rolling/ament-nodl/default.nix index acb1f030cb..a2887acd44 100644 --- a/distros/rolling/ament-nodl/default.nix +++ b/distros/rolling/ament-nodl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-nodl"; version = "0.1.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_nodl-release/archive/release/rolling/ament_nodl/0.1.0-3.tar.gz"; - name = "0.1.0-3.tar.gz"; - sha256 = "318ff03dd2b45122e81c92c2f5557ba17b0de51b437daadaeeebea449d738b36"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_nodl-release"; + rev = "release/rolling/ament_nodl/0.1.0-3"; + sha256 = "sha256-9azhFZrnSaHJiIRFdPiDTiDO3j2v3eKxQBNdAEFwd5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ament-package/default.nix b/distros/rolling/ament-package/default.nix index 0257bd2cf5..1b89ca5922 100644 --- a/distros/rolling/ament-package/default.nix +++ b/distros/rolling/ament-package/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-package"; version = "0.15.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_package-release/archive/release/rolling/ament_package/0.15.1-1.tar.gz"; - name = "0.15.1-1.tar.gz"; - sha256 = "faaa3454bd1cc63d29ab038b1d7a71bbca923762e5d8b61929ebf0b8a2be0925"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_package-release"; + rev = "release/rolling/ament_package/0.15.1-1"; + sha256 = "sha256-/8pwhj0/b78qVjm7PToe+UzNvJzs0t7QpU3AxlfIEhs="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.flake8 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-pclint/default.nix b/distros/rolling/ament-pclint/default.nix index defa63b74a..a9609ea318 100644 --- a/distros/rolling/ament-pclint/default.nix +++ b/distros/rolling/ament-pclint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-pclint"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_pclint/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "10286ffd9a12b2bf04fcef8f83790f153034e7ef87e46bb589e6804629c6026b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_pclint/0.13.2-1"; + sha256 = "sha256-Ry7w3yoN8/BtTKSTz4RPw9gMyZMgddIABYIQ55OtBJ0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-pep257/default.nix b/distros/rolling/ament-pep257/default.nix index 842a63e309..534025307f 100644 --- a/distros/rolling/ament-pep257/default.nix +++ b/distros/rolling/ament-pep257/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-pep257"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_pep257/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "a7cfb71f67bb8c4d2eeb62125db883aa62efe7972ebcca23914eb883acab1b14"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_pep257/0.13.2-1"; + sha256 = "sha256-0COZHmwUPeifhswr5Ckf2OO4ZVttx7cFGfjS84pW/0w="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 pythonPackages.pytest ]; diff --git a/distros/rolling/ament-pycodestyle/default.nix b/distros/rolling/ament-pycodestyle/default.nix index 31b827c988..b7d3d2eb5d 100644 --- a/distros/rolling/ament-pycodestyle/default.nix +++ b/distros/rolling/ament-pycodestyle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-pycodestyle"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_pycodestyle/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "0354cce77690d3af1290d26a595e726b81caa48e4b92ffcfbe02e385158aa200"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_pycodestyle/0.13.2-1"; + sha256 = "sha256-e/cFjoRtSY5oyUDoEcoKpGKZbWPL6dirzBZEDLw3PIQ="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.pycodestyle ]; diff --git a/distros/rolling/ament-pyflakes/default.nix b/distros/rolling/ament-pyflakes/default.nix index 655b872fcf..8e3ae6746e 100644 --- a/distros/rolling/ament-pyflakes/default.nix +++ b/distros/rolling/ament-pyflakes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-pyflakes"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_pyflakes/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "9396e8f5dea75a6ae70216d143b0b08243db6ced849da3733fdc097d7ab8cc28"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_pyflakes/0.13.2-1"; + sha256 = "sha256-JUw42VkIQuW0Vic/tVlv+7i0ID/VkZcAsqdGBO1brUc="; + }; buildType = "ament_python"; checkInputs = [ ament-pycodestyle pythonPackages.pytest ]; diff --git a/distros/rolling/ament-uncrustify/default.nix b/distros/rolling/ament-uncrustify/default.nix index 0d7992b02b..5c06afc1e1 100644 --- a/distros/rolling/ament-uncrustify/default.nix +++ b/distros/rolling/ament-uncrustify/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-uncrustify"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_uncrustify/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "bbfe218f30bbb2c8c98b0df37fde24af469891e0d6ec74cd3358660b46d27a9a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_uncrustify/0.13.2-1"; + sha256 = "sha256-Saoz9+u73OHSC4daIuXV7DPjkrHnGh1BwB6xAnnwW/4="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-pycodestyle pythonPackages.pytest ]; diff --git a/distros/rolling/ament-vitis/default.nix b/distros/rolling/ament-vitis/default.nix index 7e441ccd42..74f5e4b4ab 100644 --- a/distros/rolling/ament-vitis/default.nix +++ b/distros/rolling/ament-vitis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-vitis"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_vitis-release/archive/release/rolling/ament_vitis/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "7e4531b4c8539b2dfefef2c072500cd3c33961152037eec0a89eb9a137fd3dfd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_vitis-release"; + rev = "release/rolling/ament_vitis/0.10.1-1"; + sha256 = "sha256-Na2vZDmx1yo4NFMDS9mmn1De1NRtjjs953gSAHRCxtc="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-acceleration ament-cmake-core ament-cmake-ros ]; diff --git a/distros/rolling/ament-xmllint/default.nix b/distros/rolling/ament-xmllint/default.nix index d61a2a4ca3..cb05351a6d 100644 --- a/distros/rolling/ament-xmllint/default.nix +++ b/distros/rolling/ament-xmllint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ament-xmllint"; version = "0.13.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/rolling/ament_xmllint/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "c7aad28904c4c68b7a28985c4cab3dfb5fb8ecdfefe0c325833471d696e7a1fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_lint-release"; + rev = "release/rolling/ament_xmllint/0.13.2-1"; + sha256 = "sha256-5/erCKB5sG67/q0fKzxNQbMbXy7ra8IxztU3d2oDetw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/angles/default.nix b/distros/rolling/angles/default.nix index 2538dc45ef..f8ffa9ca4b 100644 --- a/distros/rolling/angles/default.nix +++ b/distros/rolling/angles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-angles"; version = "1.16.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/angles-release/archive/release/rolling/angles/1.16.0-1.tar.gz"; - name = "1.16.0-1.tar.gz"; - sha256 = "561a1add1fb8bb9d6057065f7d277708dcb12875536b82e6b4047dae9809ddcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "angles-release"; + rev = "release/rolling/angles/1.16.0-1"; + sha256 = "sha256-l4xIXnIMoWmTEkIubTtt1g/NZdI+H9zvYXd0izyPAKw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python python3Packages.setuptools ]; diff --git a/distros/rolling/apex-containers/default.nix b/distros/rolling/apex-containers/default.nix index 9fea3c04c4..d110c404b1 100644 --- a/distros/rolling/apex-containers/default.nix +++ b/distros/rolling/apex-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-apex-containers"; version = "0.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/apex_containers-release/archive/release/rolling/apex_containers/0.0.4-2.tar.gz"; - name = "0.0.4-2.tar.gz"; - sha256 = "bf5a9d606df3a7d32e9081f3d7170572843c5498672f3d4075cc4b46f1ca3858"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apex_containers-release"; + rev = "release/rolling/apex_containers/0.0.4-2"; + sha256 = "sha256-01lF2ZodmNGfazVwwxuHKPBMihyBFcKcwU2K6tpJxmk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/rolling/apex-test-tools/default.nix b/distros/rolling/apex-test-tools/default.nix index 2e08c075df..0d7879ee98 100644 --- a/distros/rolling/apex-test-tools/default.nix +++ b/distros/rolling/apex-test-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-apex-test-tools"; version = "0.0.2-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/apex_test_tools-release/archive/release/rolling/apex_test_tools/0.0.2-5.tar.gz"; - name = "0.0.2-5.tar.gz"; - sha256 = "4f0cdb7f82288de707a0bb521f4a6f368860ab106722b5611aa78244ee9a8bc9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apex_test_tools-release"; + rev = "release/rolling/apex_test_tools/0.0.2-5"; + sha256 = "sha256-vrX5LngYVt0Fxd0td4idUCVPg+j96W7S07zUG/lM8W4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/rolling/apriltag-msgs/default.nix b/distros/rolling/apriltag-msgs/default.nix new file mode 100644 index 0000000000..8d34d81a93 --- /dev/null +++ b/distros/rolling/apriltag-msgs/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rosidl-default-generators, rosidl-default-runtime, std-msgs }: +buildRosPackage { + pname = "ros-rolling-apriltag-msgs"; + version = "2.0.1-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apriltag_msgs-release"; + rev = "release/rolling/apriltag_msgs/2.0.1-1"; + sha256 = "sha256-8gmaJqHmANuH5XDGCZ8C29KjCY7QKQ8r2DSpl1jxp20="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake rosidl-default-generators ]; + checkInputs = [ ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ rosidl-default-runtime std-msgs ]; + nativeBuildInputs = [ ament-cmake rosidl-default-generators ]; + + meta = { + description = ''AprilTag message definitions''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/rolling/apriltag-ros/default.nix b/distros/rolling/apriltag-ros/default.nix new file mode 100644 index 0000000000..37f8b12968 --- /dev/null +++ b/distros/rolling/apriltag-ros/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-clang-format, ament-cmake-cppcheck, ament-lint-auto, apriltag, apriltag-msgs, cv-bridge, eigen, image-transport, rclcpp, rclcpp-components, sensor-msgs, tf2-ros }: +buildRosPackage { + pname = "ros-rolling-apriltag-ros"; + version = "3.1.1-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apriltag_ros-release"; + rev = "release/rolling/apriltag_ros/3.1.1-1"; + sha256 = "sha256-RqtO6HznMf2OumkP4Zz7aaD0HFwKa18ZRL5iHRH3TmE="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake eigen ]; + checkInputs = [ ament-cmake-clang-format ament-cmake-cppcheck ament-lint-auto ]; + propagatedBuildInputs = [ apriltag apriltag-msgs cv-bridge image-transport rclcpp rclcpp-components sensor-msgs tf2-ros ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''AprilTag detection node''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/rolling/apriltag/default.nix b/distros/rolling/apriltag/default.nix index ba162faabf..e7b1c3f411 100644 --- a/distros/rolling/apriltag/default.nix +++ b/distros/rolling/apriltag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-apriltag"; version = "3.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/apriltag-release/archive/release/rolling/apriltag/3.2.0-1.tar.gz"; - name = "3.2.0-1.tar.gz"; - sha256 = "d6a56291f6c7dc11ddfca6f86011f6cf6dc31cbdd9a8c3306d9faa347cb347eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apriltag-release"; + rev = "release/rolling/apriltag/3.2.0-1"; + sha256 = "sha256-6kUYVWACrNDZBeDwDanrR3mgspXi5sPGKoy4chT7IrM="; + }; buildType = "cmake"; buildInputs = [ cmake python3Packages.numpy ]; diff --git a/distros/rolling/aruco-opencv-msgs/default.nix b/distros/rolling/aruco-opencv-msgs/default.nix index e09aee89a0..6d0af460dd 100644 --- a/distros/rolling/aruco-opencv-msgs/default.nix +++ b/distros/rolling/aruco-opencv-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-aruco-opencv-msgs"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/aruco_opencv-release/archive/release/rolling/aruco_opencv_msgs/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "8c0c68f242ed89c595abbb0180dd32febcf9ac61675a4bac4d87c23dac75996f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "aruco_opencv-release"; + rev = "release/rolling/aruco_opencv_msgs/4.0.1-1"; + sha256 = "sha256-AZ/WLG09qSoBuXrtU5iF8ynaQNDOlOgYjh7R2/Mi4cE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/aruco-opencv/default.nix b/distros/rolling/aruco-opencv/default.nix index 6f691f42c1..a5a1d1f8b4 100644 --- a/distros/rolling/aruco-opencv/default.nix +++ b/distros/rolling/aruco-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-aruco-opencv"; version = "4.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/aruco_opencv-release/archive/release/rolling/aruco_opencv/4.0.1-1.tar.gz"; - name = "4.0.1-1.tar.gz"; - sha256 = "91a2d2635c9d22069b85a6c14220d8124ee94eb1e94701ed81828407425b19bc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "aruco_opencv-release"; + rev = "release/rolling/aruco_opencv/4.0.1-1"; + sha256 = "sha256-NpkBb+NHOlpPrg9njwOgxukgMVvq2kXA3b0fSR/bWnY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/asio-cmake-module/default.nix b/distros/rolling/asio-cmake-module/default.nix index 30f9743ec7..835320ba07 100644 --- a/distros/rolling/asio-cmake-module/default.nix +++ b/distros/rolling/asio-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-asio-cmake-module"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/rolling/asio_cmake_module/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "8fc00f544859bbd8f3ee84ae4cacb66189f5291a396bacbfcde722a90f9ea039"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "transport_drivers-release"; + rev = "release/rolling/asio_cmake_module/1.2.0-1"; + sha256 = "sha256-S4As/gOIQQTIqYgblUDPs2pjBDmLPz4Ii2/CTMHhRUs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/async-web-server-cpp/default.nix b/distros/rolling/async-web-server-cpp/default.nix index 90675b9cac..82f0636466 100644 --- a/distros/rolling/async-web-server-cpp/default.nix +++ b/distros/rolling/async-web-server-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-async-web-server-cpp"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/async_web_server_cpp-release/archive/release/rolling/async_web_server_cpp/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "a63d093c7c74efb399181c0d1065258afc0d0bca59f9ec8438796838a11ab664"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "async_web_server_cpp-release"; + rev = "release/rolling/async_web_server_cpp/2.0.0-2"; + sha256 = "sha256-bz0je03yD60CjR08T++F1rGD5GhfXZJWAbL6L5rINbo="; + }; buildType = "catkin"; buildInputs = [ ament-cmake-ros openssl ]; diff --git a/distros/rolling/automotive-autonomy-msgs/default.nix b/distros/rolling/automotive-autonomy-msgs/default.nix index 7581652c36..fde45cb067 100644 --- a/distros/rolling/automotive-autonomy-msgs/default.nix +++ b/distros/rolling/automotive-autonomy-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-automotive-autonomy-msgs"; version = "3.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/automotive_autonomy_msgs-release/archive/release/rolling/automotive_autonomy_msgs/3.0.4-2.tar.gz"; - name = "3.0.4-2.tar.gz"; - sha256 = "9a533f54e56b6b83ba367c207378d31e8cc2ef425844613576ad8939083ec3fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/rolling/automotive_autonomy_msgs/3.0.4-2"; + sha256 = "sha256-R/GduU+VD3B9INpzOpa84Bl42xFAtGthn8PEt8iYmpw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/rolling/automotive-navigation-msgs/default.nix b/distros/rolling/automotive-navigation-msgs/default.nix index ef7b4fdc97..50f97bc6c6 100644 --- a/distros/rolling/automotive-navigation-msgs/default.nix +++ b/distros/rolling/automotive-navigation-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-automotive-navigation-msgs"; version = "3.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/automotive_autonomy_msgs-release/archive/release/rolling/automotive_navigation_msgs/3.0.4-2.tar.gz"; - name = "3.0.4-2.tar.gz"; - sha256 = "5b63ed892c5de906dbd1f3732cdf2a42e910a03a016d975d8b9750051008e2af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/rolling/automotive_navigation_msgs/3.0.4-2"; + sha256 = "sha256-N+QDJUyFWyIto9hqSOYNMPTrVLJR+tIO2J4ExUZ27+0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/rolling/automotive-platform-msgs/default.nix b/distros/rolling/automotive-platform-msgs/default.nix index 9af8f07040..86767727d9 100644 --- a/distros/rolling/automotive-platform-msgs/default.nix +++ b/distros/rolling/automotive-platform-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-automotive-platform-msgs"; version = "3.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/automotive_autonomy_msgs-release/archive/release/rolling/automotive_platform_msgs/3.0.4-2.tar.gz"; - name = "3.0.4-2.tar.gz"; - sha256 = "7662bb783a45fca05f11629283a3895403d8de9302b526b010d169479e496d47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "automotive_autonomy_msgs-release"; + rev = "release/rolling/automotive_platform_msgs/3.0.4-2"; + sha256 = "sha256-HMhXhLS41h9P1STIbuEdhOgxNORj/YJrfDldGKeMKfA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/rolling/autoware-auto-msgs/default.nix b/distros/rolling/autoware-auto-msgs/default.nix index 9a94306afd..dc730cfebd 100644 --- a/distros/rolling/autoware-auto-msgs/default.nix +++ b/distros/rolling/autoware-auto-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-autoware-auto-msgs"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/autoware_auto_msgs-release/archive/release/rolling/autoware_auto_msgs/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "3e9af73c2979ab20911a1f83994e2f3f76df854d7a901c7f515a7859ad525334"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "autoware_auto_msgs-release"; + rev = "release/rolling/autoware_auto_msgs/1.0.0-3"; + sha256 = "sha256-sPwNe2uGjV3WHz+htqZrzm5dUO1JvGJC9xQcn2d+LU0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto rosidl-default-generators ]; diff --git a/distros/rolling/avt-vimba-camera/default.nix b/distros/rolling/avt-vimba-camera/default.nix index 323cd6cd28..3c41022b60 100644 --- a/distros/rolling/avt-vimba-camera/default.nix +++ b/distros/rolling/avt-vimba-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-avt-vimba-camera"; version = "2001.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/avt_vimba_camera-release/archive/release/rolling/avt_vimba_camera/2001.1.0-2.tar.gz"; - name = "2001.1.0-2.tar.gz"; - sha256 = "3cfa1e5bbe3c22b6e4fb7d6b46e178882a1b85c67229906e03d122fd9bd771b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "avt_vimba_camera-release"; + rev = "release/rolling/avt_vimba_camera/2001.1.0-2"; + sha256 = "sha256-Bm7dBh5ZYXxpxJm1eYCSgkKmcKEdGdGNbk/BO9A6rac="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/aws-robomaker-small-warehouse-world/default.nix b/distros/rolling/aws-robomaker-small-warehouse-world/default.nix index b890bcee82..de4a31b5d8 100644 --- a/distros/rolling/aws-robomaker-small-warehouse-world/default.nix +++ b/distros/rolling/aws-robomaker-small-warehouse-world/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-aws-robomaker-small-warehouse-world"; version = "1.0.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/aws_robomaker_small_warehouse_world-release/archive/release/rolling/aws_robomaker_small_warehouse_world/1.0.5-2.tar.gz"; - name = "1.0.5-2.tar.gz"; - sha256 = "f886ecab11d4e2a6721ea27ef96637c0e3eedd9fef6bda127f5e050b25b99b4d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "aws_robomaker_small_warehouse_world-release"; + rev = "release/rolling/aws_robomaker_small_warehouse_world/1.0.5-2"; + sha256 = "sha256-bMYgLcTRb5UvNDZS4HmtCbd1SRpRfQypQmT4SJPbONY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/backward-ros/default.nix b/distros/rolling/backward-ros/default.nix index 28deec5af8..88737c949b 100644 --- a/distros/rolling/backward-ros/default.nix +++ b/distros/rolling/backward-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-backward-ros"; version = "1.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/backward_ros-release/archive/release/rolling/backward_ros/1.0.2-2.tar.gz"; - name = "1.0.2-2.tar.gz"; - sha256 = "81b70852e1962d2b9fdb0dc7a5c9618ed16de077ce0b692cf374ca88695e6a37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "backward_ros-release"; + rev = "release/rolling/backward_ros/1.0.2-2"; + sha256 = "sha256-MH1nloz3Qfp5iNsqHTkmAkreWP6K+jyT3Zqn2SJySuU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/bag2-to-image/default.nix b/distros/rolling/bag2-to-image/default.nix index 797bf0f8c9..75ccf2f5fd 100644 --- a/distros/rolling/bag2-to-image/default.nix +++ b/distros/rolling/bag2-to-image/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-bag2-to-image"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bag2_to_image-release/archive/release/rolling/bag2_to_image/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "67969bf6e5b95a1ca1389125284e9d36c78c1c65f9a95aeb95519846fc714022"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bag2_to_image-release"; + rev = "release/rolling/bag2_to_image/0.1.0-1"; + sha256 = "sha256-D602KBwsYPh+wbNrK2y25DZk1/wPPc2PlZj4ktvPhqI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/behaviortree-cpp-v3/default.nix b/distros/rolling/behaviortree-cpp-v3/default.nix index 005dc82ec7..2aa18ec040 100644 --- a/distros/rolling/behaviortree-cpp-v3/default.nix +++ b/distros/rolling/behaviortree-cpp-v3/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-cpp, boost, cppzmq, ncurses, rclcpp, ros-environment }: buildRosPackage { pname = "ros-rolling-behaviortree-cpp-v3"; - version = "3.8.0-r1"; + version = "3.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/behaviortree_cpp-release/archive/release/rolling/behaviortree_cpp_v3/3.8.0-1.tar.gz"; - name = "3.8.0-1.tar.gz"; - sha256 = "fd9006bc7bbc50b5e4343a354dd836644a720c300ec2c29e2085d3495f4ec541"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "behaviortree_cpp-release"; + rev = "release/rolling/behaviortree_cpp_v3/3.8.2-1"; + sha256 = "sha256-KuS/C9quRgq4cnqiu7BeZt1GD2vayxHHdnFZtvQBnck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/rolling/bno055/default.nix b/distros/rolling/bno055/default.nix index 4dd11a7694..49acc0a96e 100644 --- a/distros/rolling/bno055/default.nix +++ b/distros/rolling/bno055/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, python3Packages, pythonPackages, rclpy, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, example-interfaces, python3Packages, pythonPackages, rclpy, std-msgs }: buildRosPackage { pname = "ros-rolling-bno055"; - version = "0.2.0-r3"; + version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bno055-release/archive/release/rolling/bno055/0.2.0-3.tar.gz"; - name = "0.2.0-3.tar.gz"; - sha256 = "2911bd97581529d22fae1c65be16901e9467f95c3561642ee090e8ebc9b4374e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bno055-release"; + rev = "release/rolling/bno055/0.4.1-1"; + sha256 = "sha256-4B7R/H6YgcMTqW90WunSaQCp7y/KJZpHFGHdpAQH+nY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; - propagatedBuildInputs = [ python3Packages.pyserial rclpy std-msgs ]; + propagatedBuildInputs = [ example-interfaces python3Packages.pyserial rclpy std-msgs ]; meta = { description = ''Bosch BNO055 IMU driver for ROS2''; diff --git a/distros/rolling/bond-core/default.nix b/distros/rolling/bond-core/default.nix index aed6a444e4..e15420bea1 100644 --- a/distros/rolling/bond-core/default.nix +++ b/distros/rolling/bond-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-bond-core"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/rolling/bond_core/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "99d9d6abd3a509854421b8274b295e79594373c5d3f63fe61bd91efda541488b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/rolling/bond_core/4.0.0-1"; + sha256 = "sha256-EA4f2CqUNq+ZLOettwEaG01DA+oOf6FFtQqVi7RDQOI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/bond/default.nix b/distros/rolling/bond/default.nix index 4ed131f966..c2de9f8c6d 100644 --- a/distros/rolling/bond/default.nix +++ b/distros/rolling/bond/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-bond"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/rolling/bond/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "42f779351935aabc09e1ad12c0eb674a811c93c048332cbea18d3d28549ecc8e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/rolling/bond/4.0.0-1"; + sha256 = "sha256-c8CNFiNhffaL6ikNaC25RLYzu6olhlMYnXu9X6CoK+U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/bondcpp/default.nix b/distros/rolling/bondcpp/default.nix index 5ce60edb2b..698518ad7f 100644 --- a/distros/rolling/bondcpp/default.nix +++ b/distros/rolling/bondcpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-bondcpp"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/rolling/bondcpp/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "2132660acbb1b55b3ca00b33f211d669f2d3568e66c3687183fbcea344283360"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/rolling/bondcpp/4.0.0-1"; + sha256 = "sha256-wy3kCL86JrjYj9NSdQSoElNk2Av00ERKHmxi5+16hNU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/rolling/boost-geometry-util/default.nix b/distros/rolling/boost-geometry-util/default.nix index d582fe67d9..51b10facab 100644 --- a/distros/rolling/boost-geometry-util/default.nix +++ b/distros/rolling/boost-geometry-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-boost-geometry-util"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/OUXT-Polaris/boost_geometry_util-release/archive/release/rolling/boost_geometry_util/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "cb19316b188dd77b20871fe80cc2152aa2db917230d2f8a18b3a681618a36d47"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "OUXT-Polaris"; + repo = "boost_geometry_util-release"; + rev = "release/rolling/boost_geometry_util/0.0.1-1"; + sha256 = "sha256-5P2YMX4buwUYt7NAF7FiWJguryH/I8GC2y+vIK5KI0w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/rolling/bosch-locator-bridge/default.nix b/distros/rolling/bosch-locator-bridge/default.nix index 2c39426a21..f6f9e43ebf 100644 --- a/distros/rolling/bosch-locator-bridge/default.nix +++ b/distros/rolling/bosch-locator-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-bosch-locator-bridge"; version = "2.1.7-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/locator_ros_bridge-release/archive/release/rolling/bosch_locator_bridge/2.1.7-1.tar.gz"; - name = "2.1.7-1.tar.gz"; - sha256 = "9c91c42bd558533bb4b4b26dd50a7343c469096c04e12c3756deeb1226cdf2ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "locator_ros_bridge-release"; + rev = "release/rolling/bosch_locator_bridge/2.1.7-1"; + sha256 = "sha256-bFJaogVUtmzsJvOF9ueN5FbWMZJyVh04/IuJ4Gh6LLw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/builtin-interfaces/default.nix b/distros/rolling/builtin-interfaces/default.nix index 1899ca6334..e9ec0a6302 100644 --- a/distros/rolling/builtin-interfaces/default.nix +++ b/distros/rolling/builtin-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-builtin-interfaces"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/rolling/builtin_interfaces/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "0c80d771619d2a25afb4ee367d2898a57d2de28d30505753d18c09cfc13d3ddf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/rolling/builtin_interfaces/1.3.1-1"; + sha256 = "sha256-joVfMN1p/djr9twbLk2pmL5se0HiRXxV6tfvdJoOP0o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-core-generators ]; diff --git a/distros/rolling/camera-calibration-parsers/default.nix b/distros/rolling/camera-calibration-parsers/default.nix index 1c67e3cb49..a630c1e79a 100644 --- a/distros/rolling/camera-calibration-parsers/default.nix +++ b/distros/rolling/camera-calibration-parsers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-camera-calibration-parsers"; version = "4.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/rolling/camera_calibration_parsers/4.1.1-1.tar.gz"; - name = "4.1.1-1.tar.gz"; - sha256 = "70ad3ca0e629f6c814e4fdf1666a15868381aebf19dc621b1bf05a7ec0e2643e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/rolling/camera_calibration_parsers/4.1.1-1"; + sha256 = "sha256-rMvN2Se5jZ1CV1lD59pPdPm/b31VmiO0hmWze0uXmpg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/camera-calibration/default.nix b/distros/rolling/camera-calibration/default.nix index 52c87012ea..f4e8cf4187 100644 --- a/distros/rolling/camera-calibration/default.nix +++ b/distros/rolling/camera-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-camera-calibration"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/camera_calibration/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "10160d8c2dbe5074c7cd9fb503aefe905222e8b353f26d8be7b44351cd43e6ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/camera_calibration/3.0.1-1"; + sha256 = "sha256-fQvzJJwJ6e27j8/v0Ld2OmMTGc6je8EkCNHowz8XBcY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 python3Packages.requests pythonPackages.pytest ]; diff --git a/distros/rolling/camera-info-manager/default.nix b/distros/rolling/camera-info-manager/default.nix index 50f235b8fe..7dd9cfb2ff 100644 --- a/distros/rolling/camera-info-manager/default.nix +++ b/distros/rolling/camera-info-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-camera-info-manager"; version = "4.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/rolling/camera_info_manager/4.1.1-1.tar.gz"; - name = "4.1.1-1.tar.gz"; - sha256 = "105e78eabe85d659ca6af143e61a1d97f898a2ec0b8e8ea878cd3be62cfd88bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/rolling/camera_info_manager/4.1.1-1"; + sha256 = "sha256-kfVJdEZHcGstEzSTQPqdaFJrGsrpFSofZEfG6008kTE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/can-msgs/default.nix b/distros/rolling/can-msgs/default.nix index 6109b43ddd..21999e32d9 100644 --- a/distros/rolling/can-msgs/default.nix +++ b/distros/rolling/can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-can-msgs"; version = "2.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_canopen-release/archive/release/rolling/can_msgs/2.0.0-3.tar.gz"; - name = "2.0.0-3.tar.gz"; - sha256 = "2acc17c31460ac06208b3b4bd128e8f6859ccdbaaa65764b438aa892d5aced5a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_canopen-release"; + rev = "release/rolling/can_msgs/2.0.0-3"; + sha256 = "sha256-9K7mCEEppzWP9ITzFZlJje6JHNIFoBxJ/FXPs+NoX4M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/cartographer-ros-msgs/default.nix b/distros/rolling/cartographer-ros-msgs/default.nix index 7d7e159195..61b00e618d 100644 --- a/distros/rolling/cartographer-ros-msgs/default.nix +++ b/distros/rolling/cartographer-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-cartographer-ros-msgs"; version = "2.0.9000-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer_ros-release/archive/release/rolling/cartographer_ros_msgs/2.0.9000-1.tar.gz"; - name = "2.0.9000-1.tar.gz"; - sha256 = "be0676680d4d15ef0db1a998318b6966e532418b91e2e14e011fda267f9c9b99"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer_ros-release"; + rev = "release/rolling/cartographer_ros_msgs/2.0.9000-1"; + sha256 = "sha256-ANRPJtqGaSasA10po2gdln9H83q4kgEUHIEVJALNgEk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/cartographer-ros/default.nix b/distros/rolling/cartographer-ros/default.nix index c22300ca86..5ecfb5e966 100644 --- a/distros/rolling/cartographer-ros/default.nix +++ b/distros/rolling/cartographer-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-cartographer-ros"; version = "2.0.9000-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer_ros-release/archive/release/rolling/cartographer_ros/2.0.9000-1.tar.gz"; - name = "2.0.9000-1.tar.gz"; - sha256 = "b28fbfb9a92caacf0f10fd0837807e16802625825a55fe8fa83f7c8c7c98f626"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer_ros-release"; + rev = "release/rolling/cartographer_ros/2.0.9000-1"; + sha256 = "sha256-4vheJuIJolPphYAtKyzlDmyyyP9klyIRg9+/ew1l9sY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake gtest python3Packages.sphinx ]; diff --git a/distros/rolling/cartographer-rviz/default.nix b/distros/rolling/cartographer-rviz/default.nix index 5fd3e46402..300cde381b 100644 --- a/distros/rolling/cartographer-rviz/default.nix +++ b/distros/rolling/cartographer-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-cartographer-rviz"; version = "2.0.9000-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer_ros-release/archive/release/rolling/cartographer_rviz/2.0.9000-1.tar.gz"; - name = "2.0.9000-1.tar.gz"; - sha256 = "d474bb8e6ad826871f040917614ff731cbd4535604dd46204fd776bc3a62e3dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer_ros-release"; + rev = "release/rolling/cartographer_rviz/2.0.9000-1"; + sha256 = "sha256-3RT9v1v/g5rj/7vGiqQI52l/LprLAdj/jH2mYk/ifQc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/cartographer/default.nix b/distros/rolling/cartographer/default.nix index 76167edd2e..de154749be 100644 --- a/distros/rolling/cartographer/default.nix +++ b/distros/rolling/cartographer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-cartographer"; version = "2.0.9002-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cartographer-release/archive/release/rolling/cartographer/2.0.9002-1.tar.gz"; - name = "2.0.9002-1.tar.gz"; - sha256 = "197d7fea1b9fc619741f4f0ee78eb6ad52b2a49fa65a9b8f7c24a967360d3d84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cartographer-release"; + rev = "release/rolling/cartographer/2.0.9002-1"; + sha256 = "sha256-Iaav1ll6a56ZLHPXKEZHko1tjkuQrd0fRGzk3jYp/zs="; + }; buildType = "cmake"; buildInputs = [ cmake git gtest python3Packages.sphinx ]; diff --git a/distros/rolling/cascade-lifecycle-msgs/default.nix b/distros/rolling/cascade-lifecycle-msgs/default.nix new file mode 100644 index 0000000000..c0a5c5f097 --- /dev/null +++ b/distros/rolling/cascade-lifecycle-msgs/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, builtin-interfaces, lifecycle-msgs, rclcpp, rosidl-default-generators }: +buildRosPackage { + pname = "ros-rolling-cascade-lifecycle-msgs"; + version = "1.0.3-r2"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cascade_lifecycle-release"; + rev = "release/rolling/cascade_lifecycle_msgs/1.0.3-2"; + sha256 = "sha256-5uR1jX0/7ik025gNg+AiwQuj9kjGhtkwnRKXUrzpOwE="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ builtin-interfaces lifecycle-msgs rclcpp rosidl-default-generators ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Messages for rclcpp_cascade_lifecycle package''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/rolling/chomp-motion-planner/default.nix b/distros/rolling/chomp-motion-planner/default.nix index d095722275..2299d9b66e 100644 --- a/distros/rolling/chomp-motion-planner/default.nix +++ b/distros/rolling/chomp-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-chomp-motion-planner"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/chomp_motion_planner/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "45eefda5d2a1c735ecda9247d77b1a26d84c95e2b20780c51edf2a74396289bf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/chomp_motion_planner/2.6.0-1"; + sha256 = "sha256-G5IHltknqZjvfHfdM2EBwS9Y7QD01IgnHstbUbzKkgc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/class-loader/default.nix b/distros/rolling/class-loader/default.nix index 24a7593c7a..78253e3144 100644 --- a/distros/rolling/class-loader/default.nix +++ b/distros/rolling/class-loader/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-class-loader"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/class_loader-release/archive/release/rolling/class_loader/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "48afd68c22ff69c5d034330dc18884469deafd07d7912f2b0b2cc6bbb6012c6d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "class_loader-release"; + rev = "release/rolling/class_loader/2.4.0-1"; + sha256 = "sha256-CU8Q6OeHMzsT1s3PPfN6AyzUqaK8Yf2AYURz/Ysm+1M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/rolling/color-names/default.nix b/distros/rolling/color-names/default.nix index 16f3b14b1e..d08f0b76d5 100644 --- a/distros/rolling/color-names/default.nix +++ b/distros/rolling/color-names/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-color-names"; version = "0.0.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/color_names-release/archive/release/rolling/color_names/0.0.3-2.tar.gz"; - name = "0.0.3-2.tar.gz"; - sha256 = "8fcd20f46eb7a5b7e3332f4f7c060353939451fc98bcdbf7cbd352877ed42068"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "color_names-release"; + rev = "release/rolling/color_names/0.0.3-2"; + sha256 = "sha256-956LQvQPv4QtQBKeDL62YimdLDh1yLGsi9AYgWiBh/k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/common-interfaces/default.nix b/distros/rolling/common-interfaces/default.nix index 548c486ec9..bcd14148be 100644 --- a/distros/rolling/common-interfaces/default.nix +++ b/distros/rolling/common-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-common-interfaces"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/common_interfaces/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "4ec0f99e529d27338142d2174370f8ab10825e27a8868b985735f21349473723"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/common_interfaces/4.6.1-1"; + sha256 = "sha256-xAMaWne7YidG96tsKBoWvVxNCJfNBMgyJWPiOGUjPQc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/composition-interfaces/default.nix b/distros/rolling/composition-interfaces/default.nix index 9ba9e6bbda..b986f5641e 100644 --- a/distros/rolling/composition-interfaces/default.nix +++ b/distros/rolling/composition-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-composition-interfaces"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/rolling/composition_interfaces/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "1cbded5f8e2875aceb5a04260c67c0e069afc8c2f6494683b980777c88d6d983"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/rolling/composition_interfaces/1.3.1-1"; + sha256 = "sha256-ZaQm8aIhN3JVSPF5Zo4PxnGyOVv6yJMrT2PVM+/+xbI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/composition/default.nix b/distros/rolling/composition/default.nix index f2cbd9457a..f55803ac97 100644 --- a/distros/rolling/composition/default.nix +++ b/distros/rolling/composition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-composition"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/composition/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "1e92484ac4be037ec6973b4233c96fe8f784a35df55bcd5a4cf28fa47883b910"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/composition/0.23.0-1"; + sha256 = "sha256-zZwV2He7FJBSbdkFiTR1jeL1rrPZf1n8K3R2a95pQYM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/compressed-depth-image-transport/default.nix b/distros/rolling/compressed-depth-image-transport/default.nix index 02ca3e9310..33e4e5308f 100644 --- a/distros/rolling/compressed-depth-image-transport/default.nix +++ b/distros/rolling/compressed-depth-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-compressed-depth-image-transport"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/rolling/compressed_depth_image_transport/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "745766a75c9d45db2ec03ca6b0c34f082fa0da99132aa69e4b5ab086d922ba02"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/rolling/compressed_depth_image_transport/2.6.0-1"; + sha256 = "sha256-BUszycMJ4VDcifwDGy3I9yS4tn636Eh8tuReqalMp5I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/compressed-image-transport/default.nix b/distros/rolling/compressed-image-transport/default.nix index 70dbb81fd2..bd4221912f 100644 --- a/distros/rolling/compressed-image-transport/default.nix +++ b/distros/rolling/compressed-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-compressed-image-transport"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/rolling/compressed_image_transport/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "9bb5f40fcb9096f599201de6ca4c4451dbf000ac711108feaf66ec7cd71c2251"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/rolling/compressed_image_transport/2.6.0-1"; + sha256 = "sha256-vN4A5m5vU0CwOpfUcpFWLzGPi2IBU08hpPx5w2HmuUU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/console-bridge-vendor/default.nix b/distros/rolling/console-bridge-vendor/default.nix index 0f4983deec..a0e573931e 100644 --- a/distros/rolling/console-bridge-vendor/default.nix +++ b/distros/rolling/console-bridge-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-console-bridge-vendor"; version = "1.5.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/console_bridge_vendor-release/archive/release/rolling/console_bridge_vendor/1.5.2-1.tar.gz"; - name = "1.5.2-1.tar.gz"; - sha256 = "b81cb4d51d65a0d8ca1c1735c8a09415771f90e83e06377706c24e7bc6e2a845"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "console_bridge_vendor-release"; + rev = "release/rolling/console_bridge_vendor/1.5.2-1"; + sha256 = "sha256-LB/wxdFo1K8D5mSehtYEscBnx/KhfoJNy6u1LfQ0JhY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/control-msgs/default.nix b/distros/rolling/control-msgs/default.nix index 2f88d6ca90..a4f31ae9f2 100644 --- a/distros/rolling/control-msgs/default.nix +++ b/distros/rolling/control-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-control-msgs"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/control_msgs-release/archive/release/rolling/control_msgs/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "029dd9d89a091d2b0e22059458ad9b64affad303231df53626752a410eb5acf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "control_msgs-release"; + rev = "release/rolling/control_msgs/4.1.0-1"; + sha256 = "sha256-xpy8ltgcLjZfm9884tBtDHYYZjuyi7LOWdO7m3V1NCA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/control-toolbox/default.nix b/distros/rolling/control-toolbox/default.nix index 46b12077dc..5daaba82fc 100644 --- a/distros/rolling/control-toolbox/default.nix +++ b/distros/rolling/control-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-control-toolbox"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/control_toolbox-release/archive/release/rolling/control_toolbox/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "07f909caf3e5bf418e46c779fd9e7bb0a33c2268ca0a2fcd13b2fceac9236458"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "control_toolbox-release"; + rev = "release/rolling/control_toolbox/2.1.2-1"; + sha256 = "sha256-e4FTDWkjuTT971m6bkwPhXRtUGbRETznWjX+DtmLPw8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/controller-interface/default.nix b/distros/rolling/controller-interface/default.nix index 061e3c0e77..cd8e4dfaa7 100644 --- a/distros/rolling/controller-interface/default.nix +++ b/distros/rolling/controller-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, hardware-interface, rclcpp-lifecycle, sensor-msgs }: buildRosPackage { pname = "ros-rolling-controller-interface"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/controller_interface/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "aa1816bc94d1a94c6f46ee44804552d0893a4e9f267ae414ae43395084fc3bc6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/controller_interface/3.7.0-1"; + sha256 = "sha256-KhZmCDWB0niuYS5qeudYEcdH6R00F+68OuZ1TiEZZU4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/controller-manager-msgs/default.nix b/distros/rolling/controller-manager-msgs/default.nix index 38ba7757c6..6042eb13c4 100644 --- a/distros/rolling/controller-manager-msgs/default.nix +++ b/distros/rolling/controller-manager-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, lifecycle-msgs, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-rolling-controller-manager-msgs"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/controller_manager_msgs/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "9f352212ea79b57254bfca904b4e62fab39c034b9af16ff8a2dc3e65cc431b87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/controller_manager_msgs/3.7.0-1"; + sha256 = "sha256-zvx3z+O4r15f54ti3oJWflYfYvWAGa7eXpmpgY22rbs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/controller-manager/default.nix b/distros/rolling/controller-manager/default.nix index b97a4d1ec9..f34a0903c7 100644 --- a/distros/rolling/controller-manager/default.nix +++ b/distros/rolling/controller-manager/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-python, ament-index-cpp, controller-interface, controller-manager-msgs, diagnostic-updater, hardware-interface, launch, launch-ros, pluginlib, rclcpp, rcpputils, realtime-tools, ros2-control-test-assets, ros2param, ros2run }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-python, ament-index-cpp, backward-ros, controller-interface, controller-manager-msgs, diagnostic-updater, hardware-interface, launch, launch-ros, pluginlib, rclcpp, rcpputils, realtime-tools, ros2-control-test-assets, ros2param, ros2run }: buildRosPackage { pname = "ros-rolling-controller-manager"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/controller_manager/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "e43e65d78a7b93c9e73fcd5296e0cb555c964656968877bb15b25b3e1bc287aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/controller_manager/3.7.0-1"; + sha256 = "sha256-qfzvYLjC0WpsOtrWJvr7jKUjiI1R4ax0YRgV9a49bKk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; checkInputs = [ ament-cmake-gmock ]; - propagatedBuildInputs = [ ament-index-cpp controller-interface controller-manager-msgs diagnostic-updater hardware-interface launch launch-ros pluginlib rclcpp rcpputils realtime-tools ros2-control-test-assets ros2param ros2run ]; + propagatedBuildInputs = [ ament-index-cpp backward-ros controller-interface controller-manager-msgs diagnostic-updater hardware-interface launch launch-ros pluginlib rclcpp rcpputils realtime-tools ros2-control-test-assets ros2param ros2run ]; nativeBuildInputs = [ ament-cmake ament-cmake-python ]; meta = { diff --git a/distros/rolling/cudnn-cmake-module/default.nix b/distros/rolling/cudnn-cmake-module/default.nix index ad0ad41fa6..75a4e4ef98 100644 --- a/distros/rolling/cudnn-cmake-module/default.nix +++ b/distros/rolling/cudnn-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-cudnn-cmake-module"; version = "0.0.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cudnn_cmake_module-release/archive/release/rolling/cudnn_cmake_module/0.0.1-2.tar.gz"; - name = "0.0.1-2.tar.gz"; - sha256 = "5e90f09cbb164a4a4b024babb391dd128d82feefb9a13ee92acf4913f964c8ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cudnn_cmake_module-release"; + rev = "release/rolling/cudnn_cmake_module/0.0.1-2"; + sha256 = "sha256-J6BqQzZzZMC0MVQ5oJCXgXu5fzoPlV+JErISeIuss6I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/cv-bridge/default.nix b/distros/rolling/cv-bridge/default.nix index 33d5e72c28..33bd430c68 100644 --- a/distros/rolling/cv-bridge/default.nix +++ b/distros/rolling/cv-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-cv-bridge"; version = "3.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/rolling/cv_bridge/3.4.0-1.tar.gz"; - name = "3.4.0-1.tar.gz"; - sha256 = "e908845b688ccfd5e433d78b2bd3791d30778b0cc1bd6e9ed5dad3622c8f0af7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/rolling/cv_bridge/3.4.0-1"; + sha256 = "sha256-dBOx5erfHZujCeftGSpaPaPgMsum6y3E6ecMkllLPDQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python-cmake-module ]; diff --git a/distros/rolling/cyclonedds/default.nix b/distros/rolling/cyclonedds/default.nix index f99eb28032..18ad076dc3 100644 --- a/distros/rolling/cyclonedds/default.nix +++ b/distros/rolling/cyclonedds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-cyclonedds"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/cyclonedds-release/archive/release/rolling/cyclonedds/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "fde04f8ab98e14e181bd6869c44fb80af5226ed3109edcfebab59ffce74fafa6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cyclonedds-release"; + rev = "release/rolling/cyclonedds/0.9.1-1"; + sha256 = "sha256-VGL8btSnRvNHXhGKhLQhNNBYh3iwzyHem8jbirjxbD8="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/demo-nodes-cpp-native/default.nix b/distros/rolling/demo-nodes-cpp-native/default.nix index 91fa76b1da..60bac627cb 100644 --- a/distros/rolling/demo-nodes-cpp-native/default.nix +++ b/distros/rolling/demo-nodes-cpp-native/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-demo-nodes-cpp-native"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/demo_nodes_cpp_native/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "d823ce53d1d293a91425b05400ddc1af8fa332ee85dd9bce3e76107008937f29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/demo_nodes_cpp_native/0.23.0-1"; + sha256 = "sha256-wYRKLgXFpyrJMSKcLzXY+8KntNVo/GppnhcBFdWvIuY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/demo-nodes-cpp/default.nix b/distros/rolling/demo-nodes-cpp/default.nix index 880af9007b..2c9bf2bb1d 100644 --- a/distros/rolling/demo-nodes-cpp/default.nix +++ b/distros/rolling/demo-nodes-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-demo-nodes-cpp"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/demo_nodes_cpp/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "cd5ef8d9f4979011b03df73b0bdff65e564fc1436096ae16b0d218c95e088d31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/demo_nodes_cpp/0.23.0-1"; + sha256 = "sha256-RP+Tn9r+u0hq7rM4YWNXKEgUjWvDkSt0fm8q+vHcEtk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw-implementation-cmake ]; diff --git a/distros/rolling/demo-nodes-py/default.nix b/distros/rolling/demo-nodes-py/default.nix index 3f3d7046e0..c3cf623555 100644 --- a/distros/rolling/demo-nodes-py/default.nix +++ b/distros/rolling/demo-nodes-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-demo-nodes-py"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/demo_nodes_py/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "b4e5d362d5ef6e7f2a1b0ef7fb1f80d4330791bab679199c3e2043b9ae89905c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/demo_nodes_py/0.23.0-1"; + sha256 = "sha256-f0fxJDrWsaAQWfBeoHv7J0H1tVmoMM1iLrW8gL1b9no="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/depth-image-proc/default.nix b/distros/rolling/depth-image-proc/default.nix index 01d614d1fd..3bcd5e6425 100644 --- a/distros/rolling/depth-image-proc/default.nix +++ b/distros/rolling/depth-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-depth-image-proc"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/depth_image_proc/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "c740c0d382b7035b4f9984dbec27a5dc6d2e7a5525624b21f966a03b4825a84b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/depth_image_proc/3.0.1-1"; + sha256 = "sha256-GzUdUhJMmjy/MLYKmeDWGalYn663OXvzJrdUYfU2JPs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto class-loader ]; diff --git a/distros/rolling/depthimage-to-laserscan/default.nix b/distros/rolling/depthimage-to-laserscan/default.nix index 2dba1375da..4d7c9134b2 100644 --- a/distros/rolling/depthimage-to-laserscan/default.nix +++ b/distros/rolling/depthimage-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-depthimage-to-laserscan"; version = "2.5.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/depthimage_to_laserscan-release/archive/release/rolling/depthimage_to_laserscan/2.5.0-2.tar.gz"; - name = "2.5.0-2.tar.gz"; - sha256 = "84cd8340acb7d745842db783ec231d1490ff5d63998a7d3713ad8bf6073dd6ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "depthimage_to_laserscan-release"; + rev = "release/rolling/depthimage_to_laserscan/2.5.0-2"; + sha256 = "sha256-+JJjxrP2tOPo9ijQrlYZuhH85XbQgrxb4RJIFeNO38Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/desktop-full/default.nix b/distros/rolling/desktop-full/default.nix index a6c790776c..9d4ccaed67 100644 --- a/distros/rolling/desktop-full/default.nix +++ b/distros/rolling/desktop-full/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-desktop-full"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/rolling/desktop_full/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "18c3a7c76ecc8c13c146d113f9dd3c6c7821a69b3d5e0188f601a474e48401f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/rolling/desktop_full/0.10.0-1"; + sha256 = "sha256-Fpf8KQVw8ZcNqmf/8VyrlxunQpvxC9fZZHZVUBkM4IU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/desktop/default.nix b/distros/rolling/desktop/default.nix index a1e8a86c66..da52b81262 100644 --- a/distros/rolling/desktop/default.nix +++ b/distros/rolling/desktop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-desktop"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/rolling/desktop/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "97113dc7a109b9b97eb6f16f4fb0df81c27b14cdedf03e6d92e17647d695cdc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/rolling/desktop/0.10.0-1"; + sha256 = "sha256-Oe0Gi0EAbvTGmyy7KyrLQqqS5ZVrp2Tdkdx4F82uVqw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/diagnostic-aggregator/default.nix b/distros/rolling/diagnostic-aggregator/default.nix index 28e7761350..7cfb3ac679 100644 --- a/distros/rolling/diagnostic-aggregator/default.nix +++ b/distros/rolling/diagnostic-aggregator/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-python, ament-lint-auto, ament-lint-common, diagnostic-msgs, launch-testing-ament-cmake, launch-testing-ros, pluginlib, rclcpp, rclpy, std-msgs }: buildRosPackage { pname = "ros-rolling-diagnostic-aggregator"; - version = "3.0.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/rolling/diagnostic_aggregator/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "6e17a7568e48888274575514761bba5daf5e6b91acc52cad415189665c61a4ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/rolling/diagnostic_aggregator/3.1.0-1"; + sha256 = "sha256-tgB1ass3ILBeOD30sqn6bLM4TdNi0YPM6njMaIEnPyc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python diagnostic-msgs pluginlib rclcpp std-msgs ]; @@ -21,6 +25,6 @@ buildRosPackage { meta = { description = ''diagnostic_aggregator''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/rolling/diagnostic-common-diagnostics/default.nix b/distros/rolling/diagnostic-common-diagnostics/default.nix new file mode 100644 index 0000000000..c9a91b9aa8 --- /dev/null +++ b/distros/rolling/diagnostic-common-diagnostics/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-lint-cmake, ament-cmake-python, ament-cmake-xmllint, ament-lint-auto, diagnostic-updater, ntp, rclpy }: +buildRosPackage { + pname = "ros-rolling-diagnostic-common-diagnostics"; + version = "3.1.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/rolling/diagnostic_common_diagnostics/3.1.0-1"; + sha256 = "sha256-nLWY/TpbC4B8BP+/rMnVgvekuvf+rwzC8S972BHNIz0="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ament-cmake-python ]; + checkInputs = [ ament-cmake-lint-cmake ament-cmake-xmllint ament-lint-auto ]; + propagatedBuildInputs = [ diagnostic-updater ntp rclpy ]; + nativeBuildInputs = [ ament-cmake ament-cmake-python ]; + + meta = { + description = ''diagnostic_common_diagnostics''; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/distros/rolling/diagnostic-msgs/default.nix b/distros/rolling/diagnostic-msgs/default.nix index e490ad7f8e..84f3990e76 100644 --- a/distros/rolling/diagnostic-msgs/default.nix +++ b/distros/rolling/diagnostic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-diagnostic-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/diagnostic_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "3a36f7c3926f58c5917c90eac301a7ee129aaa1f0d53375cedd18bf9049d82e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/diagnostic_msgs/4.6.1-1"; + sha256 = "sha256-G2oGUWcZ7XwEMoAQaDrW3Wiui70GllJAYBw+b5XERiU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/diagnostic-updater/default.nix b/distros/rolling/diagnostic-updater/default.nix index 00ffb1ea22..1e20131b9c 100644 --- a/distros/rolling/diagnostic-updater/default.nix +++ b/distros/rolling/diagnostic-updater/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-python, ament-lint-auto, ament-lint-common, diagnostic-msgs, rclcpp, rclcpp-lifecycle, rclpy, std-msgs }: buildRosPackage { pname = "ros-rolling-diagnostic-updater"; - version = "3.0.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/rolling/diagnostic_updater/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "69910ba4759b5604a441df600dcd599b53e965c5ed9cbb01c36b755231da8e45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/rolling/diagnostic_updater/3.1.0-1"; + sha256 = "sha256-xTskr5WjExtIqTza+z/AAQgPoX14wp+BL75tTPnSGqI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; @@ -21,6 +25,6 @@ buildRosPackage { meta = { description = ''diagnostic_updater contains tools for easily updating diagnostics. it is commonly used in device drivers to keep track of the status of output topics, device status, etc.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/rolling/diagnostics/default.nix b/distros/rolling/diagnostics/default.nix new file mode 100644 index 0000000000..db9d20e4db --- /dev/null +++ b/distros/rolling/diagnostics/default.nix @@ -0,0 +1,29 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, diagnostic-aggregator, diagnostic-common-diagnostics, diagnostic-updater, self-test }: +buildRosPackage { + pname = "ros-rolling-diagnostics"; + version = "3.1.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/rolling/diagnostics/3.1.0-1"; + sha256 = "sha256-4EQM94db9bRFnZIWM8lsMXaAp1H8Jmn75Lnh1JnDpSA="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + propagatedBuildInputs = [ diagnostic-aggregator diagnostic-common-diagnostics diagnostic-updater self-test ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''diagnostics''; + license = with lib.licenses; [ bsd3 ]; + }; +} diff --git a/distros/rolling/diff-drive-controller/default.nix b/distros/rolling/diff-drive-controller/default.nix index fc4a0da10a..67b4bce83b 100644 --- a/distros/rolling/diff-drive-controller/default.nix +++ b/distros/rolling/diff-drive-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-interface, controller-manager, generate-parameter-library, geometry-msgs, hardware-interface, nav-msgs, pluginlib, rclcpp, rclcpp-lifecycle, rcpputils, realtime-tools, ros2-control-test-assets, tf2, tf2-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-interface, controller-manager, generate-parameter-library, geometry-msgs, hardware-interface, nav-msgs, pluginlib, rclcpp, rclcpp-lifecycle, rcpputils, realtime-tools, ros2-control-test-assets, tf2, tf2-msgs }: buildRosPackage { pname = "ros-rolling-diff-drive-controller"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/diff_drive_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "8888f28511a4de5649d7dad34029d0e9dcb3c2d93f02bb25bd7669fd6e95a4a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/diff_drive_controller/3.1.0-1"; + sha256 = "sha256-0Jt3GMeFooJqMF1FTd8I/ZMvH+a/+u7fDlMsVCyT4tc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake generate-parameter-library pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ controller-interface geometry-msgs hardware-interface nav-msgs rclcpp rclcpp-lifecycle rcpputils realtime-tools tf2 tf2-msgs ]; + propagatedBuildInputs = [ backward-ros controller-interface geometry-msgs hardware-interface nav-msgs rclcpp rclcpp-lifecycle rcpputils realtime-tools tf2 tf2-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/dolly-follow/default.nix b/distros/rolling/dolly-follow/default.nix index baa4c0ce86..fcec44678e 100644 --- a/distros/rolling/dolly-follow/default.nix +++ b/distros/rolling/dolly-follow/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dolly-follow"; version = "0.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dolly-release/archive/release/rolling/dolly_follow/0.4.0-2.tar.gz"; - name = "0.4.0-2.tar.gz"; - sha256 = "562f93892919b5530bed54f63741636d82bb6940149173b3f3e15f975d709c13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dolly-release"; + rev = "release/rolling/dolly_follow/0.4.0-2"; + sha256 = "sha256-Udj2U+dWE5+JIz9GOSB6X4C9y3g/g30Jp3+BTuiiRX0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dolly-gazebo/default.nix b/distros/rolling/dolly-gazebo/default.nix index 1d368d4217..4c8fccf86c 100644 --- a/distros/rolling/dolly-gazebo/default.nix +++ b/distros/rolling/dolly-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dolly-gazebo"; version = "0.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dolly-release/archive/release/rolling/dolly_gazebo/0.4.0-2.tar.gz"; - name = "0.4.0-2.tar.gz"; - sha256 = "ed2618c8a0b5aaf0446280f3a69bd1fee5b0ff69f9de0e984679fc5d9cce60ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dolly-release"; + rev = "release/rolling/dolly_gazebo/0.4.0-2"; + sha256 = "sha256-sLCbhJjIRzZvq15SlStZjonIvhpPw57fK5vRlQ3689A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dolly-ignition/default.nix b/distros/rolling/dolly-ignition/default.nix index 2afb46aae5..e4761c3172 100644 --- a/distros/rolling/dolly-ignition/default.nix +++ b/distros/rolling/dolly-ignition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dolly-ignition"; version = "0.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dolly-release/archive/release/rolling/dolly_ignition/0.4.0-2.tar.gz"; - name = "0.4.0-2.tar.gz"; - sha256 = "5004cf823b7f1207abb652001d47b49d00aa4c3d22a3607d2defc5edb73c38ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dolly-release"; + rev = "release/rolling/dolly_ignition/0.4.0-2"; + sha256 = "sha256-BGdsjbemIWS94BjSHjDClK1ui6sM17J0lJlrhfhj/Vg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dolly/default.nix b/distros/rolling/dolly/default.nix index 48a34c0f61..2c68aa655e 100644 --- a/distros/rolling/dolly/default.nix +++ b/distros/rolling/dolly/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dolly"; version = "0.4.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dolly-release/archive/release/rolling/dolly/0.4.0-2.tar.gz"; - name = "0.4.0-2.tar.gz"; - sha256 = "73ac8a522823a7f19838cfb18871eacf2a95ae872f2575d414b3c789552acbe3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dolly-release"; + rev = "release/rolling/dolly/0.4.0-2"; + sha256 = "sha256-1ugxemjgNM3QtSsQ64TCZHu8J9gYPS5Qh2s6VRBTiFA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/domain-bridge/default.nix b/distros/rolling/domain-bridge/default.nix index c69b1b82a1..35dbecbddb 100644 --- a/distros/rolling/domain-bridge/default.nix +++ b/distros/rolling/domain-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-domain-bridge"; version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/domain_bridge-release/archive/release/rolling/domain_bridge/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "4c7bbb2b2fc4fbde815ce3015aed6125202d6f2ba9a0f58edfe91368cddc37ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "domain_bridge-release"; + rev = "release/rolling/domain_bridge/0.5.0-1"; + sha256 = "sha256-eajUFSE7L+45VSlUvbXcvd6RjjdERKimvpFjuXVbCO8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/domain-coordinator/default.nix b/distros/rolling/domain-coordinator/default.nix index 87fd8f4459..ea951b0d21 100644 --- a/distros/rolling/domain-coordinator/default.nix +++ b/distros/rolling/domain-coordinator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-domain-coordinator"; version = "0.11.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ament_cmake_ros-release/archive/release/rolling/domain_coordinator/0.11.1-1.tar.gz"; - name = "0.11.1-1.tar.gz"; - sha256 = "9504ae93fc144cb0a688f3696c08705d869d4169e920a6dfa46baed8ca1ee184"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ament_cmake_ros-release"; + rev = "release/rolling/domain_coordinator/0.11.1-1"; + sha256 = "sha256-U6BAOuEyQxvGMWEL2xXxsbI4fkSy3GLZ2Lag8pVXqD8="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/dummy-map-server/default.nix b/distros/rolling/dummy-map-server/default.nix index 0f7af45dc6..1e474734f3 100644 --- a/distros/rolling/dummy-map-server/default.nix +++ b/distros/rolling/dummy-map-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dummy-map-server"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/dummy_map_server/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "42663944fbfc05f91cf3dd66c773bdc5ee653c7b36b66a1a70d7c2ab800f1358"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/dummy_map_server/0.23.0-1"; + sha256 = "sha256-/gg6AXvkIPGT/5p+ECqLk8paYBbPpSTmWB8K4d0oYTs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dummy-robot-bringup/default.nix b/distros/rolling/dummy-robot-bringup/default.nix index bcf0d83c3b..993442412e 100644 --- a/distros/rolling/dummy-robot-bringup/default.nix +++ b/distros/rolling/dummy-robot-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dummy-robot-bringup"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/dummy_robot_bringup/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "77b6475aa585f014a74acff6d51baa56a49e1ba3d5a32e1cbde5fa1397d269c5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/dummy_robot_bringup/0.23.0-1"; + sha256 = "sha256-xZL85Iz7YFT07pnQbn2CFsI8YpXOeGWa2zJiGUvyxVI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dummy-sensors/default.nix b/distros/rolling/dummy-sensors/default.nix index 27bbc6b5ad..4c262b8f75 100644 --- a/distros/rolling/dummy-sensors/default.nix +++ b/distros/rolling/dummy-sensors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dummy-sensors"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/dummy_sensors/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "721ed2372f45b62058a189d7a180ba0444822c5241e9d24cd351416bf8a7f23f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/dummy_sensors/0.23.0-1"; + sha256 = "sha256-a4WyvZJLOMEQw86bK6nobRMw08s9skGJRnwRwVLXFlE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dynamic-edt-3d/default.nix b/distros/rolling/dynamic-edt-3d/default.nix index b69937ad7c..210e9ca716 100644 --- a/distros/rolling/dynamic-edt-3d/default.nix +++ b/distros/rolling/dynamic-edt-3d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dynamic-edt-3d"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap-release/archive/release/rolling/dynamic_edt_3d/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "89c40e04e2168de03a796ba102bb2ba1c11c7588e249c068b9ee377db0c37736"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap-release"; + rev = "release/rolling/dynamic_edt_3d/1.9.8-1"; + sha256 = "sha256-522JD7zQBjHhrle/McBU6igMD2aGFVJvyheYkpGEJ3g="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/dynamixel-hardware/default.nix b/distros/rolling/dynamixel-hardware/default.nix index e6e433e70e..366d1c5cbf 100644 --- a/distros/rolling/dynamixel-hardware/default.nix +++ b/distros/rolling/dynamixel-hardware/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dynamixel-hardware"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_hardware-release/archive/release/rolling/dynamixel_hardware/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "3de9166f8edf8dfa5c09a66c877574b810a2603c140ac3e813c7db5b17881389"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_hardware-release"; + rev = "release/rolling/dynamixel_hardware/0.3.1-1"; + sha256 = "sha256-GRh4SkC1vL7YCPrxbatVCu6rWYODn9zVp2z+PRc4L9Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dynamixel-sdk-custom-interfaces/default.nix b/distros/rolling/dynamixel-sdk-custom-interfaces/default.nix index 679f7c1389..9dd4cf9fdf 100644 --- a/distros/rolling/dynamixel-sdk-custom-interfaces/default.nix +++ b/distros/rolling/dynamixel-sdk-custom-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dynamixel-sdk-custom-interfaces"; version = "3.7.40-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_sdk-release/archive/release/rolling/dynamixel_sdk_custom_interfaces/3.7.40-2.tar.gz"; - name = "3.7.40-2.tar.gz"; - sha256 = "3adcb56a70f709d0190c914bc1c661a90209e10c7575edc4b70ce9604c848b5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_sdk-release"; + rev = "release/rolling/dynamixel_sdk_custom_interfaces/3.7.40-2"; + sha256 = "sha256-pWGzlnONW1lXGAui57EHtKsqI3VguxYMeL+ytq6dgec="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/dynamixel-sdk-examples/default.nix b/distros/rolling/dynamixel-sdk-examples/default.nix index 6b6035e396..1fb9ba5fbb 100644 --- a/distros/rolling/dynamixel-sdk-examples/default.nix +++ b/distros/rolling/dynamixel-sdk-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dynamixel-sdk-examples"; version = "3.7.40-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_sdk-release/archive/release/rolling/dynamixel_sdk_examples/3.7.40-2.tar.gz"; - name = "3.7.40-2.tar.gz"; - sha256 = "a0bb4f39ad8dd5140cbbf8a59573b95c64c30b546739e24a14abe14fec2fc2f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_sdk-release"; + rev = "release/rolling/dynamixel_sdk_examples/3.7.40-2"; + sha256 = "sha256-TRPWVWEEJtx/attfpSr6SATpy7YhzqP9x8ef/IVsULA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dynamixel-sdk/default.nix b/distros/rolling/dynamixel-sdk/default.nix index 501f2f6986..0626fd57df 100644 --- a/distros/rolling/dynamixel-sdk/default.nix +++ b/distros/rolling/dynamixel-sdk/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dynamixel-sdk"; version = "3.7.40-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_sdk-release/archive/release/rolling/dynamixel_sdk/3.7.40-2.tar.gz"; - name = "3.7.40-2.tar.gz"; - sha256 = "db50c8112b5c4a7d888b6fb923a2bbe898c24385f55e6b2380caf52795754e7e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_sdk-release"; + rev = "release/rolling/dynamixel_sdk/3.7.40-2"; + sha256 = "sha256-oqGB9nx57Y1CMx1pbn81xSZbN9xXdKhJmj0SvIXyaNY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dynamixel-workbench-msgs/default.nix b/distros/rolling/dynamixel-workbench-msgs/default.nix index 147fbe3d0a..cc7e982764 100644 --- a/distros/rolling/dynamixel-workbench-msgs/default.nix +++ b/distros/rolling/dynamixel-workbench-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dynamixel-workbench-msgs"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench_msgs-release/archive/release/rolling/dynamixel_workbench_msgs/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "d30840ae2387912512562cf380eded2beb31f822a723fd937af7b8c8662a9ce5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench_msgs-release"; + rev = "release/rolling/dynamixel_workbench_msgs/2.0.3-1"; + sha256 = "sha256-NMrVMFxbUmSDCdSRTO6gRJtKsmEeqY4Q5FqkBQCeY3I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/dynamixel-workbench-toolbox/default.nix b/distros/rolling/dynamixel-workbench-toolbox/default.nix index 14159fbcef..1e3800bbfc 100644 --- a/distros/rolling/dynamixel-workbench-toolbox/default.nix +++ b/distros/rolling/dynamixel-workbench-toolbox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dynamixel-workbench-toolbox"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench-release/archive/release/rolling/dynamixel_workbench_toolbox/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "7b9580eb5d194225c191c503071d32c6cb86122283561ff2908030b90203f0be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench-release"; + rev = "release/rolling/dynamixel_workbench_toolbox/2.2.3-1"; + sha256 = "sha256-nOIZ6YHjctUbm0SxTewtbsAXlfG10kknrKhpsVPGR5k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/dynamixel-workbench/default.nix b/distros/rolling/dynamixel-workbench/default.nix index 2d713dc709..ca2eb30c7e 100644 --- a/distros/rolling/dynamixel-workbench/default.nix +++ b/distros/rolling/dynamixel-workbench/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-dynamixel-workbench"; version = "2.2.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/dynamixel_workbench-release/archive/release/rolling/dynamixel_workbench/2.2.3-1.tar.gz"; - name = "2.2.3-1.tar.gz"; - sha256 = "8628f95997d1f049d7c6ad47d3be39c3035c55c1d76eb83e54e5c49ed5bea38b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "dynamixel_workbench-release"; + rev = "release/rolling/dynamixel_workbench/2.2.3-1"; + sha256 = "sha256-iA1/c6eRcHNi0wnJhwog1K7jH1fKwsqIvSfgCZivKrc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ecl-build/default.nix b/distros/rolling/ecl-build/default.nix index 2ca3503b70..4ee78bb931 100644 --- a/distros/rolling/ecl-build/default.nix +++ b/distros/rolling/ecl-build/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-build"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/rolling/ecl_build/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "2aebdb775bc6a23df222146f80f277192721b8e6724ed4b0f2b38610d403811c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/rolling/ecl_build/1.0.3-1"; + sha256 = "sha256-ttmcSFmWhB7bERQkup3ucja+EU9tIc4Sb4cVetuSS00="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ecl-command-line/default.nix b/distros/rolling/ecl-command-line/default.nix index 57458bc1dd..1a46eb706a 100644 --- a/distros/rolling/ecl-command-line/default.nix +++ b/distros/rolling/ecl-command-line/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-command-line"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_command_line/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "3ec2dbd86d439dd86721cac9332f64eaf951a6ad9af2fad8da7177665d62c0e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_command_line/1.2.1-1"; + sha256 = "sha256-0rOoPXNkY6U26dMB39t2IjB44typZqO4T5rW2jrEOl8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-concepts/default.nix b/distros/rolling/ecl-concepts/default.nix index 8aa6eeaab2..975e6c5878 100644 --- a/distros/rolling/ecl-concepts/default.nix +++ b/distros/rolling/ecl-concepts/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-concepts"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_concepts/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "ac0671cd7a6aeb7d834d2a099648819dc92fcd7051c55322f1a71ae0cf41cd31"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_concepts/1.2.1-1"; + sha256 = "sha256-hH2MIha8e5l0G1CqvBSjisV52RKAkaE0J9ZtGpxM9EM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-config/default.nix b/distros/rolling/ecl-config/default.nix index 569bdebf06..9fffe8bb80 100644 --- a/distros/rolling/ecl-config/default.nix +++ b/distros/rolling/ecl-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-config"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/rolling/ecl_config/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "3bbb4c9a84ce2a3431ccbdf79e2201144ede725164df3e6a26acef5a949cc35b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/rolling/ecl_config/1.2.0-1"; + sha256 = "sha256-eH0ytH9tso+gcYGQSXy83dIPeklxY5K+/Jo0cV9qAxI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-console/default.nix b/distros/rolling/ecl-console/default.nix index 55d3b49d94..1f289131ee 100644 --- a/distros/rolling/ecl-console/default.nix +++ b/distros/rolling/ecl-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-console"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/rolling/ecl_console/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "1b160dbd9eee0b25aa029911fc17ce06433883b4086941c52adc0cacb977fccb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/rolling/ecl_console/1.2.0-1"; + sha256 = "sha256-w1XZlDsjZDQ0MPDG+dhU0mD3KZjRt4yslxJCP5RHeTE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-containers/default.nix b/distros/rolling/ecl-containers/default.nix index 0cf0e5777a..3eafdc139c 100644 --- a/distros/rolling/ecl-containers/default.nix +++ b/distros/rolling/ecl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-containers"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_containers/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "ce1374d3fbd1a35c3ff576b7861019cd99f080b7862a47909e51c4cac076c9b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_containers/1.2.1-1"; + sha256 = "sha256-943O8bp1zs58toB05o+e+e5rOiiB7i0OAWEjrbjQ7Ng="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-converters-lite/default.nix b/distros/rolling/ecl-converters-lite/default.nix index e45b282114..e7168a8504 100644 --- a/distros/rolling/ecl-converters-lite/default.nix +++ b/distros/rolling/ecl-converters-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-converters-lite"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/rolling/ecl_converters_lite/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "0e7587fa673456a2ad755c8ff27d54287afd5823fd7016a9e47d799f48edb6b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/rolling/ecl_converters_lite/1.2.0-1"; + sha256 = "sha256-a8sm73bxxx6IYDP6tv76IbjyUHSAzx6QreCCBMQUePE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-converters/default.nix b/distros/rolling/ecl-converters/default.nix index 0875e20223..6f824292ac 100644 --- a/distros/rolling/ecl-converters/default.nix +++ b/distros/rolling/ecl-converters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-converters"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_converters/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "3fe0184381e61f3e4c7629ce2ed5705eb306b6c3a8d64b2611cac095c0b25231"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_converters/1.2.1-1"; + sha256 = "sha256-hZthKv3t/fhEc7ubch+5EneflAc54IyTtCuBW4vzaF0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-core-apps/default.nix b/distros/rolling/ecl-core-apps/default.nix index f276a7648f..4aa6ba7b10 100644 --- a/distros/rolling/ecl-core-apps/default.nix +++ b/distros/rolling/ecl-core-apps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-core-apps"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_core_apps/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "b0e9c5ab62b8768452e9a862239e33f5997731dde66baa47fe48593bdf4f0c25"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_core_apps/1.2.1-1"; + sha256 = "sha256-s2Ebyn5n1kiUIFSZ3pa4Ycrcv+Zxp6fh/XBk2xxjWbI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-core/default.nix b/distros/rolling/ecl-core/default.nix index aa1f806db0..5fa53f5a18 100644 --- a/distros/rolling/ecl-core/default.nix +++ b/distros/rolling/ecl-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-core"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_core/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "81f2da4bb137f9b7be1fe4ef55376abbcfac89ba122e040df1d264f15b599b76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_core/1.2.1-1"; + sha256 = "sha256-/qmRsU0lb8R70sW/g5572zrbdGlRSBu3BL+GhX77UII="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-devices/default.nix b/distros/rolling/ecl-devices/default.nix index f4c3d38d0b..afc62e4c5c 100644 --- a/distros/rolling/ecl-devices/default.nix +++ b/distros/rolling/ecl-devices/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-devices"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_devices/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "d874f0c6199d175b3fe05da938e6e35d60d259b03782324275b769c12bad8d23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_devices/1.2.1-1"; + sha256 = "sha256-fdhKBuF9q7x8XDG5ld90RQRXHhZf4I6pJGU5KK6EOeI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-eigen/default.nix b/distros/rolling/ecl-eigen/default.nix index f719676aff..81dc97da1e 100644 --- a/distros/rolling/ecl-eigen/default.nix +++ b/distros/rolling/ecl-eigen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-eigen"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_eigen/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "78dcbdf14768cc004b774c3b713418d99a795472d5ebd4cb20c5b6a0d4491482"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_eigen/1.2.1-1"; + sha256 = "sha256-tkEm2XgT3kJqdj/+L317KVB0SOyCjRKuLqsOWToPxbo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-errors/default.nix b/distros/rolling/ecl-errors/default.nix index 4f1a421d0e..b1f0d89b56 100644 --- a/distros/rolling/ecl-errors/default.nix +++ b/distros/rolling/ecl-errors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-errors"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/rolling/ecl_errors/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "fdec700af29b881339c71540e1338deb3acea918efa1b04c00d62647ecc0d752"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/rolling/ecl_errors/1.2.0-1"; + sha256 = "sha256-tMZvRB3bre8Dk+0YS+OqnkCGKff09J6PKWHytWxelmk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-exceptions/default.nix b/distros/rolling/ecl-exceptions/default.nix index 271f060a40..89508d1b8f 100644 --- a/distros/rolling/ecl-exceptions/default.nix +++ b/distros/rolling/ecl-exceptions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-exceptions"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_exceptions/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "717e0bf69e3eb4ac9504593bd28feb7a5175956eb529cc49ad0ce553991a239e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_exceptions/1.2.1-1"; + sha256 = "sha256-vSUx0IaohNthgxC/EHPPCyDY6YrVAcZUT4u5L099eA4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-filesystem/default.nix b/distros/rolling/ecl-filesystem/default.nix index ca6e8dd447..7bf7266fb5 100644 --- a/distros/rolling/ecl-filesystem/default.nix +++ b/distros/rolling/ecl-filesystem/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-filesystem"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_filesystem/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "a4a4e37b07ff11d8140949d5e4e2b54e380e34b4aed74ce37e8c1c8932cd36e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_filesystem/1.2.1-1"; + sha256 = "sha256-b9AmUCVBFQ84JFx0ER/eD+2NF6JP/zybtNFnzKAI+dg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-formatters/default.nix b/distros/rolling/ecl-formatters/default.nix index df041d0c0c..ef2e407de3 100644 --- a/distros/rolling/ecl-formatters/default.nix +++ b/distros/rolling/ecl-formatters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-formatters"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_formatters/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "ff92e9c767d8ef36d938f63b731ce3bb82efef170f26790f3f4e420c9616d119"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_formatters/1.2.1-1"; + sha256 = "sha256-KJ9Xhcl2ACKk7qJz2OTu+dVkgzMcvIBEwmXdl0NaiKg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-geometry/default.nix b/distros/rolling/ecl-geometry/default.nix index c3bebc1e18..2fb96156cf 100644 --- a/distros/rolling/ecl-geometry/default.nix +++ b/distros/rolling/ecl-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-geometry"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_geometry/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "79e177d2aa43c0355db4ed3cc15255d5ef04f269ea31abceb76eb0d950b49a86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_geometry/1.2.1-1"; + sha256 = "sha256-XXr9pl1hLn7gS04rAzdTRXa+Fe0p4Mn7sC0scLWC2Zc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-io/default.nix b/distros/rolling/ecl-io/default.nix index 6eeada64c8..1a16c2eadf 100644 --- a/distros/rolling/ecl-io/default.nix +++ b/distros/rolling/ecl-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-io"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/rolling/ecl_io/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "490e19659794363b5d4a53e6cbae19a0d85d5c89d6b2772cf14c4d1e16f468e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/rolling/ecl_io/1.2.0-1"; + sha256 = "sha256-I434FhFkRvH1CxPDYASTtfmyT/mK0OLoVA+VPEiSa24="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-ipc/default.nix b/distros/rolling/ecl-ipc/default.nix index 268a1671f5..4686405b92 100644 --- a/distros/rolling/ecl-ipc/default.nix +++ b/distros/rolling/ecl-ipc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-ipc"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_ipc/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "a52e551ac1dd6dca575ff4892fd79e45656488e785014bfceeaddf230cede909"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_ipc/1.2.1-1"; + sha256 = "sha256-VScic0GudpLDyw3R7bdxdgKjaPeyx0ynFGMpfB66eRo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-license/default.nix b/distros/rolling/ecl-license/default.nix index 75b9e1c03b..c732145849 100644 --- a/distros/rolling/ecl-license/default.nix +++ b/distros/rolling/ecl-license/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-license"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/rolling/ecl_license/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "73334e786fb9cd0574169dd73bc0919239ac1d0a111e38405a980c29850badcd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/rolling/ecl_license/1.0.3-1"; + sha256 = "sha256-7IkZyQJw9go1s2je+YLPGemSTMtC8PNA66qCC6akU6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ecl-linear-algebra/default.nix b/distros/rolling/ecl-linear-algebra/default.nix index b445623950..669348f60e 100644 --- a/distros/rolling/ecl-linear-algebra/default.nix +++ b/distros/rolling/ecl-linear-algebra/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-linear-algebra"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_linear_algebra/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "880b035dec854d3da5628edcc771bbc7e8d6fbf1c897c22728a20fbf9b8c9bc4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_linear_algebra/1.2.1-1"; + sha256 = "sha256-2Mofxug8ckLfTnStaTQtx69z6SvToiY8incBV3OMXJo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-lite/default.nix b/distros/rolling/ecl-lite/default.nix index c485252109..67841f53fe 100644 --- a/distros/rolling/ecl-lite/default.nix +++ b/distros/rolling/ecl-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-lite"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/rolling/ecl_lite/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "ba366d57f03b570721ea061d30a5e0a0b0d7137d7dcf42cbaf3f17f99ffe68dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/rolling/ecl_lite/1.2.0-1"; + sha256 = "sha256-pfGGGa3tTMW+9VEsHT0ofv7mnz478eGmJA10PjrEvJI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-manipulators/default.nix b/distros/rolling/ecl-manipulators/default.nix index f420253910..7c2d1a2dca 100644 --- a/distros/rolling/ecl-manipulators/default.nix +++ b/distros/rolling/ecl-manipulators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-manipulators"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_manipulators/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "2b7523ed7c5da28eab425982742775852fa2c4b9f104487d6e63139b17db9d85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_manipulators/1.2.1-1"; + sha256 = "sha256-O2B7UtubuHvctssWyG6E5OwnApjjdWF+m62+6Da9Qy4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-math/default.nix b/distros/rolling/ecl-math/default.nix index b47ce2639a..9b5b91a21f 100644 --- a/distros/rolling/ecl-math/default.nix +++ b/distros/rolling/ecl-math/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-math"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_math/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "f1590fa93b362876367398af70ae587ce05b6e23c615c5263175626e11454888"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_math/1.2.1-1"; + sha256 = "sha256-FJevrMf2MxF+heenjke0paV5yAvePcxmHcEW7Is+Pmc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-mobile-robot/default.nix b/distros/rolling/ecl-mobile-robot/default.nix index bcde4fd631..7011a35cb3 100644 --- a/distros/rolling/ecl-mobile-robot/default.nix +++ b/distros/rolling/ecl-mobile-robot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-mobile-robot"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_mobile_robot/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "ba62b857008f869caf53d16ad889ef233a06e0562512c6e4383618d88b570444"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_mobile_robot/1.2.1-1"; + sha256 = "sha256-NQJy3LdrqwiDAynl1fLCbDJz/A4qCxq6VpeaO+fr/4Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-mpl/default.nix b/distros/rolling/ecl-mpl/default.nix index 37b418147e..17f9c5926b 100644 --- a/distros/rolling/ecl-mpl/default.nix +++ b/distros/rolling/ecl-mpl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-mpl"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_mpl/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "e2f08429886359c70b2253ff673589a73e8a7313075232faf73ef96592b27b1b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_mpl/1.2.1-1"; + sha256 = "sha256-b7VJovFqbuLBco3qEl5r57uuO7wTyZrjQSNR6hNX00k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-sigslots-lite/default.nix b/distros/rolling/ecl-sigslots-lite/default.nix index 12d992553d..bd1d9a6de7 100644 --- a/distros/rolling/ecl-sigslots-lite/default.nix +++ b/distros/rolling/ecl-sigslots-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-sigslots-lite"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/rolling/ecl_sigslots_lite/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "ed9ae02df0d914c99a91fbb94c2c63407988575a98e36d72281fbddf5254d277"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/rolling/ecl_sigslots_lite/1.2.0-1"; + sha256 = "sha256-nGYQQNr6VnsCIPQoCQfLmIxpw1uEBrqSu1PjF4XPSxk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-sigslots/default.nix b/distros/rolling/ecl-sigslots/default.nix index c93e6915e1..454c0c6aba 100644 --- a/distros/rolling/ecl-sigslots/default.nix +++ b/distros/rolling/ecl-sigslots/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-sigslots"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_sigslots/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "8394b4d3a448ff81b67314918b324cdd74ee61373226bb7daaf9786e2741194a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_sigslots/1.2.1-1"; + sha256 = "sha256-c5lvTwI1CTmfeMKJsCuyr/ilN2KWeABt+RYdAxB9cdI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-statistics/default.nix b/distros/rolling/ecl-statistics/default.nix index 741d8d6c6c..b8ad68c844 100644 --- a/distros/rolling/ecl-statistics/default.nix +++ b/distros/rolling/ecl-statistics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-statistics"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_statistics/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "d9f374d8a3bde2a21659e7327a11195d47c2f40509724ccaac5277adfa3fcd85"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_statistics/1.2.1-1"; + sha256 = "sha256-znVdvA/1rSX25k4ZeeWg3ageP91ua9cDRosJ2FCTUyo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-streams/default.nix b/distros/rolling/ecl-streams/default.nix index 4f9475edb0..d7cb49dca7 100644 --- a/distros/rolling/ecl-streams/default.nix +++ b/distros/rolling/ecl-streams/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-streams"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_streams/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "7d1814038149305c75bad03d2c4acaebff34e7cfa8ec95788bd755abde96d036"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_streams/1.2.1-1"; + sha256 = "sha256-IpgY894/j+PnAx+KIYX8Wvb7yve2eAvnuYrKq0ZgX0s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-threads/default.nix b/distros/rolling/ecl-threads/default.nix index 6b99d7b960..1c07a7106d 100644 --- a/distros/rolling/ecl-threads/default.nix +++ b/distros/rolling/ecl-threads/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-threads"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_threads/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "2d6013ef139fe6a8274c79c9d733cc90efbdb889ea924efb49582f6402acad52"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_threads/1.2.1-1"; + sha256 = "sha256-4lhOg9DicobrUw8Xel3vSP7jrgFI9obXn6dYbQEyFHA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-time-lite/default.nix b/distros/rolling/ecl-time-lite/default.nix index 65519872b9..7e2292c8d1 100644 --- a/distros/rolling/ecl-time-lite/default.nix +++ b/distros/rolling/ecl-time-lite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-time-lite"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/rolling/ecl_time_lite/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "557bc9f5e17aec7a74a4bdecc8177f2f009edb19820f6ff70a45be42062b8990"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_lite-release"; + rev = "release/rolling/ecl_time_lite/1.2.0-1"; + sha256 = "sha256-xUWy6QEatAillIK/EUqV549irG+mWxeknSHHCLIkMT0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-time/default.nix b/distros/rolling/ecl-time/default.nix index b4aa62642e..1de12e7784 100644 --- a/distros/rolling/ecl-time/default.nix +++ b/distros/rolling/ecl-time/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-time"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_time/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "d2d95f96576dceee6dca19a6f386dfa9249d72e6c4926bbd7544633a101d92b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_time/1.2.1-1"; + sha256 = "sha256-SC1B6uuNMjWdHD10L5nXdVvgkguZSiwRc1i/zONxu5E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ecl-tools/default.nix b/distros/rolling/ecl-tools/default.nix index e64e75befa..41f9e63824 100644 --- a/distros/rolling/ecl-tools/default.nix +++ b/distros/rolling/ecl-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-tools"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/rolling/ecl_tools/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "d152618602e0e95ee322940bbbc94afe41f41631f6bd4b4b942b36ff7ba4828d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_tools-release"; + rev = "release/rolling/ecl_tools/1.0.3-1"; + sha256 = "sha256-z/lKRKqVLxiSJ9nSnQyQh/Dsk/+USiDw68+Nfg9Fc0U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ecl-type-traits/default.nix b/distros/rolling/ecl-type-traits/default.nix index c7d4f52d7e..8c7837171b 100644 --- a/distros/rolling/ecl-type-traits/default.nix +++ b/distros/rolling/ecl-type-traits/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-type-traits"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_type_traits/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "22500cb148f3e37fe5dda191a8dc8c80d1474687dd97625520189f6477f5ea01"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_type_traits/1.2.1-1"; + sha256 = "sha256-s8Qksqd5xzvMghgqo0aQ6r0Oyou3x5hgXLB5t3MvZVk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/ecl-utilities/default.nix b/distros/rolling/ecl-utilities/default.nix index e8254378a2..2b3bd0fa2e 100644 --- a/distros/rolling/ecl-utilities/default.nix +++ b/distros/rolling/ecl-utilities/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ecl-utilities"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/rolling/ecl_utilities/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "19f76bffe0cbf3542b68def315effed277d7625b3f8e835e4fda802ea12bc4af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "ecl_core-release"; + rev = "release/rolling/ecl_utilities/1.2.1-1"; + sha256 = "sha256-lr/gRtkjgtYbXIMwa5OUbaSehxs5kKRTATWgZooFnRA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/effort-controllers/default.nix b/distros/rolling/effort-controllers/default.nix index 4ddf0d58b5..77d8ee65da 100644 --- a/distros/rolling/effort-controllers/default.nix +++ b/distros/rolling/effort-controllers/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-manager, forward-command-controller, pluginlib, rclcpp, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-manager, forward-command-controller, pluginlib, rclcpp, ros2-control-test-assets }: buildRosPackage { pname = "ros-rolling-effort-controllers"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/effort_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "4671be67801af24f350fabad3f670b465997123d671f1992d237b959b2752aa1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/effort_controllers/3.1.0-1"; + sha256 = "sha256-UnyJsEQgaC18VOFN8/7le80Hin1jgDLSk+xoj0l8evU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ forward-command-controller rclcpp ]; + propagatedBuildInputs = [ backward-ros forward-command-controller rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/eigen-stl-containers/default.nix b/distros/rolling/eigen-stl-containers/default.nix index 87aeb99a2f..65f6bb0a2e 100644 --- a/distros/rolling/eigen-stl-containers/default.nix +++ b/distros/rolling/eigen-stl-containers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-eigen-stl-containers"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/eigen_stl_containers-release/archive/release/rolling/eigen_stl_containers/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "9005104113fe074994ed3804cb77ab62da46b48a7edacc667696bed8bb4ebf09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "eigen_stl_containers-release"; + rev = "release/rolling/eigen_stl_containers/1.0.0-3"; + sha256 = "sha256-Zjjaom5lCGLMKC33kq6er1Ji54XUj/3hkSIWcBnXI+E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/eigen3-cmake-module/default.nix b/distros/rolling/eigen3-cmake-module/default.nix index 12b9afbf0c..441a99f3df 100644 --- a/distros/rolling/eigen3-cmake-module/default.nix +++ b/distros/rolling/eigen3-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-eigen3-cmake-module"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/eigen3_cmake_module-release/archive/release/rolling/eigen3_cmake_module/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "e927a8bb63420ea16ccc83cf84a3153cee3f40a56390d251d8e093d67cadf26a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "eigen3_cmake_module-release"; + rev = "release/rolling/eigen3_cmake_module/0.2.1-1"; + sha256 = "sha256-HYzm0DrBm9AT+4eYJ6+turdRGtO4umPzTYfi/s/x3g4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/eigenpy/default.nix b/distros/rolling/eigenpy/default.nix index a0f274c172..cb8596c7f4 100644 --- a/distros/rolling/eigenpy/default.nix +++ b/distros/rolling/eigenpy/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, cmake, doxygen, eigen, git, python3, python3Packages }: buildRosPackage { pname = "ros-rolling-eigenpy"; - version = "2.8.1-r1"; + version = "2.9.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/eigenpy-release/archive/release/rolling/eigenpy/2.8.1-1.tar.gz"; - name = "2.8.1-1.tar.gz"; - sha256 = "e7923018e187d1cd43c8bdabe9af308c435dc43af36ffa46cebb7f4acf74fe76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "eigenpy-release"; + rev = "release/rolling/eigenpy/2.9.1-1"; + sha256 = "sha256-juoSzSnrZce3goJK0Szhl+SMr5yPzy/AoDt1OghCvWg="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git ]; diff --git a/distros/rolling/example-interfaces/default.nix b/distros/rolling/example-interfaces/default.nix index 8bad1ca627..02eb47bd12 100644 --- a/distros/rolling/example-interfaces/default.nix +++ b/distros/rolling/example-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-example-interfaces"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/example_interfaces-release/archive/release/rolling/example_interfaces/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "03fd197ac95a8530750e41a7ad0586ab003ad55cb845043c1c915067fdbced95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "example_interfaces-release"; + rev = "release/rolling/example_interfaces/0.10.1-1"; + sha256 = "sha256-31O3ZWxNv34N/J/ek2UYKuDiAsoY48eg3S06x7nBM2k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/examples-rclcpp-async-client/default.nix b/distros/rolling/examples-rclcpp-async-client/default.nix index cfc096a4ab..a5ed5869d7 100644 --- a/distros/rolling/examples-rclcpp-async-client/default.nix +++ b/distros/rolling/examples-rclcpp-async-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-async-client"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_async_client/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "f13ede4c399772189b0615fc09b1f4c861af3525ee7450078454dab0b29a1ec4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_async_client/0.16.2-1"; + sha256 = "sha256-bKiyFXtVfjLF2FNdEO+eCl1tn1onS9oPqDkBn9ml5Lg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-cbg-executor/default.nix b/distros/rolling/examples-rclcpp-cbg-executor/default.nix index ffa954f3dd..9e7b1f63dd 100644 --- a/distros/rolling/examples-rclcpp-cbg-executor/default.nix +++ b/distros/rolling/examples-rclcpp-cbg-executor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-cbg-executor"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_cbg_executor/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "ad6d8b95f7a4878dbfe1211e2fbda8378eafb0303463447ed811ec257eb8e286"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_cbg_executor/0.16.2-1"; + sha256 = "sha256-NM9nDBT+WGb1471IzS78G2tq43JNiLg4BHVY8+/X2OI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-minimal-action-client/default.nix b/distros/rolling/examples-rclcpp-minimal-action-client/default.nix index 87053e3491..00736d3873 100644 --- a/distros/rolling/examples-rclcpp-minimal-action-client/default.nix +++ b/distros/rolling/examples-rclcpp-minimal-action-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-minimal-action-client"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_minimal_action_client/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "3c7e673792c00a7eda1ed3e0f62b373f59db509a39a46641e96aeec1e4c5167d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_minimal_action_client/0.16.2-1"; + sha256 = "sha256-48RtSqY6U1y6CTwreOVnX2vschzKcYQ5LUcJGh2wgOI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-minimal-action-server/default.nix b/distros/rolling/examples-rclcpp-minimal-action-server/default.nix index 0841f59acc..5a2b17aab5 100644 --- a/distros/rolling/examples-rclcpp-minimal-action-server/default.nix +++ b/distros/rolling/examples-rclcpp-minimal-action-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-minimal-action-server"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_minimal_action_server/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "73f6920d0d2901295ebfae1d55c3e1d9cb1ae0c718136ea89083a5c399df6572"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_minimal_action_server/0.16.2-1"; + sha256 = "sha256-hz2K4YhVYmm5p/U0w5434vhMzEZZtSG/ujjiMZp7TLs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-minimal-client/default.nix b/distros/rolling/examples-rclcpp-minimal-client/default.nix index b85533164e..7703b54649 100644 --- a/distros/rolling/examples-rclcpp-minimal-client/default.nix +++ b/distros/rolling/examples-rclcpp-minimal-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-minimal-client"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_minimal_client/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "4ea51cdede621c1f1c39a40ad93fa8b723092eb2db8e7bf872c6afdd9b7fd00d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_minimal_client/0.16.2-1"; + sha256 = "sha256-XRs1bkSGPOmunEur11p+5FNF0kqivWr+MR6zK0Epg8g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-minimal-composition/default.nix b/distros/rolling/examples-rclcpp-minimal-composition/default.nix index 54d2f53eec..84abcc9fbf 100644 --- a/distros/rolling/examples-rclcpp-minimal-composition/default.nix +++ b/distros/rolling/examples-rclcpp-minimal-composition/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-minimal-composition"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_minimal_composition/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "f47c580425ddb57a931411547d054b4b040840b9f628170e36036a5b388858b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_minimal_composition/0.16.2-1"; + sha256 = "sha256-XccZbx6YSi/SZLDRHvQ1yAO3tEEZ3ZzMGqX8hnRq1Jg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-minimal-publisher/default.nix b/distros/rolling/examples-rclcpp-minimal-publisher/default.nix index 3e97a6446a..eace9b46fe 100644 --- a/distros/rolling/examples-rclcpp-minimal-publisher/default.nix +++ b/distros/rolling/examples-rclcpp-minimal-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-minimal-publisher"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_minimal_publisher/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "536f2f3886eb28dbe21318f6d9cf81b7b766f1dea8eb823793190cac8aacdbba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_minimal_publisher/0.16.2-1"; + sha256 = "sha256-5fDGzMotKwBL1CpP5JZHLz9rhHUNk1HB8WSTZUqc8bM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-minimal-service/default.nix b/distros/rolling/examples-rclcpp-minimal-service/default.nix index 23932721ac..155227ea01 100644 --- a/distros/rolling/examples-rclcpp-minimal-service/default.nix +++ b/distros/rolling/examples-rclcpp-minimal-service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-minimal-service"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_minimal_service/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "a41b566d2e61236a034363df99ec2e4b6498850560527a02093a5b8d8a3ade37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_minimal_service/0.16.2-1"; + sha256 = "sha256-0G5SucuLFgCdNzu1G5PrBdcLHGxoDX8B4eTV2fPY9Zo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-minimal-subscriber/default.nix b/distros/rolling/examples-rclcpp-minimal-subscriber/default.nix index c9d6672326..e4f32db62a 100644 --- a/distros/rolling/examples-rclcpp-minimal-subscriber/default.nix +++ b/distros/rolling/examples-rclcpp-minimal-subscriber/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-minimal-subscriber"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_minimal_subscriber/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "30ae89c4e2e22f68a38f0b6c5eb1b3bf1a784f356d56bf7a0d8c627eb272eaf7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_minimal_subscriber/0.16.2-1"; + sha256 = "sha256-YnyQ1lP/7Om2t17gXdbkXurKxO3YO9FTsHnRHWvSuRM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-minimal-timer/default.nix b/distros/rolling/examples-rclcpp-minimal-timer/default.nix index 11417c8c1c..42b40e57ac 100644 --- a/distros/rolling/examples-rclcpp-minimal-timer/default.nix +++ b/distros/rolling/examples-rclcpp-minimal-timer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-minimal-timer"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_minimal_timer/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "04f53a03fa232c3056b4087cb10f3cb42cf287ce10eb08388c34141fdcb8a049"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_minimal_timer/0.16.2-1"; + sha256 = "sha256-QIue7dvvzUykd5TK2yKRJf+aDTjmeKPtR8WkQcO9zw8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-multithreaded-executor/default.nix b/distros/rolling/examples-rclcpp-multithreaded-executor/default.nix index ef561d3113..cb3379f7e4 100644 --- a/distros/rolling/examples-rclcpp-multithreaded-executor/default.nix +++ b/distros/rolling/examples-rclcpp-multithreaded-executor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-multithreaded-executor"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_multithreaded_executor/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "3183408d70d4448d5f48e4a930bfc4155f0788c8c17f295d42e9356f076a30c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_multithreaded_executor/0.16.2-1"; + sha256 = "sha256-yvHNZeWwglmEnJ2zaMDzXkk1tG+xgIa6iHIasi+pQXE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclcpp-wait-set/default.nix b/distros/rolling/examples-rclcpp-wait-set/default.nix index b254e4f0b8..06ccd01079 100644 --- a/distros/rolling/examples-rclcpp-wait-set/default.nix +++ b/distros/rolling/examples-rclcpp-wait-set/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclcpp-wait-set"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclcpp_wait_set/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "1c20dc37ea3f683c6fcdcf05cd1f0ed8a0735914e01dc5f9b68994f70a6734ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclcpp_wait_set/0.16.2-1"; + sha256 = "sha256-peItFxyuhXk6d9dZStLOU+d4SXVEWh9SQlxcta+CiHM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/examples-rclpy-executors/default.nix b/distros/rolling/examples-rclpy-executors/default.nix index a09abe1bb3..cdde4015ef 100644 --- a/distros/rolling/examples-rclpy-executors/default.nix +++ b/distros/rolling/examples-rclpy-executors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-executors"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_executors/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "ac63f37e73289bdad7acc2bc21c7de8dddf65598e15544f1a0d640274a4ff263"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_executors/0.16.2-1"; + sha256 = "sha256-HPmCVSWGQc34o3Ep/6Q8Hu2cJD9LRwqKQbnDL1Jr71Y="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-rclpy-guard-conditions/default.nix b/distros/rolling/examples-rclpy-guard-conditions/default.nix index e229ad0ad5..0b18630012 100644 --- a/distros/rolling/examples-rclpy-guard-conditions/default.nix +++ b/distros/rolling/examples-rclpy-guard-conditions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-guard-conditions"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_guard_conditions/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "bc5a3142641ac76eb714d7ae637b61c51c7fa0b616c3e4793c7dcb23be7f28a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_guard_conditions/0.16.2-1"; + sha256 = "sha256-opSsTBfYzzF4x4NlOoeNI7I5XKM5Nw4txRJoo7Xso1E="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-rclpy-minimal-action-client/default.nix b/distros/rolling/examples-rclpy-minimal-action-client/default.nix index ac8dd7fad2..e239f89a68 100644 --- a/distros/rolling/examples-rclpy-minimal-action-client/default.nix +++ b/distros/rolling/examples-rclpy-minimal-action-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-minimal-action-client"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_minimal_action_client/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "728309bff6962ab3aa46c88f30832ec28faeddb98dada3ef3dbc993ac0584a5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_minimal_action_client/0.16.2-1"; + sha256 = "sha256-EqdUsv++SPJHT+ocBijeW0InHjrTP9+UVBsFX5T1Unw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-rclpy-minimal-action-server/default.nix b/distros/rolling/examples-rclpy-minimal-action-server/default.nix index 02494d34bc..4b0301df73 100644 --- a/distros/rolling/examples-rclpy-minimal-action-server/default.nix +++ b/distros/rolling/examples-rclpy-minimal-action-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-minimal-action-server"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_minimal_action_server/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "15a16be65e77abbe796cc6e79afd012f48fa376e0b48085250160aca7565515a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_minimal_action_server/0.16.2-1"; + sha256 = "sha256-gqGKAbYN2iFUtaZx3I+eUo+4fsDR8Qfv0WQoJs6b5co="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-rclpy-minimal-client/default.nix b/distros/rolling/examples-rclpy-minimal-client/default.nix index 8837c2d34a..0cc7d6aaca 100644 --- a/distros/rolling/examples-rclpy-minimal-client/default.nix +++ b/distros/rolling/examples-rclpy-minimal-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-minimal-client"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_minimal_client/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "e0b3b789272a4cf8a77c481c14d37c877e27f8dbca7a63a313768e3cad19cb0a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_minimal_client/0.16.2-1"; + sha256 = "sha256-GL4FkqupLz/eHF8X0D/NI5JbLvN/JqwlOfWZO0mq34o="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-rclpy-minimal-publisher/default.nix b/distros/rolling/examples-rclpy-minimal-publisher/default.nix index 9c03e0e81b..3030c4ab73 100644 --- a/distros/rolling/examples-rclpy-minimal-publisher/default.nix +++ b/distros/rolling/examples-rclpy-minimal-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-minimal-publisher"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_minimal_publisher/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "d34f282cdf7acdf233deced397b5a13adddcaff45a328cda07e198468c6e01fc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_minimal_publisher/0.16.2-1"; + sha256 = "sha256-iO3cWLdnQqJaTmOwVKVmtCgjHrreQbU8C8EEQY6RKB8="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-rclpy-minimal-service/default.nix b/distros/rolling/examples-rclpy-minimal-service/default.nix index ed2f7dc84e..5b334021d1 100644 --- a/distros/rolling/examples-rclpy-minimal-service/default.nix +++ b/distros/rolling/examples-rclpy-minimal-service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-minimal-service"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_minimal_service/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "af6e53f0421c304a47678238a12e1c3ba392f87e59af42018f6e77cf9a8cc5ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_minimal_service/0.16.2-1"; + sha256 = "sha256-JifdaHLUCYiPDKdSIXfOE5yAMzAseugNXfEdeJ02lEY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-rclpy-minimal-subscriber/default.nix b/distros/rolling/examples-rclpy-minimal-subscriber/default.nix index 23a99fc6b8..f4cae33720 100644 --- a/distros/rolling/examples-rclpy-minimal-subscriber/default.nix +++ b/distros/rolling/examples-rclpy-minimal-subscriber/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-minimal-subscriber"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_minimal_subscriber/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "dd801482c70013c3d948f76f2b0648f4411f803146a492a9be5b3c0e71bb558f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_minimal_subscriber/0.16.2-1"; + sha256 = "sha256-ZNxJZSFP5Fg4IgM7YCwWzHw8V+3FZVxSJdeZ9jFL8SM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-rclpy-pointcloud-publisher/default.nix b/distros/rolling/examples-rclpy-pointcloud-publisher/default.nix index 5abceea208..bf0f7d8fe5 100644 --- a/distros/rolling/examples-rclpy-pointcloud-publisher/default.nix +++ b/distros/rolling/examples-rclpy-pointcloud-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-rclpy-pointcloud-publisher"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/examples_rclpy_pointcloud_publisher/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "3e05d82d6539fb27c85513a5bb1455dd5095bd5494f0671df4e33caa919e7546"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/examples_rclpy_pointcloud_publisher/0.16.2-1"; + sha256 = "sha256-M3iDfKzCA++fvDUPxTb+Z3On5cJ1xc8LF2ahketvv10="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/examples-tf2-py/default.nix b/distros/rolling/examples-tf2-py/default.nix index 58fbd4568b..80074ca474 100644 --- a/distros/rolling/examples-tf2-py/default.nix +++ b/distros/rolling/examples-tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-examples-tf2-py"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/examples_tf2_py/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "f3489a6d18ec3419f2cced24df336ad6249b45eb5031c7d8132852e861d91d2f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/examples_tf2_py/0.29.0-1"; + sha256 = "sha256-Th3sRahNzkO71Jd6AhONFoaGgozMwVgI/+jqcVS83/Y="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/fastcdr/default.nix b/distros/rolling/fastcdr/default.nix index 485a4f1d8b..5947911045 100644 --- a/distros/rolling/fastcdr/default.nix +++ b/distros/rolling/fastcdr/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-fastcdr"; version = "1.0.24-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fastcdr-release/archive/release/rolling/fastcdr/1.0.24-2.tar.gz"; - name = "1.0.24-2.tar.gz"; - sha256 = "abd9ad1d4b1a7644bc9f27d06c16a79c79215955ed31715242187c11b9418a7c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fastcdr-release"; + rev = "release/rolling/fastcdr/1.0.24-2"; + sha256 = "sha256-c3xN1mu7qNZyR0MBb923pa0a69z/QGvWtYRN6aJtDq4="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/fastrtps-cmake-module/default.nix b/distros/rolling/fastrtps-cmake-module/default.nix index 3dcb21e111..57a0058462 100644 --- a/distros/rolling/fastrtps-cmake-module/default.nix +++ b/distros/rolling/fastrtps-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-fastrtps-cmake-module"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/rolling/fastrtps_cmake_module/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "186b9e88d995bf4f59db42c240d7efed3d52e80c055592245ee6875c2e2fa56e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/rolling/fastrtps_cmake_module/2.4.0-1"; + sha256 = "sha256-dTaPI6kFyVge9SLIKM6oMyEf+b8o2mJ8Pq30J5endJU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/fastrtps/default.nix b/distros/rolling/fastrtps/default.nix index 7cc2d4ea77..70b410e60a 100644 --- a/distros/rolling/fastrtps/default.nix +++ b/distros/rolling/fastrtps/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, asio, cmake, fastcdr, foonathan-memory-vendor, openssl, python3, tinyxml-2 }: buildRosPackage { pname = "ros-rolling-fastrtps"; - version = "2.8.1-r1"; + version = "2.9.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fastrtps-release/archive/release/rolling/fastrtps/2.8.1-1.tar.gz"; - name = "2.8.1-1.tar.gz"; - sha256 = "ebce9ce9badb2b94dff408ad83fab286d69f41f173ef01dd0a90af87d90581a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fastrtps-release"; + rev = "release/rolling/fastrtps/2.9.1-1"; + sha256 = "sha256-SLW0wC6aWAA+CfsNLaZ7wU2pAnPaDfVYPr5LB4R8zZ8="; + }; buildType = "cmake"; buildInputs = [ asio cmake ]; diff --git a/distros/rolling/filters/default.nix b/distros/rolling/filters/default.nix index bddd233051..0982643ccd 100644 --- a/distros/rolling/filters/default.nix +++ b/distros/rolling/filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-filters"; version = "2.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/filters-release/archive/release/rolling/filters/2.1.0-2.tar.gz"; - name = "2.1.0-2.tar.gz"; - sha256 = "ab701f4a433ed54676587904878ceaf46f8c1f2cdd378e88e194e11537430525"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "filters-release"; + rev = "release/rolling/filters/2.1.0-2"; + sha256 = "sha256-Re52fPUttgC8YnZIBEC84USVr2a80IwbqJd14I2klNc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/find-object-2d/default.nix b/distros/rolling/find-object-2d/default.nix index 027ce12b0e..c940e45bcb 100644 --- a/distros/rolling/find-object-2d/default.nix +++ b/distros/rolling/find-object-2d/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-find-object-2d"; version = "0.7.0-r2"; - src = fetchurl { - url = "https://github.com/introlab/find_object_2d-release/archive/release/rolling/find_object_2d/0.7.0-2.tar.gz"; - name = "0.7.0-2.tar.gz"; - sha256 = "17a2b3050d92508fd8cd0b4b67c54de682180ebb11a2c80be7d14b276a31b474"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "introlab"; + repo = "find_object_2d-release"; + rev = "release/rolling/find_object_2d/0.7.0-2"; + sha256 = "sha256-KtLe1v52K9gb/p4t0Yqdkc99Hgi67wNcFpmguOilOnA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/rolling/fluent-rviz/default.nix b/distros/rolling/fluent-rviz/default.nix index e2ffb4210a..1b7726cdb1 100644 --- a/distros/rolling/fluent-rviz/default.nix +++ b/distros/rolling/fluent-rviz/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-fluent-rviz"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fluent_rviz-release/archive/release/rolling/fluent_rviz/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "cd05e1b0a15e8a5107fac33aa5a632e642ab458ca79a0c840a5773415fd611b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fluent_rviz-release"; + rev = "release/rolling/fluent_rviz/0.0.3-1"; + sha256 = "sha256-/LmzIiGEHhv+jlon28dyJAjyB233kvyupBzUS01rdjA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/fmi-adapter-examples/default.nix b/distros/rolling/fmi-adapter-examples/default.nix index acf4f39288..1c197e2da5 100644 --- a/distros/rolling/fmi-adapter-examples/default.nix +++ b/distros/rolling/fmi-adapter-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-fmi-adapter-examples"; version = "2.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmi_adapter-release/archive/release/rolling/fmi_adapter_examples/2.1.1-2.tar.gz"; - name = "2.1.1-2.tar.gz"; - sha256 = "6003d546393860cc7a15eaacc0a3426ec3e9e3ee0187e54128c74484c843807a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmi_adapter-release"; + rev = "release/rolling/fmi_adapter_examples/2.1.1-2"; + sha256 = "sha256-R5kjXvGqUx+ux+q1zgh54sd5aNSXWSJ1edV01iOh5Fc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/fmi-adapter/default.nix b/distros/rolling/fmi-adapter/default.nix index ca3f85c64a..16dee830b3 100644 --- a/distros/rolling/fmi-adapter/default.nix +++ b/distros/rolling/fmi-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-fmi-adapter"; version = "2.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmi_adapter-release/archive/release/rolling/fmi_adapter/2.1.1-2.tar.gz"; - name = "2.1.1-2.tar.gz"; - sha256 = "6d78acb9a8142111da89acd32ec9bf1f7dd4924d084a951b5bc4d5ebd0aef7af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmi_adapter-release"; + rev = "release/rolling/fmi_adapter/2.1.1-2"; + sha256 = "sha256-pC2a5q3fbSAGFRlotIahHSzRm+tJOBSAjho9Q70/otU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake fmilibrary-vendor ]; diff --git a/distros/rolling/fmilibrary-vendor/default.nix b/distros/rolling/fmilibrary-vendor/default.nix index d41bf1342c..33d15ecc33 100644 --- a/distros/rolling/fmilibrary-vendor/default.nix +++ b/distros/rolling/fmilibrary-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-fmilibrary-vendor"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/fmilibrary_vendor-release/archive/release/rolling/fmilibrary_vendor/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "e0140366a25ed7526aea9fafe643819f2fe5ce71d594b581202df8b5337a756d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "fmilibrary_vendor-release"; + rev = "release/rolling/fmilibrary_vendor/1.0.1-2"; + sha256 = "sha256-RwFS1j6Bue1ac96cXWL4i1A+KcMFWctqGRc0ZGeTR70="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/foonathan-memory-vendor/default.nix b/distros/rolling/foonathan-memory-vendor/default.nix index f85718332f..1981fd5cbf 100644 --- a/distros/rolling/foonathan-memory-vendor/default.nix +++ b/distros/rolling/foonathan-memory-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-foonathan-memory-vendor"; version = "1.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foonathan_memory_vendor-release/archive/release/rolling/foonathan_memory_vendor/1.2.0-2.tar.gz"; - name = "1.2.0-2.tar.gz"; - sha256 = "9d2a22bf1705848296358cf00acbfc697a84420d5166f43cca27d1dabd8b7aec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foonathan_memory_vendor-release"; + rev = "release/rolling/foonathan_memory_vendor/1.2.0-2"; + sha256 = "sha256-0DgqmgXZ9PpV/sf51//kHGZGB6L/VNySZf+o8dWcCE4="; + }; buildType = "cmake"; buildInputs = [ git ]; diff --git a/distros/rolling/force-torque-sensor-broadcaster/default.nix b/distros/rolling/force-torque-sensor-broadcaster/default.nix index 5f8bcd9a49..cf4ebd6b48 100644 --- a/distros/rolling/force-torque-sensor-broadcaster/default.nix +++ b/distros/rolling/force-torque-sensor-broadcaster/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-interface, controller-manager, generate-parameter-library, geometry-msgs, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-interface, controller-manager, generate-parameter-library, geometry-msgs, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets }: buildRosPackage { pname = "ros-rolling-force-torque-sensor-broadcaster"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/force_torque_sensor_broadcaster/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "4c826bbff9dc7dced28c3de8ca60ee29ce90823697dbe50988e2a5e11a4ed49a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/force_torque_sensor_broadcaster/3.1.0-1"; + sha256 = "sha256-2DTuMN1g4tD4ZI/+AtXqz+781wk48PyYvpihr+guzlM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock controller-manager hardware-interface ros2-control-test-assets ]; - propagatedBuildInputs = [ controller-interface generate-parameter-library geometry-msgs hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools ]; + propagatedBuildInputs = [ backward-ros controller-interface generate-parameter-library geometry-msgs hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/forward-command-controller/default.nix b/distros/rolling/forward-command-controller/default.nix index 5c4c1f9484..066696a240 100644 --- a/distros/rolling/forward-command-controller/default.nix +++ b/distros/rolling/forward-command-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, std-msgs }: buildRosPackage { pname = "ros-rolling-forward-command-controller"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/forward_command_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "4434ead7bb5cb87ece4007caff8739004df304b41cc86e5befe048c63356f9b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/forward_command_controller/3.1.0-1"; + sha256 = "sha256-UlXnS+QiWmiNPUIaboEYyEqzkHW0WrQkoh7r/jY4P5w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ controller-interface generate-parameter-library hardware-interface rclcpp rclcpp-lifecycle realtime-tools std-msgs ]; + propagatedBuildInputs = [ backward-ros controller-interface generate-parameter-library hardware-interface rclcpp rclcpp-lifecycle realtime-tools std-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/four-wheel-steering-msgs/default.nix b/distros/rolling/four-wheel-steering-msgs/default.nix index 3c1073c174..0dcdf305fd 100644 --- a/distros/rolling/four-wheel-steering-msgs/default.nix +++ b/distros/rolling/four-wheel-steering-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-four-wheel-steering-msgs"; version = "2.0.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/four_wheel_steering_msgs-release/archive/release/rolling/four_wheel_steering_msgs/2.0.1-2.tar.gz"; - name = "2.0.1-2.tar.gz"; - sha256 = "fecf71f171d85b6902483d2152ffa1038ab96ca5707694cd0defc7f098a136a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "four_wheel_steering_msgs-release"; + rev = "release/rolling/four_wheel_steering_msgs/2.0.1-2"; + sha256 = "sha256-lESkZ6d2jUSfCCCB5KsV8gJwBTO0EG7O4/LInYggSzc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/foxglove-bridge/default.nix b/distros/rolling/foxglove-bridge/default.nix index 0edf591acc..84377f8b67 100644 --- a/distros/rolling/foxglove-bridge/default.nix +++ b/distros/rolling/foxglove-bridge/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-cpp, ament-lint-auto, asio, nlohmann_json, openssl, rclcpp, rclcpp-components, ros-environment, rosgraph-msgs, std-msgs, websocketpp }: buildRosPackage { pname = "ros-rolling-foxglove-bridge"; - version = "0.2.2-r1"; + version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/foxglove_bridge-release/archive/release/rolling/foxglove_bridge/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "6725f9692a22c0789e44acfa22df5227ff65a4e86542f578dcd938dcbedf8560"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "foxglove_bridge-release"; + rev = "release/rolling/foxglove_bridge/0.3.0-1"; + sha256 = "sha256-wRnMOoLOn6E7TrYny2wfwmQuOqnYt2T/ru+L/9ua1Tk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake asio nlohmann_json ros-environment websocketpp ]; diff --git a/distros/rolling/foxglove-msgs/default.nix b/distros/rolling/foxglove-msgs/default.nix index aab6b8c014..9731f8e49c 100644 --- a/distros/rolling/foxglove-msgs/default.nix +++ b/distros/rolling/foxglove-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-foxglove-msgs"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_foxglove_msgs-release/archive/release/rolling/foxglove_msgs/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "37e15337561216b4181df8b70fecb1bbf46075a99b878909308be53f38380363"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_foxglove_msgs-release"; + rev = "release/rolling/foxglove_msgs/2.1.1-1"; + sha256 = "sha256-WVd87BSDwF+o7s/HMSXhpwvIBHYpp6J263sCn635ILE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/rolling/gazebo-dev/default.nix b/distros/rolling/gazebo-dev/default.nix index 9f0b1f0a9c..cdfdbb5320 100644 --- a/distros/rolling/gazebo-dev/default.nix +++ b/distros/rolling/gazebo-dev/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gazebo-dev"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/rolling/gazebo_dev/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "40a3c8d3dde74997d0e43e6aa9356c3f03e98ade66b04fd56856c31b4ec241dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/rolling/gazebo_dev/3.7.0-1"; + sha256 = "sha256-mrueslrQTjk6YEdaHeKosgUwED/y28Lamkk7Xu2FW8Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/gazebo-msgs/default.nix b/distros/rolling/gazebo-msgs/default.nix index 38b50d6c0d..ca40476232 100644 --- a/distros/rolling/gazebo-msgs/default.nix +++ b/distros/rolling/gazebo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gazebo-msgs"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/rolling/gazebo_msgs/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "d83c91f1f1034132a90d3bbfdee33b029090f23eb368cebf328c45ff6d8f949d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/rolling/gazebo_msgs/3.7.0-1"; + sha256 = "sha256-UEKtnD23be8+FhZoXcZ5WNX/ki81mNNmoreVf2LEcHM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/gazebo-plugins/default.nix b/distros/rolling/gazebo-plugins/default.nix index 69e0b283d8..bfc00eed28 100644 --- a/distros/rolling/gazebo-plugins/default.nix +++ b/distros/rolling/gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gazebo-plugins"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/rolling/gazebo_plugins/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "4a3d07df59810de337de12bd0c65fc5c576bd325c606fd31cac0e83eaebb6bd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/rolling/gazebo_plugins/3.7.0-1"; + sha256 = "sha256-WIdWb0AYx07PFWwH/o1Du5im1crwunrAhf50PZV8cZQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/gazebo-ros-pkgs/default.nix b/distros/rolling/gazebo-ros-pkgs/default.nix index 73679f40fa..436087036d 100644 --- a/distros/rolling/gazebo-ros-pkgs/default.nix +++ b/distros/rolling/gazebo-ros-pkgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gazebo-ros-pkgs"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/rolling/gazebo_ros_pkgs/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "f60f23e289944fb8a2e3730e3a90d140141170c56912c433dc94135567f72556"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/rolling/gazebo_ros_pkgs/3.7.0-1"; + sha256 = "sha256-FXZ3pJ6bNIk5o2Om5C+LOP3dCWr3gXPqxUDI4J9GV20="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/gazebo-ros/default.nix b/distros/rolling/gazebo-ros/default.nix index 0b4b3c5f1a..c2579cfe70 100644 --- a/distros/rolling/gazebo-ros/default.nix +++ b/distros/rolling/gazebo-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gazebo-ros"; version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/rolling/gazebo_ros/3.7.0-1.tar.gz"; - name = "3.7.0-1.tar.gz"; - sha256 = "4618c86d85ab32b1975d9dfcc316b42579e61173c3525e2bb9f3b4eb2fd80b23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros_pkgs-release"; + rev = "release/rolling/gazebo_ros/3.7.0-1"; + sha256 = "sha256-UNmsqu6Ze0LnEV7B9vv751AnDxri5MEcMDx7AAiBwOE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/gazebo-ros2-control-demos/default.nix b/distros/rolling/gazebo-ros2-control-demos/default.nix index 0954621db6..4731d45d7b 100644 --- a/distros/rolling/gazebo-ros2-control-demos/default.nix +++ b/distros/rolling/gazebo-ros2-control-demos/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-python, ament-lint-auto, ament-lint-common, control-msgs, diff-drive-controller, effort-controllers, gazebo-ros, gazebo-ros2-control, geometry-msgs, hardware-interface, joint-state-broadcaster, joint-trajectory-controller, launch, launch-ros, rclcpp, rclcpp-action, robot-state-publisher, ros2-control, ros2-controllers, std-msgs, velocity-controllers, xacro }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-python, ament-lint-auto, ament-lint-common, control-msgs, diff-drive-controller, effort-controllers, gazebo-ros, gazebo-ros2-control, geometry-msgs, hardware-interface, joint-state-broadcaster, joint-trajectory-controller, launch, launch-ros, rclcpp, rclcpp-action, robot-state-publisher, ros2-control, ros2-controllers, std-msgs, tricycle-controller, velocity-controllers, xacro }: buildRosPackage { pname = "ros-rolling-gazebo-ros2-control-demos"; - version = "0.4.0-r1"; + version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros2_control-release/archive/release/rolling/gazebo_ros2_control_demos/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "d040b7884aabef824145f576f3245fd11794e8188bf1d199ef5a7116385379f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros2_control-release"; + rev = "release/rolling/gazebo_ros2_control_demos/0.5.0-1"; + sha256 = "sha256-4oFQCId6g6uSz4mLyE/CxJ1VLwP8JkcGd8G6pSltsZs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rclcpp-action ]; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ ament-index-python control-msgs diff-drive-controller effort-controllers gazebo-ros gazebo-ros2-control geometry-msgs hardware-interface joint-state-broadcaster joint-trajectory-controller launch launch-ros rclcpp robot-state-publisher ros2-control ros2-controllers std-msgs velocity-controllers xacro ]; + propagatedBuildInputs = [ ament-index-python control-msgs diff-drive-controller effort-controllers gazebo-ros gazebo-ros2-control geometry-msgs hardware-interface joint-state-broadcaster joint-trajectory-controller launch launch-ros rclcpp robot-state-publisher ros2-control ros2-controllers std-msgs tricycle-controller velocity-controllers xacro ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/gazebo-ros2-control/default.nix b/distros/rolling/gazebo-ros2-control/default.nix index d6fb4ee8ed..7e6f07c56b 100644 --- a/distros/rolling/gazebo-ros2-control/default.nix +++ b/distros/rolling/gazebo-ros2-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, angles, controller-manager, gazebo-dev, gazebo-ros, hardware-interface, pluginlib, rclcpp, std-msgs, yaml-cpp-vendor }: buildRosPackage { pname = "ros-rolling-gazebo-ros2-control"; - version = "0.4.0-r1"; + version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gazebo_ros2_control-release/archive/release/rolling/gazebo_ros2_control/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "2915b045d65af06d3484d531f9c222d5ce18269bc766054d07a91f3469d6c009"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gazebo_ros2_control-release"; + rev = "release/rolling/gazebo_ros2_control/0.5.0-1"; + sha256 = "sha256-eCQEcRKKpo6gG2boc8Ky2shIPf0qIzkXsFBxakE3SH0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/gc-spl-2022/default.nix b/distros/rolling/gc-spl-2022/default.nix index c740d2df47..3cc176dc0f 100644 --- a/distros/rolling/gc-spl-2022/default.nix +++ b/distros/rolling/gc-spl-2022/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gc-spl-2022"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/rolling/gc_spl_2022/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "05f0ba9a4adce1d3ea5e825514d042f5990580cb8e007faf90fb92f8647650fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/rolling/gc_spl_2022/3.0.0-1"; + sha256 = "sha256-Uy+4opcd3FM+qUn2qdy3wMyjl7I8TPw4gT3gfVmQ7JQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/generate-parameter-library-example/default.nix b/distros/rolling/generate-parameter-library-example/default.nix index 0adac37530..a205d79313 100644 --- a/distros/rolling/generate-parameter-library-example/default.nix +++ b/distros/rolling/generate-parameter-library-example/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-generate-parameter-library-example"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/generate_parameter_library-release/archive/release/rolling/generate_parameter_library_example/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "262673b779d9f5c21aa06b8053697168f036b5716d7ff5ae1bec703c5cba7559"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "generate_parameter_library-release"; + rev = "release/rolling/generate_parameter_library_example/0.3.0-1"; + sha256 = "sha256-hH6ARQmZWvProM7nvmi+RWSycC93HYWVrMbULnw6AyA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/generate-parameter-library-py/default.nix b/distros/rolling/generate-parameter-library-py/default.nix index d778640f96..470b094072 100644 --- a/distros/rolling/generate-parameter-library-py/default.nix +++ b/distros/rolling/generate-parameter-library-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-generate-parameter-library-py"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/generate_parameter_library-release/archive/release/rolling/generate_parameter_library_py/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "56ffaab075a10bf55863dac1a0039c3155fe5ee02dac06ec1d9d125fff3094cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "generate_parameter_library-release"; + rev = "release/rolling/generate_parameter_library_py/0.3.0-1"; + sha256 = "sha256-5bTniyP8on8ZMXyGUkFKS2AT7IyI8yGgeOnw8WflxMM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright pythonPackages.pytest ]; diff --git a/distros/rolling/generate-parameter-library/default.nix b/distros/rolling/generate-parameter-library/default.nix index 12295ce22a..48e908aa76 100644 --- a/distros/rolling/generate-parameter-library/default.nix +++ b/distros/rolling/generate-parameter-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-generate-parameter-library"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/generate_parameter_library-release/archive/release/rolling/generate_parameter_library/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "9f89dd2e285abb4d4762ad93d9711451b1c065adf32566a93195e8a5fe9491da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "generate_parameter_library-release"; + rev = "release/rolling/generate_parameter_library/0.3.0-1"; + sha256 = "sha256-roGeZanzoZNM9V5/iae41ikNVpsMi924g9fPD48wflw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/generated.nix b/distros/rolling/generated.nix index d9075d0b36..d272f5a0e6 100644 --- a/distros/rolling/generated.nix +++ b/distros/rolling/generated.nix @@ -154,6 +154,10 @@ self: super: { apriltag = self.callPackage ./apriltag {}; + apriltag-msgs = self.callPackage ./apriltag-msgs {}; + + apriltag-ros = self.callPackage ./apriltag-ros {}; + aruco-opencv = self.callPackage ./aruco-opencv {}; aruco-opencv-msgs = self.callPackage ./aruco-opencv-msgs {}; @@ -210,6 +214,8 @@ self: super: { cartographer-rviz = self.callPackage ./cartographer-rviz {}; + cascade-lifecycle-msgs = self.callPackage ./cascade-lifecycle-msgs {}; + chomp-motion-planner = self.callPackage ./chomp-motion-planner {}; class-loader = self.callPackage ./class-loader {}; @@ -260,10 +266,14 @@ self: super: { diagnostic-aggregator = self.callPackage ./diagnostic-aggregator {}; + diagnostic-common-diagnostics = self.callPackage ./diagnostic-common-diagnostics {}; + diagnostic-msgs = self.callPackage ./diagnostic-msgs {}; diagnostic-updater = self.callPackage ./diagnostic-updater {}; + diagnostics = self.callPackage ./diagnostics {}; + diff-drive-controller = self.callPackage ./diff-drive-controller {}; dolly = self.callPackage ./dolly {}; @@ -588,6 +598,8 @@ self: super: { joy-teleop = self.callPackage ./joy-teleop {}; + joy-tester = self.callPackage ./joy-tester {}; + kdl-parser = self.callPackage ./kdl-parser {}; key-teleop = self.callPackage ./key-teleop {}; @@ -958,6 +970,8 @@ self: super: { position-controllers = self.callPackage ./position-controllers {}; + py-trees = self.callPackage ./py-trees {}; + py-trees-ros-interfaces = self.callPackage ./py-trees-ros-interfaces {}; pybind11-json-vendor = self.callPackage ./pybind11-json-vendor {}; @@ -1046,6 +1060,8 @@ self: super: { rclcpp-action = self.callPackage ./rclcpp-action {}; + rclcpp-cascade-lifecycle = self.callPackage ./rclcpp-cascade-lifecycle {}; + rclcpp-components = self.callPackage ./rclcpp-components {}; rclcpp-lifecycle = self.callPackage ./rclcpp-lifecycle {}; @@ -1282,6 +1298,8 @@ self: super: { rosbag2-performance-benchmarking = self.callPackage ./rosbag2-performance-benchmarking {}; + rosbag2-performance-benchmarking-msgs = self.callPackage ./rosbag2-performance-benchmarking-msgs {}; + rosbag2-py = self.callPackage ./rosbag2-py {}; rosbag2-storage = self.callPackage ./rosbag2-storage {}; diff --git a/distros/rolling/geodesy/default.nix b/distros/rolling/geodesy/default.nix index 37b2f63a09..2556ab3e56 100644 --- a/distros/rolling/geodesy/default.nix +++ b/distros/rolling/geodesy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-geodesy"; version = "1.0.4-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geographic_info-release/archive/release/rolling/geodesy/1.0.4-5.tar.gz"; - name = "1.0.4-5.tar.gz"; - sha256 = "52de865618ce1c63b8f4c91d82c3368c1de63fb466fc9f0d44563b77c1305d63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geographic_info-release"; + rev = "release/rolling/geodesy/1.0.4-5"; + sha256 = "sha256-Mzm8AWuKEp7IOCpF3+LvcThDlbjh5/5D9ftJVe7R1AA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.catkin-pkg ]; diff --git a/distros/rolling/geographic-info/default.nix b/distros/rolling/geographic-info/default.nix index 45c65540be..9934aa2c13 100644 --- a/distros/rolling/geographic-info/default.nix +++ b/distros/rolling/geographic-info/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-geographic-info"; version = "1.0.4-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geographic_info-release/archive/release/rolling/geographic_info/1.0.4-5.tar.gz"; - name = "1.0.4-5.tar.gz"; - sha256 = "198c754db78ae53be82c8288ea2091736814ab5cf2094119365781bf91203753"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geographic_info-release"; + rev = "release/rolling/geographic_info/1.0.4-5"; + sha256 = "sha256-Fem5FLsZ+lxPuX8NgnKK7k543+bE3uOlVAPQ/5sMLJM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/geographic-msgs/default.nix b/distros/rolling/geographic-msgs/default.nix index f41eaa43b0..b2b8987429 100644 --- a/distros/rolling/geographic-msgs/default.nix +++ b/distros/rolling/geographic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-geographic-msgs"; version = "1.0.4-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geographic_info-release/archive/release/rolling/geographic_msgs/1.0.4-5.tar.gz"; - name = "1.0.4-5.tar.gz"; - sha256 = "220ee05d6bdb3c2317fdbe27d800a0cd4d4836c4517157474f02a663825a06f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geographic_info-release"; + rev = "release/rolling/geographic_msgs/1.0.4-5"; + sha256 = "sha256-hbbW+QtNX3HdOdRx5JgV/D7VzcaZoXAPuiFiOWfvpQI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/geometric-shapes/default.nix b/distros/rolling/geometric-shapes/default.nix index cb47518643..9b07812138 100644 --- a/distros/rolling/geometric-shapes/default.nix +++ b/distros/rolling/geometric-shapes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-geometric-shapes"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometric_shapes-release/archive/release/rolling/geometric_shapes/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "a73718985a665eb751d4a94d3ef2a9bffae29b59437ed70fe5d75fd643da425f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometric_shapes-release"; + rev = "release/rolling/geometric_shapes/2.1.3-1"; + sha256 = "sha256-Z8bt1wMFIfgQRfYat6fCd9hEKtS2qf8Wzbz+0hA+xzo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config rosidl-default-generators ]; diff --git a/distros/rolling/geometry-msgs/default.nix b/distros/rolling/geometry-msgs/default.nix index 8522965a93..ebab379b12 100644 --- a/distros/rolling/geometry-msgs/default.nix +++ b/distros/rolling/geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-geometry-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/geometry_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "e92170c52c9ddf9a0bce4c03a10243dd1570fbcee8b7fb9728b784463b9f10cb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/geometry_msgs/4.6.1-1"; + sha256 = "sha256-7b2Iqd+YCLyQVDUsY4opDv2TJzHvu+VWKETt5POoBsg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/geometry-tutorials/default.nix b/distros/rolling/geometry-tutorials/default.nix index 8bba9533ba..2bcb3e8798 100644 --- a/distros/rolling/geometry-tutorials/default.nix +++ b/distros/rolling/geometry-tutorials/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-geometry-tutorials"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/rolling/geometry_tutorials/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "4916738beadc2cbb6611476669bf7e17cb9bea9d0ea1cdddd7f1c7be3e2b71d5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/rolling/geometry_tutorials/0.3.6-1"; + sha256 = "sha256-Cy6+rG9fkARM6Pr7xFDRN/CEObs8kkLsxj+qr4W2h0U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/geometry2/default.nix b/distros/rolling/geometry2/default.nix index 0c86a33ea2..2603587b75 100644 --- a/distros/rolling/geometry2/default.nix +++ b/distros/rolling/geometry2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-geometry2"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/geometry2/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "4a4eaf2e4e8966895d708525b429da2f8b6036377d17cb66e3ca850cda5433a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/geometry2/0.29.0-1"; + sha256 = "sha256-+Y52vG12sq+2AHp7iccwedHi/lSzvnok6T0oJPNUg4s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/gmock-vendor/default.nix b/distros/rolling/gmock-vendor/default.nix index deaf31e1af..afab432da7 100644 --- a/distros/rolling/gmock-vendor/default.nix +++ b/distros/rolling/gmock-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gmock-vendor"; version = "1.10.9004-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/googletest-release/archive/release/rolling/gmock_vendor/1.10.9004-3.tar.gz"; - name = "1.10.9004-3.tar.gz"; - sha256 = "60bf125799482d3491d56c10a279a59511ff0e213fdef62edc4935a8b65272d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "googletest-release"; + rev = "release/rolling/gmock_vendor/1.10.9004-3"; + sha256 = "sha256-9a2mzifX5WZ65XB00MXj/2Sx29pzlnH/SsUHvRc/n8g="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/google-benchmark-vendor/default.nix b/distros/rolling/google-benchmark-vendor/default.nix index a2f40d3cee..0a5a3eadea 100644 --- a/distros/rolling/google-benchmark-vendor/default.nix +++ b/distros/rolling/google-benchmark-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-google-benchmark-vendor"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/google_benchmark_vendor-release/archive/release/rolling/google_benchmark_vendor/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "f8c6450cd814d1699c9138ad7d3c9ba741e3efa4f3de87954458990f8a77036b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "google_benchmark_vendor-release"; + rev = "release/rolling/google_benchmark_vendor/0.2.0-1"; + sha256 = "sha256-zLIBIsRJUiN/60pItbmX+5QMyoL1MGjbJudYS9yuJP8="; + }; buildType = "cmake"; buildInputs = [ cmake git ]; diff --git a/distros/rolling/gps-msgs/default.nix b/distros/rolling/gps-msgs/default.nix index 367d2e3983..99fcab78ce 100644 --- a/distros/rolling/gps-msgs/default.nix +++ b/distros/rolling/gps-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gps-msgs"; version = "1.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gps_umd-release/archive/release/rolling/gps_msgs/1.0.4-2.tar.gz"; - name = "1.0.4-2.tar.gz"; - sha256 = "f3b3c438bea122cfb339e02edefd058dd70f76956621ed36091830dcf17afeed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gps_umd-release"; + rev = "release/rolling/gps_msgs/1.0.4-2"; + sha256 = "sha256-iltmQJlA5iAtRPGIepzY6Z6F2X/oCZDgMJGqGC1NNDQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/gps-tools/default.nix b/distros/rolling/gps-tools/default.nix index b95eaba183..f31ffee64b 100644 --- a/distros/rolling/gps-tools/default.nix +++ b/distros/rolling/gps-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gps-tools"; version = "1.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gps_umd-release/archive/release/rolling/gps_tools/1.0.4-2.tar.gz"; - name = "1.0.4-2.tar.gz"; - sha256 = "55c51a6fac8c67e59c3e5bb4952ecc34d0574d0688361ca9435caf077af1bfe1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gps_umd-release"; + rev = "release/rolling/gps_tools/1.0.4-2"; + sha256 = "sha256-a5M/+7i+icLvBEIote2loEZnOP3/xdJ1+xo8RteS8Xg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/gps-umd/default.nix b/distros/rolling/gps-umd/default.nix index cee69c40ed..5f1a76d3b7 100644 --- a/distros/rolling/gps-umd/default.nix +++ b/distros/rolling/gps-umd/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gps-umd"; version = "1.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gps_umd-release/archive/release/rolling/gps_umd/1.0.4-2.tar.gz"; - name = "1.0.4-2.tar.gz"; - sha256 = "b4b12686aff3f62942d3884d4b4d9980ce9193751350f902abe5f8b84998d3bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gps_umd-release"; + rev = "release/rolling/gps_umd/1.0.4-2"; + sha256 = "sha256-Pxfv1FZznAbN+lK9n7uoMEItczKj//qS+sjed3Xte4s="; + }; buildType = "catkin"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/gpsd-client/default.nix b/distros/rolling/gpsd-client/default.nix index 2a84dfbf32..ee2ac61dd2 100644 --- a/distros/rolling/gpsd-client/default.nix +++ b/distros/rolling/gpsd-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gpsd-client"; version = "1.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gps_umd-release/archive/release/rolling/gpsd_client/1.0.4-2.tar.gz"; - name = "1.0.4-2.tar.gz"; - sha256 = "405c16d603cc5abc55bc54f98b3414d2b9afb57916b8f0a233806ddb4f9caefc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gps_umd-release"; + rev = "release/rolling/gpsd_client/1.0.4-2"; + sha256 = "sha256-P4dlJySWrBf26c3Bmchjgh5ln3A6p76PsN3uGpwh9L0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/graph-msgs/default.nix b/distros/rolling/graph-msgs/default.nix index 4d2a3ff7eb..c4aae53aff 100644 --- a/distros/rolling/graph-msgs/default.nix +++ b/distros/rolling/graph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-graph-msgs"; version = "0.2.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/graph_msgs-release/archive/release/rolling/graph_msgs/0.2.0-2.tar.gz"; - name = "0.2.0-2.tar.gz"; - sha256 = "e7c4aa1ee31fbb2acaad5a1cbef09ab401054e78635865d95359e985964ddb56"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "graph_msgs-release"; + rev = "release/rolling/graph_msgs/0.2.0-2"; + sha256 = "sha256-Zs/vEflqm3Ft6PVC5rmE7JAj2pPFja8QAhBxSsH93dg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/grbl-msgs/default.nix b/distros/rolling/grbl-msgs/default.nix index c36179f1ce..978e3608df 100644 --- a/distros/rolling/grbl-msgs/default.nix +++ b/distros/rolling/grbl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-grbl-msgs"; version = "0.0.2-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grbl_msgs-release/archive/release/rolling/grbl_msgs/0.0.2-5.tar.gz"; - name = "0.0.2-5.tar.gz"; - sha256 = "419964fa85ad2daeb39a57fa763019303e9db10cf712b9b331228883be90ef34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grbl_msgs-release"; + rev = "release/rolling/grbl_msgs/0.0.2-5"; + sha256 = "sha256-cjvc4arr+Z92IcwzqZryuU4FC2MY+FNpA+6JBe0dhiE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/grbl-ros/default.nix b/distros/rolling/grbl-ros/default.nix index 4424b5ef89..979c562e48 100644 --- a/distros/rolling/grbl-ros/default.nix +++ b/distros/rolling/grbl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-grbl-ros"; version = "0.0.16-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/grbl_ros-release/archive/release/rolling/grbl_ros/0.0.16-3.tar.gz"; - name = "0.0.16-3.tar.gz"; - sha256 = "18d5caf2661ca669134deed089c334919f520ca3cd0dafa1f531c1894b531f95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "grbl_ros-release"; + rev = "release/rolling/grbl_ros/0.0.16-3"; + sha256 = "sha256-uOD7K0XcDuU2nIY8KOYAsZRn0oQDjKcQzC+O4TjR3pE="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.pyserial ]; diff --git a/distros/rolling/gripper-controllers/default.nix b/distros/rolling/gripper-controllers/default.nix index 94f99a0cab..bacc86d5a3 100644 --- a/distros/rolling/gripper-controllers/default.nix +++ b/distros/rolling/gripper-controllers/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, control-msgs, control-toolbox, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-action, realtime-tools, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, control-msgs, control-toolbox, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-action, realtime-tools, ros2-control-test-assets }: buildRosPackage { pname = "ros-rolling-gripper-controllers"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/gripper_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "12351df636c897753adc1c4676df112f933ff644343bcea865c7775dd958c3b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/gripper_controllers/3.1.0-1"; + sha256 = "sha256-sATEQCeClOLWSTFsnr813T9atpIyu602Gepa5KKQjs8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ control-msgs control-toolbox controller-interface generate-parameter-library hardware-interface rclcpp rclcpp-action realtime-tools ]; + propagatedBuildInputs = [ backward-ros control-msgs control-toolbox controller-interface generate-parameter-library hardware-interface rclcpp rclcpp-action realtime-tools ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/gscam/default.nix b/distros/rolling/gscam/default.nix index f54ca39473..11ccaf9820 100644 --- a/distros/rolling/gscam/default.nix +++ b/distros/rolling/gscam/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gscam"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gscam-release/archive/release/rolling/gscam/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "14cbe4d872ed71ddabd59d41a3c1e55bbc00feab71cef00d449b65d810444c7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gscam-release"; + rev = "release/rolling/gscam/2.0.2-1"; + sha256 = "sha256-CKQzdZxZ6OZeWkirhmcrfJhb0hNN0vSimKIRHSUDT3k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/gtest-vendor/default.nix b/distros/rolling/gtest-vendor/default.nix index 7f9d6853e0..2e403f76a3 100644 --- a/distros/rolling/gtest-vendor/default.nix +++ b/distros/rolling/gtest-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-gtest-vendor"; version = "1.10.9004-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/googletest-release/archive/release/rolling/gtest_vendor/1.10.9004-3.tar.gz"; - name = "1.10.9004-3.tar.gz"; - sha256 = "5a023d69d03459948a5ca9d69911bea9e2dbbb176080c425738997fcaf72ae45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "googletest-release"; + rev = "release/rolling/gtest_vendor/1.10.9004-3"; + sha256 = "sha256-u2gx0IqMkxU6eLi5phF25OuU1T4HZuCuIhQBi48RXYM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/hardware-interface/default.nix b/distros/rolling/hardware-interface/default.nix index b99fe5c2e4..e5c4566299 100644 --- a/distros/rolling/hardware-interface/default.nix +++ b/distros/rolling/hardware-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, control-msgs, lifecycle-msgs, pluginlib, rclcpp-lifecycle, rcpputils, rcutils, ros2-control-test-assets, tinyxml2-vendor }: buildRosPackage { pname = "ros-rolling-hardware-interface"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/hardware_interface/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "53e9397bf6e5901eafcae1ece7399393fe4d5a96394cfa0b135616b7b7efe63e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/hardware_interface/3.7.0-1"; + sha256 = "sha256-dfDmpI0s4OvkHMXb0v1uqPc13SAx+bF45p0zt2DmW0k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/hash-library-vendor/default.nix b/distros/rolling/hash-library-vendor/default.nix index 463c752908..3cdb489a5c 100644 --- a/distros/rolling/hash-library-vendor/default.nix +++ b/distros/rolling/hash-library-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-hash-library-vendor"; version = "0.1.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/hash_library_vendor-release/archive/release/rolling/hash_library_vendor/0.1.1-2.tar.gz"; - name = "0.1.1-2.tar.gz"; - sha256 = "c8d3148d35c93aa7848f312e6623267b3cd2801a81dc7b8c6e08b6672a66d965"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "hash_library_vendor-release"; + rev = "release/rolling/hash_library_vendor/0.1.1-2"; + sha256 = "sha256-/aXRAfmumq2WRfhcS24fzeg13YY+hDi9NQYpVUQNR6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto git ]; diff --git a/distros/rolling/hls-lfcd-lds-driver/default.nix b/distros/rolling/hls-lfcd-lds-driver/default.nix index b2c78837e5..24f507e78a 100644 --- a/distros/rolling/hls-lfcd-lds-driver/default.nix +++ b/distros/rolling/hls-lfcd-lds-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-hls-lfcd-lds-driver"; version = "2.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/hls_lfcd_lds_driver-release/archive/release/rolling/hls_lfcd_lds_driver/2.0.4-2.tar.gz"; - name = "2.0.4-2.tar.gz"; - sha256 = "7c5db1900d270ca7c35af140b5e8aedafb4cea532257d3d45a6b91bd29ff7f0f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "hls_lfcd_lds_driver-release"; + rev = "release/rolling/hls_lfcd_lds_driver/2.0.4-2"; + sha256 = "sha256-IC90bdvcThGSViEWkM2aKIB6ZLYxKU5WrzcqDDmO7Aw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/hpp-fcl/default.nix b/distros/rolling/hpp-fcl/default.nix index d0a019de89..b243dba70a 100644 --- a/distros/rolling/hpp-fcl/default.nix +++ b/distros/rolling/hpp-fcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-hpp-fcl"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/hpp_fcl-release/archive/release/rolling/hpp-fcl/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "5816642c80a414c2c9aede70f50438c137b8d8ff156bfc24d8710d517fb07445"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "hpp_fcl-release"; + rev = "release/rolling/hpp-fcl/2.2.0-1"; + sha256 = "sha256-49mQlinFO8OV7StlVR4t1AyeVBCAbwUOCCYMMaGwf94="; + }; buildType = "cmake"; buildInputs = [ cmake doxygen git python3Packages.lxml ]; diff --git a/distros/rolling/iceoryx-binding-c/default.nix b/distros/rolling/iceoryx-binding-c/default.nix index 6a968f74fc..dcbde5a867 100644 --- a/distros/rolling/iceoryx-binding-c/default.nix +++ b/distros/rolling/iceoryx-binding-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-iceoryx-binding-c"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/iceoryx-release/archive/release/rolling/iceoryx_binding_c/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "9dbd62e3905781498fabf30d430893d1f86ef6dda88466e83c8dd8a4663bc490"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "iceoryx-release"; + rev = "release/rolling/iceoryx_binding_c/2.0.2-1"; + sha256 = "sha256-bYKtG1mrp/9TmmCt2BRAtbAsvOY5zYMpTKhZNuniXcg="; + }; buildType = "cmake"; buildInputs = [ cmake iceoryx-hoofs iceoryx-posh ]; diff --git a/distros/rolling/iceoryx-hoofs/default.nix b/distros/rolling/iceoryx-hoofs/default.nix index 3f21306b2c..ea7cd93496 100644 --- a/distros/rolling/iceoryx-hoofs/default.nix +++ b/distros/rolling/iceoryx-hoofs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-iceoryx-hoofs"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/iceoryx-release/archive/release/rolling/iceoryx_hoofs/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "619364471b6b461c1b3edf8d507f9b5332b7b166c9f7b6660aca9f68e4ded00c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "iceoryx-release"; + rev = "release/rolling/iceoryx_hoofs/2.0.2-1"; + sha256 = "sha256-Rp1PfAjOoTn1F97oI/pkwePNPqZ2GOmbh/M5RwIgHvU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/iceoryx-posh/default.nix b/distros/rolling/iceoryx-posh/default.nix index 66724d83bc..7ed14fc217 100644 --- a/distros/rolling/iceoryx-posh/default.nix +++ b/distros/rolling/iceoryx-posh/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-iceoryx-posh"; version = "2.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/iceoryx-release/archive/release/rolling/iceoryx_posh/2.0.2-1.tar.gz"; - name = "2.0.2-1.tar.gz"; - sha256 = "58c382b5cfe4dad232bece0416a18ae847bbd876d0e2c5b3904e232bb0858a43"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "iceoryx-release"; + rev = "release/rolling/iceoryx_posh/2.0.2-1"; + sha256 = "sha256-P4HeIkdRap//axiH0seXCvNf5vCYpd2eImkztWl275M="; + }; buildType = "cmake"; buildInputs = [ cmake git ]; diff --git a/distros/rolling/ifm3d-core/default.nix b/distros/rolling/ifm3d-core/default.nix index 35695d37b5..ff62e88958 100644 --- a/distros/rolling/ifm3d-core/default.nix +++ b/distros/rolling/ifm3d-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ifm3d-core"; version = "0.18.0-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ifm3d-release/archive/release/rolling/ifm3d_core/0.18.0-6.tar.gz"; - name = "0.18.0-6.tar.gz"; - sha256 = "d8c37c96f9cf13545977b65839b0bec9db17ca39320b5191c1530b025bec6b1a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ifm3d-release"; + rev = "release/rolling/ifm3d_core/0.18.0-6"; + sha256 = "sha256-uR93fGa2he8/x1p8bZM2xobrFhbm7cnUGAw341qYlOE="; + }; buildType = "cmake"; buildInputs = [ boost cmake ]; diff --git a/distros/rolling/ign-ros2-control-demos/default.nix b/distros/rolling/ign-ros2-control-demos/default.nix index 7b05ed349d..6cb976e431 100644 --- a/distros/rolling/ign-ros2-control-demos/default.nix +++ b/distros/rolling/ign-ros2-control-demos/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ 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 }: +{ 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, ros2launch, std-msgs, tricycle-controller, velocity-controllers, xacro }: buildRosPackage { pname = "ros-rolling-ign-ros2-control-demos"; - version = "0.5.0-r1"; + version = "0.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ign_ros2_control-release/archive/release/rolling/ign_ros2_control_demos/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "d9a2dd78c4069b28092f64e7cf23bc40211ff92ca2fc1dc0082102bf5d3a64b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ign_ros2_control-release"; + rev = "release/rolling/ign_ros2_control_demos/0.6.0-1"; + sha256 = "sha256-Z4fGLh8w8ZhhGx3zEP5pmqkcyYMkGuqk0kFSU6UJakA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rclcpp-action ]; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ ament-index-python 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 robot-state-publisher ros-ign-gazebo ros2controlcli std-msgs velocity-controllers xacro ]; + propagatedBuildInputs = [ ament-index-python 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 robot-state-publisher ros-ign-gazebo ros2controlcli ros2launch std-msgs tricycle-controller velocity-controllers xacro ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/ignition-cmake2-vendor/default.nix b/distros/rolling/ignition-cmake2-vendor/default.nix index 01035414e0..b69593acd4 100644 --- a/distros/rolling/ignition-cmake2-vendor/default.nix +++ b/distros/rolling/ignition-cmake2-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ignition-cmake2-vendor"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ignition_cmake2_vendor-release/archive/release/rolling/ignition_cmake2_vendor/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "0d57fe9bdc1c2328c2c4f7020a11575464f39cd8c4d172bd885659b2ab31adf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ignition_cmake2_vendor-release"; + rev = "release/rolling/ignition_cmake2_vendor/0.0.2-1"; + sha256 = "sha256-bZxidfrsqkCbbKbqdgbiC7SuwHBPMfR+/87ZeJpKzZY="; + }; buildType = "cmake"; buildInputs = [ ament-cmake-test cmake doxygen git ]; diff --git a/distros/rolling/ignition-math6-vendor/default.nix b/distros/rolling/ignition-math6-vendor/default.nix index 4fc0a0d5b3..38251b8481 100644 --- a/distros/rolling/ignition-math6-vendor/default.nix +++ b/distros/rolling/ignition-math6-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ignition-math6-vendor"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ignition_math6_vendor-release/archive/release/rolling/ignition_math6_vendor/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "b5dce2e3cca9f97c52f41616ad1c43c16c16feda0f67e4b427e41b3173e11a17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ignition_math6_vendor-release"; + rev = "release/rolling/ignition_math6_vendor/0.0.2-1"; + sha256 = "sha256-HR32tjvnD5KaVPw4YWj43yrNsA3PGhuwcALJlBciHYQ="; + }; buildType = "cmake"; buildInputs = [ ament-cmake-test cmake eigen git ]; diff --git a/distros/rolling/image-common/default.nix b/distros/rolling/image-common/default.nix index 6c3e233498..b04755c283 100644 --- a/distros/rolling/image-common/default.nix +++ b/distros/rolling/image-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-common"; version = "4.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/rolling/image_common/4.1.1-1.tar.gz"; - name = "4.1.1-1.tar.gz"; - sha256 = "50643154a7d713aae4805f26dd61ca5f79dc6df4b7e9c92db6c153311bf46eef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/rolling/image_common/4.1.1-1"; + sha256 = "sha256-H5ZGcJjEEG7Y1J//HlSSsc90quzq3wt8w73LCLCTP/M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/image-geometry/default.nix b/distros/rolling/image-geometry/default.nix index 24bc5ed716..4166be0673 100644 --- a/distros/rolling/image-geometry/default.nix +++ b/distros/rolling/image-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-geometry"; version = "3.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/rolling/image_geometry/3.4.0-1.tar.gz"; - name = "3.4.0-1.tar.gz"; - sha256 = "8c069e621f0782bd9f6f3a52c3f83cdd1648e7d374aec6808244e6ccd74d8a87"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/rolling/image_geometry/3.4.0-1"; + sha256 = "sha256-906rFxvVs8/lmvQFj1xxV/qwyGLNGb1zMeXW0h3Q/H0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros ]; diff --git a/distros/rolling/image-pipeline/default.nix b/distros/rolling/image-pipeline/default.nix index 662825b7fe..c1ee89dc49 100644 --- a/distros/rolling/image-pipeline/default.nix +++ b/distros/rolling/image-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-pipeline"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/image_pipeline/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "2b2c4719031a37a4e171f3c90e1816e6942d9644a3bbc5235960ad6c1cc5b335"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/image_pipeline/3.0.1-1"; + sha256 = "sha256-OxK9LwrniFfRpA4z1dcsboo8Y9nQEi4xtzrpa8Rv4kU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/image-proc/default.nix b/distros/rolling/image-proc/default.nix index ebc5e407b2..11eee888e8 100644 --- a/distros/rolling/image-proc/default.nix +++ b/distros/rolling/image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-proc"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/image_proc/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "f8408ae8ff2ff93fe5c9b36c7cec37e4b01a8afdacc343e4dac44104f12d0aa6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/image_proc/3.0.1-1"; + sha256 = "sha256-LF+CUjTJxxZEw/JjwgwxJ7RWfM3Yf5DqZb/YOcuS2TM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/image-publisher/default.nix b/distros/rolling/image-publisher/default.nix index b711b571be..5baf9ebc2b 100644 --- a/distros/rolling/image-publisher/default.nix +++ b/distros/rolling/image-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-publisher"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/image_publisher/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "ba3fe7ea277aa9e995a03fb514956f2b977661afdf94e0d5b12794e42322cfb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/image_publisher/3.0.1-1"; + sha256 = "sha256-k4+TCzE59mefv1hV1qUuhHcT6Iv0B8celAX1EsPAEl4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/image-rotate/default.nix b/distros/rolling/image-rotate/default.nix index 0e3f704fcc..daddc982eb 100644 --- a/distros/rolling/image-rotate/default.nix +++ b/distros/rolling/image-rotate/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-rotate"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/image_rotate/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "438fc0aa24d6003daeea37da398380c52d6a9bda29c44d0c89127f9c271ccdf5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/image_rotate/3.0.1-1"; + sha256 = "sha256-LBsnSxfsqXa7ZzNWvETRMXeJgY9UdyXXUjPBf8lvVQI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto class-loader ]; diff --git a/distros/rolling/image-tools/default.nix b/distros/rolling/image-tools/default.nix index 8618a9d29a..9503f369e4 100644 --- a/distros/rolling/image-tools/default.nix +++ b/distros/rolling/image-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-tools"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/image_tools/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "ad07f02e5268b4830f3c97bccca67bc349aa2b9175260c8a0d676cf0b6c2cf8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/image_tools/0.23.0-1"; + sha256 = "sha256-vDOlltB9PJ6zi0Y4TFcWB4m4sqRkvXxjjr4wOYnBtZI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/image-transport-plugins/default.nix b/distros/rolling/image-transport-plugins/default.nix index 0b39e0a097..46be9ffb59 100644 --- a/distros/rolling/image-transport-plugins/default.nix +++ b/distros/rolling/image-transport-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-transport-plugins"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/rolling/image_transport_plugins/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "fe0a5a166db24bfcf567d40d6ca4ba464edbb3d713fd1943abbbd978175ddf56"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_transport_plugins-release"; + rev = "release/rolling/image_transport_plugins/2.6.0-1"; + sha256 = "sha256-NFeN64pix7JCZcQ5R3tfgX3mowXoLfjhkTeA1aD+Iic="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/image-transport/default.nix b/distros/rolling/image-transport/default.nix index 453e63c5d6..a7a175001f 100644 --- a/distros/rolling/image-transport/default.nix +++ b/distros/rolling/image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-transport"; version = "4.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_common-release/archive/release/rolling/image_transport/4.1.1-1.tar.gz"; - name = "4.1.1-1.tar.gz"; - sha256 = "612bb4a124dfaa46c1ce406928359205706fa7c37ba06d2edfc7e6e8c56af22d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_common-release"; + rev = "release/rolling/image_transport/4.1.1-1"; + sha256 = "sha256-VD2Ig9F2D0YnR9VDYGk90YWhg/jOzz6YtmfOyO9gO/I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/image-view/default.nix b/distros/rolling/image-view/default.nix index cc239b963b..096d18cefb 100644 --- a/distros/rolling/image-view/default.nix +++ b/distros/rolling/image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-image-view"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/image_view/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "dcdfbd9303512d83abfcc08bde2c0789d91e7cc427e460e42917f704cad6faa1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/image_view/3.0.1-1"; + sha256 = "sha256-OcgUX7o7LNbFIiORrWT1LqJDmfbjhCIbZ87Yylp8XzE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/imu-complementary-filter/default.nix b/distros/rolling/imu-complementary-filter/default.nix index dccfdd1489..ca4e4be9c5 100644 --- a/distros/rolling/imu-complementary-filter/default.nix +++ b/distros/rolling/imu-complementary-filter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-imu-complementary-filter"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/rolling/imu_complementary_filter/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "cb1de27942f8d287274b6b34fec1617c10f9e419e51d6ebf3d3874853cbdd9dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/rolling/imu_complementary_filter/2.1.3-1"; + sha256 = "sha256-wuAsf255PYh35JCpP4czKRL9rKu2pxO/i4NOMSETePc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake geometry-msgs message-filters rclcpp sensor-msgs std-msgs tf2 tf2-ros ]; diff --git a/distros/rolling/imu-filter-madgwick/default.nix b/distros/rolling/imu-filter-madgwick/default.nix index f0a8a16992..688b42d1e1 100644 --- a/distros/rolling/imu-filter-madgwick/default.nix +++ b/distros/rolling/imu-filter-madgwick/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-imu-filter-madgwick"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/rolling/imu_filter_madgwick/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "b858b5eff23b3ae5428dd3a938e47e32a0d9a07c3fa63f367fb7321e547a859d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/rolling/imu_filter_madgwick/2.1.3-1"; + sha256 = "sha256-w1yVzPSVadsRmFRs1oZ8HEZ6DXYiezID3dunE9J6VUY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/imu-sensor-broadcaster/default.nix b/distros/rolling/imu-sensor-broadcaster/default.nix index 4fa1a66cdf..5805b6e64e 100644 --- a/distros/rolling/imu-sensor-broadcaster/default.nix +++ b/distros/rolling/imu-sensor-broadcaster/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, sensor-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, backward-ros, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, sensor-msgs }: buildRosPackage { pname = "ros-rolling-imu-sensor-broadcaster"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/imu_sensor_broadcaster/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "000d513f723db6387e84c8d42b2f4064fdfc3800ad9f05a0f5cf6c64718b7db6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/imu_sensor_broadcaster/3.1.0-1"; + sha256 = "sha256-9TBzFy2LceZ+yiH9rXtjfhufRnPSf7T9OS3PJ95x7Tk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock ament-lint-auto ament-lint-common controller-manager hardware-interface ros2-control-test-assets ]; - propagatedBuildInputs = [ controller-interface generate-parameter-library hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools sensor-msgs ]; + propagatedBuildInputs = [ backward-ros controller-interface generate-parameter-library hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools sensor-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/imu-tools/default.nix b/distros/rolling/imu-tools/default.nix index 4ca5e8f8ca..1e5f2aa38e 100644 --- a/distros/rolling/imu-tools/default.nix +++ b/distros/rolling/imu-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-imu-tools"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/rolling/imu_tools/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "2bd95d3f4b0f9efa2e5404ddb696c1eafccb97cb31961434a5e6fc5e46881003"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/rolling/imu_tools/2.1.3-1"; + sha256 = "sha256-+i6Cvdit5GQDlcCdOUAFdg6ESROTgWjJQ1IqxGC94Ug="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/interactive-markers/default.nix b/distros/rolling/interactive-markers/default.nix index e8e732f695..71e3090cb4 100644 --- a/distros/rolling/interactive-markers/default.nix +++ b/distros/rolling/interactive-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-interactive-markers"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/interactive_markers-release/archive/release/rolling/interactive_markers/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "400c1702d152e66c5d179ff0afe222ef9cf37b961c608c8ce67775fea30c9acb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "interactive_markers-release"; + rev = "release/rolling/interactive_markers/2.3.2-1"; + sha256 = "sha256-AOue7aI9DAZ4GHtHtOAPRcV7DJ0zvONib2v2n+DIggY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/intra-process-demo/default.nix b/distros/rolling/intra-process-demo/default.nix index dc68fe8f61..a23e2d8f9e 100644 --- a/distros/rolling/intra-process-demo/default.nix +++ b/distros/rolling/intra-process-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-intra-process-demo"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/intra_process_demo/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "2dc030e2c49944e053966eeed62da9bc3bdec86c23e3c28f4b4d189fd16678fd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/intra_process_demo/0.23.0-1"; + sha256 = "sha256-GO7twzLlSocs7Nw2nwbptUg/4OF1Rb4+e447yIs0yrE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake std-msgs ]; diff --git a/distros/rolling/io-context/default.nix b/distros/rolling/io-context/default.nix index 405e86a97c..81c19d709c 100644 --- a/distros/rolling/io-context/default.nix +++ b/distros/rolling/io-context/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-io-context"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/rolling/io_context/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "dcf1498467b854ae8a37f6db511eec382411ec161c893fc061062cc3d9f66764"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "transport_drivers-release"; + rev = "release/rolling/io_context/1.2.0-1"; + sha256 = "sha256-RINF/bmOZEexBa8eMAkn2J1r1NOrze8SI3fx1t/ywak="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/rolling/joint-limits/default.nix b/distros/rolling/joint-limits/default.nix index bb89fdcf56..92abe5d2f0 100644 --- a/distros/rolling/joint-limits/default.nix +++ b/distros/rolling/joint-limits/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, launch-testing-ament-cmake, rclcpp, rclcpp-lifecycle }: buildRosPackage { pname = "ros-rolling-joint-limits"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/joint_limits/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "a83ebcd914684de00cae7e0a8803a602bb13c3688cfa22ff5ac4cd711acb9f0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/joint_limits/3.7.0-1"; + sha256 = "sha256-IfRbwEF//5O0nur7eYTlfE2r8n+3OWB/zR7+fieZjP8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/joint-state-broadcaster/default.nix b/distros/rolling/joint-state-broadcaster/default.nix index 1be615b7c0..30e7c56678 100644 --- a/distros/rolling/joint-state-broadcaster/default.nix +++ b/distros/rolling/joint-state-broadcaster/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, control-msgs, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, rcutils, realtime-tools, ros2-control-test-assets, sensor-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, control-msgs, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, rcutils, realtime-tools, ros2-control-test-assets, sensor-msgs }: buildRosPackage { pname = "ros-rolling-joint-state-broadcaster"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/joint_state_broadcaster/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "30c806fa235b31d0a8686fc7be5930dd1b94fcd383302b0c5d90904fa1554f08"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/joint_state_broadcaster/3.1.0-1"; + sha256 = "sha256-Nfi/VVy7FRS6JUNKfM/vGPriYXWU5jC3DGhyRNPRxAU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock controller-manager rclcpp ros2-control-test-assets ]; - propagatedBuildInputs = [ control-msgs controller-interface generate-parameter-library hardware-interface pluginlib rclcpp-lifecycle rcutils realtime-tools sensor-msgs ]; + propagatedBuildInputs = [ backward-ros control-msgs controller-interface generate-parameter-library hardware-interface pluginlib rclcpp-lifecycle rcutils realtime-tools sensor-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/joint-state-publisher-gui/default.nix b/distros/rolling/joint-state-publisher-gui/default.nix index 0ddc9922d7..a75c4ef530 100644 --- a/distros/rolling/joint-state-publisher-gui/default.nix +++ b/distros/rolling/joint-state-publisher-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-joint-state-publisher-gui"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joint_state_publisher-release/archive/release/rolling/joint_state_publisher_gui/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "9c6c71a32544b1a9702c4267b17642c8d2e416143decd31b3301cfcaf740f53a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/rolling/joint_state_publisher_gui/2.3.0-1"; + sha256 = "sha256-UgpMKR1spc/YH/Bs30Gifn/Ov9lC+cuHmXgs+d4a7I8="; + }; buildType = "ament_python"; propagatedBuildInputs = [ joint-state-publisher python-qt-binding rclpy ]; diff --git a/distros/rolling/joint-state-publisher/default.nix b/distros/rolling/joint-state-publisher/default.nix index f653e92f5f..c373740c6a 100644 --- a/distros/rolling/joint-state-publisher/default.nix +++ b/distros/rolling/joint-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-joint-state-publisher"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joint_state_publisher-release/archive/release/rolling/joint_state_publisher/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "407aa8a3c76ffd64ad1a21a8b37d941dbef688ae0cf1b50573ca3b982d5402fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joint_state_publisher-release"; + rev = "release/rolling/joint_state_publisher/2.3.0-1"; + sha256 = "sha256-JA4xQ4bvMon+tXWHg/JOBSFOkDPo6TGZcqjsZn08hyk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-xmllint launch-testing launch-testing-ros pythonPackages.pytest ros2topic ]; diff --git a/distros/rolling/joint-trajectory-controller/default.nix b/distros/rolling/joint-trajectory-controller/default.nix index e043b358aa..b6a3db5426 100644 --- a/distros/rolling/joint-trajectory-controller/default.nix +++ b/distros/rolling/joint-trajectory-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, angles, control-msgs, control-toolbox, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, trajectory-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, angles, backward-ros, control-msgs, control-toolbox, controller-interface, controller-manager, generate-parameter-library, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, realtime-tools, ros2-control-test-assets, rsl, tl-expected, trajectory-msgs }: buildRosPackage { pname = "ros-rolling-joint-trajectory-controller"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/joint_trajectory_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "483ab741370479d9beed37480f47c3f8204dd2c419cefd6eaab1af6aafff8b5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/joint_trajectory_controller/3.1.0-1"; + sha256 = "sha256-3m/Mgbu9tNX7X8XxJq9Pqtnad+/qee5V2Rz+5UCozKw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ angles control-msgs control-toolbox controller-interface generate-parameter-library hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools trajectory-msgs ]; + propagatedBuildInputs = [ angles backward-ros control-msgs control-toolbox controller-interface generate-parameter-library hardware-interface pluginlib rclcpp rclcpp-lifecycle realtime-tools rsl tl-expected trajectory-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/joy-linux/default.nix b/distros/rolling/joy-linux/default.nix index cc98ca7c36..d36402d6e5 100644 --- a/distros/rolling/joy-linux/default.nix +++ b/distros/rolling/joy-linux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-joy-linux"; version = "3.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/rolling/joy_linux/3.1.0-2.tar.gz"; - name = "3.1.0-2.tar.gz"; - sha256 = "cab183b440552dcd1ae15fc0612361fb5da27839abdd3a6da2d5d0390a7c7355"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/rolling/joy_linux/3.1.0-2"; + sha256 = "sha256-Ud7B/decJ0vqf/8LrcWatgTku5IS5sZ34MW8VWp23vE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/joy-teleop/default.nix b/distros/rolling/joy-teleop/default.nix index 134b5b3496..19e29f7e16 100644 --- a/distros/rolling/joy-teleop/default.nix +++ b/distros/rolling/joy-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-joy-teleop"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/rolling/joy_teleop/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "9c8eb136a4a3bce477c30e76484d3966570591a274383716dbc0d9d3aed13692"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/rolling/joy_teleop/1.3.0-2"; + sha256 = "sha256-pOO81abXuYpWTZZ3XcPdFNVRBA04FYijCK3alScPZJ8="; + }; buildType = "ament_python"; checkInputs = [ action-tutorials-interfaces ament-copyright ament-flake8 ament-pep257 ament-xmllint example-interfaces geometry-msgs launch-ros launch-testing std-msgs std-srvs test-msgs ]; diff --git a/distros/rolling/joy-tester/default.nix b/distros/rolling/joy-tester/default.nix new file mode 100644 index 0000000000..2b5df3363a --- /dev/null +++ b/distros/rolling/joy-tester/default.nix @@ -0,0 +1,28 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, python3Packages, pythonPackages, rclpy, sensor-msgs }: +buildRosPackage { + pname = "ros-rolling-joy-tester"; + version = "0.0.2-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joy_tester-release"; + rev = "release/rolling/joy_tester/0.0.2-1"; + sha256 = "sha256-4aFhMjPuS3BCh6fHb0WNYkfy1WWLeNrxlXiK8vs/zGI="; + }; + + buildType = "ament_python"; + checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; + propagatedBuildInputs = [ python3Packages.tkinter rclpy sensor-msgs ]; + + meta = { + description = ''Simple GUI tool for testing joysticks/gamepads''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/rolling/joy/default.nix b/distros/rolling/joy/default.nix index 26bf71714e..1372c6b616 100644 --- a/distros/rolling/joy/default.nix +++ b/distros/rolling/joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-joy"; version = "3.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/rolling/joy/3.1.0-2.tar.gz"; - name = "3.1.0-2.tar.gz"; - sha256 = "1bc2d9131c6afe8f1c9c396ae6c2a7a2de08aa4f29c8ee31b62997438eebc8c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/rolling/joy/3.1.0-2"; + sha256 = "sha256-LVq01bvfmA7TdJQjbrFwa17MdoQoTZj+fMTxjgRHsHY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/kdl-parser/default.nix b/distros/rolling/kdl-parser/default.nix index 9a8763a382..95b2bf20e6 100644 --- a/distros/rolling/kdl-parser/default.nix +++ b/distros/rolling/kdl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-kdl-parser"; version = "2.8.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kdl_parser-release/archive/release/rolling/kdl_parser/2.8.2-1.tar.gz"; - name = "2.8.2-1.tar.gz"; - sha256 = "f22ded43425259e2d52c8e5670db7b72705213c74f62af0798c6019738572f76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kdl_parser-release"; + rev = "release/rolling/kdl_parser/2.8.2-1"; + sha256 = "sha256-35J06kwJiMaoUJx5w6eyiBUJeJ+s3DaiH/NPGa1lqa0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/key-teleop/default.nix b/distros/rolling/key-teleop/default.nix index 18e342cdba..4e80483154 100644 --- a/distros/rolling/key-teleop/default.nix +++ b/distros/rolling/key-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-key-teleop"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/rolling/key_teleop/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "b76a355278305d48844605b8351776d77582ab59ef729a54da416431ad0a9776"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/rolling/key_teleop/1.3.0-2"; + sha256 = "sha256-87yL4CShLr4rcnlMktKgwgbI5fQEz2pKnQ2f50LTssY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/keyboard-handler/default.nix b/distros/rolling/keyboard-handler/default.nix index fda961b40b..c67a027369 100644 --- a/distros/rolling/keyboard-handler/default.nix +++ b/distros/rolling/keyboard-handler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-keyboard-handler"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/keyboard_handler-release/archive/release/rolling/keyboard_handler/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "051706198cefe0e782f523f023edd413ee42af90064fc3d3c4581758519cb0ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "keyboard_handler-release"; + rev = "release/rolling/keyboard_handler/0.1.0-1"; + sha256 = "sha256-fkpRaQUbznewITMBQDBbm300KUlbGpzm11LxI1Qc+1w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/kinematics-interface-kdl/default.nix b/distros/rolling/kinematics-interface-kdl/default.nix index 4d1968b452..3ae0df0d15 100644 --- a/distros/rolling/kinematics-interface-kdl/default.nix +++ b/distros/rolling/kinematics-interface-kdl/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, eigen, eigen3-cmake-module, kdl-parser, kinematics-interface, pluginlib, ros2-control-test-assets, tf2-eigen-kdl }: buildRosPackage { pname = "ros-rolling-kinematics-interface-kdl"; - version = "0.0.2-r1"; + version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kinematics_interface-release/archive/release/rolling/kinematics_interface_kdl/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "1c3621219ee1cb0253e90fa15fce3f3819b3c633b9916ca0eccd5568cf4f701c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kinematics_interface-release"; + rev = "release/rolling/kinematics_interface_kdl/0.1.0-1"; + sha256 = "sha256-OHSv8OF89XULb0+wSU5CtNaQikTKlPlZlu/wAEGOpzU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen3-cmake-module ]; diff --git a/distros/rolling/kinematics-interface/default.nix b/distros/rolling/kinematics-interface/default.nix index 85fe9a7568..31605fefb6 100644 --- a/distros/rolling/kinematics-interface/default.nix +++ b/distros/rolling/kinematics-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, eigen, rclcpp-lifecycle }: buildRosPackage { pname = "ros-rolling-kinematics-interface"; - version = "0.0.2-r1"; + version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kinematics_interface-release/archive/release/rolling/kinematics_interface/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "1b9444290bfd0d3a1371d3aa7a26546b6309eab643b4555a18b809d7f791a336"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kinematics_interface-release"; + rev = "release/rolling/kinematics_interface/0.1.0-1"; + sha256 = "sha256-9qrp7FLhxFV4gNsXGUO8kXohokXrTjEDviCg9LXDwNk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/kobuki-core/default.nix b/distros/rolling/kobuki-core/default.nix index bfca67707d..50ff9f6652 100644 --- a/distros/rolling/kobuki-core/default.nix +++ b/distros/rolling/kobuki-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-kobuki-core"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kobuki_core-release/archive/release/rolling/kobuki_core/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "3c514482ffa613e205601017f8680fdac9716bcf860ff72a2e0da08d77b4779b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kobuki_core-release"; + rev = "release/rolling/kobuki_core/1.4.0-1"; + sha256 = "sha256-Bq/+5lnLAiJ2HQtIr0h6wB08J7OxRxT4YhcLHIrCUwI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/kobuki-ros-interfaces/default.nix b/distros/rolling/kobuki-ros-interfaces/default.nix index 45cb6d6ce2..1617315bc4 100644 --- a/distros/rolling/kobuki-ros-interfaces/default.nix +++ b/distros/rolling/kobuki-ros-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-kobuki-ros-interfaces"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kobuki_ros_interfaces-release/archive/release/rolling/kobuki_ros_interfaces/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "0b78f44211880401b7b55b6078e2953e804944d8e0dbe45b7ab25c2e5382d490"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kobuki_ros_interfaces-release"; + rev = "release/rolling/kobuki_ros_interfaces/1.0.0-2"; + sha256 = "sha256-svbQG6e1o4u1HncdcNcx55XoYK99I02G7CxL2jvBZhs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/kobuki-velocity-smoother/default.nix b/distros/rolling/kobuki-velocity-smoother/default.nix index 5971b1cd5f..e0bbfcc21f 100644 --- a/distros/rolling/kobuki-velocity-smoother/default.nix +++ b/distros/rolling/kobuki-velocity-smoother/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-kobuki-velocity-smoother"; version = "0.15.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/kobuki_velocity_smoother-release/archive/release/rolling/kobuki_velocity_smoother/0.15.0-1.tar.gz"; - name = "0.15.0-1.tar.gz"; - sha256 = "5a14e0dcb821a317f006c3044f0cb801fe9e1b742a525862f555d0c8be5f73b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "kobuki_velocity_smoother-release"; + rev = "release/rolling/kobuki_velocity_smoother/0.15.0-1"; + sha256 = "sha256-kZmyem+NJit8xtwuRz5Zx8AkdojVm7/pxgSOR63CkcM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ecl-build ]; diff --git a/distros/rolling/lanelet2-core/default.nix b/distros/rolling/lanelet2-core/default.nix index 9dd466a131..10916ba596 100644 --- a/distros/rolling/lanelet2-core/default.nix +++ b/distros/rolling/lanelet2-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-core"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_core/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "351c016670d0bf311bc85e436f5705e6fc747c4985023d82dac8b9943f8ab7b7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_core/1.1.1-3"; + sha256 = "sha256-NpBQJ/brNiWnlLzVj16s4Xq257hkZ+PCNAudtWfEkks="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2-examples/default.nix b/distros/rolling/lanelet2-examples/default.nix index c494238faf..c116c842a2 100644 --- a/distros/rolling/lanelet2-examples/default.nix +++ b/distros/rolling/lanelet2-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-examples"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_examples/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "4c74af3cb79940f4f3ff1e50ec45e8f07f26fa862957a179398273919dc7a8ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_examples/1.1.1-3"; + sha256 = "sha256-r9Uj64Lgu/hODrKwkACMfUdwdOk9wBWovMNWD5KjTvM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2-io/default.nix b/distros/rolling/lanelet2-io/default.nix index 24af9c154e..11c627fa1f 100644 --- a/distros/rolling/lanelet2-io/default.nix +++ b/distros/rolling/lanelet2-io/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-io"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_io/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "29f00113c05b3e2346d0e42ab0471a3cb955f8ca87812098326691798e99e3c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_io/1.1.1-3"; + sha256 = "sha256-mW8p1j9qBuv8wPpmUu1kWNNJb7+pngf70mRvO8NciSc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2-maps/default.nix b/distros/rolling/lanelet2-maps/default.nix index 92b0433d78..56189fa97b 100644 --- a/distros/rolling/lanelet2-maps/default.nix +++ b/distros/rolling/lanelet2-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-maps"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_maps/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "a6d687e128368ddde9e2d3e7b2f98a6136125ce2bc9cd0e013c3419b256ee003"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_maps/1.1.1-3"; + sha256 = "sha256-iDbAH06Tpfjgf4La3huKzwojpdvk7EPzGsU65+td7z8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2-projection/default.nix b/distros/rolling/lanelet2-projection/default.nix index 6e1ceb3c9e..52a4ca2b70 100644 --- a/distros/rolling/lanelet2-projection/default.nix +++ b/distros/rolling/lanelet2-projection/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-projection"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_projection/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "a1e8d0c65522f94176dff93b3cc7d1c9338d25cb78884f14cfdb670336caae78"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_projection/1.1.1-3"; + sha256 = "sha256-g7mKXEdhoZS5qv8iio+6QG27tM/nleTmGWeaw66I+bU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2-python/default.nix b/distros/rolling/lanelet2-python/default.nix index eac3362b0f..52ceb99ae1 100644 --- a/distros/rolling/lanelet2-python/default.nix +++ b/distros/rolling/lanelet2-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-python"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_python/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "fa86f606fd79fd964861d73e3c11b02ae8ec0b333e1eb3ab5760ac7c741e19f4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_python/1.1.1-3"; + sha256 = "sha256-SfwKuO3PAhugfhidN7+7VHGaegF4UPhoRdhpJ3xjBIo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2-routing/default.nix b/distros/rolling/lanelet2-routing/default.nix index b7e21b225c..1b59f2c1e3 100644 --- a/distros/rolling/lanelet2-routing/default.nix +++ b/distros/rolling/lanelet2-routing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-routing"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_routing/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "9a49d0086eea7fce7af853ca16565dd826a6aee9eb6c5d03aa8b37179a31862f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_routing/1.1.1-3"; + sha256 = "sha256-bcQwF0woqvqfOeIO7haHyco3dmf6CNAotcyEVFPHkGk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2-traffic-rules/default.nix b/distros/rolling/lanelet2-traffic-rules/default.nix index 5c106655b1..6803350ff1 100644 --- a/distros/rolling/lanelet2-traffic-rules/default.nix +++ b/distros/rolling/lanelet2-traffic-rules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-traffic-rules"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_traffic_rules/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "5d655613cb78d42844f302c336e3421f2b2d9a6c71bc0f687905ee1e9f24c47f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_traffic_rules/1.1.1-3"; + sha256 = "sha256-f8lvg45yjWovjMCmp3Pdmr6KFejBnczY67qkvP5uFWw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2-validation/default.nix b/distros/rolling/lanelet2-validation/default.nix index 72b690fce9..51102d8575 100644 --- a/distros/rolling/lanelet2-validation/default.nix +++ b/distros/rolling/lanelet2-validation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2-validation"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2_validation/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "2d6e29a0d4e8ed09174571c93de49336537ce2a247048ae7de615ee0a452617d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2_validation/1.1.1-3"; + sha256 = "sha256-BjMp2DLjsi33ViCZSemJ1kXsu/o4W8xgoAIgna6cX5A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/lanelet2/default.nix b/distros/rolling/lanelet2/default.nix index e7068b917c..3e0935eae4 100644 --- a/distros/rolling/lanelet2/default.nix +++ b/distros/rolling/lanelet2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lanelet2"; version = "1.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lanelet2-release/archive/release/rolling/lanelet2/1.1.1-3.tar.gz"; - name = "1.1.1-3.tar.gz"; - sha256 = "ec19b94825e8af4b291132d038e90827367227ea80afeceea17312852e2b01b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lanelet2-release"; + rev = "release/rolling/lanelet2/1.1.1-3"; + sha256 = "sha256-xW2nmdxh/bfs+AVc/+WN+rgfRzsuy9u8TH7w21x7g90="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ros-environment ]; diff --git a/distros/rolling/laser-filters/default.nix b/distros/rolling/laser-filters/default.nix index 64e9ba52da..e9067918a7 100644 --- a/distros/rolling/laser-filters/default.nix +++ b/distros/rolling/laser-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-laser-filters"; version = "2.0.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/laser_filters-release/archive/release/rolling/laser_filters/2.0.5-2.tar.gz"; - name = "2.0.5-2.tar.gz"; - sha256 = "5b6816cd3ce7689513a910e2ac7fbbe2beae9cacd5fb0275ee7dc1c47ae5344c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "laser_filters-release"; + rev = "release/rolling/laser_filters/2.0.5-2"; + sha256 = "sha256-Ce8KbDAKhfJUqoSJZczGprJMyAeUW6KMPE3XrtaevoE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/laser-geometry/default.nix b/distros/rolling/laser-geometry/default.nix index 95d1bee50f..c8d5281326 100644 --- a/distros/rolling/laser-geometry/default.nix +++ b/distros/rolling/laser-geometry/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-laser-geometry"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/laser_geometry-release/archive/release/rolling/laser_geometry/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "1acf94056e5779beb524cc46528bc7b79bc803d19c3ec4f84c8164d87804eb6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "laser_geometry-release"; + rev = "release/rolling/laser_geometry/2.4.0-1"; + sha256 = "sha256-JH57bYK6eAzaANWyYK8v9l9W6MJBFNpKxSrjaFfmPDA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/laser-proc/default.nix b/distros/rolling/laser-proc/default.nix index 1b262fc0a8..284bc4d0a9 100644 --- a/distros/rolling/laser-proc/default.nix +++ b/distros/rolling/laser-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-laser-proc"; version = "1.0.2-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/laser_proc-release/archive/release/rolling/laser_proc/1.0.2-4.tar.gz"; - name = "1.0.2-4.tar.gz"; - sha256 = "992243cd2ba28d5fb6e8507800dd3f41f4fc5b6928086769132db125a8d00592"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "laser_proc-release"; + rev = "release/rolling/laser_proc/1.0.2-4"; + sha256 = "sha256-h2lPjaJimCF/20eVEH3+ZS7CDqoML9voXq2B0x32NSY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/launch-param-builder/default.nix b/distros/rolling/launch-param-builder/default.nix index feb59455fa..460fb0634d 100644 --- a/distros/rolling/launch-param-builder/default.nix +++ b/distros/rolling/launch-param-builder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-param-builder"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_param_builder-release/archive/release/rolling/launch_param_builder/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "3054b584def08d6227e665a6c5a2803237e707abed385e442a07b253a1f78394"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_param_builder-release"; + rev = "release/rolling/launch_param_builder/0.1.1-1"; + sha256 = "sha256-5wzPO7Vg6sA7heEmRxiLcDbilS5YyieLi8fBrtcJe/g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright pythonPackages.pytest ]; diff --git a/distros/rolling/launch-pytest/default.nix b/distros/rolling/launch-pytest/default.nix index fc79093d8e..4903760e2d 100644 --- a/distros/rolling/launch-pytest/default.nix +++ b/distros/rolling/launch-pytest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-pytest"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/rolling/launch_pytest/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "f5c38da07d4bb2b526ad42735a37ffea1ff2d64d7eb2003a51577de7a6642c90"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/rolling/launch_pytest/1.3.0-1"; + sha256 = "sha256-dIBgct0wFQtysqy8O3qZoDJ/ZEaocsIAvRiIHhW0DgM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch ]; diff --git a/distros/rolling/launch-ros/default.nix b/distros/rolling/launch-ros/default.nix index d5f2e842f3..1b638d4652 100644 --- a/distros/rolling/launch-ros/default.nix +++ b/distros/rolling/launch-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-ros"; version = "0.22.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/rolling/launch_ros/0.22.0-1.tar.gz"; - name = "0.22.0-1.tar.gz"; - sha256 = "e7a423b5521b9e9a10b5f53938f1e529f3f17e1a873f05d2b945c272706f01c4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/rolling/launch_ros/0.22.0-1"; + sha256 = "sha256-M7DOLxpwZqB4ot1fz9oG568jbj65F+kL96o6cP21WqM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/launch-system-modes/default.nix b/distros/rolling/launch-system-modes/default.nix index 7e30e45361..f626c13230 100644 --- a/distros/rolling/launch-system-modes/default.nix +++ b/distros/rolling/launch-system-modes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-system-modes"; version = "0.9.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/system_modes-release/archive/release/rolling/launch_system_modes/0.9.0-3.tar.gz"; - name = "0.9.0-3.tar.gz"; - sha256 = "ee0eceaf6bf5918dd4c78f3b914d64d5ca9aa806db06775eac91d2804630136f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "system_modes-release"; + rev = "release/rolling/launch_system_modes/0.9.0-3"; + sha256 = "sha256-igv7EQutLOf+qcExGB554hDDTuFxB1P9COvQUY2izGA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/launch-testing-ament-cmake/default.nix b/distros/rolling/launch-testing-ament-cmake/default.nix index 98513a2e8b..391a56239c 100644 --- a/distros/rolling/launch-testing-ament-cmake/default.nix +++ b/distros/rolling/launch-testing-ament-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-testing-ament-cmake"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/rolling/launch_testing_ament_cmake/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "378fff46dca3d1326d165c8866f375b9f2a4216df207b1e2bdda85fcff8ae751"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/rolling/launch_testing_ament_cmake/1.3.0-1"; + sha256 = "sha256-wyMJh0lsIrSMkxhiDGL+FFkfaloAChXkIli5LelbWvQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/launch-testing-examples/default.nix b/distros/rolling/launch-testing-examples/default.nix index 0a0e6a41a8..39848fde08 100644 --- a/distros/rolling/launch-testing-examples/default.nix +++ b/distros/rolling/launch-testing-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-testing-examples"; version = "0.16.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/examples-release/archive/release/rolling/launch_testing_examples/0.16.2-1.tar.gz"; - name = "0.16.2-1.tar.gz"; - sha256 = "33619e42d285a77f06b686215f6a5a1f51d4e694b87e14b1acbbf8df784fdc32"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "examples-release"; + rev = "release/rolling/launch_testing_examples/0.16.2-1"; + sha256 = "sha256-SJbwrSwG92XX0UAl+8+XzycvrXb3WU+z9Dbc1tw5BS0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 demo-nodes-cpp launch launch-ros launch-testing launch-testing-ros pythonPackages.pytest rclpy ros2bag rosbag2-transport std-msgs ]; diff --git a/distros/rolling/launch-testing-ros/default.nix b/distros/rolling/launch-testing-ros/default.nix index 17175b6319..64be00f27d 100644 --- a/distros/rolling/launch-testing-ros/default.nix +++ b/distros/rolling/launch-testing-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-testing-ros"; version = "0.22.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/rolling/launch_testing_ros/0.22.0-1.tar.gz"; - name = "0.22.0-1.tar.gz"; - sha256 = "7f306d1a688671257864c177fbc0990878002187c322979d3a339867f62c8b4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/rolling/launch_testing_ros/0.22.0-1"; + sha256 = "sha256-FuKgooNh6gLl+DQOU4fWQcMmtSsyZe/uyXfNHvbUP5k="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest std-msgs ]; diff --git a/distros/rolling/launch-testing/default.nix b/distros/rolling/launch-testing/default.nix index 400c335629..949342ad6d 100644 --- a/distros/rolling/launch-testing/default.nix +++ b/distros/rolling/launch-testing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-testing"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/rolling/launch_testing/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "de186838902f3714c182e3cf506afd768e8d775f391cc771bbdeb0a56e1e6810"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/rolling/launch_testing/1.3.0-1"; + sha256 = "sha256-ouOcsVNFvD+Nh+3fU7PfE93OV0AmKR6d9BxCW1zPNPY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch ]; diff --git a/distros/rolling/launch-xml/default.nix b/distros/rolling/launch-xml/default.nix index c6f9c48b1e..b6cd00a87a 100644 --- a/distros/rolling/launch-xml/default.nix +++ b/distros/rolling/launch-xml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-xml"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/rolling/launch_xml/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "0bfc9a0606cb7dcc0666584f8f229cdc1eadf1a5846cb5021ae60a2445f9da94"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/rolling/launch_xml/1.3.0-1"; + sha256 = "sha256-f5aaLTdkUUam+i2bvcjfhJpFseY9r4JkpWo5GH1V2/A="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/launch-yaml/default.nix b/distros/rolling/launch-yaml/default.nix index 5bfbd86857..ee89fef6f7 100644 --- a/distros/rolling/launch-yaml/default.nix +++ b/distros/rolling/launch-yaml/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch-yaml"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/rolling/launch_yaml/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "1b04f4a90afd08c39762d0eb039ea6a1107aa9b58cd45215cf4a0605cb18ea30"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/rolling/launch_yaml/1.3.0-1"; + sha256 = "sha256-wWTNkbYIaw2AmVV2CP4CakS1btqAoOk2eJlb10QFCKo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/launch/default.nix b/distros/rolling/launch/default.nix index ccb6048b83..563eccf53d 100644 --- a/distros/rolling/launch/default.nix +++ b/distros/rolling/launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-launch"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch-release/archive/release/rolling/launch/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "3664bfeaa8544084b34df13949bc97c376a4b391ff456032bab453643b77fcbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch-release"; + rev = "release/rolling/launch/1.3.0-1"; + sha256 = "sha256-bOBrUMIMRqG4WBF8xz2Xn8IRgkFbWdEoLGDGdYoL/+U="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/lgsvl-msgs/default.nix b/distros/rolling/lgsvl-msgs/default.nix index 408b68c8dc..503a95d405 100644 --- a/distros/rolling/lgsvl-msgs/default.nix +++ b/distros/rolling/lgsvl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lgsvl-msgs"; version = "0.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/lgsvl_msgs-release/archive/release/rolling/lgsvl_msgs/0.0.4-2.tar.gz"; - name = "0.0.4-2.tar.gz"; - sha256 = "5fa65a21d231edbf4bb40fd9d70810e053d0bbadd5b976fbe28ea7a761ac0054"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "lgsvl_msgs-release"; + rev = "release/rolling/lgsvl_msgs/0.0.4-2"; + sha256 = "sha256-Pd5TP0wLuUr0/m+WvLpkvURpB0d0hbik3SOPkifg8YU="; + }; buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; diff --git a/distros/rolling/libcurl-vendor/default.nix b/distros/rolling/libcurl-vendor/default.nix index 99ddef1487..5e304e6673 100644 --- a/distros/rolling/libcurl-vendor/default.nix +++ b/distros/rolling/libcurl-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-libcurl-vendor"; version = "3.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/resource_retriever-release/archive/release/rolling/libcurl_vendor/3.2.2-1.tar.gz"; - name = "3.2.2-1.tar.gz"; - sha256 = "9138c4772aa752b4bb4240cd1fc6e26e192b062c1ab8b1455bccb70cfaf4b20f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "resource_retriever-release"; + rev = "release/rolling/libcurl_vendor/3.2.2-1"; + sha256 = "sha256-rBKaXBI2vsbOUomT/7fu+yhC1Fgl8OU4RKve53M3SFM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake file ]; diff --git a/distros/rolling/libg2o/default.nix b/distros/rolling/libg2o/default.nix index ddf4c79c80..e46a8463d4 100644 --- a/distros/rolling/libg2o/default.nix +++ b/distros/rolling/libg2o/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-libg2o"; version = "2020.5.29-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libg2o-release/archive/release/rolling/libg2o/2020.5.29-3.tar.gz"; - name = "2020.5.29-3.tar.gz"; - sha256 = "d308e857ba2a3697d0b03f7fddc3ad0589423a44fb273d3e759c713ccf2dd5ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libg2o-release"; + rev = "release/rolling/libg2o/2020.5.29-3"; + sha256 = "sha256-tzFuVFEfIVou0MpxLMIt10GCb/D5A83cc5BWKSNwSrY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/libmavconn/default.nix b/distros/rolling/libmavconn/default.nix index 1f20cd94e4..2e70bac41b 100644 --- a/distros/rolling/libmavconn/default.nix +++ b/distros/rolling/libmavconn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-libmavconn"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavros-release/archive/release/rolling/libmavconn/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "a4b447351013f98bd5221838d27222ddbefc05e862f4a47e13920e7243efc262"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavros-release"; + rev = "release/rolling/libmavconn/2.4.0-1"; + sha256 = "sha256-zQQtWJ7KocYWlfkpJ0fdoVomUNd//KTIlPYMu2y/f00="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.empy ]; diff --git a/distros/rolling/libnabo/default.nix b/distros/rolling/libnabo/default.nix index 05b4b989ae..fefadc5236 100644 --- a/distros/rolling/libnabo/default.nix +++ b/distros/rolling/libnabo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-libnabo"; version = "1.0.7-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libnabo-release/archive/release/rolling/libnabo/1.0.7-2.tar.gz"; - name = "1.0.7-2.tar.gz"; - sha256 = "93bc05da30dcbe2b0e638d1ca40d5809b928f86d61d3b908ad7c1b6855852389"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libnabo-release"; + rev = "release/rolling/libnabo/1.0.7-2"; + sha256 = "sha256-Mgrzbissrz6FpDhNnycTc06xxw2+MpwzohUg4wBKVmI="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/libphidget22/default.nix b/distros/rolling/libphidget22/default.nix index 1640e2f913..72e53471da 100644 --- a/distros/rolling/libphidget22/default.nix +++ b/distros/rolling/libphidget22/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-libphidget22"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/libphidget22/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "3bed8ddd7ec477e8c4d5360053f203ab932081e64c48bc2470a2e462ac5eff4a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/libphidget22/2.3.0-1"; + sha256 = "sha256-GSe+j+FQUqkURPbpdDRFr6ehzfbsb+viTisUcqVZs4g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/libpointmatcher/default.nix b/distros/rolling/libpointmatcher/default.nix index 43f58e0e81..0958c318f2 100644 --- a/distros/rolling/libpointmatcher/default.nix +++ b/distros/rolling/libpointmatcher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-libpointmatcher"; version = "1.3.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libpointmatcher-release/archive/release/rolling/libpointmatcher/1.3.1-2.tar.gz"; - name = "1.3.1-2.tar.gz"; - sha256 = "e6b852f80337c2faa7d5a452c9345a3d30fecd151930d283326a7cb14d335f95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libpointmatcher-release"; + rev = "release/rolling/libpointmatcher/1.3.1-2"; + sha256 = "sha256-i1zVnTiuW4sSLaTP5wY2SMl+URtpnQHi2KuwrB7gUoY="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/libstatistics-collector/default.nix b/distros/rolling/libstatistics-collector/default.nix index 06988e9d73..fbe556f00d 100644 --- a/distros/rolling/libstatistics-collector/default.nix +++ b/distros/rolling/libstatistics-collector/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-libstatistics-collector"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libstatistics_collector-release/archive/release/rolling/libstatistics_collector/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "0054f00e9ac07e14db39b10b51814a63b3c1d9d1d1663386288bd17e9a27f7ca"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libstatistics_collector-release"; + rev = "release/rolling/libstatistics_collector/1.4.0-1"; + sha256 = "sha256-WVoP3syh3A14usB1xfDSUsoBztZILshUigRTHD0atq4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/libyaml-vendor/default.nix b/distros/rolling/libyaml-vendor/default.nix index 3fdf9c767d..5be0464daa 100644 --- a/distros/rolling/libyaml-vendor/default.nix +++ b/distros/rolling/libyaml-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-libyaml-vendor"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/libyaml_vendor-release/archive/release/rolling/libyaml_vendor/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "27d791f3501e735b2f44336d84b83e0b3eaf31763aa32433e3c8288c69321a45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "libyaml_vendor-release"; + rev = "release/rolling/libyaml_vendor/1.4.2-1"; + sha256 = "sha256-B2uqS9U3CPThw71pjdP7RBBkjyBN8DlCbibIR3rmS80="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/lifecycle-msgs/default.nix b/distros/rolling/lifecycle-msgs/default.nix index 19cd95315f..16d008f1c4 100644 --- a/distros/rolling/lifecycle-msgs/default.nix +++ b/distros/rolling/lifecycle-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lifecycle-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/rolling/lifecycle_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "77a198ca10782125d0848eb63dbdbb1118bde0a2a0085d642d5b7f2a091abcf2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/rolling/lifecycle_msgs/1.3.1-1"; + sha256 = "sha256-i4PZuC0st03DIkUZYdttKQwnEsBbm6JkWn/z2kDuRUY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/lifecycle-py/default.nix b/distros/rolling/lifecycle-py/default.nix index 45c92ab4d0..708c1320c4 100644 --- a/distros/rolling/lifecycle-py/default.nix +++ b/distros/rolling/lifecycle-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lifecycle-py"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/lifecycle_py/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "bf72e8701f45b1c087922e55fdde1e244819976bedcbd7ad5b1c4e4e0ee1d418"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/lifecycle_py/0.23.0-1"; + sha256 = "sha256-fL/sM7YtAJbl5/V9QkSPOAsoPk16hvMcli+Gwx6kn5s="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common lifecycle ros-testing ]; diff --git a/distros/rolling/lifecycle/default.nix b/distros/rolling/lifecycle/default.nix index 34762ec97c..ef158001a5 100644 --- a/distros/rolling/lifecycle/default.nix +++ b/distros/rolling/lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-lifecycle"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/lifecycle/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "121512c216438b2cf886d0dddee66ef89394422553603071499c90260fe11024"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/lifecycle/0.23.0-1"; + sha256 = "sha256-69lcbqx+HUFYmtwYOSwqMsS96LNlmd6f0F1a9lP54e0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/logging-demo/default.nix b/distros/rolling/logging-demo/default.nix index 8a896a4f80..2cf0cd4d24 100644 --- a/distros/rolling/logging-demo/default.nix +++ b/distros/rolling/logging-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-logging-demo"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/logging_demo/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "50aa008d2b3cb416498e94baf7ecc4e647dc1ebbf3e16a6b8b2333edfbcfa463"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/logging_demo/0.23.0-1"; + sha256 = "sha256-31mBIfDJPFJbP7XBMs1/pnbF4FPPCQIL3OTK5q/12Fk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/map-msgs/default.nix b/distros/rolling/map-msgs/default.nix index bfa3e99c84..dcef90844b 100644 --- a/distros/rolling/map-msgs/default.nix +++ b/distros/rolling/map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-map-msgs"; version = "2.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/navigation_msgs-release/archive/release/rolling/map_msgs/2.1.0-2.tar.gz"; - name = "2.1.0-2.tar.gz"; - sha256 = "f6709ba39ba35c67e15fe230bf54275fa22ae402a8d1745b221c8d33669da43f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "navigation_msgs-release"; + rev = "release/rolling/map_msgs/2.1.0-2"; + sha256 = "sha256-cSeyqhHbFCEKh+19DvBtK0jHQGhHk3P6eAgwkY7+Bls="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-can-msgs/default.nix b/distros/rolling/marti-can-msgs/default.nix index 2c884fe030..0433c10843 100644 --- a/distros/rolling/marti-can-msgs/default.nix +++ b/distros/rolling/marti-can-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-can-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_can_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "9c495696250efe22c869585c66591b5b4657a078f3d79fdcbc2c5c00b23b0ad0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_can_msgs/1.3.0-2"; + sha256 = "sha256-dD73BRybzPxwc4w6fSXE3OXQUl/NYp92lxRuTw4AwNY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-common-msgs/default.nix b/distros/rolling/marti-common-msgs/default.nix index 0b233f8575..3cbca91569 100644 --- a/distros/rolling/marti-common-msgs/default.nix +++ b/distros/rolling/marti-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-common-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_common_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "966584de90d46618ac64a2167f5bba5dff5069e98297c318e87309b6fec36157"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_common_msgs/1.3.0-2"; + sha256 = "sha256-uBRx3r5MOxI2BqfwFj8QAnaQ19Nc0WMh5bBklhTU1BI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-dbw-msgs/default.nix b/distros/rolling/marti-dbw-msgs/default.nix index afb39bc9ec..f083536f0d 100644 --- a/distros/rolling/marti-dbw-msgs/default.nix +++ b/distros/rolling/marti-dbw-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-dbw-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_dbw_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "0b9092418ac4da7ab5252f5f48037ceb47867166d64f0fd13ec91e00eb504f45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_dbw_msgs/1.3.0-2"; + sha256 = "sha256-JvC6VZgKaBLZehzL6s0p9Ce81FcuP/N42zHmtGhRBVQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-introspection-msgs/default.nix b/distros/rolling/marti-introspection-msgs/default.nix index f62ad88f9f..091e076441 100644 --- a/distros/rolling/marti-introspection-msgs/default.nix +++ b/distros/rolling/marti-introspection-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-introspection-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_introspection_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "3ab68286dcb1ab5f44c4e4e75bbc25dac11885640335b0e03371355f73d278d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_introspection_msgs/1.3.0-2"; + sha256 = "sha256-M9aqF73htqTcDPNFuBk7A+6LzLZBBwXWc5LPOxf9X3g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-nav-msgs/default.nix b/distros/rolling/marti-nav-msgs/default.nix index 6091e5be5d..423e8eb993 100644 --- a/distros/rolling/marti-nav-msgs/default.nix +++ b/distros/rolling/marti-nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-nav-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_nav_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "f0dd41b1df66b1b12008836f3c3a94f97bfef3df50159b1e27fdaea69cca1209"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_nav_msgs/1.3.0-2"; + sha256 = "sha256-SRWOiuvZJ/2pvijdDbD+I9B7OU4xqgjXzYwIF2H5pPY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-perception-msgs/default.nix b/distros/rolling/marti-perception-msgs/default.nix index f4a0af846b..f8c4590176 100644 --- a/distros/rolling/marti-perception-msgs/default.nix +++ b/distros/rolling/marti-perception-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-perception-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_perception_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "4c0408562bf21ec5a37f2c71412c02d9f7b16e9187d66b80ff25f5bec015fbb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_perception_msgs/1.3.0-2"; + sha256 = "sha256-exDlhwOZU0vkvXPezARIXpuYzv3B5UEGHR/3Il8kmyA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-sensor-msgs/default.nix b/distros/rolling/marti-sensor-msgs/default.nix index 5ac39c9854..999e503d3f 100644 --- a/distros/rolling/marti-sensor-msgs/default.nix +++ b/distros/rolling/marti-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-sensor-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_sensor_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "b3bb883c0d90f73d302dafef6583c3e344cad9f686f02b998fe6f5ceeedbd6f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_sensor_msgs/1.3.0-2"; + sha256 = "sha256-hGNz/a7qOnf12cPokEyjxe+Xp1zESqFYCzYxTa7Fg4g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-status-msgs/default.nix b/distros/rolling/marti-status-msgs/default.nix index 48df98cbcf..8c301d24c2 100644 --- a/distros/rolling/marti-status-msgs/default.nix +++ b/distros/rolling/marti-status-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-status-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_status_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "c3faa422ac7e0672cb553925e7ea07aafae77f44be50b7cbc6a0a7712e88c8de"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_status_msgs/1.3.0-2"; + sha256 = "sha256-JIIYkZANCtSigjSIfcZ1T7ysxvv3VaxVxHjIF6c5qQY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/marti-visualization-msgs/default.nix b/distros/rolling/marti-visualization-msgs/default.nix index 516537fd1a..55e5bcdf4a 100644 --- a/distros/rolling/marti-visualization-msgs/default.nix +++ b/distros/rolling/marti-visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-marti-visualization-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_messages-release/archive/release/rolling/marti_visualization_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "4db865fc709b76a9c65d17366bb388f3a4a8fce61c791476d32792963adfa050"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_messages-release"; + rev = "release/rolling/marti_visualization_msgs/1.3.0-2"; + sha256 = "sha256-ln8TB7XB3itqW2qSG4noDxLwjdTJMrccgDELU/7sm+A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/mavlink/default.nix b/distros/rolling/mavlink/default.nix index bd4d5661f3..84244bc1cf 100644 --- a/distros/rolling/mavlink/default.nix +++ b/distros/rolling/mavlink/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-mavlink"; version = "2022.12.30-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavlink-gbp-release/archive/release/rolling/mavlink/2022.12.30-1.tar.gz"; - name = "2022.12.30-1.tar.gz"; - sha256 = "d9f4ac40790463fca4d9680033964149667ffd64cb4625ce31d53f5f31f6023a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavlink-gbp-release"; + rev = "release/rolling/mavlink/2022.12.30-1"; + sha256 = "sha256-weCXfCMFBO/hfDHDLJs1Pc7lXxkWPFu9Ug1E0j4bbQI="; + }; buildType = "cmake"; buildInputs = [ ament-cmake cmake python3 python3Packages.future python3Packages.lxml ros-environment ]; diff --git a/distros/rolling/mavros-extras/default.nix b/distros/rolling/mavros-extras/default.nix index eab0041577..7b4ffda208 100644 --- a/distros/rolling/mavros-extras/default.nix +++ b/distros/rolling/mavros-extras/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-mavros-extras"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavros-release/archive/release/rolling/mavros_extras/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "23cfb158e77c59828d2175d7c8fcc145ba4a503d6b423c355fc70d557d53e054"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavros-release"; + rev = "release/rolling/mavros_extras/2.4.0-1"; + sha256 = "sha256-PtIYTIYjcVKAIS0pP0hq1LdX+rB++3XRmqDHaZif8jM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python angles ]; diff --git a/distros/rolling/mavros-msgs/default.nix b/distros/rolling/mavros-msgs/default.nix index cd13c0ae47..76cbbe7c45 100644 --- a/distros/rolling/mavros-msgs/default.nix +++ b/distros/rolling/mavros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-mavros-msgs"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavros-release/archive/release/rolling/mavros_msgs/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "e20128ff94347e9916d354b6b028b47cfbd31db31c91e1532011f2f7d214e1ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavros-release"; + rev = "release/rolling/mavros_msgs/2.4.0-1"; + sha256 = "sha256-wDx+TrJOa9Fy2q/W1rGM/YvHumOu3oiWQgQroVg0H1A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/mavros/default.nix b/distros/rolling/mavros/default.nix index b5224981a1..090629e0c4 100644 --- a/distros/rolling/mavros/default.nix +++ b/distros/rolling/mavros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-mavros"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mavros-release/archive/release/rolling/mavros/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "7c937e5e6c6511ff5bc84b0688611d696f109636e2d9cb3002673a4d3688b703"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mavros-release"; + rev = "release/rolling/mavros/2.4.0-1"; + sha256 = "sha256-vNoFZgoW95lOa0ryKo2cAkU20W/qQoNLgqDkdPSoV3k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python angles ]; diff --git a/distros/rolling/mcap-vendor/default.nix b/distros/rolling/mcap-vendor/default.nix index 8430b468e8..c6c4a11142 100644 --- a/distros/rolling/mcap-vendor/default.nix +++ b/distros/rolling/mcap-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, git, zstd-vendor }: buildRosPackage { pname = "ros-rolling-mcap-vendor"; - version = "0.5.0-r1"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/rolling/mcap_vendor/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "b435ec231661990f6dcf7bf94aecf915684357d74dd7f502d85f538bd7a770fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/mcap_vendor/0.19.0-1"; + sha256 = "sha256-xyZnaapyiP2BT/UP+Ge5bMc49gEaTOp96AfWfwTRIYA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/menge-vendor/default.nix b/distros/rolling/menge-vendor/default.nix index 7c0f4a7a94..f2292367f4 100644 --- a/distros/rolling/menge-vendor/default.nix +++ b/distros/rolling/menge-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-menge-vendor"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/menge_vendor-release/archive/release/rolling/menge_vendor/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "63dbee9c587c70444a0533de42585c8359a0846a45a9146cab423a1f9d60a454"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "menge_vendor-release"; + rev = "release/rolling/menge_vendor/1.0.0-2"; + sha256 = "sha256-pwDvm+FUMHbvtumRly3aV2QEDQ0UxPN8GlgjCe8TOZE="; + }; buildType = "catkin"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/rolling/message-filters/default.nix b/distros/rolling/message-filters/default.nix index c1a527235c..4848d0b862 100644 --- a/distros/rolling/message-filters/default.nix +++ b/distros/rolling/message-filters/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-message-filters"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_message_filters-release/archive/release/rolling/message_filters/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "62628c5580474b6e65cbe5c61f7685042139a8de073456de714176cbe418a0ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_message_filters-release"; + rev = "release/rolling/message_filters/4.6.1-1"; + sha256 = "sha256-H2gW8/YlGFRpTfkH0+2QDxsVGS/bqwEJmEe50QW316k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros python-cmake-module ]; diff --git a/distros/rolling/micro-ros-diagnostic-bridge/default.nix b/distros/rolling/micro-ros-diagnostic-bridge/default.nix index 75adda06e7..a75933d581 100644 --- a/distros/rolling/micro-ros-diagnostic-bridge/default.nix +++ b/distros/rolling/micro-ros-diagnostic-bridge/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-micro-ros-diagnostic-bridge"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_diagnostics-release/archive/release/rolling/micro_ros_diagnostic_bridge/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "1e0093a6aa52761d451a4aad5781ac0ffcbdd502e6121f591075b290cf005d6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_diagnostics-release"; + rev = "release/rolling/micro_ros_diagnostic_bridge/0.3.0-2"; + sha256 = "sha256-mBsQdSKOPVQJVBc/FxvaxH5NOtAJy3M+bYciq7eHg+c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/micro-ros-diagnostic-msgs/default.nix b/distros/rolling/micro-ros-diagnostic-msgs/default.nix index e98d19d774..7c50a04ce3 100644 --- a/distros/rolling/micro-ros-diagnostic-msgs/default.nix +++ b/distros/rolling/micro-ros-diagnostic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-micro-ros-diagnostic-msgs"; version = "0.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_diagnostics-release/archive/release/rolling/micro_ros_diagnostic_msgs/0.3.0-2.tar.gz"; - name = "0.3.0-2.tar.gz"; - sha256 = "49b35ac225ff1bf6e82d09d42032857192a2ff3f606c9af62230fc6e774d11ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_diagnostics-release"; + rev = "release/rolling/micro_ros_diagnostic_msgs/0.3.0-2"; + sha256 = "sha256-SzsjLMKb42ISN6YTe6pUsmSDS9aBoczr3ayWBkrJAgU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/micro-ros-msgs/default.nix b/distros/rolling/micro-ros-msgs/default.nix index 72b0ba9681..5799cc37f7 100644 --- a/distros/rolling/micro-ros-msgs/default.nix +++ b/distros/rolling/micro-ros-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-micro-ros-msgs"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/micro_ros_msgs-release/archive/release/rolling/micro_ros_msgs/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "8b9b66d98a9fb78e9b5db442c97ad9d70687675984a89d6340f30c9a5d9e10dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "micro_ros_msgs-release"; + rev = "release/rolling/micro_ros_msgs/1.0.0-2"; + sha256 = "sha256-kuDv7e3C0BCXolx6ePv0TLEpK9E3OfLGFAh0K/9Wb8o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/microstrain-inertial-driver/default.nix b/distros/rolling/microstrain-inertial-driver/default.nix index fced759019..00196b77cb 100644 --- a/distros/rolling/microstrain-inertial-driver/default.nix +++ b/distros/rolling/microstrain-inertial-driver/default.nix @@ -2,22 +2,26 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cpplint, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, jq, lifecycle-msgs, mavros-msgs, microstrain-inertial-msgs, nav-msgs, nmea-msgs, rclcpp-lifecycle, ros-environment, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: +{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cpplint, curl, diagnostic-aggregator, diagnostic-updater, geometry-msgs, git, jq, lifecycle-msgs, mavros-msgs, microstrain-inertial-msgs, nav-msgs, nmea-msgs, rclcpp-lifecycle, ros-environment, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, tf2, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-rolling-microstrain-inertial-driver"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/rolling/microstrain_inertial_driver/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "59144b6e43323359929321caa5487a9966075a4d5516e013e00c292b58b1296d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/rolling/microstrain_inertial_driver/3.0.0-1"; + sha256 = "sha256-OZKIsgqemRajXQ1xpFsAA9AitmFdk7DwZlaJMsTxJDI="; + }; buildType = "ament_cmake"; - buildInputs = [ curl jq ros-environment rosidl-default-generators ]; + buildInputs = [ curl git jq ros-environment rosidl-default-generators ]; checkInputs = [ ament-cmake-gtest ament-cpplint ]; propagatedBuildInputs = [ diagnostic-aggregator diagnostic-updater geometry-msgs lifecycle-msgs mavros-msgs microstrain-inertial-msgs nav-msgs nmea-msgs rclcpp-lifecycle rosidl-default-runtime sensor-msgs std-msgs std-srvs tf2 tf2-geometry-msgs tf2-ros ]; - nativeBuildInputs = [ rosidl-default-generators ]; + nativeBuildInputs = [ git rosidl-default-generators ]; meta = { description = ''The ros_mscl package provides a driver for the LORD/Microstrain inertial products.''; diff --git a/distros/rolling/microstrain-inertial-examples/default.nix b/distros/rolling/microstrain-inertial-examples/default.nix index df8f2ea129..61b309a382 100644 --- a/distros/rolling/microstrain-inertial-examples/default.nix +++ b/distros/rolling/microstrain-inertial-examples/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, microstrain-inertial-msgs, rclcpp, rclcpp-components, rclpy, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-rolling-microstrain-inertial-examples"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/rolling/microstrain_inertial_examples/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "a299a6d48ee2b1ecdbf6790bc62b792fb901d57a18d56a6f71c86cdc902bcb5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/rolling/microstrain_inertial_examples/3.0.0-1"; + sha256 = "sha256-YzEuGLkXcxn35LDW2RzWaTtuyLA2lDz3vzbROI3D8zA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/microstrain-inertial-msgs/default.nix b/distros/rolling/microstrain-inertial-msgs/default.nix index e4013b0882..12f9029678 100644 --- a/distros/rolling/microstrain-inertial-msgs/default.nix +++ b/distros/rolling/microstrain-inertial-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, geometry-msgs, rosidl-default-generators, std-msgs }: buildRosPackage { pname = "ros-rolling-microstrain-inertial-msgs"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/rolling/microstrain_inertial_msgs/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "b3e78b2e33c64ce428c90ebde395bf7b2a50cf6fbf983531ee2a15f6e77e07e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/rolling/microstrain_inertial_msgs/3.0.0-1"; + sha256 = "sha256-b6iL7dD696BbltyHrGXGYyBrO04x+0iHvwhuSwBLRJw="; + }; buildType = "ament_cmake"; buildInputs = [ rosidl-default-generators ]; diff --git a/distros/rolling/microstrain-inertial-rqt/default.nix b/distros/rolling/microstrain-inertial-rqt/default.nix index 0cf23b0a4e..cfae105a75 100644 --- a/distros/rolling/microstrain-inertial-rqt/default.nix +++ b/distros/rolling/microstrain-inertial-rqt/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, geometry-msgs, microstrain-inertial-msgs, nav-msgs, rclpy, rqt-gui, rqt-gui-py, std-msgs }: buildRosPackage { pname = "ros-rolling-microstrain-inertial-rqt"; - version = "2.7.1-r1"; + version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/microstrain_inertial-release/archive/release/rolling/microstrain_inertial_rqt/2.7.1-1.tar.gz"; - name = "2.7.1-1.tar.gz"; - sha256 = "9416b0106341833db9b5d220d6a918a6fa140ccb71b7340e55090b2d450542a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "microstrain_inertial-release"; + rev = "release/rolling/microstrain_inertial_rqt/3.0.0-1"; + sha256 = "sha256-OvjYgtHC/5jU2RV8qNvN+c5ZV0rVScf1u1LaJwLt8BM="; + }; buildType = "ament_python"; propagatedBuildInputs = [ geometry-msgs microstrain-inertial-msgs nav-msgs rclpy rqt-gui rqt-gui-py std-msgs ]; diff --git a/distros/rolling/mimick-vendor/default.nix b/distros/rolling/mimick-vendor/default.nix index dc40dd7941..08e9090c15 100644 --- a/distros/rolling/mimick-vendor/default.nix +++ b/distros/rolling/mimick-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-mimick-vendor"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mimick_vendor-release/archive/release/rolling/mimick_vendor/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "cee31e9fe55575ca74c7ff1e156c070665b247baa5b730d212214df6b88758a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mimick_vendor-release"; + rev = "release/rolling/mimick_vendor/0.3.1-1"; + sha256 = "sha256-pXDH9PXGCN1qy5ANpLj7G0dJh8pwQhIVmqLc1ceayZ4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/mouse-teleop/default.nix b/distros/rolling/mouse-teleop/default.nix index f1cb28a23c..44760f69fe 100644 --- a/distros/rolling/mouse-teleop/default.nix +++ b/distros/rolling/mouse-teleop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-mouse-teleop"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/rolling/mouse_teleop/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "57bbdc5b57c0bc3a674f6ef490b3d8a779499b7a037043b15cc0bd546c19b7e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/rolling/mouse_teleop/1.3.0-2"; + sha256 = "sha256-e7Z2ycDQ6c5iskftouMX5osIQ17YJ6aS1Jn6tEPTs3w="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint ]; diff --git a/distros/rolling/moveit-chomp-optimizer-adapter/default.nix b/distros/rolling/moveit-chomp-optimizer-adapter/default.nix index 6d8162e34f..26cc8b4aee 100644 --- a/distros/rolling/moveit-chomp-optimizer-adapter/default.nix +++ b/distros/rolling/moveit-chomp-optimizer-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-chomp-optimizer-adapter"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_chomp_optimizer_adapter/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "582551651ea3828f39dcde413e00c2b4783f5fba282f2d103958573e1fcf6b2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_chomp_optimizer_adapter/2.6.0-1"; + sha256 = "sha256-p2HZqde/8Ga+1nD4JE3WTiid0Cz5+4414bY4I68JfTM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-common/default.nix b/distros/rolling/moveit-common/default.nix index a6118f1e95..7ea4c369f2 100644 --- a/distros/rolling/moveit-common/default.nix +++ b/distros/rolling/moveit-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-common"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_common/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "664cd6d8ed99d15578e74e936e4ef1e279141cb368c056762d9ace6e1f2c6fc7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_common/2.6.0-1"; + sha256 = "sha256-iTi6dJHpr9AC5xzXgkjUiNOo4y4jl12rkq4qHMnsMhs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-configs-utils/default.nix b/distros/rolling/moveit-configs-utils/default.nix index a3ce488269..e475e1cb62 100644 --- a/distros/rolling/moveit-configs-utils/default.nix +++ b/distros/rolling/moveit-configs-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-configs-utils"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_configs_utils/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "141babc843b995dfa1625d42b72629f10c80ca3de3f177f2804323c6ff8da6aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_configs_utils/2.6.0-1"; + sha256 = "sha256-oMTHKxvRvtpglbicjB3AriIXD6p1/Bbr2kwjy9Z6Fu8="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/moveit-core/default.nix b/distros/rolling/moveit-core/default.nix index 1b3c824e3c..f4b940ab52 100644 --- a/distros/rolling/moveit-core/default.nix +++ b/distros/rolling/moveit-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-core"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_core/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "db73e78e433a5613a559d147adfe63f50cd47a34e3d89e5bc77335f3f444ac1e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_core/2.6.0-1"; + sha256 = "sha256-zfOz0uNr+iUMTRBDu2RWNZw+ch/Q7dEYvXWuYD+M4qQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/rolling/moveit-hybrid-planning/default.nix b/distros/rolling/moveit-hybrid-planning/default.nix index 091e6fe441..d61f365601 100644 --- a/distros/rolling/moveit-hybrid-planning/default.nix +++ b/distros/rolling/moveit-hybrid-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-hybrid-planning"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_hybrid_planning/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "4db511ebd90c7834c390b0726cf0fd0e2d41c68e492f35a3f46056df28d0a740"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_hybrid_planning/2.6.0-1"; + sha256 = "sha256-WeIpWCGtjbH9dFeBncJfxO6xBpj/ayNv0Yczu9b5jXo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-kinematics/default.nix b/distros/rolling/moveit-kinematics/default.nix index 8bdacacb1b..10f7519f57 100644 --- a/distros/rolling/moveit-kinematics/default.nix +++ b/distros/rolling/moveit-kinematics/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-kinematics"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_kinematics/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "2fc2e92c1b283802525a5e5ec4b47ed6301b978eeddf071378f8ec00c8d7b55a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_kinematics/2.6.0-1"; + sha256 = "sha256-lGeOClCZQ6w8pprggEgAL0Atrct5Rdow89hopD0Tt5o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-msgs/default.nix b/distros/rolling/moveit-msgs/default.nix index 113d864d0f..d57c6b77ff 100644 --- a/distros/rolling/moveit-msgs/default.nix +++ b/distros/rolling/moveit-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-msgs"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_msgs-release/archive/release/rolling/moveit_msgs/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "f0a7ff8bf497e0239acd9e783661843d93e78db046503fccfaeac8ec81da8b60"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_msgs-release"; + rev = "release/rolling/moveit_msgs/2.2.1-1"; + sha256 = "sha256-j2kN0/aZXgqQgw3wkRghueiY+X/URho8qm57Ze8n1y0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/moveit-planners-chomp/default.nix b/distros/rolling/moveit-planners-chomp/default.nix index ff5f53ef0b..aae1be793e 100644 --- a/distros/rolling/moveit-planners-chomp/default.nix +++ b/distros/rolling/moveit-planners-chomp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-planners-chomp"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_planners_chomp/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "77b9b5d96c127719d133986e7dd42a4757a5b5515793b0ed3f3c932984aec26a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_planners_chomp/2.6.0-1"; + sha256 = "sha256-6z1bqne/a57rEiZcnMcRN30+n8If/Cw3V+Z+1CNtyvo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-planners-ompl/default.nix b/distros/rolling/moveit-planners-ompl/default.nix index 3d9107f946..fdda6aea66 100644 --- a/distros/rolling/moveit-planners-ompl/default.nix +++ b/distros/rolling/moveit-planners-ompl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-planners-ompl"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_planners_ompl/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "a2e1c4a8dccb3eda3d689216c298d3960277dad4a2e9bcd01239af2bc6ea0f09"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_planners_ompl/2.6.0-1"; + sha256 = "sha256-u59uW+1kt94+RbbS/SV/N/CkkwtA2MUS+WtJQ/lbKJk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen3-cmake-module ]; diff --git a/distros/rolling/moveit-planners/default.nix b/distros/rolling/moveit-planners/default.nix index f24c44daa4..6b839fe23f 100644 --- a/distros/rolling/moveit-planners/default.nix +++ b/distros/rolling/moveit-planners/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-planners"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_planners/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "729ae9c4cc5eb70418e152d15b9f8f8d463b2fe050a5658dae9a68ac3e35e90a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_planners/2.6.0-1"; + sha256 = "sha256-pi6zZagVexeoPGYtKPCzJRwW3V7d8jdJdx5JHW8CkNY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-plugins/default.nix b/distros/rolling/moveit-plugins/default.nix index d335f4418d..b53d49e5e9 100644 --- a/distros/rolling/moveit-plugins/default.nix +++ b/distros/rolling/moveit-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-plugins"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_plugins/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "22845af81b7120f9242e3eb1792cd1cdd52855c6cd44e7ec0e830992671235f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_plugins/2.6.0-1"; + sha256 = "sha256-TF+3AvUyHsO+N63eUrHynaf4NyCZ2Ks4Hbv0/1X1aoM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources-fanuc-description/default.nix b/distros/rolling/moveit-resources-fanuc-description/default.nix index 09088a9f28..2ec204e171 100644 --- a/distros/rolling/moveit-resources-fanuc-description/default.nix +++ b/distros/rolling/moveit-resources-fanuc-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-fanuc-description"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/rolling/moveit_resources_fanuc_description/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "1a450e717dee4a75fe6574d8dd91c885ddf224342261da60b5785343691730ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/rolling/moveit_resources_fanuc_description/2.0.6-1"; + sha256 = "sha256-hGTrUYAikxOi8egxDimAoqOcoKHW8F0RW1t6vuYewIA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources-fanuc-moveit-config/default.nix b/distros/rolling/moveit-resources-fanuc-moveit-config/default.nix index ee9b37d92f..7db72deadc 100644 --- a/distros/rolling/moveit-resources-fanuc-moveit-config/default.nix +++ b/distros/rolling/moveit-resources-fanuc-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-fanuc-moveit-config"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/rolling/moveit_resources_fanuc_moveit_config/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "f282e068154018ff3ad14611e0dc093e3dc56ec9dcf9a3d65e85089393b37bb7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/rolling/moveit_resources_fanuc_moveit_config/2.0.6-1"; + sha256 = "sha256-cJ3DCFtICWq9luUEgd9v2OoVJXMLFgFmrFeLKU6C69s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources-panda-description/default.nix b/distros/rolling/moveit-resources-panda-description/default.nix index 163bc56737..b604aea25e 100644 --- a/distros/rolling/moveit-resources-panda-description/default.nix +++ b/distros/rolling/moveit-resources-panda-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-panda-description"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/rolling/moveit_resources_panda_description/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "2fc5f5807a626e084e6679fa5c2412f1dfa739e055092f60c4856260897c54d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/rolling/moveit_resources_panda_description/2.0.6-1"; + sha256 = "sha256-9T8wcYBgF1ulNpNXqhBZxswjqvzNOtlDJsno0T83VJ0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources-panda-moveit-config/default.nix b/distros/rolling/moveit-resources-panda-moveit-config/default.nix index 79427c5a82..2a2793e680 100644 --- a/distros/rolling/moveit-resources-panda-moveit-config/default.nix +++ b/distros/rolling/moveit-resources-panda-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-panda-moveit-config"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/rolling/moveit_resources_panda_moveit_config/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "b8921617a708561ad090bb1d2334d8b4b909b2e4205221bd3303667344d42535"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/rolling/moveit_resources_panda_moveit_config/2.0.6-1"; + sha256 = "sha256-0DZTez3C9HxtsOUf/t1s/Xm7uoqkXISmy3O6zBVXq3Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources-pr2-description/default.nix b/distros/rolling/moveit-resources-pr2-description/default.nix index b1df777e18..7a1832e11d 100644 --- a/distros/rolling/moveit-resources-pr2-description/default.nix +++ b/distros/rolling/moveit-resources-pr2-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-pr2-description"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/rolling/moveit_resources_pr2_description/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "ec5fd7b5dc2d331faf407d12c68e2abc290adb641ec53e3f3a7fdce77699d4b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/rolling/moveit_resources_pr2_description/2.0.6-1"; + sha256 = "sha256-kZjnvlnHY5J6SQdLGAteN6dfi19Sb8JVRlYa5yrrDFs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix b/distros/rolling/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix index 5ab78e4402..76e4254374 100644 --- a/distros/rolling/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix +++ b/distros/rolling/moveit-resources-prbt-ikfast-manipulator-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-prbt-ikfast-manipulator-plugin"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_resources_prbt_ikfast_manipulator_plugin/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "6e49e4750e52ed58abfa637fa2a820bec2d4d5931a8b41844118710f3d056ca4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_resources_prbt_ikfast_manipulator_plugin/2.6.0-1"; + sha256 = "sha256-rjImhRAEjCLxY3CPUyXetd0+vkSkoLulYJhIrEWW928="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake tf2-eigen tf2-eigen-kdl ]; diff --git a/distros/rolling/moveit-resources-prbt-moveit-config/default.nix b/distros/rolling/moveit-resources-prbt-moveit-config/default.nix index 166f7faebf..d3fb4ca7d1 100644 --- a/distros/rolling/moveit-resources-prbt-moveit-config/default.nix +++ b/distros/rolling/moveit-resources-prbt-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-prbt-moveit-config"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_resources_prbt_moveit_config/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "02680ea49050d5bfffd742454a559280fe6bc620238fd39c52d82a858f2f7e4e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_resources_prbt_moveit_config/2.6.0-1"; + sha256 = "sha256-YpMtiyqDNaBxUp7GJ+ynuCrEcnwDagt9TFfsB02Q/J4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources-prbt-pg70-support/default.nix b/distros/rolling/moveit-resources-prbt-pg70-support/default.nix index 989a87aafa..c3b78d8dd2 100644 --- a/distros/rolling/moveit-resources-prbt-pg70-support/default.nix +++ b/distros/rolling/moveit-resources-prbt-pg70-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-prbt-pg70-support"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_resources_prbt_pg70_support/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "1bbaff4523ad071b55952b916f0a3d7c488dab537a92d97f48b39530cbc9d48a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_resources_prbt_pg70_support/2.6.0-1"; + sha256 = "sha256-VDgVkdy3u4/GXc5AvW/xfkLLpl73s7zJIHAFyX619BE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources-prbt-support/default.nix b/distros/rolling/moveit-resources-prbt-support/default.nix index 9ee11a70d2..e82a674493 100644 --- a/distros/rolling/moveit-resources-prbt-support/default.nix +++ b/distros/rolling/moveit-resources-prbt-support/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources-prbt-support"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_resources_prbt_support/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "add69e07b19862edf50c327a6e4b612bc27853900df1d5e65f71558d9c8189fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_resources_prbt_support/2.6.0-1"; + sha256 = "sha256-YCLyjRrYYoLl49TQXY55FRHMreJ7E/kbo9qmtMF0pxQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-resources/default.nix b/distros/rolling/moveit-resources/default.nix index ef0087a2a4..71566dbfe3 100644 --- a/distros/rolling/moveit-resources/default.nix +++ b/distros/rolling/moveit-resources/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-resources"; version = "2.0.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_resources-release/archive/release/rolling/moveit_resources/2.0.6-1.tar.gz"; - name = "2.0.6-1.tar.gz"; - sha256 = "f7be0be0dec030e12e51fc5c94a1a490694836e22950db293f5740548fc3a5f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_resources-release"; + rev = "release/rolling/moveit_resources/2.0.6-1"; + sha256 = "sha256-6SeNklZ6FV3leAPoweE7scYHip2GWoiT6Wl6A5NywNI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-ros-benchmarks/default.nix b/distros/rolling/moveit-ros-benchmarks/default.nix index 620fe3bf27..4fab6a3f43 100644 --- a/distros/rolling/moveit-ros-benchmarks/default.nix +++ b/distros/rolling/moveit-ros-benchmarks/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-benchmarks"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_benchmarks/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "917481ee0766f713b39d8604304249ea867baccb02c66532e4abd80063d523b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_benchmarks/2.6.0-1"; + sha256 = "sha256-8uJEEWOEjaJiPEfBeWdGcpO89rPr6AVe3a+/l8JselA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake moveit-core ]; diff --git a/distros/rolling/moveit-ros-control-interface/default.nix b/distros/rolling/moveit-ros-control-interface/default.nix index b27a69fb7c..ac33aaf6f1 100644 --- a/distros/rolling/moveit-ros-control-interface/default.nix +++ b/distros/rolling/moveit-ros-control-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-control-interface"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_control_interface/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "85c169c8033068ed22777445b5b20c017c57b7b0995b19ec658b34f52dca55f9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_control_interface/2.6.0-1"; + sha256 = "sha256-DSEkdmzUrJ4IfnWx247QF8ko9yVcXxbCc15+VXV5D3k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-ros-move-group/default.nix b/distros/rolling/moveit-ros-move-group/default.nix index 05ca5492e7..4b134d7f78 100644 --- a/distros/rolling/moveit-ros-move-group/default.nix +++ b/distros/rolling/moveit-ros-move-group/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-move-group"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_move_group/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "6b5eb87def22e3dc4a14eb2bb4081014c5703656d684f35b529bb607b2bfdeb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_move_group/2.6.0-1"; + sha256 = "sha256-gfwf+c0PAtDunf4Pfb/IFNvTHGATL1CmObIZxkz+fyk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-ros-occupancy-map-monitor/default.nix b/distros/rolling/moveit-ros-occupancy-map-monitor/default.nix index f957fa8137..a2523c8a84 100644 --- a/distros/rolling/moveit-ros-occupancy-map-monitor/default.nix +++ b/distros/rolling/moveit-ros-occupancy-map-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-occupancy-map-monitor"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_occupancy_map_monitor/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "92e9f0703b02c72f6e8b2d19e6dea910a7c706bcb89076e20eba451234ab6455"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_occupancy_map_monitor/2.6.0-1"; + sha256 = "sha256-FLAg9GA+VKfDF7hDh2lOqkmX4n3QRorev+HuqQqZptI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-ros-perception/default.nix b/distros/rolling/moveit-ros-perception/default.nix index 91e05a3568..9ead5e7361 100644 --- a/distros/rolling/moveit-ros-perception/default.nix +++ b/distros/rolling/moveit-ros-perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-perception"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_perception/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "c430452445cf2a9cf344c04d8e2e94bd70ed622e476de466329b69949285759f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_perception/2.6.0-1"; + sha256 = "sha256-FWmgFDeXjsJzWlnJ37h6b0q9ILXTbSpgPZNBoGG07dk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/rolling/moveit-ros-planning-interface/default.nix b/distros/rolling/moveit-ros-planning-interface/default.nix index 8b226ea42d..fcf15200b1 100644 --- a/distros/rolling/moveit-ros-planning-interface/default.nix +++ b/distros/rolling/moveit-ros-planning-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-planning-interface"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_planning_interface/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "a076e82c3ffd6cb70c24e51569c0e610f7ec643b8e1d6429abe6de5a93fa9f04"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_planning_interface/2.6.0-1"; + sha256 = "sha256-bA4np7RkAOpJVRlq5qXF23JeX01gdixjT4jO3idMGWw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen eigen3-cmake-module ]; diff --git a/distros/rolling/moveit-ros-planning/default.nix b/distros/rolling/moveit-ros-planning/default.nix index 0e8f4ce702..ab395aa795 100644 --- a/distros/rolling/moveit-ros-planning/default.nix +++ b/distros/rolling/moveit-ros-planning/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-planning"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_planning/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "bf3de0b90e949102a90bc6b213c77fe23d9a3f42b98d1c1787cffd510feedefe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_planning/2.6.0-1"; + sha256 = "sha256-LS/w3WwcA277qC5d4GW4GvAyHRCRDq3t6ah1PUW7DzE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-ros-robot-interaction/default.nix b/distros/rolling/moveit-ros-robot-interaction/default.nix index e32ff00215..d0df7ccf83 100644 --- a/distros/rolling/moveit-ros-robot-interaction/default.nix +++ b/distros/rolling/moveit-ros-robot-interaction/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-robot-interaction"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_robot_interaction/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "5f483d3681eb95b4f6f52a94b902ddf38b4ef4d5987eb9c741ee8b6ece53fedf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_robot_interaction/2.6.0-1"; + sha256 = "sha256-9OVum0u4X/9WzIQAeEK7pBmtbF+8eZ701+rdeYeCXdU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-ros-visualization/default.nix b/distros/rolling/moveit-ros-visualization/default.nix index e1281a9b0f..f2cbfabe56 100644 --- a/distros/rolling/moveit-ros-visualization/default.nix +++ b/distros/rolling/moveit-ros-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-visualization"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_visualization/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "cb883fd31c84378135f130096187f796e836f5e6eedd188bffffca08c7100741"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_visualization/2.6.0-1"; + sha256 = "sha256-ffY4ftNmuDt6c3w5JpzfhQcNnEot8rYOFkQMKny2T5M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake class-loader eigen pkg-config qt5.qtbase ]; diff --git a/distros/rolling/moveit-ros-warehouse/default.nix b/distros/rolling/moveit-ros-warehouse/default.nix index 8e180dcc3b..8a2459dec4 100644 --- a/distros/rolling/moveit-ros-warehouse/default.nix +++ b/distros/rolling/moveit-ros-warehouse/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros-warehouse"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros_warehouse/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "2dc239553f0e46c991085cd7456b98f06180a9989e4ab00b68916d777ded8d25"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros_warehouse/2.6.0-1"; + sha256 = "sha256-0stxqAxRvv7Li9ZJLy0BoxWEtz4LDs/6aqeqo73JMqs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-ros/default.nix b/distros/rolling/moveit-ros/default.nix index 25707d1153..031fad3a1c 100644 --- a/distros/rolling/moveit-ros/default.nix +++ b/distros/rolling/moveit-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-ros"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_ros/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "0373ab417f6608a3b241248548d890892369b25fba9b43fead2a4691bc47a625"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_ros/2.6.0-1"; + sha256 = "sha256-CiXDR1puB1i3EcPhmFDWtu1mO3WtFDUzgsQeAw8iRy8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-runtime/default.nix b/distros/rolling/moveit-runtime/default.nix index f20a78dda5..811e2ddcd6 100644 --- a/distros/rolling/moveit-runtime/default.nix +++ b/distros/rolling/moveit-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-runtime"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_runtime/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "338bfe300d1e883ce05523c9dcae0f0f876483f9434cb14a4f16a931d36d243e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_runtime/2.6.0-1"; + sha256 = "sha256-OsfDNOicBQDyxB7OdN4Qjet8BoyYGsmlEanJWDlOWps="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-servo/default.nix b/distros/rolling/moveit-servo/default.nix index 3cb879e76f..151bf19e5a 100644 --- a/distros/rolling/moveit-servo/default.nix +++ b/distros/rolling/moveit-servo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-servo"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_servo/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "8de77cc23fcbbf649f6cbe62c9844398468fcb964cb228c6f95c3d1d442cdbd9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_servo/2.6.0-1"; + sha256 = "sha256-WYMXxYGDYXZsDIheP0LpJcBphEmO5ZscP9pAlojxOsw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-setup-app-plugins/default.nix b/distros/rolling/moveit-setup-app-plugins/default.nix index 9230527307..dc59eb3d64 100644 --- a/distros/rolling/moveit-setup-app-plugins/default.nix +++ b/distros/rolling/moveit-setup-app-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-setup-app-plugins"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_setup_app_plugins/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "da2ba5690ae954a0825e4abde76f29f3a606fe4bb2e2b1946f576aa38220ccb9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_setup_app_plugins/2.6.0-1"; + sha256 = "sha256-RzU5tbkUlFT0v+K+8GkuyMZlWPCfkXfSOYMgFIcvwLw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-setup-assistant/default.nix b/distros/rolling/moveit-setup-assistant/default.nix index af9a9f71fa..1a4f86d91a 100644 --- a/distros/rolling/moveit-setup-assistant/default.nix +++ b/distros/rolling/moveit-setup-assistant/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-setup-assistant"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_setup_assistant/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "151be628967845fddbc7ae98451c8c185a5380ce2a5c91e4d9dceaa82f54d073"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_setup_assistant/2.6.0-1"; + sha256 = "sha256-ixN+lu2IEsezJwiFczH9Kp7ktQP19y6lvbUINSYrs/E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-setup-controllers/default.nix b/distros/rolling/moveit-setup-controllers/default.nix index 96106c247e..42568eaa77 100644 --- a/distros/rolling/moveit-setup-controllers/default.nix +++ b/distros/rolling/moveit-setup-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-setup-controllers"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_setup_controllers/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "cec741235b3fececc30733e9456b5f8b946b6eac31f14db79141dbacef6cd84b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_setup_controllers/2.6.0-1"; + sha256 = "sha256-ZzkgxLmaf/CVLUThMAmySvaaRZXZ7u3CCEwLC7+t5BM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-setup-core-plugins/default.nix b/distros/rolling/moveit-setup-core-plugins/default.nix index d265787b22..62fc3aaae0 100644 --- a/distros/rolling/moveit-setup-core-plugins/default.nix +++ b/distros/rolling/moveit-setup-core-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-setup-core-plugins"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_setup_core_plugins/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "c7b6c0546652310301b6bd9dd8da0071fe8d90ea0493fd42140179c9780581b3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_setup_core_plugins/2.6.0-1"; + sha256 = "sha256-+EQ56grZ8LXU2H5dPJgAN1sOtBDMhGkqtrrbrER0+4M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-setup-framework/default.nix b/distros/rolling/moveit-setup-framework/default.nix index 28a613611c..ce70edb2b5 100644 --- a/distros/rolling/moveit-setup-framework/default.nix +++ b/distros/rolling/moveit-setup-framework/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-setup-framework"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_setup_framework/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "94467d6477d11ad7424b1d51c69b68b6400e4e8e11618cec66bb6da91449bce7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_setup_framework/2.6.0-1"; + sha256 = "sha256-J9xRS+ecxFaihxOQyG+oli+y4vJRbychN1G210+j+cI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-setup-srdf-plugins/default.nix b/distros/rolling/moveit-setup-srdf-plugins/default.nix index 364b5c4512..aea61d1122 100644 --- a/distros/rolling/moveit-setup-srdf-plugins/default.nix +++ b/distros/rolling/moveit-setup-srdf-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-setup-srdf-plugins"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_setup_srdf_plugins/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "3b117b4f95e3355b909fea58b8f4dd17cbe1c263fde0517754b8b6ba345e5132"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_setup_srdf_plugins/2.6.0-1"; + sha256 = "sha256-9k1YD8qvhYQI9kVtxughuh35K73/3rjiIc10grWeFeY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-simple-controller-manager/default.nix b/distros/rolling/moveit-simple-controller-manager/default.nix index 28006d9170..e334538ac4 100644 --- a/distros/rolling/moveit-simple-controller-manager/default.nix +++ b/distros/rolling/moveit-simple-controller-manager/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-simple-controller-manager"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit_simple_controller_manager/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "73b3b7aa2fe25311cb5951112e8e413b7ba55efe2afdb13a35a437db79b8e303"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit_simple_controller_manager/2.6.0-1"; + sha256 = "sha256-o7JlhYYW6slhM6ic6d2RhVxt0We4YhXaPbMqOS8L/lc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit-visual-tools/default.nix b/distros/rolling/moveit-visual-tools/default.nix index e6baf556ef..e33608794a 100644 --- a/distros/rolling/moveit-visual-tools/default.nix +++ b/distros/rolling/moveit-visual-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit-visual-tools"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/moveit_visual_tools-release/archive/release/rolling/moveit_visual_tools/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "40d9478303563259b02f8e5adde3c5a89d64c3ca302bbcba352a93370d85c115"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "moveit_visual_tools-release"; + rev = "release/rolling/moveit_visual_tools/4.1.0-1"; + sha256 = "sha256-OsgJs0kV7m3GzRlDL1x8i5hG03piwA+9f+Mbpx+dOmw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/moveit/default.nix b/distros/rolling/moveit/default.nix index 6123a63297..36029f36be 100644 --- a/distros/rolling/moveit/default.nix +++ b/distros/rolling/moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-moveit"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/moveit/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "04db3540623d88fafdc356ab43abd09192ae4c9608db992d2148981b2092cebd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/moveit/2.6.0-1"; + sha256 = "sha256-YrMnr+9ZASYU50vpu3ZxZF4CNkEh72GwYqxEwlQTjck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/mrpt-msgs/default.nix b/distros/rolling/mrpt-msgs/default.nix index c6ad79e1f3..5ab750c0bb 100644 --- a/distros/rolling/mrpt-msgs/default.nix +++ b/distros/rolling/mrpt-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-mrpt-msgs"; version = "0.4.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mrpt_msgs-release/archive/release/rolling/mrpt_msgs/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "8100451b8d74488f296c023894b9273250cc9e77b29b0e50673eb7d6856064a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mrpt_msgs-release"; + rev = "release/rolling/mrpt_msgs/0.4.4-1"; + sha256 = "sha256-FSw//54G9jpJoibViHkmDUI+/IqcjDC67ZxH4JOk4qk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment rosidl-default-generators ]; diff --git a/distros/rolling/mrt-cmake-modules/default.nix b/distros/rolling/mrt-cmake-modules/default.nix index 67fc7d9f37..95438d335b 100644 --- a/distros/rolling/mrt-cmake-modules/default.nix +++ b/distros/rolling/mrt-cmake-modules/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-mrt-cmake-modules"; version = "1.0.9-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mrt_cmake_modules-release/archive/release/rolling/mrt_cmake_modules/1.0.9-2.tar.gz"; - name = "1.0.9-2.tar.gz"; - sha256 = "ab11795cb72423cf6660e9dd262b9b128016e3d6980f2c5b9c09dc527271d420"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mrt_cmake_modules-release"; + rev = "release/rolling/mrt_cmake_modules/1.0.9-2"; + sha256 = "sha256-PCqR+osiiGlHN0JWW6C/bhSD9H7GuzuQ4Lo8fExnOk0="; + }; buildType = "catkin"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/mvsim/default.nix b/distros/rolling/mvsim/default.nix index 5913fcb682..4e8d62161e 100644 --- a/distros/rolling/mvsim/default.nix +++ b/distros/rolling/mvsim/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-xmllint, ament-lint-auto, ament-lint-common, boost, box2d, cmake, cppzmq, mrpt2, nav-msgs, protobuf, python3, pythonPackages, ros-environment, ros2launch, sensor-msgs, tf2, tf2-geometry-msgs, visualization-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-gtest, ament-cmake-xmllint, ament-lint-auto, ament-lint-common, boost, box2d, cmake, cppzmq, mrpt2, nav-msgs, protobuf, python3, python3Packages, pythonPackages, ros-environment, ros2launch, sensor-msgs, tf2, tf2-geometry-msgs, unzip, visualization-msgs, wget }: buildRosPackage { pname = "ros-rolling-mvsim"; - version = "0.4.3-r1"; + version = "0.5.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/mvsim-release/archive/release/rolling/mvsim/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "ea675887de0501c94e2a2954fa82a7a611c5696b7e82bafdec36f8389fa4047f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "mvsim-release"; + rev = "release/rolling/mvsim/0.5.1-2"; + sha256 = "sha256-E8duQNKx1R8uGZ3o3G3NSvLjxkRqwZDi+O2Moy0u38k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest ament-cmake-xmllint cmake ros-environment ]; checkInputs = [ ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ boost box2d cppzmq mrpt2 nav-msgs protobuf python3 pythonPackages.pybind11 ros2launch sensor-msgs tf2 tf2-geometry-msgs visualization-msgs ]; + propagatedBuildInputs = [ boost box2d cppzmq mrpt2 nav-msgs protobuf python3 python3Packages.protobuf pythonPackages.pybind11 ros2launch sensor-msgs tf2 tf2-geometry-msgs unzip visualization-msgs wget ]; nativeBuildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest cmake ]; meta = { diff --git a/distros/rolling/nao-button-sim/default.nix b/distros/rolling/nao-button-sim/default.nix index 623e4e26e1..0eea1dd440 100644 --- a/distros/rolling/nao-button-sim/default.nix +++ b/distros/rolling/nao-button-sim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nao-button-sim"; version = "0.1.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nao_button_sim-release/archive/release/rolling/nao_button_sim/0.1.1-3.tar.gz"; - name = "0.1.1-3.tar.gz"; - sha256 = "2e810214a61ab1f7b1cbb36c09d7ba36db1de699826567ea901ca73364da2b5f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nao_button_sim-release"; + rev = "release/rolling/nao_button_sim/0.1.1-3"; + sha256 = "sha256-kSAZ/BDlwmj/kpJek7GBfiEO1RBUa8Lmld+ZbxmlAX0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/nao-command-msgs/default.nix b/distros/rolling/nao-command-msgs/default.nix index 93440a4c05..6a820eae57 100644 --- a/distros/rolling/nao-command-msgs/default.nix +++ b/distros/rolling/nao-command-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nao-command-msgs"; version = "0.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nao_interfaces-release/archive/release/rolling/nao_command_msgs/0.0.4-2.tar.gz"; - name = "0.0.4-2.tar.gz"; - sha256 = "789354af00dc2cd75a798d44fae83d3f5cb3599a6725eaa1f0626e813402943a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nao_interfaces-release"; + rev = "release/rolling/nao_command_msgs/0.0.4-2"; + sha256 = "sha256-c5MI9xmqIM6a6lV86cpezLUwbxtIfICdZYHA39QMhiw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/nao-lola/default.nix b/distros/rolling/nao-lola/default.nix index f37a2e1b8d..e2bee9d79e 100644 --- a/distros/rolling/nao-lola/default.nix +++ b/distros/rolling/nao-lola/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nao-lola"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nao_lola-release/archive/release/rolling/nao_lola/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "6842d05776bf62fb0b6172e042e96b2c737661c2fae6da7ea588772f54ba5fb9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nao_lola-release"; + rev = "release/rolling/nao_lola/0.2.0-1"; + sha256 = "sha256-0hakIRpfMEClzpS1jht5/hiG6D+zU1MWUSexnzDhoDQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/nao-sensor-msgs/default.nix b/distros/rolling/nao-sensor-msgs/default.nix index 26d049b6e9..958d3d8e09 100644 --- a/distros/rolling/nao-sensor-msgs/default.nix +++ b/distros/rolling/nao-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nao-sensor-msgs"; version = "0.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nao_interfaces-release/archive/release/rolling/nao_sensor_msgs/0.0.4-2.tar.gz"; - name = "0.0.4-2.tar.gz"; - sha256 = "f973e97107df5ce3cb6d9b279a1eef8ace30484cb3006ecdfd4b3815fe20b010"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nao_interfaces-release"; + rev = "release/rolling/nao_sensor_msgs/0.0.4-2"; + sha256 = "sha256-ZUHpXdRXtKXTlh+vFBMwE8bIfT9g/5YI9Z/XDh7MvS0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/nav-msgs/default.nix b/distros/rolling/nav-msgs/default.nix index 84d13b7a1f..0f012698ee 100644 --- a/distros/rolling/nav-msgs/default.nix +++ b/distros/rolling/nav-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nav-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/nav_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "225d3de05a52ade351bc61991e201d67a728954edc6a67b6fad298f7e962b1d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/nav_msgs/4.6.1-1"; + sha256 = "sha256-VD0THsTVa9A1am7vi58Fpq/KYA2Kh0293kL+JCPYB7U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/neo-simulation2/default.nix b/distros/rolling/neo-simulation2/default.nix index 36a434b116..a84c74fcb6 100644 --- a/distros/rolling/neo-simulation2/default.nix +++ b/distros/rolling/neo-simulation2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-neo-simulation2"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/neo_simulation2-release/archive/release/rolling/neo_simulation2/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "4c42e86f728406ae0ff84bd71e64fe1c740b5f451bbf3196a227319b8fdde9c8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "neo_simulation2-release"; + rev = "release/rolling/neo_simulation2/1.0.0-2"; + sha256 = "sha256-z2uL/hWNQtHjZbw4Z0U4RKZYVGd2lIu1CGIvi4+s4/s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/nlohmann-json-schema-validator-vendor/default.nix b/distros/rolling/nlohmann-json-schema-validator-vendor/default.nix index 29bfaf0e21..6250149441 100644 --- a/distros/rolling/nlohmann-json-schema-validator-vendor/default.nix +++ b/distros/rolling/nlohmann-json-schema-validator-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nlohmann-json-schema-validator-vendor"; version = "0.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nlohmann_json_schema_validator_vendor-release/archive/release/rolling/nlohmann_json_schema_validator_vendor/0.2.4-1.tar.gz"; - name = "0.2.4-1.tar.gz"; - sha256 = "d3bfaef045250a66f7c50192d072717034d87493c1739bddcd5d8518ca23576f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nlohmann_json_schema_validator_vendor-release"; + rev = "release/rolling/nlohmann_json_schema_validator_vendor/0.2.4-1"; + sha256 = "sha256-4IFPjmJ77/9j47gU2b0HRDdNiJ0TiHlUInxSXC/tI90="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/nmea-hardware-interface/default.nix b/distros/rolling/nmea-hardware-interface/default.nix index cdda8a7aaf..2e840a3a76 100644 --- a/distros/rolling/nmea-hardware-interface/default.nix +++ b/distros/rolling/nmea-hardware-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nmea-hardware-interface"; version = "0.0.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nmea_hardware_interface-release/archive/release/rolling/nmea_hardware_interface/0.0.1-2.tar.gz"; - name = "0.0.1-2.tar.gz"; - sha256 = "38a7b906bb141425b7108334b7002e0449506b0777ae1c60d8323ae84f1c3fde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nmea_hardware_interface-release"; + rev = "release/rolling/nmea_hardware_interface/0.0.1-2"; + sha256 = "sha256-YibMQpu2E/mEdOx3OB8wbxnUVH/AukvJlND3wu5+oeE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/nmea-msgs/default.nix b/distros/rolling/nmea-msgs/default.nix index b27f598219..852b0b9feb 100644 --- a/distros/rolling/nmea-msgs/default.nix +++ b/distros/rolling/nmea-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nmea-msgs"; version = "2.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nmea_msgs-release/archive/release/rolling/nmea_msgs/2.0.0-3.tar.gz"; - name = "2.0.0-3.tar.gz"; - sha256 = "54bf07000b5703417a4e721ef7a53e8297e7e881902add9c053b7535cbca3884"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nmea_msgs-release"; + rev = "release/rolling/nmea_msgs/2.0.0-3"; + sha256 = "sha256-bswqgESVo01rxSNhUMSl4dZwBC88WoKlS55Dn0U5CQc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/nmea-navsat-driver/default.nix b/distros/rolling/nmea-navsat-driver/default.nix index a93e522275..ebd437d3e1 100644 --- a/distros/rolling/nmea-navsat-driver/default.nix +++ b/distros/rolling/nmea-navsat-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nmea-navsat-driver"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nmea_navsat_driver-release/archive/release/rolling/nmea_navsat_driver/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "7f7db9e81bbedd1f03f7b3a16c999deb787fbdf15858fd80e07554baccb449ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nmea_navsat_driver-release"; + rev = "release/rolling/nmea_navsat_driver/2.0.0-1"; + sha256 = "sha256-/jHp7vYV6qWnGc27Qt0moJsJK6CptKQULqNO1KHWgec="; + }; buildType = "ament_python"; checkInputs = [ pythonPackages.pytest ]; diff --git a/distros/rolling/nodl-python/default.nix b/distros/rolling/nodl-python/default.nix index ac025a3ece..dc937f7f08 100644 --- a/distros/rolling/nodl-python/default.nix +++ b/distros/rolling/nodl-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nodl-python"; version = "0.3.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nodl-release/archive/release/rolling/nodl_python/0.3.1-2.tar.gz"; - name = "0.3.1-2.tar.gz"; - sha256 = "9be2d3408e0aa17320fe45de4099172e8345862f33a6b266f79a2ea0422b05dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nodl-release"; + rev = "release/rolling/nodl_python/0.3.1-2"; + sha256 = "sha256-rHEAtKnNTsXSB1UGfZYRfy3DQXrnGFWNntTfJyxEymc="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-lint-auto ament-lint-common ament-mypy python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/rolling/nodl-to-policy/default.nix b/distros/rolling/nodl-to-policy/default.nix index 9bb250e89f..1b88c0bdcf 100644 --- a/distros/rolling/nodl-to-policy/default.nix +++ b/distros/rolling/nodl-to-policy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-nodl-to-policy"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nodl_to_policy-release/archive/release/rolling/nodl_to_policy/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "f7b37c75966366663ef843e1593782fee11d5162878c282405ef8e450f5ccd16"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nodl_to_policy-release"; + rev = "release/rolling/nodl_to_policy/1.0.0-2"; + sha256 = "sha256-e3+aKkyGXpBFCwulLKU8Tv8PSYEtqUTsp6iL1bE5W9g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-lint-auto ament-mypy ament-pep257 ament-pycodestyle python3Packages.pytest-mock pythonPackages.pytest ros-testing test-msgs ]; diff --git a/distros/rolling/novatel-gps-driver/default.nix b/distros/rolling/novatel-gps-driver/default.nix index 50741fa4fe..5aa6af048e 100644 --- a/distros/rolling/novatel-gps-driver/default.nix +++ b/distros/rolling/novatel-gps-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-novatel-gps-driver"; version = "4.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/novatel_gps_driver-release/archive/release/rolling/novatel_gps_driver/4.1.0-2.tar.gz"; - name = "4.1.0-2.tar.gz"; - sha256 = "86350caffeac52f4cf991deea5bff0481a1effff3586184f30265acbd7d34e18"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/rolling/novatel_gps_driver/4.1.0-2"; + sha256 = "sha256-cZjlG6dRNZFhbj3Ss7eoWxudyZjsuebtPzpvz4watQA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/novatel-gps-msgs/default.nix b/distros/rolling/novatel-gps-msgs/default.nix index 683f842d76..4efe2e06a6 100644 --- a/distros/rolling/novatel-gps-msgs/default.nix +++ b/distros/rolling/novatel-gps-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-novatel-gps-msgs"; version = "4.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/novatel_gps_driver-release/archive/release/rolling/novatel_gps_msgs/4.1.0-2.tar.gz"; - name = "4.1.0-2.tar.gz"; - sha256 = "3f02f9755885768c8e891dc358867c69f63d7129f5305df22aa14a0c6d701016"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "novatel_gps_driver-release"; + rev = "release/rolling/novatel_gps_msgs/4.1.0-2"; + sha256 = "sha256-elfNxlJFo9e8ju38PBf3lPgK556DR5KyNBIPcvS7VMc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/ntpd-driver/default.nix b/distros/rolling/ntpd-driver/default.nix index a5bc6b7f19..403738b7af 100644 --- a/distros/rolling/ntpd-driver/default.nix +++ b/distros/rolling/ntpd-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ntpd-driver"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ntpd_driver-release/archive/release/rolling/ntpd_driver/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "59cd40e8116ec8ac2e081a7266dbcbe2bfc97844b136f487c013f6b47840c260"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ntpd_driver-release"; + rev = "release/rolling/ntpd_driver/2.2.0-1"; + sha256 = "sha256-Y3hISLK0EHzcJD4MrfgxDdmYH+cpgQTjbH3DCmbd0VE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ntrip-client/default.nix b/distros/rolling/ntrip-client/default.nix index 7fd2c145fb..be6a13e9fd 100644 --- a/distros/rolling/ntrip-client/default.nix +++ b/distros/rolling/ntrip-client/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ntrip-client"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ntrip_client-release/archive/release/rolling/ntrip_client/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "e1ac18642dbbc89837c16e924c48c264d3eeaa736e49b7f2a04f632592add1b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ntrip_client-release"; + rev = "release/rolling/ntrip_client/1.2.0-1"; + sha256 = "sha256-D2B2lApA/XdsUVc6tMvHaZBKPMxKG+1deA3REcfJSS8="; + }; buildType = "ament_python"; propagatedBuildInputs = [ mavros-msgs nmea-msgs rclpy std-msgs ]; diff --git a/distros/rolling/object-recognition-msgs/default.nix b/distros/rolling/object-recognition-msgs/default.nix index 4b03d267a6..e26a783b9d 100644 --- a/distros/rolling/object-recognition-msgs/default.nix +++ b/distros/rolling/object-recognition-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-object-recognition-msgs"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/object_recognition_msgs-release/archive/release/rolling/object_recognition_msgs/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "7369fcfc8ae8c8e49f726df74896b499611d700585df5caab37a875dc41d46f3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "object_recognition_msgs-release"; + rev = "release/rolling/object_recognition_msgs/2.0.0-2"; + sha256 = "sha256-51GLrMSSWkdlTz5SBW9ImQilU5Rojo8emRiwZZtZtS0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/octomap-mapping/default.nix b/distros/rolling/octomap-mapping/default.nix index 4c4c13fd30..5b210dcd20 100644 --- a/distros/rolling/octomap-mapping/default.nix +++ b/distros/rolling/octomap-mapping/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-octomap-mapping"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_mapping-release/archive/release/rolling/octomap_mapping/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "02862a10cd97500288686dd2ca987dce53a6a297b504756641f8b245c8faa67b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_mapping-release"; + rev = "release/rolling/octomap_mapping/2.0.0-2"; + sha256 = "sha256-8X4kZ4yCTELXt6wgdUt0ftR0Nn+TvtK9cMWDMgapEhM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/octomap-msgs/default.nix b/distros/rolling/octomap-msgs/default.nix index b0f0bfeb53..9fa5f1bbb9 100644 --- a/distros/rolling/octomap-msgs/default.nix +++ b/distros/rolling/octomap-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-octomap-msgs"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_msgs-release/archive/release/rolling/octomap_msgs/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "6a592edc220ac9884d80193f35487e2e0c8d142002378e64be4002e529024e2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_msgs-release"; + rev = "release/rolling/octomap_msgs/2.0.0-2"; + sha256 = "sha256-97tbZTVcZMc2CB2JAW6gn0/ABahvBbfiC3jpHDIJJ6I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/octomap-ros/default.nix b/distros/rolling/octomap-ros/default.nix index 35f1e9e03a..04d7659020 100644 --- a/distros/rolling/octomap-ros/default.nix +++ b/distros/rolling/octomap-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-octomap-ros"; version = "0.4.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_ros-release/archive/release/rolling/octomap_ros/0.4.3-1.tar.gz"; - name = "0.4.3-1.tar.gz"; - sha256 = "883a9a7082f28c78f4ef5870c4d61ee71d1c994d5a330d3ac46c3de3da13a17b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_ros-release"; + rev = "release/rolling/octomap_ros/0.4.3-1"; + sha256 = "sha256-RD+gwS31k6UPEKegLdv6kSOha4ju5W2T5EwCpMkZ5Lc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/octomap-rviz-plugins/default.nix b/distros/rolling/octomap-rviz-plugins/default.nix index b1b01c8c99..2d5329be48 100644 --- a/distros/rolling/octomap-rviz-plugins/default.nix +++ b/distros/rolling/octomap-rviz-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-octomap-rviz-plugins"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_rviz_plugins-release/archive/release/rolling/octomap_rviz_plugins/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "950c4ed0ea0a53aee6d6c198fe7dcddd8edca2b20c64b5474da0869851df726e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_rviz_plugins-release"; + rev = "release/rolling/octomap_rviz_plugins/2.0.0-2"; + sha256 = "sha256-M9xdQSP9dc1bw2Jkn7tJ506Ah5/lABFrjFf03Ot8828="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/octomap-server/default.nix b/distros/rolling/octomap-server/default.nix index 0b5dc76491..5589b35cb5 100644 --- a/distros/rolling/octomap-server/default.nix +++ b/distros/rolling/octomap-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-octomap-server"; version = "2.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap_mapping-release/archive/release/rolling/octomap_server/2.0.0-2.tar.gz"; - name = "2.0.0-2.tar.gz"; - sha256 = "9876a7a14b88f2e18ccb439aa1a428764556a3e18bfe580d361cdf6727d56c3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap_mapping-release"; + rev = "release/rolling/octomap_server/2.0.0-2"; + sha256 = "sha256-Uh6hgimLc8sgK2A6cuJWe0IPqZeR6ljm1xQoNRwe9ck="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/octomap/default.nix b/distros/rolling/octomap/default.nix index 4f71c508a3..17f9839ab6 100644 --- a/distros/rolling/octomap/default.nix +++ b/distros/rolling/octomap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-octomap"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap-release/archive/release/rolling/octomap/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "c8ceb252810657d25e85dfef154406cea09166100a2c1cb2b803334179e49f23"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap-release"; + rev = "release/rolling/octomap/1.9.8-1"; + sha256 = "sha256-1C49qDf+5BFNi34JzrSFN0B0kNfv1MBTmcdT/hEjkKI="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/octovis/default.nix b/distros/rolling/octovis/default.nix index 9c30dec07c..b3d42e5db3 100644 --- a/distros/rolling/octovis/default.nix +++ b/distros/rolling/octovis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-octovis"; version = "1.9.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/octomap-release/archive/release/rolling/octovis/1.9.8-1.tar.gz"; - name = "1.9.8-1.tar.gz"; - sha256 = "1f858832f41b57bf8c7ccea76b0cd7bbcf17c9bf6778e6b6c137c59559d99e8c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "octomap-release"; + rev = "release/rolling/octovis/1.9.8-1"; + sha256 = "sha256-B3o5qIG2TXL7n4EG8EOfFE/k4yEj6kdYAtRPXbUfB6s="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/ompl/default.nix b/distros/rolling/ompl/default.nix index 1a0b816028..d47178e319 100644 --- a/distros/rolling/ompl/default.nix +++ b/distros/rolling/ompl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ompl"; version = "1.5.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ompl-release/archive/release/rolling/ompl/1.5.2-2.tar.gz"; - name = "1.5.2-2.tar.gz"; - sha256 = "fd6f7eca75d22aae6fd64709ef9d8bffe4a76e67b1fa53de42d93c789828088b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ompl-release"; + rev = "release/rolling/ompl/1.5.2-2"; + sha256 = "sha256-S/r7lhDzSeFwxL4OMv2qlVAqTQ0Ew5NoFBdUqZFY43I="; + }; buildType = "cmake"; buildInputs = [ cmake pkg-config ]; diff --git a/distros/rolling/orocos-kdl-vendor/default.nix b/distros/rolling/orocos-kdl-vendor/default.nix index 9c384788e1..180b94d290 100644 --- a/distros/rolling/orocos-kdl-vendor/default.nix +++ b/distros/rolling/orocos-kdl-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-orocos-kdl-vendor"; version = "0.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/orocos_kdl_vendor-release/archive/release/rolling/orocos_kdl_vendor/0.3.4-1.tar.gz"; - name = "0.3.4-1.tar.gz"; - sha256 = "4178b8ed4a1b3cebb10bcab80880d27a3a137e931ba6927f1cfea125415f300a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "orocos_kdl_vendor-release"; + rev = "release/rolling/orocos_kdl_vendor/0.3.4-1"; + sha256 = "sha256-8878heWJ0CVI+sqZ4A7SwqJ76ZnDqkCzmA/OPn7Ahk8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/osqp-vendor/default.nix b/distros/rolling/osqp-vendor/default.nix index 50351af7a2..9113c2362c 100644 --- a/distros/rolling/osqp-vendor/default.nix +++ b/distros/rolling/osqp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-osqp-vendor"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osqp_vendor-release/archive/release/rolling/osqp_vendor/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "f8abf6ee5d88a0ad516d3c2993ca7cb5d4ac8f2c31cb581db5f3ba1d7fcd98cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osqp_vendor-release"; + rev = "release/rolling/osqp_vendor/0.2.0-1"; + sha256 = "sha256-I6jhthmRppj6fiDd1M+bbW8W/bsR5/0ur5UWcf4/ZGQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ros-environment ]; diff --git a/distros/rolling/osrf-pycommon/default.nix b/distros/rolling/osrf-pycommon/default.nix index b243a86077..8704b19d02 100644 --- a/distros/rolling/osrf-pycommon/default.nix +++ b/distros/rolling/osrf-pycommon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-osrf-pycommon"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osrf_pycommon-release/archive/release/rolling/osrf_pycommon/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "eafee255e0db354c281db4743751ac231aa0ccbfe8a7f398ef1ee774116f957a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osrf_pycommon-release"; + rev = "release/rolling/osrf_pycommon/2.1.0-1"; + sha256 = "sha256-Jagi5o6y6ob8H7noMWMF79xB0q806Lyxnqb7Zb4Ov/g="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.importlib-metadata ]; diff --git a/distros/rolling/osrf-testing-tools-cpp/default.nix b/distros/rolling/osrf-testing-tools-cpp/default.nix index c39a1f31c0..7b38ac6f1e 100644 --- a/distros/rolling/osrf-testing-tools-cpp/default.nix +++ b/distros/rolling/osrf-testing-tools-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-osrf-testing-tools-cpp"; version = "1.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/osrf_testing_tools_cpp-release/archive/release/rolling/osrf_testing_tools_cpp/1.5.1-1.tar.gz"; - name = "1.5.1-1.tar.gz"; - sha256 = "67774cad82f65cec778006841bbfe8e653221fb8167c1c7221bbe008b03844c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "osrf_testing_tools_cpp-release"; + rev = "release/rolling/osrf_testing_tools_cpp/1.5.1-1"; + sha256 = "sha256-iAKn39fp7o3r6B5o5HcBwH9k6+fnzOR5UIEeb5DWYPw="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/ouster-msgs/default.nix b/distros/rolling/ouster-msgs/default.nix index 3dda70cc40..8bc1d12b38 100644 --- a/distros/rolling/ouster-msgs/default.nix +++ b/distros/rolling/ouster-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ouster-msgs"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_ouster_drivers-release/archive/release/rolling/ouster_msgs/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "b79f905dbe0a0f641147cf8c2a05ce18876a862476f1c591523731a1de1f952f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_ouster_drivers-release"; + rev = "release/rolling/ouster_msgs/0.4.0-1"; + sha256 = "sha256-oylHsdjvwrFqsBGe0Ge/z8sd3v6XRA8lMhlzdlXLPyM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ouxt-common/default.nix b/distros/rolling/ouxt-common/default.nix index efecdee4d7..473c114e45 100644 --- a/distros/rolling/ouxt-common/default.nix +++ b/distros/rolling/ouxt-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ouxt-common"; version = "0.0.8-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ouxt_common-release/archive/release/rolling/ouxt_common/0.0.8-2.tar.gz"; - name = "0.0.8-2.tar.gz"; - sha256 = "f54330eec8cb03dd3c17efddaaf49d98649fd457919b33efbc79650666372e44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ouxt_common-release"; + rev = "release/rolling/ouxt_common/0.0.8-2"; + sha256 = "sha256-4nyGy7HVcpb5Cb/zBa9+kz8o7aXZyGqY2Fdy17Xd9ZY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ouxt-lint-common/default.nix b/distros/rolling/ouxt-lint-common/default.nix index 3fb9e1de4c..46d0121521 100644 --- a/distros/rolling/ouxt-lint-common/default.nix +++ b/distros/rolling/ouxt-lint-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ouxt-lint-common"; version = "0.0.8-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ouxt_common-release/archive/release/rolling/ouxt_lint_common/0.0.8-2.tar.gz"; - name = "0.0.8-2.tar.gz"; - sha256 = "2be2df274ad1432716eafb6e0fbcd476cd4ccf46ce58b195aacde1c35eb83911"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ouxt_common-release"; + rev = "release/rolling/ouxt_lint_common/0.0.8-2"; + sha256 = "sha256-CzvbzrJWL16B2/c63ryLS008hT4dSu50P4AhU+lsHpQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/parameter-traits/default.nix b/distros/rolling/parameter-traits/default.nix index 3d1ab47c39..32ec35c91e 100644 --- a/distros/rolling/parameter-traits/default.nix +++ b/distros/rolling/parameter-traits/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-parameter-traits"; version = "0.3.0-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/generate_parameter_library-release/archive/release/rolling/parameter_traits/0.3.0-1.tar.gz"; - name = "0.3.0-1.tar.gz"; - sha256 = "9abb0f7275b3a4a05645b572fb47b2100b96d73f6825d5a85d351e5ddc78c87c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "generate_parameter_library-release"; + rev = "release/rolling/parameter_traits/0.3.0-1"; + sha256 = "sha256-CE7WX8x5Ilik/BADGqMSQOBYcG2ZakWdUKs7Ergu22g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/pcl-conversions/default.nix b/distros/rolling/pcl-conversions/default.nix index e66d928cf5..a7b06212b6 100644 --- a/distros/rolling/pcl-conversions/default.nix +++ b/distros/rolling/pcl-conversions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pcl-conversions"; version = "2.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/rolling/pcl_conversions/2.4.0-3.tar.gz"; - name = "2.4.0-3.tar.gz"; - sha256 = "bf50262d64f65ad0814533b7ebdc4736b018f7716b2b60fb982e30741a3c0998"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/rolling/pcl_conversions/2.4.0-3"; + sha256 = "sha256-Yhd4nTb/B3ZWVpZk/WiJMPIqeR7Bp/yWryUXWUuz0bU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/pcl-msgs/default.nix b/distros/rolling/pcl-msgs/default.nix index 31ead30507..bb07b17afd 100644 --- a/distros/rolling/pcl-msgs/default.nix +++ b/distros/rolling/pcl-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pcl-msgs"; version = "1.0.0-r6"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pcl_msgs-release/archive/release/rolling/pcl_msgs/1.0.0-6.tar.gz"; - name = "1.0.0-6.tar.gz"; - sha256 = "89e83496581fffa5d74ac6d4f8878bae740ec35493b9e07aedf4124a64eb3ee1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pcl_msgs-release"; + rev = "release/rolling/pcl_msgs/1.0.0-6"; + sha256 = "sha256-YdspDlpwU8CIVBKEa3kLCnDsR3MsuehC9zuvXtAnt4w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/pcl-ros/default.nix b/distros/rolling/pcl-ros/default.nix index 261ae6128e..e84b3d4fdb 100644 --- a/distros/rolling/pcl-ros/default.nix +++ b/distros/rolling/pcl-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pcl-ros"; version = "2.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/rolling/pcl_ros/2.4.0-3.tar.gz"; - name = "2.4.0-3.tar.gz"; - sha256 = "a976f6489ff84d06b07a31375357c6e59d4b7557228a91c5f5b158a029f398f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/rolling/pcl_ros/2.4.0-3"; + sha256 = "sha256-y37VynRX0MmG+KHoNnewCb8S6U4+GBY8nETGRMq+pY8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/pendulum-control/default.nix b/distros/rolling/pendulum-control/default.nix index 07306c7a50..f45b1ba374 100644 --- a/distros/rolling/pendulum-control/default.nix +++ b/distros/rolling/pendulum-control/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pendulum-control"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/pendulum_control/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "6eb609679b10d21fa557ff79d630124cc121473409c553a40101c3bddf454b53"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/pendulum_control/0.23.0-1"; + sha256 = "sha256-QYP3BztMJbGwuB9j/RG4KoZysVghSt4LDi2/iH5+690="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/pendulum-msgs/default.nix b/distros/rolling/pendulum-msgs/default.nix index 60e3f699ee..42819a881f 100644 --- a/distros/rolling/pendulum-msgs/default.nix +++ b/distros/rolling/pendulum-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pendulum-msgs"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/pendulum_msgs/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "65314bd1117be8471cc3efa895d93ece8b7e19a6178b224e500d6cc3072064fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/pendulum_msgs/0.23.0-1"; + sha256 = "sha256-eUsQdjfOA0iFOttdAN2/z71hZ8ys0Qz6jHPQz+kL6Og="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/perception-pcl/default.nix b/distros/rolling/perception-pcl/default.nix index 6c700b3cc5..9129e17b06 100644 --- a/distros/rolling/perception-pcl/default.nix +++ b/distros/rolling/perception-pcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-perception-pcl"; version = "2.4.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/perception_pcl-release/archive/release/rolling/perception_pcl/2.4.0-3.tar.gz"; - name = "2.4.0-3.tar.gz"; - sha256 = "a18772a44e5733bb839729977ed8cf58958bbef74ab506d31e0702c0ef4c3492"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "perception_pcl-release"; + rev = "release/rolling/perception_pcl/2.4.0-3"; + sha256 = "sha256-vaelynEY5Nl6dBCMHgjnRIcRRl4Em53DNQIvwfmo36A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/perception/default.nix b/distros/rolling/perception/default.nix index ba016fae64..b218c213ed 100644 --- a/distros/rolling/perception/default.nix +++ b/distros/rolling/perception/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-perception"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/rolling/perception/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "2b24e8b105b0a395b82b519fce587f7be6707b134728b217cb1f4331fc9ad2ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/rolling/perception/0.10.0-1"; + sha256 = "sha256-c9lGVLwPCuMSbgiHggs37sSu7II5YKdn0ruTBwk2wMs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/performance-test-fixture/default.nix b/distros/rolling/performance-test-fixture/default.nix index 7440cd5dd4..98565b3469 100644 --- a/distros/rolling/performance-test-fixture/default.nix +++ b/distros/rolling/performance-test-fixture/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-performance-test-fixture"; version = "0.0.9-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/performance_test_fixture-release/archive/release/rolling/performance_test_fixture/0.0.9-1.tar.gz"; - name = "0.0.9-1.tar.gz"; - sha256 = "d583714458f8d932e46e7a11b0e8850a9327cbefffd31c5d304d92d5bfc0dcf4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "performance_test_fixture-release"; + rev = "release/rolling/performance_test_fixture/0.0.9-1"; + sha256 = "sha256-AGkyb6QjietsUExtcqvwhnGy5Sd2EFBT8JkBAd4rb4o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ament-cmake-export-dependencies ament-cmake-export-targets ament-cmake-test ]; diff --git a/distros/rolling/performance-test/default.nix b/distros/rolling/performance-test/default.nix index d6414c8613..206c90d9fa 100644 --- a/distros/rolling/performance-test/default.nix +++ b/distros/rolling/performance-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-performance-test"; version = "1.2.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/performance_test-release/archive/release/rolling/performance_test/1.2.1-2.tar.gz"; - name = "1.2.1-2.tar.gz"; - sha256 = "b4071d74cda85348dfed0f509e42d9c3379d0989abb5a1f8c76c077ba19ad203"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "performance_test-release"; + rev = "release/rolling/performance_test/1.2.1-2"; + sha256 = "sha256-u4mAwbA+JRMXmY53Z0E6Uz7BQJcVZkDovcmnVCK1KxU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake osrf-testing-tools-cpp rosidl-default-generators ]; diff --git a/distros/rolling/phidgets-accelerometer/default.nix b/distros/rolling/phidgets-accelerometer/default.nix index 1371e35d64..8a9010b35b 100644 --- a/distros/rolling/phidgets-accelerometer/default.nix +++ b/distros/rolling/phidgets-accelerometer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-accelerometer"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_accelerometer/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "80b75c09e40a2c621b672413b4daada18121032ddc70c207a2d33376d7d454af"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_accelerometer/2.3.0-1"; + sha256 = "sha256-ZZ38MAd5LLwpkOcc0xySyAADOtKfbo1UhCbo3xHUHf4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-analog-inputs/default.nix b/distros/rolling/phidgets-analog-inputs/default.nix index f0754451db..3f9922cff4 100644 --- a/distros/rolling/phidgets-analog-inputs/default.nix +++ b/distros/rolling/phidgets-analog-inputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-analog-inputs"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_analog_inputs/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "b646ca1ca2368153f8acb6320a8d30d184faf977a1d75253a54bf0eb5aaf75d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_analog_inputs/2.3.0-1"; + sha256 = "sha256-gL8HOdwoDA0GqMihsxhlj6gh6+u81FDWe5OHmNjkpWE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-api/default.nix b/distros/rolling/phidgets-api/default.nix index 4e015acd86..3a048a71b2 100644 --- a/distros/rolling/phidgets-api/default.nix +++ b/distros/rolling/phidgets-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-api"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_api/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "ca81e46ec591af59374b7a0ed3a9a0aeec3f9ff03157712486b26bd58ca2e08d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_api/2.3.0-1"; + sha256 = "sha256-9pXa6lWke+ucR8zTxpZjlQfMeJWONZYZUvmjBQIqLZM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-digital-inputs/default.nix b/distros/rolling/phidgets-digital-inputs/default.nix index f93d9a1f36..602e9619bd 100644 --- a/distros/rolling/phidgets-digital-inputs/default.nix +++ b/distros/rolling/phidgets-digital-inputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-digital-inputs"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_digital_inputs/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "1e52dd82e73bfa778311cb909e2eaf67a6a3bd4eceaadebe611868f88cf66da2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_digital_inputs/2.3.0-1"; + sha256 = "sha256-e4bvL+yTdSX8se9BLUOEEjUGo21Yyz6MSg7BhPOc7Aw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-digital-outputs/default.nix b/distros/rolling/phidgets-digital-outputs/default.nix index 6c450cd254..4f6aa7691e 100644 --- a/distros/rolling/phidgets-digital-outputs/default.nix +++ b/distros/rolling/phidgets-digital-outputs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-digital-outputs"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_digital_outputs/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "3d4b56dedc67747a9e88b32a9adfca56dae0ad0187f529a74a2509413dad0e7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_digital_outputs/2.3.0-1"; + sha256 = "sha256-zOFyZkgcW26GCITyhA5OlHtMEp2iOOtVV3tVFdq6fNg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-drivers/default.nix b/distros/rolling/phidgets-drivers/default.nix index d66ee72667..95cd67a97b 100644 --- a/distros/rolling/phidgets-drivers/default.nix +++ b/distros/rolling/phidgets-drivers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-drivers"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_drivers/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "a3a3c48658a4f7c3d1e0b1418dae48c51ef9dd60d7bdd622bbc26681d6c42c48"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_drivers/2.3.0-1"; + sha256 = "sha256-e7a4VL3O/iO56J1ltHQdTNbdIM7PUNt7vA8k8mrxb/M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/phidgets-gyroscope/default.nix b/distros/rolling/phidgets-gyroscope/default.nix index 316426179f..ba8932496f 100644 --- a/distros/rolling/phidgets-gyroscope/default.nix +++ b/distros/rolling/phidgets-gyroscope/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-gyroscope"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_gyroscope/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "b40a932f68792b56ae5bfc453cab6bc42bb6bc432942b01b3259128f0942f645"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_gyroscope/2.3.0-1"; + sha256 = "sha256-+mhlfdRHl7101Ao2qYW3ogNPpHsjeInSXyYSx1915bs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-high-speed-encoder/default.nix b/distros/rolling/phidgets-high-speed-encoder/default.nix index 6c011d67a9..2dea7cc168 100644 --- a/distros/rolling/phidgets-high-speed-encoder/default.nix +++ b/distros/rolling/phidgets-high-speed-encoder/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-high-speed-encoder"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_high_speed_encoder/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "3db493a6dd2360fe54f80b8438efbc8d6796dfeef3a2c1bace7f93909644854f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_high_speed_encoder/2.3.0-1"; + sha256 = "sha256-dsxanJZdDiTWtlSUgDzXZWvzc6uCFf/qVV7s5zyF+ys="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-ik/default.nix b/distros/rolling/phidgets-ik/default.nix index 2aec53660a..16b1dcf2dd 100644 --- a/distros/rolling/phidgets-ik/default.nix +++ b/distros/rolling/phidgets-ik/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-ik"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_ik/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "33b08f0b6188152ca9fa09e44e3e649ac232352c02fceedb5bbfe22d3bf615c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_ik/2.3.0-1"; + sha256 = "sha256-xV9s5q10/6CJKEdpCngj3LGli0cIFUgZLgHAdqUjgpY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/phidgets-magnetometer/default.nix b/distros/rolling/phidgets-magnetometer/default.nix index f8cae8e60f..0b868b71af 100644 --- a/distros/rolling/phidgets-magnetometer/default.nix +++ b/distros/rolling/phidgets-magnetometer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-magnetometer"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_magnetometer/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "329f9996582ea31bc12a262dd694e5a572d0217dbc08601b17946ea340568b29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_magnetometer/2.3.0-1"; + sha256 = "sha256-YG+rzCkh8JuJ+3squICUuWd97KP/uZQ7JW9+r/teKow="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-motors/default.nix b/distros/rolling/phidgets-motors/default.nix index ef40f3d95b..dd5d1f2f86 100644 --- a/distros/rolling/phidgets-motors/default.nix +++ b/distros/rolling/phidgets-motors/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-motors"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_motors/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "bcc73f1ffd8ff5dcd9d890b93d3454cb3a154183d8bdf249467ffe500a634166"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_motors/2.3.0-1"; + sha256 = "sha256-CJ15pEIC0w/oEqLyGVnrQZqm/k6hjHTUfobsw9vaRcA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-msgs/default.nix b/distros/rolling/phidgets-msgs/default.nix index 34161d7f46..1725793e97 100644 --- a/distros/rolling/phidgets-msgs/default.nix +++ b/distros/rolling/phidgets-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-msgs"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_msgs/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "aaed3e0d42760cb34afa69098a8e59b40fc5156441cb9e7afd91281f7bafa622"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_msgs/2.3.0-1"; + sha256 = "sha256-KdyLUx65wdwbkUEqtpBamPz4Si2mVRADGNH0G8756dg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/phidgets-spatial/default.nix b/distros/rolling/phidgets-spatial/default.nix index 0164579fe0..829ca00ed8 100644 --- a/distros/rolling/phidgets-spatial/default.nix +++ b/distros/rolling/phidgets-spatial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-spatial"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_spatial/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "2501e496a87c16310b02e974063dc9862254ca866dee082550373984239ac845"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_spatial/2.3.0-1"; + sha256 = "sha256-Kp1BaQKjpaOh8SZWo/h8mLTA4ZfYszHCYd0vY8xqtNI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/phidgets-temperature/default.nix b/distros/rolling/phidgets-temperature/default.nix index b9f8eb4331..fe795675ac 100644 --- a/distros/rolling/phidgets-temperature/default.nix +++ b/distros/rolling/phidgets-temperature/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-phidgets-temperature"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/phidgets_drivers-release/archive/release/rolling/phidgets_temperature/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "bb13fd6e318c3e7665df4fb7a20ea1a87993e419686fb32984576da7de331640"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "phidgets_drivers-release"; + rev = "release/rolling/phidgets_temperature/2.3.0-1"; + sha256 = "sha256-ysJlA4vNbW2mfoCNFXJTIwEJO0N44VHIUqHeOAi0BL0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/picknik-ament-copyright/default.nix b/distros/rolling/picknik-ament-copyright/default.nix index d778edf445..569c525d65 100644 --- a/distros/rolling/picknik-ament-copyright/default.nix +++ b/distros/rolling/picknik-ament-copyright/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-picknik-ament-copyright"; version = "0.0.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/picknik_ament_copyright-release/archive/release/rolling/picknik_ament_copyright/0.0.2-2.tar.gz"; - name = "0.0.2-2.tar.gz"; - sha256 = "48f7a7ad8667dfa7077ae7c3e87a13604a3780e469ea77c968254c96cf85d5f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "picknik_ament_copyright-release"; + rev = "release/rolling/picknik_ament_copyright/0.0.2-2"; + sha256 = "sha256-zw0URrOQbcL7fo+BgOUHgI0yqf0DDRVGnOOxbJmog48="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/pilz-industrial-motion-planner-testutils/default.nix b/distros/rolling/pilz-industrial-motion-planner-testutils/default.nix index 2203735113..137eb43094 100644 --- a/distros/rolling/pilz-industrial-motion-planner-testutils/default.nix +++ b/distros/rolling/pilz-industrial-motion-planner-testutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pilz-industrial-motion-planner-testutils"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/pilz_industrial_motion_planner_testutils/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "ec8160d4695885f91df0d3f831c367bfd7cbeebd221697d3ceadcaa68c47079f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/pilz_industrial_motion_planner_testutils/2.6.0-1"; + sha256 = "sha256-bCEQx826CMflWlJ73u6PbmZfnHzygx8tSATgir9d880="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake tf2-eigen ]; diff --git a/distros/rolling/pilz-industrial-motion-planner/default.nix b/distros/rolling/pilz-industrial-motion-planner/default.nix index 646d186d45..4b1687c08d 100644 --- a/distros/rolling/pilz-industrial-motion-planner/default.nix +++ b/distros/rolling/pilz-industrial-motion-planner/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pilz-industrial-motion-planner"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/moveit/moveit2-release/archive/release/rolling/pilz_industrial_motion_planner/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "71137fa513f4e2bda518648942a16a8bb91191ff3197e7da11db8e55270796e6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "moveit"; + repo = "moveit2-release"; + rev = "release/rolling/pilz_industrial_motion_planner/2.6.0-1"; + sha256 = "sha256-naSMXE8oN8FLZ2dmN7i3rq2Q4WH7Aktb3vc+U9EjB4s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/pinocchio/default.nix b/distros/rolling/pinocchio/default.nix index f128418088..776a32618c 100644 --- a/distros/rolling/pinocchio/default.nix +++ b/distros/rolling/pinocchio/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, boost, clang, cmake, doxygen, eigen, eigenpy, git, hpp-fcl, python3, python3Packages, urdfdom }: buildRosPackage { pname = "ros-rolling-pinocchio"; - version = "2.6.12-r1"; + version = "2.6.15-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pinocchio-release/archive/release/rolling/pinocchio/2.6.12-1.tar.gz"; - name = "2.6.12-1.tar.gz"; - sha256 = "8ae4c41ab9004b08fc0896ddae8268be204a8105635ce4dea8d549fe51d76f97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pinocchio-release"; + rev = "release/rolling/pinocchio/2.6.15-1"; + sha256 = "sha256-hXWKT/bgvPhX512Yq6HmFBpXwYZBucvI6HDEWMpS9fA="; + }; buildType = "cmake"; buildInputs = [ clang cmake doxygen git ]; diff --git a/distros/rolling/plotjuggler-msgs/default.nix b/distros/rolling/plotjuggler-msgs/default.nix index d01771ba9a..23cd062539 100644 --- a/distros/rolling/plotjuggler-msgs/default.nix +++ b/distros/rolling/plotjuggler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-plotjuggler-msgs"; version = "0.2.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/plotjuggler_msgs-release/archive/release/rolling/plotjuggler_msgs/0.2.3-2.tar.gz"; - name = "0.2.3-2.tar.gz"; - sha256 = "a3cc0e4b7a2b2cd4e5f32e7e51c09da6214d8c6a524a75b4ed64e556225659ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "plotjuggler_msgs-release"; + rev = "release/rolling/plotjuggler_msgs/0.2.3-2"; + sha256 = "sha256-Lu4ZRsDpvbS2QzbjWOL23H8lsKRSTPGe6MgiCaUedO4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/plotjuggler-ros/default.nix b/distros/rolling/plotjuggler-ros/default.nix index ee9476df31..fb793f8ba2 100644 --- a/distros/rolling/plotjuggler-ros/default.nix +++ b/distros/rolling/plotjuggler-ros/default.nix @@ -5,13 +5,17 @@ { 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-rolling-plotjuggler-ros"; - version = "1.5.1-r2"; + version = "1.7.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/plotjuggler-ros-plugins-release/archive/release/rolling/plotjuggler_ros/1.5.1-2.tar.gz"; - name = "1.5.1-2.tar.gz"; - sha256 = "316f952eede49fd0b5f7ffe5479f4102baacf31af2525c214262f869cdd6ecbc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "plotjuggler-ros-plugins-release"; + rev = "release/rolling/plotjuggler_ros/1.7.3-3"; + sha256 = "sha256-ezW6pVV11yzVp0y9eUSZIfFE1fAwKKjrS5UJmxxLC7k="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/plotjuggler/default.nix b/distros/rolling/plotjuggler/default.nix index 0c4b8b849b..ba7f96acc7 100644 --- a/distros/rolling/plotjuggler/default.nix +++ b/distros/rolling/plotjuggler/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-plotjuggler"; version = "3.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/plotjuggler-release/archive/release/rolling/plotjuggler/3.5.1-1.tar.gz"; - name = "3.5.1-1.tar.gz"; - sha256 = "b9ee3382ed5df31652a1d2e778716f7487b41475d78b1919fbdaa355be0eb910"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "plotjuggler-release"; + rev = "release/rolling/plotjuggler/3.5.1-1"; + sha256 = "sha256-WvQEM88AESCxr0oJp3yxWyWMX6zgR+M/kyrONmGt7N4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/pluginlib/default.nix b/distros/rolling/pluginlib/default.nix index e0510da02d..f46f25d5ce 100644 --- a/distros/rolling/pluginlib/default.nix +++ b/distros/rolling/pluginlib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pluginlib"; version = "5.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pluginlib-release/archive/release/rolling/pluginlib/5.2.1-1.tar.gz"; - name = "5.2.1-1.tar.gz"; - sha256 = "e716b282ce049be7f68da54f9abb771c44903d2917128567fe565b86810adf56"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pluginlib-release"; + rev = "release/rolling/pluginlib/5.2.1-1"; + sha256 = "sha256-GnQonedocJAzqRn6N+CRmPjNCOt66kpMpsgutiofqkw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/point-cloud-msg-wrapper/default.nix b/distros/rolling/point-cloud-msg-wrapper/default.nix index 5e67c866cc..77fa41775a 100644 --- a/distros/rolling/point-cloud-msg-wrapper/default.nix +++ b/distros/rolling/point-cloud-msg-wrapper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-point-cloud-msg-wrapper"; version = "1.0.7-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/point_cloud_msg_wrapper-release/archive/release/rolling/point_cloud_msg_wrapper/1.0.7-2.tar.gz"; - name = "1.0.7-2.tar.gz"; - sha256 = "2005089636bec115a9829eca64f8d8f625caea084295a045080ce71751d34807"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "point_cloud_msg_wrapper-release"; + rev = "release/rolling/point_cloud_msg_wrapper/1.0.7-2"; + sha256 = "sha256-LiHXg+Jj7fMDItxqFAz8F5On1mitqVf18p4luIzXtWk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/rolling/pointcloud-to-laserscan/default.nix b/distros/rolling/pointcloud-to-laserscan/default.nix index ec16faf4bf..29c4ccba9e 100644 --- a/distros/rolling/pointcloud-to-laserscan/default.nix +++ b/distros/rolling/pointcloud-to-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pointcloud-to-laserscan"; version = "2.0.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pointcloud_to_laserscan-release/archive/release/rolling/pointcloud_to_laserscan/2.0.1-2.tar.gz"; - name = "2.0.1-2.tar.gz"; - sha256 = "78beaa6308a0952ccb13df1c8a9e1ca22dc03536beb6527a3ce7f815da20a957"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pointcloud_to_laserscan-release"; + rev = "release/rolling/pointcloud_to_laserscan/2.0.1-2"; + sha256 = "sha256-JPlIFeKS6DMGh6xSWvg9EPxL1diI2e9udRprTb9LzZE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/pose-cov-ops/default.nix b/distros/rolling/pose-cov-ops/default.nix index 4a408a82d5..91777ba3fa 100644 --- a/distros/rolling/pose-cov-ops/default.nix +++ b/distros/rolling/pose-cov-ops/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pose-cov-ops"; version = "0.3.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pose_cov_ops-release/archive/release/rolling/pose_cov_ops/0.3.8-1.tar.gz"; - name = "0.3.8-1.tar.gz"; - sha256 = "aa882c3c81145f65e871e95df2b8b9fa3c991b6a87bdb7d3575010c013df461a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pose_cov_ops-release"; + rev = "release/rolling/pose_cov_ops/0.3.8-1"; + sha256 = "sha256-PedCn7b0uRpfsVpaUyJ5yPWogpyzEvsBI6xR2g6O7RE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-gmock ament-cmake-gtest ament-cmake-xmllint cmake ros-environment ]; diff --git a/distros/rolling/position-controllers/default.nix b/distros/rolling/position-controllers/default.nix index e6c8eedb2f..c84177782d 100644 --- a/distros/rolling/position-controllers/default.nix +++ b/distros/rolling/position-controllers/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-manager, forward-command-controller, pluginlib, rclcpp, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-manager, forward-command-controller, pluginlib, rclcpp, ros2-control-test-assets }: buildRosPackage { pname = "ros-rolling-position-controllers"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/position_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "b1e600cefcd0eb9383e652cfe006ec4c7786c98eec05b6fdb1b621b2fed0d5dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/position_controllers/3.1.0-1"; + sha256 = "sha256-kbhEBM6Bv3tHj50DnznD2z9fom+x9jD8kC/vn+R+LNw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ forward-command-controller rclcpp ]; + propagatedBuildInputs = [ backward-ros forward-command-controller rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/py-trees-ros-interfaces/default.nix b/distros/rolling/py-trees-ros-interfaces/default.nix index cc66330ae2..b3d4b2f668 100644 --- a/distros/rolling/py-trees-ros-interfaces/default.nix +++ b/distros/rolling/py-trees-ros-interfaces/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-msgs, ament-cmake, ament-lint-common, diagnostic-msgs, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, unique-identifier-msgs }: buildRosPackage { pname = "ros-rolling-py-trees-ros-interfaces"; - version = "2.0.3-r1"; + version = "2.0.3-r4"; - src = fetchurl { - url = "https://github.com/stonier/py_trees_ros_interfaces-release/archive/release/rolling/py_trees_ros_interfaces/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "eaa1cf2351072901940778fb7effd896f88434acc17eed8244b878e4728626d6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "py_trees_ros_interfaces-release"; + rev = "release/rolling/py_trees_ros_interfaces/2.0.3-4"; + sha256 = "sha256-/YAn9axu8hgAg09ST4zfeqgKuT03Ar4oCl3A9wNUdWg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/py-trees/default.nix b/distros/rolling/py-trees/default.nix new file mode 100644 index 0000000000..3391ef0690 --- /dev/null +++ b/distros/rolling/py-trees/default.nix @@ -0,0 +1,28 @@ + +# Copyright 2023 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, python3Packages }: +buildRosPackage { + pname = "ros-rolling-py-trees"; + version = "2.2.1-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "py_trees-release"; + rev = "release/rolling/py_trees/2.2.1-1"; + sha256 = "sha256-D4D4KgMpC2gXiPRmmTMkb2IW5rzxXUbEUFu5RVEnaqc="; + }; + + buildType = "ament_python"; + buildInputs = [ python3Packages.setuptools ]; + propagatedBuildInputs = [ python3Packages.pydot ]; + + meta = { + description = ''Pythonic implementation of behaviour trees.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/rolling/pybind11-json-vendor/default.nix b/distros/rolling/pybind11-json-vendor/default.nix index 74568c5246..e38b57cb6d 100644 --- a/distros/rolling/pybind11-json-vendor/default.nix +++ b/distros/rolling/pybind11-json-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pybind11-json-vendor"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pybind11_json_vendor-release/archive/release/rolling/pybind11_json_vendor/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "9a2effacb4289db6471fb972d7e528e31ab51fce12bf32af3ccda012486bef68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pybind11_json_vendor-release"; + rev = "release/rolling/pybind11_json_vendor/0.2.2-1"; + sha256 = "sha256-qoFKeo7jfb52fZdwNmBZ4HguVJdKPPh2ULzBGHZFPJ0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/pybind11-vendor/default.nix b/distros/rolling/pybind11-vendor/default.nix index b970a2082a..99950c243b 100644 --- a/distros/rolling/pybind11-vendor/default.nix +++ b/distros/rolling/pybind11-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-pybind11-vendor"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/pybind11_vendor-release/archive/release/rolling/pybind11_vendor/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "2bfc6e6b549c72b0bc6765a246fa6a77d67213f86a28493c3d295071efe438d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "pybind11_vendor-release"; + rev = "release/rolling/pybind11_vendor/3.0.2-1"; + sha256 = "sha256-9/LsOZIBXBEFOECyXi0ljTgUZk5wEtGyNUHZ1r2dbvI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/python-cmake-module/default.nix b/distros/rolling/python-cmake-module/default.nix index 0f21610d42..d931fbe686 100644 --- a/distros/rolling/python-cmake-module/default.nix +++ b/distros/rolling/python-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-python-cmake-module"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/python_cmake_module-release/archive/release/rolling/python_cmake_module/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "9b964563288c32d7578328efe797c9ce7ae2a4d130a065d884ef443c990547fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "python_cmake_module-release"; + rev = "release/rolling/python_cmake_module/0.10.1-1"; + sha256 = "sha256-pLwS7Ch7Zqch033Z4Qe35W1AOQz4fvBmwGiH2C+FfNg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/python-orocos-kdl-vendor/default.nix b/distros/rolling/python-orocos-kdl-vendor/default.nix index b73ae82b0a..a47ed8d2eb 100644 --- a/distros/rolling/python-orocos-kdl-vendor/default.nix +++ b/distros/rolling/python-orocos-kdl-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-python-orocos-kdl-vendor"; version = "0.3.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/orocos_kdl_vendor-release/archive/release/rolling/python_orocos_kdl_vendor/0.3.4-1.tar.gz"; - name = "0.3.4-1.tar.gz"; - sha256 = "26d3205193deaed462ec00b651cf0be2f7033a5302b4ddd802f3548d67e5da1f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "orocos_kdl_vendor-release"; + rev = "release/rolling/python_orocos_kdl_vendor/0.3.4-1"; + sha256 = "sha256-x4xJ/ugl2IkKnTrezCQgIrkPr3KR+KI1Q7+Y69Wggis="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python python-cmake-module ]; diff --git a/distros/rolling/python-qt-binding/default.nix b/distros/rolling/python-qt-binding/default.nix index 51444ed8ef..4a24a2b651 100644 --- a/distros/rolling/python-qt-binding/default.nix +++ b/distros/rolling/python-qt-binding/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-python-qt-binding"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/python_qt_binding-release/archive/release/rolling/python_qt_binding/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "10b196a7bfca5606ec27420dc6f8233e3d926d95b226f898972ff9e459ea6628"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "python_qt_binding-release"; + rev = "release/rolling/python_qt_binding/1.2.0-1"; + sha256 = "sha256-AT0Kp3YFa14apGbBkI6y0TUx3DKNQMsS8NKrPTTY0uo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/rolling/qpoases-vendor/default.nix b/distros/rolling/qpoases-vendor/default.nix index b124036286..6fb687dcb1 100644 --- a/distros/rolling/qpoases-vendor/default.nix +++ b/distros/rolling/qpoases-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-qpoases-vendor"; version = "3.2.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qpoases_vendor-release/archive/release/rolling/qpoases_vendor/3.2.3-2.tar.gz"; - name = "3.2.3-2.tar.gz"; - sha256 = "35e308c6014bc2ddd5017a4f279b15d4a16343791fa1f93babbc9909e36091a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qpoases_vendor-release"; + rev = "release/rolling/qpoases_vendor/3.2.3-2"; + sha256 = "sha256-jUSNiB8b0P8JHYXdXeKMs5Ucxjk+fhbPqxcJnD2GIQ4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/qt-dotgraph/default.nix b/distros/rolling/qt-dotgraph/default.nix index b1e18883d5..d9a9519129 100644 --- a/distros/rolling/qt-dotgraph/default.nix +++ b/distros/rolling/qt-dotgraph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-qt-dotgraph"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/rolling/qt_dotgraph/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "1539b9d3b2e4127160525a2db352b309a1fe69a80cebed7cd9d938cbb47fc0bd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/rolling/qt_dotgraph/2.3.2-1"; + sha256 = "sha256-iyzVzqaGa8aQ8zCCgA7e/w7YmodpUcB87g0//JMpCA4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/qt-gui-app/default.nix b/distros/rolling/qt-gui-app/default.nix index 89de7d0d5e..cc7505a593 100644 --- a/distros/rolling/qt-gui-app/default.nix +++ b/distros/rolling/qt-gui-app/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-qt-gui-app"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/rolling/qt_gui_app/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "1e2240184ffd64ebb5ed93c7ea6e5b6ca339213f1a54692668967061c168f624"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/rolling/qt_gui_app/2.3.2-1"; + sha256 = "sha256-/f6tIL18w5Y46rUbyi3J7WcDzkt6U6URo/73eaVgHxU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/qt-gui-core/default.nix b/distros/rolling/qt-gui-core/default.nix index 726791b471..93a8c66f15 100644 --- a/distros/rolling/qt-gui-core/default.nix +++ b/distros/rolling/qt-gui-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-qt-gui-core"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/rolling/qt_gui_core/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "93fa0e8cf0c7267b23b3545f2fe5bdc91665178748a9c773803ead734687cb7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/rolling/qt_gui_core/2.3.2-1"; + sha256 = "sha256-xk+dHf9ScJ1rNLXTAftbTElbIuAexKuF0ZpKPbPJpdk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/qt-gui-cpp/default.nix b/distros/rolling/qt-gui-cpp/default.nix index db88e19f6d..6c2a53d6a4 100644 --- a/distros/rolling/qt-gui-cpp/default.nix +++ b/distros/rolling/qt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-qt-gui-cpp"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/rolling/qt_gui_cpp/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "b7111d192d8f689189c4d3d5a27877c0fe7c573e5e29260e3d38dd8d0e820b3b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/rolling/qt_gui_cpp/2.3.2-1"; + sha256 = "sha256-9AopTZl8Zhg+UcK3AjGiAYe6BZA3mOp7YG/RKJc/gDg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config python-qt-binding qt5.qtbase ]; diff --git a/distros/rolling/qt-gui-py-common/default.nix b/distros/rolling/qt-gui-py-common/default.nix index 22c95c0b27..27b3102d95 100644 --- a/distros/rolling/qt-gui-py-common/default.nix +++ b/distros/rolling/qt-gui-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-qt-gui-py-common"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/rolling/qt_gui_py_common/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "49ac59cb8cfe4a60feb5d88d3d75a3ca61c25ffd893033fd93dcd820218c5982"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/rolling/qt_gui_py_common/2.3.2-1"; + sha256 = "sha256-svvD2Ai0Q6V5UYl09MHdM1ZdXoO/XeAjfAp9/knZcTI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/qt-gui/default.nix b/distros/rolling/qt-gui/default.nix index 3f07297532..dda3ff72fb 100644 --- a/distros/rolling/qt-gui/default.nix +++ b/distros/rolling/qt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-qt-gui"; version = "2.3.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/rolling/qt_gui/2.3.2-1.tar.gz"; - name = "2.3.2-1.tar.gz"; - sha256 = "686272ba5c2d8f4eba7a34fe7648b7394aff772776abca31539de942bcb5dcc5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "qt_gui_core-release"; + rev = "release/rolling/qt_gui/2.3.2-1"; + sha256 = "sha256-bGACcoB4+Jy3Ui0YWp8N12lR6XoK55IalNZtQKUhkOw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python3Packages.pyqt5 qt5.qtbase ]; diff --git a/distros/rolling/quality-of-service-demo-cpp/default.nix b/distros/rolling/quality-of-service-demo-cpp/default.nix index aa802fe1a5..4decbdf3b1 100644 --- a/distros/rolling/quality-of-service-demo-cpp/default.nix +++ b/distros/rolling/quality-of-service-demo-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-quality-of-service-demo-cpp"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/quality_of_service_demo_cpp/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "49afc5e10802919bdf65b684db9dd46b3b867f1af3417ff9b71cfcd03cab8970"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/quality_of_service_demo_cpp/0.23.0-1"; + sha256 = "sha256-CdwVcEG2WhiEhDQ8ugklbuBfw7vTU6mIcK22D5j/khw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw-implementation-cmake ]; diff --git a/distros/rolling/quality-of-service-demo-py/default.nix b/distros/rolling/quality-of-service-demo-py/default.nix index 6b938aa07d..897e0a93d0 100644 --- a/distros/rolling/quality-of-service-demo-py/default.nix +++ b/distros/rolling/quality-of-service-demo-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-quality-of-service-demo-py"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/quality_of_service_demo_py/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "9ccf89cab7094c2327d9e42a055faf9c2ea31c031e49159f6a469fc06faa54f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/quality_of_service_demo_py/0.23.0-1"; + sha256 = "sha256-89OdylPUlmk8QCcvsWjwR80LKROCB3z7kAxH9kqzBAU="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/quaternion-operation/default.nix b/distros/rolling/quaternion-operation/default.nix index dbd8140728..f1dd1544eb 100644 --- a/distros/rolling/quaternion-operation/default.nix +++ b/distros/rolling/quaternion-operation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-quaternion-operation"; version = "0.0.7-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/quaternion_operation-release/archive/release/rolling/quaternion_operation/0.0.7-2.tar.gz"; - name = "0.0.7-2.tar.gz"; - sha256 = "533530cebee0024b00353383d614af363c190eb9d47c4dd04fb4660a7130b966"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "quaternion_operation-release"; + rev = "release/rolling/quaternion_operation/0.0.7-2"; + sha256 = "sha256-EOoZrowJNVGtJNutD+5WlSgVWbmOGlzSJyvsALmfji8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/r2r-spl-7/default.nix b/distros/rolling/r2r-spl-7/default.nix index 8ca1866def..6f6f261c48 100644 --- a/distros/rolling/r2r-spl-7/default.nix +++ b/distros/rolling/r2r-spl-7/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-r2r-spl-7"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/r2r_spl-release/archive/release/rolling/r2r_spl_7/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "d05563c4dd026b1a3681575e10982cb8bfe5fe9deb7a1db162cc4b21d6e0046e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "r2r_spl-release"; + rev = "release/rolling/r2r_spl_7/3.0.1-1"; + sha256 = "sha256-KqN+JK6GIZritk8/5cBigl1cu2sdMFz9nP3mrSQOsro="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/radar-msgs/default.nix b/distros/rolling/radar-msgs/default.nix index 4d4641fff1..0d0cf470c8 100644 --- a/distros/rolling/radar-msgs/default.nix +++ b/distros/rolling/radar-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-radar-msgs"; version = "0.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/radar_msgs-release/archive/release/rolling/radar_msgs/0.2.2-1.tar.gz"; - name = "0.2.2-1.tar.gz"; - sha256 = "cc91fbc52fa04881e7c6a10bf9beaa6db87c47540ec8ba2bbd6605bc76ddb65b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "radar_msgs-release"; + rev = "release/rolling/radar_msgs/0.2.2-1"; + sha256 = "sha256-HO0hAoc99su0O3J40Mywg7/qtbQJof/b5/wwBnx6xbI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/random-numbers/default.nix b/distros/rolling/random-numbers/default.nix index 6bb0c5eaf0..7a538cbc3c 100644 --- a/distros/rolling/random-numbers/default.nix +++ b/distros/rolling/random-numbers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-random-numbers"; version = "2.0.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/random_numbers-release/archive/release/rolling/random_numbers/2.0.1-2.tar.gz"; - name = "2.0.1-2.tar.gz"; - sha256 = "6e7fe0f9a3209f2f2d199a7b751330296350aa3e9c33ff6c2a16ecf45ec30888"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "random_numbers-release"; + rev = "release/rolling/random_numbers/2.0.1-2"; + sha256 = "sha256-hQN9n+tLK1rKA+wXOXW/TfT4RzrXxvaIfDlzgV+LJnU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rc-common-msgs/default.nix b/distros/rolling/rc-common-msgs/default.nix index 5246e1fcbc..ae1163d5fc 100644 --- a/distros/rolling/rc-common-msgs/default.nix +++ b/distros/rolling/rc-common-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rc-common-msgs"; version = "0.5.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_common_msgs_ros2-release/archive/release/rolling/rc_common_msgs/0.5.3-3.tar.gz"; - name = "0.5.3-3.tar.gz"; - sha256 = "bf747be8abfce92d9ff84d4e99fe22f9dbcbdf7bfd0cb955d6b1c094777f0f80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_common_msgs_ros2-release"; + rev = "release/rolling/rc_common_msgs/0.5.3-3"; + sha256 = "sha256-/ApqcAoxtUu0eHcF5gxxFhroOIdz457iCAONfAC2xxQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rc-dynamics-api/default.nix b/distros/rolling/rc-dynamics-api/default.nix index 3b9047f6d9..09369a4d06 100644 --- a/distros/rolling/rc-dynamics-api/default.nix +++ b/distros/rolling/rc-dynamics-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rc-dynamics-api"; version = "0.10.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_dynamics_api-release/archive/release/rolling/rc_dynamics_api/0.10.3-2.tar.gz"; - name = "0.10.3-2.tar.gz"; - sha256 = "d6563e18d95431da14f080cf914b45531e24766526cdfe16711091699e64dba1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_dynamics_api-release"; + rev = "release/rolling/rc_dynamics_api/0.10.3-2"; + sha256 = "sha256-2Xz3z1UUmRUzeuFyIjo/9HstRwhjRSMaWpjMGwR4e2w="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/rc-genicam-api/default.nix b/distros/rolling/rc-genicam-api/default.nix index 133dbb0dac..c678fecb8c 100644 --- a/distros/rolling/rc-genicam-api/default.nix +++ b/distros/rolling/rc-genicam-api/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rc-genicam-api"; version = "2.5.12-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_genicam_api-release/archive/release/rolling/rc_genicam_api/2.5.12-2.tar.gz"; - name = "2.5.12-2.tar.gz"; - sha256 = "c72e66ceb96d02b4b050194752f933c66f53675717848d1d8847f12dd74d74c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_genicam_api-release"; + rev = "release/rolling/rc_genicam_api/2.5.12-2"; + sha256 = "sha256-YkKXiMMUXT+aUMsQJFQ3PcRm8kWdFZTFd4NM5JLRheA="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/rc-genicam-driver/default.nix b/distros/rolling/rc-genicam-driver/default.nix index 6d93296b1f..6af0614eb4 100644 --- a/distros/rolling/rc-genicam-driver/default.nix +++ b/distros/rolling/rc-genicam-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rc-genicam-driver"; version = "0.2.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_genicam_driver_ros2-release/archive/release/rolling/rc_genicam_driver/0.2.1-2.tar.gz"; - name = "0.2.1-2.tar.gz"; - sha256 = "9eb1f27526093c74c82d3bd247b1fc9ab11959a6d122a3bc8276635399f67e6d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_genicam_driver_ros2-release"; + rev = "release/rolling/rc_genicam_driver/0.2.1-2"; + sha256 = "sha256-nRYR4RZ3PnqDi707KxIuq4SODUBru+GdMF+Ex296hEw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rc-reason-clients/default.nix b/distros/rolling/rc-reason-clients/default.nix index 4098cb9595..cc99f734ce 100644 --- a/distros/rolling/rc-reason-clients/default.nix +++ b/distros/rolling/rc-reason-clients/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rc-reason-clients"; version = "0.2.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_reason_clients-release/archive/release/rolling/rc_reason_clients/0.2.1-3.tar.gz"; - name = "0.2.1-3.tar.gz"; - sha256 = "4bb863984475bfa4d0f7c72e6923b3a1972d797f874c2e479783bed085d1310c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_reason_clients-release"; + rev = "release/rolling/rc_reason_clients/0.2.1-3"; + sha256 = "sha256-0AzKL+C5f5BEGPSkQ+Tj53eFBF2C4KMC1hYhmGqCq94="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/rc-reason-msgs/default.nix b/distros/rolling/rc-reason-msgs/default.nix index 08447b0a54..a0e48c9834 100644 --- a/distros/rolling/rc-reason-msgs/default.nix +++ b/distros/rolling/rc-reason-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rc-reason-msgs"; version = "0.2.1-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rc_reason_clients-release/archive/release/rolling/rc_reason_msgs/0.2.1-3.tar.gz"; - name = "0.2.1-3.tar.gz"; - sha256 = "b6ab735ee4abfc86fe4071d6f95b19d4c9f5356ad0c95699f1dd5e588a3acf81"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rc_reason_clients-release"; + rev = "release/rolling/rc_reason_msgs/0.2.1-3"; + sha256 = "sha256-/5aKBHyw2TFvQb2O/UJaDxIJJ9vbLwTMAz77XMRKEww="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rcdiscover/default.nix b/distros/rolling/rcdiscover/default.nix index a29bffe022..25f8e74962 100644 --- a/distros/rolling/rcdiscover/default.nix +++ b/distros/rolling/rcdiscover/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcdiscover"; version = "1.1.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcdiscover-release/archive/release/rolling/rcdiscover/1.1.4-2.tar.gz"; - name = "1.1.4-2.tar.gz"; - sha256 = "735fbae4158e70d399ec074bc7a667ca6b0107a5dd6e0bcce7e3a3a5dcaeaebe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcdiscover-release"; + rev = "release/rolling/rcdiscover/1.1.4-2"; + sha256 = "sha256-IzHfwuLyT18CS/9Qj/yMlO3ghLUflM1FesXkbpqXruE="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/rcgcd-spl-14-conversion/default.nix b/distros/rolling/rcgcd-spl-14-conversion/default.nix index 89236f46e8..f5c3b03c6b 100644 --- a/distros/rolling/rcgcd-spl-14-conversion/default.nix +++ b/distros/rolling/rcgcd-spl-14-conversion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcgcd-spl-14-conversion"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/rolling/rcgcd_spl_14_conversion/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "df5f680138520ce426209d7aa290c49c409efdf7e60f4b25753a77edb1166d68"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/rolling/rcgcd_spl_14_conversion/3.0.0-1"; + sha256 = "sha256-ofPNtyAdCLgHocDftNu/4aE6Bk5j+kYdth8shL27G3g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/rcgcd-spl-14/default.nix b/distros/rolling/rcgcd-spl-14/default.nix index d8eebb62e2..07bb6d7dfe 100644 --- a/distros/rolling/rcgcd-spl-14/default.nix +++ b/distros/rolling/rcgcd-spl-14/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcgcd-spl-14"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/rolling/rcgcd_spl_14/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "4f59197d691a0a5c171e0e1b954e419e2eaa28d4f8e6333127cd788929484d55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/rolling/rcgcd_spl_14/3.0.0-1"; + sha256 = "sha256-7tC3rNdCVqicAQlZa0ZGgvZzWmHJUiqp/fuorBKtIGc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rcgcrd-spl-4-conversion/default.nix b/distros/rolling/rcgcrd-spl-4-conversion/default.nix index 3888c6eba5..f75075b753 100644 --- a/distros/rolling/rcgcrd-spl-4-conversion/default.nix +++ b/distros/rolling/rcgcrd-spl-4-conversion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcgcrd-spl-4-conversion"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/rolling/rcgcrd_spl_4_conversion/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "c533ce77ee067d93c713a3c9a3c8996bca4ee95254cf9be202c5ec6fd1427d02"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/rolling/rcgcrd_spl_4_conversion/3.0.0-1"; + sha256 = "sha256-6aBzUttp4BZ1m9EquRQdEHqzTOWrIc8vRJqHZ2QFJf4="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/rcgcrd-spl-4/default.nix b/distros/rolling/rcgcrd-spl-4/default.nix index 92eeb9a820..a404ab1dd3 100644 --- a/distros/rolling/rcgcrd-spl-4/default.nix +++ b/distros/rolling/rcgcrd-spl-4/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcgcrd-spl-4"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/gc_spl-release/archive/release/rolling/rcgcrd_spl_4/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "d6bc021923908776ecdc157a19d65c9cd26695c970b4339a98aa2bf0a93439df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "gc_spl-release"; + rev = "release/rolling/rcgcrd_spl_4/3.0.0-1"; + sha256 = "sha256-SiPjT9UiwdFMpXe7vyHnE/IbC+YgzIuBEDNFAuG0wAs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rcl-action/default.nix b/distros/rolling/rcl-action/default.nix index f4850be210..b007fbdbf0 100644 --- a/distros/rolling/rcl-action/default.nix +++ b/distros/rolling/rcl-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcl-action"; version = "5.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/rolling/rcl_action/5.6.0-1.tar.gz"; - name = "5.6.0-1.tar.gz"; - sha256 = "9356417fa9e046d2a720fdbd3ab601f29a8059353cfa9f2c47d816084563c4da"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/rolling/rcl_action/5.6.0-1"; + sha256 = "sha256-v00zbVi5/kEnbdvk69TtI99RstYQYmkhTA/UQmyMDRI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rcl-interfaces/default.nix b/distros/rolling/rcl-interfaces/default.nix index 449e2e2a65..f1853df03c 100644 --- a/distros/rolling/rcl-interfaces/default.nix +++ b/distros/rolling/rcl-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcl-interfaces"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/rolling/rcl_interfaces/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "49d05b4be9fcf007a39fdf2098bcb28f78064dec93009ccb9d06a1cba6fccacc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/rolling/rcl_interfaces/1.3.1-1"; + sha256 = "sha256-8FplWi5nm1zKuDzWpqn+6CIlgofrn12g9MKjX66qbXw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rcl-lifecycle/default.nix b/distros/rolling/rcl-lifecycle/default.nix index 13d8df1cee..2a469cf1b7 100644 --- a/distros/rolling/rcl-lifecycle/default.nix +++ b/distros/rolling/rcl-lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcl-lifecycle"; version = "5.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/rolling/rcl_lifecycle/5.6.0-1.tar.gz"; - name = "5.6.0-1.tar.gz"; - sha256 = "e5d48fcd14a60d311f81aea7b35d1d8bffb1030fe6770fd3831a88b7f3be920b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/rolling/rcl_lifecycle/5.6.0-1"; + sha256 = "sha256-spbBjRyxurcsbSclZDbsHzp4w0fFtcdmURK+xwjOCdI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rcl-logging-interface/default.nix b/distros/rolling/rcl-logging-interface/default.nix index 1eb662e5dd..4b1f9ca0ec 100644 --- a/distros/rolling/rcl-logging-interface/default.nix +++ b/distros/rolling/rcl-logging-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcl-logging-interface"; version = "2.4.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/rolling/rcl_logging_interface/2.4.3-1.tar.gz"; - name = "2.4.3-1.tar.gz"; - sha256 = "7a7e7d3ca93883894e16b63d194716e7ba53e4e9f841f0e1c63581f40618b436"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/rolling/rcl_logging_interface/2.4.3-1"; + sha256 = "sha256-geAxtZBujPCDhVh9jtpCZRdwMTh2qcHpoNVBQwnXaGc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rcl-logging-noop/default.nix b/distros/rolling/rcl-logging-noop/default.nix index 9267cf93f6..841ac63467 100644 --- a/distros/rolling/rcl-logging-noop/default.nix +++ b/distros/rolling/rcl-logging-noop/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcl-logging-noop"; version = "2.4.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/rolling/rcl_logging_noop/2.4.3-1.tar.gz"; - name = "2.4.3-1.tar.gz"; - sha256 = "9ae991e2cb2bee25366e923fa56a6a754abfb06debf2e50a75975423625d0322"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/rolling/rcl_logging_noop/2.4.3-1"; + sha256 = "sha256-gxZ/ZnBZ0hezKqXHk93K0i1t/NYcrysmiBqGPba7fTk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python3Packages.empy ]; diff --git a/distros/rolling/rcl-logging-spdlog/default.nix b/distros/rolling/rcl-logging-spdlog/default.nix index 38f5e5b99e..b0f52367ab 100644 --- a/distros/rolling/rcl-logging-spdlog/default.nix +++ b/distros/rolling/rcl-logging-spdlog/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcl-logging-spdlog"; version = "2.4.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/rolling/rcl_logging_spdlog/2.4.3-1.tar.gz"; - name = "2.4.3-1.tar.gz"; - sha256 = "1141ae9ddc06a9650de9b2db0d6c544ff2f70dad03dac6743b1ee5037626dfd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_logging-release"; + rev = "release/rolling/rcl_logging_spdlog/2.4.3-1"; + sha256 = "sha256-oUJ+0g1xHJA2g2JP8FvaHTSIhhreGfkhNv8SSWBp+fE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rcl-yaml-param-parser/default.nix b/distros/rolling/rcl-yaml-param-parser/default.nix index 02c017a6ee..dcc3ecdc2c 100644 --- a/distros/rolling/rcl-yaml-param-parser/default.nix +++ b/distros/rolling/rcl-yaml-param-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcl-yaml-param-parser"; version = "5.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/rolling/rcl_yaml_param_parser/5.6.0-1.tar.gz"; - name = "5.6.0-1.tar.gz"; - sha256 = "0384a625d8ca2a58a533b8da34b033e4b613816de7021269693df0debd0ee732"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/rolling/rcl_yaml_param_parser/5.6.0-1"; + sha256 = "sha256-bsPJQtioI5dRMhSY0PZ+oe2gy9o8FpKjOjzkufzZwn4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rcutils ]; diff --git a/distros/rolling/rcl/default.nix b/distros/rolling/rcl/default.nix index 7e25cccbb5..d53b0132ee 100644 --- a/distros/rolling/rcl/default.nix +++ b/distros/rolling/rcl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcl"; version = "5.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl-release/archive/release/rolling/rcl/5.6.0-1.tar.gz"; - name = "5.6.0-1.tar.gz"; - sha256 = "36ab6da0c037cdafde16bd5c8fc514731da2b1ab03b7b3a1c99cf9c3d9e3ff6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl-release"; + rev = "release/rolling/rcl/5.6.0-1"; + sha256 = "sha256-wdqxJDxdrGr6ATP24YSNAGz03BXOd+46WDT5zEpLT4M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rclc-examples/default.nix b/distros/rolling/rclc-examples/default.nix index 969e7115b5..7f23f69352 100644 --- a/distros/rolling/rclc-examples/default.nix +++ b/distros/rolling/rclc-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rclc-examples"; version = "3.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/rolling/rclc_examples/3.0.8-1.tar.gz"; - name = "3.0.8-1.tar.gz"; - sha256 = "b997fa9ca8dfacd484bd152cfab1b100bbcc5350ac4e8be3fbe0fedde4009583"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/rolling/rclc_examples/3.0.8-1"; + sha256 = "sha256-c1sWSOShR9cwIFpufpQC+5TLLKrKxBLsx4u+DGq5alo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rclc-lifecycle/default.nix b/distros/rolling/rclc-lifecycle/default.nix index 196fa5b285..45abf6550d 100644 --- a/distros/rolling/rclc-lifecycle/default.nix +++ b/distros/rolling/rclc-lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rclc-lifecycle"; version = "3.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/rolling/rclc_lifecycle/3.0.8-1.tar.gz"; - name = "3.0.8-1.tar.gz"; - sha256 = "52bc873b1c2bb39618e17c944a2a938fcc8f66b70c4bece390891b8737500b33"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/rolling/rclc_lifecycle/3.0.8-1"; + sha256 = "sha256-dSm6/KSiXqDkR5lYLwETmQ/J87xexs1BugD7b6Zu1Sg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rclc-parameter/default.nix b/distros/rolling/rclc-parameter/default.nix index 80e88a0efd..5e7ec78f43 100644 --- a/distros/rolling/rclc-parameter/default.nix +++ b/distros/rolling/rclc-parameter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rclc-parameter"; version = "3.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/rolling/rclc_parameter/3.0.8-1.tar.gz"; - name = "3.0.8-1.tar.gz"; - sha256 = "c539e6d1c620bdd75f1a6863577b26f290d8e09ebff749797cb4fbea7df46fb5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/rolling/rclc_parameter/3.0.8-1"; + sha256 = "sha256-dAftnHDkphrq3aigfcytaV70GujCjNHfsYKSUs4vFNQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rclc/default.nix b/distros/rolling/rclc/default.nix index 2a64e1a936..6b2f83a086 100644 --- a/distros/rolling/rclc/default.nix +++ b/distros/rolling/rclc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rclc"; version = "3.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/rolling/rclc/3.0.8-1.tar.gz"; - name = "3.0.8-1.tar.gz"; - sha256 = "7ebaf60f4b31333e877ac740df42c6c292111af5d6fba1c9a431a1181999335a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclc-release"; + rev = "release/rolling/rclc/3.0.8-1"; + sha256 = "sha256-wNiBo9Mw3SxgEzBcTrNXo26pB9wBklEr078+GQbrQbQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-c ]; diff --git a/distros/rolling/rclcpp-action/default.nix b/distros/rolling/rclcpp-action/default.nix index 295663f267..482f549ed9 100644 --- a/distros/rolling/rclcpp-action/default.nix +++ b/distros/rolling/rclcpp-action/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, action-msgs, ament-cmake, ament-cmake-gtest, ament-cmake-ros, ament-lint-auto, ament-lint-common, mimick-vendor, performance-test-fixture, rcl-action, rclcpp, rcpputils, rosidl-runtime-c, test-msgs }: buildRosPackage { pname = "ros-rolling-rclcpp-action"; - version = "18.0.0-r1"; + version = "19.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/rolling/rclcpp_action/18.0.0-1.tar.gz"; - name = "18.0.0-1.tar.gz"; - sha256 = "ee3c8692a366334ca025a3845f90ee296adf3c0469e4feb9960acd066a3517c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/rolling/rclcpp_action/19.0.0-1"; + sha256 = "sha256-ciXvOSru0ygucuUb6CWr1l5Sh7GrKqY9+BuRV7vNn28="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rclcpp-cascade-lifecycle/default.nix b/distros/rolling/rclcpp-cascade-lifecycle/default.nix new file mode 100644 index 0000000000..df57dc933e --- /dev/null +++ b/distros/rolling/rclcpp-cascade-lifecycle/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 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, cascade-lifecycle-msgs, lifecycle-msgs, rclcpp, rclcpp-lifecycle }: +buildRosPackage { + pname = "ros-rolling-rclcpp-cascade-lifecycle"; + version = "1.0.3-r2"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "cascade_lifecycle-release"; + rev = "release/rolling/rclcpp_cascade_lifecycle/1.0.3-2"; + sha256 = "sha256-uHIPyOcwX6g1+BXBLCg7A2zIVH7JyZZFiTHc3fX3Pmo="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake ]; + checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ cascade-lifecycle-msgs lifecycle-msgs rclcpp rclcpp-lifecycle ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''Provides a mechanism to make trees of lifecycle nodes to propagate state changes''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/rolling/rclcpp-components/default.nix b/distros/rolling/rclcpp-components/default.nix index aaf13fabe9..f919a8577b 100644 --- a/distros/rolling/rclcpp-components/default.nix +++ b/distros/rolling/rclcpp-components/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-google-benchmark, ament-cmake-gtest, ament-cmake-ros, ament-index-cpp, ament-lint-auto, ament-lint-common, class-loader, composition-interfaces, launch-testing, rclcpp, rcpputils, std-msgs }: buildRosPackage { pname = "ros-rolling-rclcpp-components"; - version = "18.0.0-r1"; + version = "19.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/rolling/rclcpp_components/18.0.0-1.tar.gz"; - name = "18.0.0-1.tar.gz"; - sha256 = "f95f068ddd71c25523db404db717ead253fe39941938d749f0092c97748e8477"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/rolling/rclcpp_components/19.0.0-1"; + sha256 = "sha256-IGkYVtUSOafdgEKvWSC6AQGmBYk8IwLMMQUhUuN7HiI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rcpputils ]; diff --git a/distros/rolling/rclcpp-lifecycle/default.nix b/distros/rolling/rclcpp-lifecycle/default.nix index 591c2d0755..05b59d295e 100644 --- a/distros/rolling/rclcpp-lifecycle/default.nix +++ b/distros/rolling/rclcpp-lifecycle/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, ament-lint-auto, ament-lint-common, lifecycle-msgs, mimick-vendor, performance-test-fixture, rcl, rcl-interfaces, rcl-lifecycle, rclcpp, rcpputils, rcutils, rmw, rosidl-typesupport-cpp, test-msgs }: buildRosPackage { pname = "ros-rolling-rclcpp-lifecycle"; - version = "18.0.0-r1"; + version = "19.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/rolling/rclcpp_lifecycle/18.0.0-1.tar.gz"; - name = "18.0.0-1.tar.gz"; - sha256 = "0ba7955fef1252b364d198c3a4b41d4072d98eca60143ed17b867455e1f77f58"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/rolling/rclcpp_lifecycle/19.0.0-1"; + sha256 = "sha256-nU+KWADf9tO4vYUlnuBsGKgd38+n5qaoWYy0nVYKoU8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rclcpp/default.nix b/distros/rolling/rclcpp/default.nix index 0e23315bf8..f5eb00bd56 100644 --- a/distros/rolling/rclcpp/default.nix +++ b/distros/rolling/rclcpp/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gen-version-h, ament-cmake-gmock, ament-cmake-google-benchmark, ament-cmake-gtest, ament-cmake-ros, ament-index-cpp, ament-lint-auto, ament-lint-common, builtin-interfaces, libstatistics-collector, mimick-vendor, performance-test-fixture, python3, rcl, rcl-interfaces, rcl-yaml-param-parser, rcpputils, rcutils, rmw, rmw-implementation-cmake, rosgraph-msgs, rosidl-default-generators, rosidl-runtime-cpp, rosidl-typesupport-c, rosidl-typesupport-cpp, statistics-msgs, test-msgs, tracetools }: buildRosPackage { pname = "ros-rolling-rclcpp"; - version = "18.0.0-r1"; + version = "19.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/rolling/rclcpp/18.0.0-1.tar.gz"; - name = "18.0.0-1.tar.gz"; - sha256 = "b188e26a7cef94e4a49bd6ee189f6f37ccc074c01ccec1938193d18902990f3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclcpp-release"; + rev = "release/rolling/rclcpp/19.0.0-1"; + sha256 = "sha256-e/DhXQ6bX86582KDpd5s0hHSLFTcB8F8mAdigYHqf6M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-gen-version-h ament-cmake-ros python3 ]; diff --git a/distros/rolling/rclpy-message-converter-msgs/default.nix b/distros/rolling/rclpy-message-converter-msgs/default.nix index 45260a75db..8371826e82 100644 --- a/distros/rolling/rclpy-message-converter-msgs/default.nix +++ b/distros/rolling/rclpy-message-converter-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rclpy-message-converter-msgs"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rospy_message_converter-release/archive/release/rolling/rclpy_message_converter_msgs/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "65863207f10dde81d073382deb108cd439180b37ed4ac3e7bf67b8cff33ca457"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rospy_message_converter-release"; + rev = "release/rolling/rclpy_message_converter_msgs/2.0.1-1"; + sha256 = "sha256-vWAM+JjdKQvohD6qBeuCVmL+zcOgq1szEkS8jYnSPkw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces rosidl-default-generators ]; diff --git a/distros/rolling/rclpy-message-converter/default.nix b/distros/rolling/rclpy-message-converter/default.nix index 61af926377..ee9e86e269 100644 --- a/distros/rolling/rclpy-message-converter/default.nix +++ b/distros/rolling/rclpy-message-converter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rclpy-message-converter"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rospy_message_converter-release/archive/release/rolling/rclpy_message_converter/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "6e5a0d0795d186f6f81dca8121ab96a9329c49a988e82a2e5390a83a3db4638b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rospy_message_converter-release"; + rev = "release/rolling/rclpy_message_converter/2.0.1-1"; + sha256 = "sha256-4HeOI1VnkkBwlxa0SlJMAGbmV5bMUIvxslRecDwZm04="; + }; buildType = "ament_python"; buildInputs = [ builtin-interfaces rosidl-default-generators ]; diff --git a/distros/rolling/rclpy/default.nix b/distros/rolling/rclpy/default.nix index d88a1b3302..60a0c9149d 100644 --- a/distros/rolling/rclpy/default.nix +++ b/distros/rolling/rclpy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rclpy"; version = "3.7.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rclpy-release/archive/release/rolling/rclpy/3.7.1-1.tar.gz"; - name = "3.7.1-1.tar.gz"; - sha256 = "0ab4628b5c8c90bceb74209e6ff3cb6ef4b66cb758cc1f12a1c84d5610a32e9d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rclpy-release"; + rev = "release/rolling/rclpy/3.7.1-1"; + sha256 = "sha256-BwZ0LEM2Uqd4pGLV1s0iYsr5Oi4dDJ8wQw5zX7kEwjU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pybind11-vendor python-cmake-module rcpputils rcutils rmw-implementation-cmake ]; diff --git a/distros/rolling/rcpputils/default.nix b/distros/rolling/rcpputils/default.nix index 0b3bd65325..c354779394 100644 --- a/distros/rolling/rcpputils/default.nix +++ b/distros/rolling/rcpputils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcpputils"; version = "2.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcpputils-release/archive/release/rolling/rcpputils/2.6.0-1.tar.gz"; - name = "2.6.0-1.tar.gz"; - sha256 = "d67567400ce46da8658bf7a2e6c6303c27d5a2c24f452bfa0957062a52f3885f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcpputils-release"; + rev = "release/rolling/rcpputils/2.6.0-1"; + sha256 = "sha256-t6Qp+redf6zf8BAc9YVRngPORF3iPYsrL++qz6FW3ao="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/rolling/rcss3d-agent-basic/default.nix b/distros/rolling/rcss3d-agent-basic/default.nix index ea2c614aed..22043cd9e6 100644 --- a/distros/rolling/rcss3d-agent-basic/default.nix +++ b/distros/rolling/rcss3d-agent-basic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcss3d-agent-basic"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcss3d_agent-release/archive/release/rolling/rcss3d_agent_basic/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "148eb5547d7c49f6a8895d1d5071bc648f13dd55618e9828cbd10429007d2a96"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcss3d_agent-release"; + rev = "release/rolling/rcss3d_agent_basic/0.4.1-1"; + sha256 = "sha256-nDJGmIM8WHHjNPs3KRLNXOf8EM2VIwF9YZX1CVE662Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rcss3d-agent-msgs-to-soccer-interfaces/default.nix b/distros/rolling/rcss3d-agent-msgs-to-soccer-interfaces/default.nix index 79f90cc4c7..e73f1bfcee 100644 --- a/distros/rolling/rcss3d-agent-msgs-to-soccer-interfaces/default.nix +++ b/distros/rolling/rcss3d-agent-msgs-to-soccer-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcss3d-agent-msgs-to-soccer-interfaces"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcss3d_agent-release/archive/release/rolling/rcss3d_agent_msgs_to_soccer_interfaces/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "05ada4c47ceb9d57601d36ed50b7b4c8a638d201d16ee4ac823301c8701f4684"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcss3d_agent-release"; + rev = "release/rolling/rcss3d_agent_msgs_to_soccer_interfaces/0.4.1-1"; + sha256 = "sha256-2bEjbfPy02UiTflYzF8AZb2bjZB/Xg1iHUC0deLs7UQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rcss3d-agent-msgs/default.nix b/distros/rolling/rcss3d-agent-msgs/default.nix index 2bbd77affe..f46a63a749 100644 --- a/distros/rolling/rcss3d-agent-msgs/default.nix +++ b/distros/rolling/rcss3d-agent-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcss3d-agent-msgs"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcss3d_agent-release/archive/release/rolling/rcss3d_agent_msgs/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "4eb034191f17f7a11b133c06ec883552fbf885fc980cd8ccce7110deff63578a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcss3d_agent-release"; + rev = "release/rolling/rcss3d_agent_msgs/0.4.1-1"; + sha256 = "sha256-AN/eyLroQDeZjI/JosPYI5tZHhbJn0jP1d8D3wjuN54="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rcss3d-agent/default.nix b/distros/rolling/rcss3d-agent/default.nix index 9d8308484e..8606c7a04c 100644 --- a/distros/rolling/rcss3d-agent/default.nix +++ b/distros/rolling/rcss3d-agent/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcss3d-agent"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcss3d_agent-release/archive/release/rolling/rcss3d_agent/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "5a92982d39a6b5adf5fdc0ea1032a0068f78af403a1e45790f10e452c3bd1177"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcss3d_agent-release"; + rev = "release/rolling/rcss3d_agent/0.4.1-1"; + sha256 = "sha256-+o4JHdFoFIHtAM7cDawZFy2d7S6RVocfUM8ZD5z0WW8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rcss3d-nao/default.nix b/distros/rolling/rcss3d-nao/default.nix index 87d4d50b92..fcc68544fc 100644 --- a/distros/rolling/rcss3d-nao/default.nix +++ b/distros/rolling/rcss3d-nao/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcss3d-nao"; version = "0.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcss3d_nao-release/archive/release/rolling/rcss3d_nao/0.1.1-1.tar.gz"; - name = "0.1.1-1.tar.gz"; - sha256 = "438571fa12e46dc4e3fd3da364541e9ca1d229a453439a46d62e158dc65dd76b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcss3d_nao-release"; + rev = "release/rolling/rcss3d_nao/0.1.1-1"; + sha256 = "sha256-kiydlR35nLodRNpS+Qbo+TMTCXy8cFfUK4qSPpTk0NA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rcutils/default.nix b/distros/rolling/rcutils/default.nix index 5ffbb40e66..926f39b7ef 100644 --- a/distros/rolling/rcutils/default.nix +++ b/distros/rolling/rcutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rcutils"; version = "6.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcutils-release/archive/release/rolling/rcutils/6.0.1-1.tar.gz"; - name = "6.0.1-1.tar.gz"; - sha256 = "31a9937d5517d1144e881bfa16594281544596e48fbdcff88147429c911a49f6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcutils-release"; + rev = "release/rolling/rcutils/6.0.1-1"; + sha256 = "sha256-PokWB3yFhoqcUaZHLaOZN/baxDVIdqH3btnNyNd+pXk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros python3Packages.empy ]; diff --git a/distros/rolling/realtime-tools/default.nix b/distros/rolling/realtime-tools/default.nix index 0fa73d4f43..eaa5386fd0 100644 --- a/distros/rolling/realtime-tools/default.nix +++ b/distros/rolling/realtime-tools/default.nix @@ -2,19 +2,23 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, rclcpp, rclcpp-action, test-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, rclcpp, rclcpp-action, test-msgs }: buildRosPackage { pname = "ros-rolling-realtime-tools"; - version = "2.4.0-r1"; + version = "2.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/realtime_tools-release/archive/release/rolling/realtime_tools/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "3cbfcf620ba7bb222a9289f097b172bb105c56c2078af6a8522416dfefb8f828"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "realtime_tools-release"; + rev = "release/rolling/realtime_tools/2.5.0-1"; + sha256 = "sha256-Q+ZmEMwbVher38kNPY7nBhoTCWhDQRs6ytN4V4cZqjM="; + }; buildType = "ament_cmake"; - checkInputs = [ rclcpp-action test-msgs ]; + checkInputs = [ ament-cmake-gmock test-msgs ]; propagatedBuildInputs = [ ament-cmake rclcpp rclcpp-action ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/rolling/resource-retriever/default.nix b/distros/rolling/resource-retriever/default.nix index 5d591bf75d..268530832e 100644 --- a/distros/rolling/resource-retriever/default.nix +++ b/distros/rolling/resource-retriever/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-resource-retriever"; version = "3.2.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/resource_retriever-release/archive/release/rolling/resource_retriever/3.2.2-1.tar.gz"; - name = "3.2.2-1.tar.gz"; - sha256 = "ebded33ec2aef9e2cd39648ef0a4f4d1402a9b153544ccb539717c27f50aa5b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "resource_retriever-release"; + rev = "release/rolling/resource_retriever/3.2.2-1"; + sha256 = "sha256-rkBYfjdQoGFm1+1wwXiodEPbQUInVehpNe1Y2ua6h/8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rmf-api-msgs/default.nix b/distros/rolling/rmf-api-msgs/default.nix index 1c973c26a5..1b39c4f019 100644 --- a/distros/rolling/rmf-api-msgs/default.nix +++ b/distros/rolling/rmf-api-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-api-msgs"; version = "0.0.1-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_api_msgs-release/archive/release/rolling/rmf_api_msgs/0.0.1-4.tar.gz"; - name = "0.0.1-4.tar.gz"; - sha256 = "d9678142b0b777ce4951ee4cf72db857ca6da3ff0544d43ebfcb8b3dcb5414e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_api_msgs-release"; + rev = "release/rolling/rmf_api_msgs/0.0.1-4"; + sha256 = "sha256-h4F3FbFrB5lQ4zR80l3Dj3w4eoUeCzJBa5s9iUPL6fg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-battery/default.nix b/distros/rolling/rmf-battery/default.nix index f3e069e237..93a6807ec0 100644 --- a/distros/rolling/rmf-battery/default.nix +++ b/distros/rolling/rmf-battery/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-battery"; version = "0.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_battery-release/archive/release/rolling/rmf_battery/0.1.3-1.tar.gz"; - name = "0.1.3-1.tar.gz"; - sha256 = "a226153acd4ffa0d35868eb2d393f664c9fcf183958832eec240ac8184218ff5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_battery-release"; + rev = "release/rolling/rmf_battery/0.1.3-1"; + sha256 = "sha256-oGw9NxbR7XnmDLwVkWHPmJHRVwOZtCV59cLWq56hrUA="; + }; buildType = "cmake"; buildInputs = [ eigen eigen3-cmake-module ]; diff --git a/distros/rolling/rmf-building-map-msgs/default.nix b/distros/rolling/rmf-building-map-msgs/default.nix index 015d18ef22..bed56d7f45 100644 --- a/distros/rolling/rmf-building-map-msgs/default.nix +++ b/distros/rolling/rmf-building-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-building-map-msgs"; version = "1.2.0-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_building_map_msgs-release/archive/release/rolling/rmf_building_map_msgs/1.2.0-5.tar.gz"; - name = "1.2.0-5.tar.gz"; - sha256 = "07c25dbb3063fbb8deacb63991e694a0c938e6eaaff0e316b19c2cd55fc95186"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_building_map_msgs-release"; + rev = "release/rolling/rmf_building_map_msgs/1.2.0-5"; + sha256 = "sha256-snyMuXdNPfPqMZ8hpU/Lno8b23lqgRLHWYygxrKe3tQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-building-sim-common/default.nix b/distros/rolling/rmf-building-sim-common/default.nix index f4ab7ee57f..c068d2b4f9 100644 --- a/distros/rolling/rmf-building-sim-common/default.nix +++ b/distros/rolling/rmf-building-sim-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-building-sim-common"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/rolling/rmf_building_sim_common/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "063d39728c9fc2c4cba6b847e8cca247d560fb84dc5c4ab042434a25d48a9619"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/rolling/rmf_building_sim_common/2.0.0-1"; + sha256 = "sha256-m+erezYIgPF/6kubq+BP5hUVj/BzCSetD9APTjO/Kd0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-building-sim-gz-classic-plugins/default.nix b/distros/rolling/rmf-building-sim-gz-classic-plugins/default.nix index 6000595fc5..4dd0369ff7 100644 --- a/distros/rolling/rmf-building-sim-gz-classic-plugins/default.nix +++ b/distros/rolling/rmf-building-sim-gz-classic-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-building-sim-gz-classic-plugins"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/rolling/rmf_building_sim_gz_classic_plugins/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "1eafb20a8b02c1420325bd9b8f17f42b37b7ff46cc7a2be5c519a5cbf2d06f6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/rolling/rmf_building_sim_gz_classic_plugins/2.0.0-1"; + sha256 = "sha256-Mg2m6ogUnJjTr5g0leCh5gggCHw5ZKS/X+zhWhTyyHs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-charger-msgs/default.nix b/distros/rolling/rmf-charger-msgs/default.nix index 00de0eb1cd..45b85ceff5 100644 --- a/distros/rolling/rmf-charger-msgs/default.nix +++ b/distros/rolling/rmf-charger-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-charger-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_charger_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "7764cc3a5892f69a360571cde49bcbc51b2ec9bd019d8712f920f0fea374ed37"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_charger_msgs/3.0.2-1"; + sha256 = "sha256-4vGvZLfBSIo9E8ERxKDXo4TeiQAl3Cm+GgobEDOqYvU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-cmake-uncrustify/default.nix b/distros/rolling/rmf-cmake-uncrustify/default.nix index e27b8c1d01..eaccd833dd 100644 --- a/distros/rolling/rmf-cmake-uncrustify/default.nix +++ b/distros/rolling/rmf-cmake-uncrustify/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-cmake-uncrustify"; version = "1.2.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_cmake_uncrustify-release/archive/release/rolling/rmf_cmake_uncrustify/1.2.0-3.tar.gz"; - name = "1.2.0-3.tar.gz"; - sha256 = "1d20ccd8b44f576560ebf538c55cde06f9a75169d65021ee90ab365f4408cda4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_cmake_uncrustify-release"; + rev = "release/rolling/rmf_cmake_uncrustify/1.2.0-3"; + sha256 = "sha256-YwXGjK9Uaj03Os5oVwylNtS6dDmirgOgm6bY+0K+8Ic="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/rmf-dispenser-msgs/default.nix b/distros/rolling/rmf-dispenser-msgs/default.nix index b3ceabb84c..faeabe58b3 100644 --- a/distros/rolling/rmf-dispenser-msgs/default.nix +++ b/distros/rolling/rmf-dispenser-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-dispenser-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_dispenser_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "45bbb39049067c65f504d069d86d1025019aaa9e30b6637206f1bd7031673a44"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_dispenser_msgs/3.0.2-1"; + sha256 = "sha256-iNMN6NJs3s2ZsHxHu9opSZOBDchOT/IdFZ4VuWr5IaM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-door-msgs/default.nix b/distros/rolling/rmf-door-msgs/default.nix index 5e0a355565..7e7f2de73b 100644 --- a/distros/rolling/rmf-door-msgs/default.nix +++ b/distros/rolling/rmf-door-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-door-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_door_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "3976d315ed428407f73e4f76cad09d33dc6177e10d459b145c6e52a6e9a33409"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_door_msgs/3.0.2-1"; + sha256 = "sha256-DZ4/GoMrs1KVn2qFqdF4rNrgsmrB8MtxXhM59DF9INo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-fleet-adapter-python/default.nix b/distros/rolling/rmf-fleet-adapter-python/default.nix index 426b33c941..1c39cd8eca 100644 --- a/distros/rolling/rmf-fleet-adapter-python/default.nix +++ b/distros/rolling/rmf-fleet-adapter-python/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-fleet-adapter-python"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/rolling/rmf_fleet_adapter_python/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "35bda9f2eed271d7469d255d9f464b3929a8d1c0506c741f6251d461ad9e47ae"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/rolling/rmf_fleet_adapter_python/2.1.2-1"; + sha256 = "sha256-s3WYFs/d1Kxh3rtV7v2gAHOmTSbTtO2J+t5fAuIbP98="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-pytest ]; diff --git a/distros/rolling/rmf-fleet-adapter/default.nix b/distros/rolling/rmf-fleet-adapter/default.nix index 6179ff4b07..20a1bb0cc3 100644 --- a/distros/rolling/rmf-fleet-adapter/default.nix +++ b/distros/rolling/rmf-fleet-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-fleet-adapter"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/rolling/rmf_fleet_adapter/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "0299cf329731619064ba20202559d7390233fa81818b0eb5841f9098f55d479e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/rolling/rmf_fleet_adapter/2.1.2-1"; + sha256 = "sha256-nhu7m0bf0ORhJStcjxrdpmVXf0oRVIdm8C2QDRcy+zQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen libyamlcpp ]; diff --git a/distros/rolling/rmf-fleet-msgs/default.nix b/distros/rolling/rmf-fleet-msgs/default.nix index e800d7051a..ace6888d24 100644 --- a/distros/rolling/rmf-fleet-msgs/default.nix +++ b/distros/rolling/rmf-fleet-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-fleet-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_fleet_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "7a4537cf8d705d608f2416be6b4d3f6db6180033843c6ccc20da39ad730b859b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_fleet_msgs/3.0.2-1"; + sha256 = "sha256-CFa6/eKQMXbJdvmpAowO/8qQ/D1y5uvy9ovOQweVJt0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-ingestor-msgs/default.nix b/distros/rolling/rmf-ingestor-msgs/default.nix index 7fecbc41ea..a8f5c5f591 100644 --- a/distros/rolling/rmf-ingestor-msgs/default.nix +++ b/distros/rolling/rmf-ingestor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-ingestor-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_ingestor_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "a809cabd96cfea096df20f56ec483957243625c8df2a1d71e01701f6c7941c83"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_ingestor_msgs/3.0.2-1"; + sha256 = "sha256-tL6Cp59t7ulNQnu7hDBs86RQ1SQ1TIzJYcVF7roRjlQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-lift-msgs/default.nix b/distros/rolling/rmf-lift-msgs/default.nix index d8ddf20567..0449029661 100644 --- a/distros/rolling/rmf-lift-msgs/default.nix +++ b/distros/rolling/rmf-lift-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-lift-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_lift_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "714d67c20f4cd6ee7899163b143bc3760569ab6dc8f7e9b3246b1c241310f95f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_lift_msgs/3.0.2-1"; + sha256 = "sha256-6WzzKCLRIzQio1Ebs/w9u6lGKDRCxZHl/elHv2M/o3c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-obstacle-msgs/default.nix b/distros/rolling/rmf-obstacle-msgs/default.nix index 013c589630..e2ee9823cf 100644 --- a/distros/rolling/rmf-obstacle-msgs/default.nix +++ b/distros/rolling/rmf-obstacle-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-obstacle-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_obstacle_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "0a5ea399a696073f87299a5d20113eda31489d1713927f5a17eb1b8a9b4006ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_obstacle_msgs/3.0.2-1"; + sha256 = "sha256-yQq/6bZxOdGT2SFHMn4vQyPU4v/2myKJWwbkC7BqahM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-robot-sim-common/default.nix b/distros/rolling/rmf-robot-sim-common/default.nix index 370c9319c8..965277c03d 100644 --- a/distros/rolling/rmf-robot-sim-common/default.nix +++ b/distros/rolling/rmf-robot-sim-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-robot-sim-common"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/rolling/rmf_robot_sim_common/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "844bbbac13f01bddca23e49e9b94fdfcd6de41ef7bf29e84452924164b74e975"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/rolling/rmf_robot_sim_common/2.0.0-1"; + sha256 = "sha256-IuYKkMsVg6T/njTAoWEph65/bez/rgULyYgub6xPIVE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-robot-sim-gz-classic-plugins/default.nix b/distros/rolling/rmf-robot-sim-gz-classic-plugins/default.nix index 1a0507d99c..a28b1253a9 100644 --- a/distros/rolling/rmf-robot-sim-gz-classic-plugins/default.nix +++ b/distros/rolling/rmf-robot-sim-gz-classic-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-robot-sim-gz-classic-plugins"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_simulation-release/archive/release/rolling/rmf_robot_sim_gz_classic_plugins/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "f609743e3cc2e695abbe7e6154a563a4f52eff92cee47ddc2c59775e599ff872"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_simulation-release"; + rev = "release/rolling/rmf_robot_sim_gz_classic_plugins/2.0.0-1"; + sha256 = "sha256-8HbGHykuYSSLz3x/8MQUe32fpQDIq7a1KWQXhmQ99TU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-scheduler-msgs/default.nix b/distros/rolling/rmf-scheduler-msgs/default.nix index ae3fbc1a4a..4f9f19bf12 100644 --- a/distros/rolling/rmf-scheduler-msgs/default.nix +++ b/distros/rolling/rmf-scheduler-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-scheduler-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_scheduler_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "07124859fe19957af01f71900ab2755fbe1d4f0147956567a75b730fad31e151"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_scheduler_msgs/3.0.2-1"; + sha256 = "sha256-A3Z12sm+6O3gYcBaT6WpnByHpjr1Z9NHTTI7qUEKpkI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-site-map-msgs/default.nix b/distros/rolling/rmf-site-map-msgs/default.nix index e193da0ddc..f8092dedf0 100644 --- a/distros/rolling/rmf-site-map-msgs/default.nix +++ b/distros/rolling/rmf-site-map-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-site-map-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_site_map_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "8a9e8fed5fdd8cc05c7f28c9638df23c100fc471d3c7bd6abf9984fc26f5403c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_site_map_msgs/3.0.2-1"; + sha256 = "sha256-1XFEKfUJX0WX7J2hgLsCBAGNmLr8rGxCv2No62KeDjg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-task-msgs/default.nix b/distros/rolling/rmf-task-msgs/default.nix index 02ddac4648..c431da52ae 100644 --- a/distros/rolling/rmf-task-msgs/default.nix +++ b/distros/rolling/rmf-task-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-task-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_task_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "a24a6e44b18926ee54d1fe0bf9a0df35aa2a5b6785fa0fbc433d8e8438442d00"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_task_msgs/3.0.2-1"; + sha256 = "sha256-VQIlf3lwjm+YzFprx0m6KsFMFvhyL9ZwG6L0o9mZJio="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-task-ros2/default.nix b/distros/rolling/rmf-task-ros2/default.nix index ede71f4364..51e88ce862 100644 --- a/distros/rolling/rmf-task-ros2/default.nix +++ b/distros/rolling/rmf-task-ros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-task-ros2"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/rolling/rmf_task_ros2/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "4a14e5bf13f728fe3f7618ae709432838a921d4fef38906062373dffea8debd9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/rolling/rmf_task_ros2/2.1.2-1"; + sha256 = "sha256-GNoZeeN1ZYoV8BEqTISi/hpnyy5lfW9ENcaTd1x7wHM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/rolling/rmf-task-sequence/default.nix b/distros/rolling/rmf-task-sequence/default.nix index 209c898992..911b622efa 100644 --- a/distros/rolling/rmf-task-sequence/default.nix +++ b/distros/rolling/rmf-task-sequence/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-task-sequence"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_task-release/archive/release/rolling/rmf_task_sequence/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "4120ea735e6ffd3b001941752987c0d3c4f3fd77fde85897a19da975e96ef608"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_task-release"; + rev = "release/rolling/rmf_task_sequence/2.1.2-1"; + sha256 = "sha256-xKKc4CaoQV2uoKYB0z3KwTBHxw7tJgu4SP/UYvdfEAw="; + }; buildType = "cmake"; checkInputs = [ ament-cmake-catch2 ament-cmake-uncrustify ]; diff --git a/distros/rolling/rmf-task/default.nix b/distros/rolling/rmf-task/default.nix index b152429b7c..a99257e987 100644 --- a/distros/rolling/rmf-task/default.nix +++ b/distros/rolling/rmf-task/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-task"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_task-release/archive/release/rolling/rmf_task/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "549c84e258be38c2fb6522bd0803e9085bc470cd3772d4a91421fc4949c2a9f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_task-release"; + rev = "release/rolling/rmf_task/2.1.2-1"; + sha256 = "sha256-KZmivQBJGc0UXlZQv4dPk3Gbpg983+dv57HXcuLPJZM="; + }; buildType = "cmake"; checkInputs = [ ament-cmake-catch2 ament-cmake-uncrustify ]; diff --git a/distros/rolling/rmf-traffic-editor-assets/default.nix b/distros/rolling/rmf-traffic-editor-assets/default.nix index 2c2403bc91..640b34c2f6 100644 --- a/distros/rolling/rmf-traffic-editor-assets/default.nix +++ b/distros/rolling/rmf-traffic-editor-assets/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-traffic-editor-assets"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/rolling/rmf_traffic_editor_assets/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "cd4428fdc82203735e18f2b85f3fa2c4612f25bb4d512795fa25dcafb293904f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/rolling/rmf_traffic_editor_assets/1.6.0-1"; + sha256 = "sha256-3HVyWZy2Em7zQxEzVkXZU7O+iJdNBU0SMNuKfOPzzts="; + }; buildType = "ament_python"; diff --git a/distros/rolling/rmf-traffic-editor-test-maps/default.nix b/distros/rolling/rmf-traffic-editor-test-maps/default.nix index 0013f75a56..eed379cc97 100644 --- a/distros/rolling/rmf-traffic-editor-test-maps/default.nix +++ b/distros/rolling/rmf-traffic-editor-test-maps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-traffic-editor-test-maps"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/rolling/rmf_traffic_editor_test_maps/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "ae87204222abf676e74979cfb4701883f292862a47290fa5adf9b9243b650ea3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/rolling/rmf_traffic_editor_test_maps/1.6.0-1"; + sha256 = "sha256-YEuFPXau+4A9aHgXCPVNxOoqSM5s77RXplHkMwe+XJo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmf-building-map-tools ros2run ]; diff --git a/distros/rolling/rmf-traffic-editor/default.nix b/distros/rolling/rmf-traffic-editor/default.nix index 823f6935d5..12454312b5 100644 --- a/distros/rolling/rmf-traffic-editor/default.nix +++ b/distros/rolling/rmf-traffic-editor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-traffic-editor"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic_editor-release/archive/release/rolling/rmf_traffic_editor/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "0b8029a0cee076e91c238d19d3d953a991d82c812b8c2d35a63c1efc096b3ab5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic_editor-release"; + rev = "release/rolling/rmf_traffic_editor/1.6.0-1"; + sha256 = "sha256-dHrJ7FHaRCA+Oa8rqL6u6Okzlr1dWvUZcQqxW5cTb9A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-index-cpp eigen libyamlcpp qt5.qtbase rmf-utils ]; diff --git a/distros/rolling/rmf-traffic-examples/default.nix b/distros/rolling/rmf-traffic-examples/default.nix index 86388fd1c9..7f8ec4a820 100644 --- a/distros/rolling/rmf-traffic-examples/default.nix +++ b/distros/rolling/rmf-traffic-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-traffic-examples"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic-release/archive/release/rolling/rmf_traffic_examples/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "33d3fc5174d24084a30d85ecf0ce046cb724da05c98a4f70e9148401e35b4999"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic-release"; + rev = "release/rolling/rmf_traffic_examples/3.0.0-1"; + sha256 = "sha256-bBRDoknCyTKV2epwCF7WNWrDCGPK9bJJuydn6S9n7nU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/rmf-traffic-msgs/default.nix b/distros/rolling/rmf-traffic-msgs/default.nix index aedee9ab7f..217d7a6383 100644 --- a/distros/rolling/rmf-traffic-msgs/default.nix +++ b/distros/rolling/rmf-traffic-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-traffic-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_traffic_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "f00865212d864e70146f67caa65ee2fdd2eabdb46cdbd7d4cec0a297a7246885"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_traffic_msgs/3.0.2-1"; + sha256 = "sha256-Mpro9J9umfpGkfpGplbSA5ht3fMZWfkV57m4D3EOwkU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-traffic-ros2/default.nix b/distros/rolling/rmf-traffic-ros2/default.nix index 71991862d1..491db0f770 100644 --- a/distros/rolling/rmf-traffic-ros2/default.nix +++ b/distros/rolling/rmf-traffic-ros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-traffic-ros2"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/rolling/rmf_traffic_ros2/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "4205a113502356dd73c88c6ff2171a86a37f777ac30251468048f182960a4c0e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/rolling/rmf_traffic_ros2/2.1.2-1"; + sha256 = "sha256-VVLTJbIr4nL8EkVB97IQMBwMhYnsyWlI6itaK51Xg0U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/rolling/rmf-traffic/default.nix b/distros/rolling/rmf-traffic/default.nix index 33413e1b83..e6a2042a41 100644 --- a/distros/rolling/rmf-traffic/default.nix +++ b/distros/rolling/rmf-traffic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-traffic"; version = "3.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_traffic-release/archive/release/rolling/rmf_traffic/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "ddf85d4393d67ea43c2b58aaab2ac0f117ae145aa478694024ce5dd3a06bc566"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_traffic-release"; + rev = "release/rolling/rmf_traffic/3.0.0-1"; + sha256 = "sha256-7ltO2BBCmnZ53l/P0JcbgduPk36d2Canzw7ZkWPeC4Q="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/rmf-utils/default.nix b/distros/rolling/rmf-utils/default.nix index 38818d187a..29bcf1bbee 100644 --- a/distros/rolling/rmf-utils/default.nix +++ b/distros/rolling/rmf-utils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-utils"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_utils-release/archive/release/rolling/rmf_utils/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "e51b54a8af36aa2c61f2c7152e44b8935e23b9bfdbb864cc45309775f73c9865"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_utils-release"; + rev = "release/rolling/rmf_utils/1.4.0-1"; + sha256 = "sha256-0J61gdqsqdGIb+/2E3zFOq/Z3qjwXkncR96hBB8a8S0="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/rmf-visualization-building-systems/default.nix b/distros/rolling/rmf-visualization-building-systems/default.nix index 06d1b4c654..58e8a281d9 100644 --- a/distros/rolling/rmf-visualization-building-systems/default.nix +++ b/distros/rolling/rmf-visualization-building-systems/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization-building-systems"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/rolling/rmf_visualization_building_systems/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "1c1797564a8462b4ceec34a891f897784c51790f1c1af2575e2940729ac88f92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/rolling/rmf_visualization_building_systems/2.0.1-1"; + sha256 = "sha256-bzWELLaFrfPrEtNcdJFDKXKbLZg7XdYqyOxbGRFn8po="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/rmf-visualization-fleet-states/default.nix b/distros/rolling/rmf-visualization-fleet-states/default.nix index f79f81d0ab..26a96b5065 100644 --- a/distros/rolling/rmf-visualization-fleet-states/default.nix +++ b/distros/rolling/rmf-visualization-fleet-states/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization-fleet-states"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/rolling/rmf_visualization_fleet_states/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "7bd581cdca4166cdf15c52221d950b6300eb574c01aab12e45ef3fbeb2e14c13"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/rolling/rmf_visualization_fleet_states/2.0.1-1"; + sha256 = "sha256-Gsmzd90IBRTaa0jAIZbQGE98Wd8FUjzYQzH8IyFUJVw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-visualization-floorplans/default.nix b/distros/rolling/rmf-visualization-floorplans/default.nix index 5786f331c3..b6a5d4bf19 100644 --- a/distros/rolling/rmf-visualization-floorplans/default.nix +++ b/distros/rolling/rmf-visualization-floorplans/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization-floorplans"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/rolling/rmf_visualization_floorplans/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "ae457032b6db60b2dfe03afd357e2874f133360b795bfedbc9ceb277c0e5a10b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/rolling/rmf_visualization_floorplans/2.0.1-1"; + sha256 = "sha256-Wfa+U3d8n/ltb0ETtQhGCwPqWX4JDLFS4axmsKGPdWQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen3-cmake-module ]; diff --git a/distros/rolling/rmf-visualization-msgs/default.nix b/distros/rolling/rmf-visualization-msgs/default.nix index d3f105b1a5..603a7838e8 100644 --- a/distros/rolling/rmf-visualization-msgs/default.nix +++ b/distros/rolling/rmf-visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization-msgs"; version = "1.2.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization_msgs-release/archive/release/rolling/rmf_visualization_msgs/1.2.0-3.tar.gz"; - name = "1.2.0-3.tar.gz"; - sha256 = "21a43ace052f2fc1e0bcf3c649f1416aa30bcf764bc03be62be8a3641ef2b815"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization_msgs-release"; + rev = "release/rolling/rmf_visualization_msgs/1.2.0-3"; + sha256 = "sha256-f0qmm88R8ojtHtOAJxyMJRQyfj2ycFGIOQVZfRMWkyE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmf-visualization-navgraphs/default.nix b/distros/rolling/rmf-visualization-navgraphs/default.nix index 3c984d0de1..eecf62fff8 100644 --- a/distros/rolling/rmf-visualization-navgraphs/default.nix +++ b/distros/rolling/rmf-visualization-navgraphs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization-navgraphs"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/rolling/rmf_visualization_navgraphs/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "559c1e0dc893eb78c743f129b581f6df4d6b8ee7893374c10afcf641e8b13e7a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/rolling/rmf_visualization_navgraphs/2.0.1-1"; + sha256 = "sha256-h+H688TKVECTpN5AYTFxfpMN4xcLtdN5cH9SJmpEm0s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-visualization-obstacles/default.nix b/distros/rolling/rmf-visualization-obstacles/default.nix index 6e750c503f..e7e05746fb 100644 --- a/distros/rolling/rmf-visualization-obstacles/default.nix +++ b/distros/rolling/rmf-visualization-obstacles/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization-obstacles"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/rolling/rmf_visualization_obstacles/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "02d3d421b8f4d76db877aa686ae7d06f14472e7dec8230fb2da43fb0ed206cc6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/rolling/rmf_visualization_obstacles/2.0.1-1"; + sha256 = "sha256-shQGtdpxAvFO6ZToJBQRlXyTVPsrBvTy+KHcqnNv2t4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-visualization-rviz2-plugins/default.nix b/distros/rolling/rmf-visualization-rviz2-plugins/default.nix index fe8f2076fd..de32660f1d 100644 --- a/distros/rolling/rmf-visualization-rviz2-plugins/default.nix +++ b/distros/rolling/rmf-visualization-rviz2-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization-rviz2-plugins"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/rolling/rmf_visualization_rviz2_plugins/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "86f2f52de2e84b85d48c7988ff1b9a0be0b332f2e5aa8fda26b2f86b80ecdc60"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/rolling/rmf_visualization_rviz2_plugins/2.0.1-1"; + sha256 = "sha256-ac6iguQpxf37LJDaePtiCM2jX1hB43uWZuiblf+ZYmg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/rolling/rmf-visualization-schedule/default.nix b/distros/rolling/rmf-visualization-schedule/default.nix index 31f9f504ba..331a4a4623 100644 --- a/distros/rolling/rmf-visualization-schedule/default.nix +++ b/distros/rolling/rmf-visualization-schedule/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization-schedule"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/rolling/rmf_visualization_schedule/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "fd136396fa91e3c93bd61e0113c0d5cd0d0dd71f562e1dd8cc43dcf7f0514aa5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/rolling/rmf_visualization_schedule/2.0.1-1"; + sha256 = "sha256-R2q8DUCMH2rXcmK8n01D8agp9VHhIpGVI52W3+7i4mQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-visualization/default.nix b/distros/rolling/rmf-visualization/default.nix index 5ffe55b9a2..cfa4ed1aff 100644 --- a/distros/rolling/rmf-visualization/default.nix +++ b/distros/rolling/rmf-visualization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-visualization"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_visualization-release/archive/release/rolling/rmf_visualization/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "8966a6fda6367cb15356af9fc5572dcee82f5ee3ff2198622a2229d639f3c1d8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_visualization-release"; + rev = "release/rolling/rmf_visualization/2.0.1-1"; + sha256 = "sha256-SkyvfOH6DxJIcgBv/bD6aiGIZ4ScQxz9bv2syYy0V0s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rmf-websocket/default.nix b/distros/rolling/rmf-websocket/default.nix index 6ffdaf93ac..8c852bf776 100644 --- a/distros/rolling/rmf-websocket/default.nix +++ b/distros/rolling/rmf-websocket/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-websocket"; version = "2.1.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_ros2-release/archive/release/rolling/rmf_websocket/2.1.2-1.tar.gz"; - name = "2.1.2-1.tar.gz"; - sha256 = "0ae843000d9a4ff7a5a1546cd3b5354d0e03a5062f6bb19474674cb1b8ddf3dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_ros2-release"; + rev = "release/rolling/rmf_websocket/2.1.2-1"; + sha256 = "sha256-ryGSxKGS5CeRUUw9vuR9ehUBZy396JC8mTLmPjg8Er8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen ]; diff --git a/distros/rolling/rmf-workcell-msgs/default.nix b/distros/rolling/rmf-workcell-msgs/default.nix index b505d7a3b5..e64ec310a4 100644 --- a/distros/rolling/rmf-workcell-msgs/default.nix +++ b/distros/rolling/rmf-workcell-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmf-workcell-msgs"; version = "3.0.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmf_internal_msgs-release/archive/release/rolling/rmf_workcell_msgs/3.0.2-1.tar.gz"; - name = "3.0.2-1.tar.gz"; - sha256 = "f313c10a25b91ad74e8364dd985399ab86e5b4b624f5da238d3bc07a176285ad"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmf_internal_msgs-release"; + rev = "release/rolling/rmf_workcell_msgs/3.0.2-1"; + sha256 = "sha256-xbcYhUVF2L0w6qNqAGKdGVjr2jWldgyA5ob23ZmS+yU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmw-connextdds-common/default.nix b/distros/rolling/rmw-connextdds-common/default.nix index 0abe4077e7..74d925cd86 100644 --- a/distros/rolling/rmw-connextdds-common/default.nix +++ b/distros/rolling/rmw-connextdds-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-connextdds-common"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_connextdds-release/archive/release/rolling/rmw_connextdds_common/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "c07a9a8a067f88d24db7c1c6b0ae0e3cee836ca7702c37893ac23a2ebeabb548"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_connextdds-release"; + rev = "release/rolling/rmw_connextdds_common/0.13.0-1"; + sha256 = "sha256-wWrKMku/YzsiofxwH3O/LQ1xIrxwtoAy7auf1O4JBoU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rmw-connextdds/default.nix b/distros/rolling/rmw-connextdds/default.nix index a6f40dcba0..b56a21b428 100644 --- a/distros/rolling/rmw-connextdds/default.nix +++ b/distros/rolling/rmw-connextdds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-connextdds"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_connextdds-release/archive/release/rolling/rmw_connextdds/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "06c868eb365c1a74b73ba557d8a3590170132dc6e10258141642c779dec92015"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_connextdds-release"; + rev = "release/rolling/rmw_connextdds/0.13.0-1"; + sha256 = "sha256-0VndsnzKK0M5IvmIMXmKJzIGDgAvCN8ryJ4teyCsd3c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rmw-cyclonedds-cpp/default.nix b/distros/rolling/rmw-cyclonedds-cpp/default.nix index 1e891100ae..10738437e1 100644 --- a/distros/rolling/rmw-cyclonedds-cpp/default.nix +++ b/distros/rolling/rmw-cyclonedds-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-cyclonedds-cpp"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_cyclonedds-release/archive/release/rolling/rmw_cyclonedds_cpp/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "f52320eda92b02c8075045134e3d0897e488bf4d71346b79ca006449a4d2fb6f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_cyclonedds-release"; + rev = "release/rolling/rmw_cyclonedds_cpp/1.5.0-1"; + sha256 = "sha256-3ZOEZFjxX8pWz9r5Auoonm/Js9E+BvK6W2LZplaXYDE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rmw-dds-common/default.nix b/distros/rolling/rmw-dds-common/default.nix index fd62c2d9a2..10110bcbe6 100644 --- a/distros/rolling/rmw-dds-common/default.nix +++ b/distros/rolling/rmw-dds-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-dds-common"; version = "1.7.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_dds_common-release/archive/release/rolling/rmw_dds_common/1.7.1-1.tar.gz"; - name = "1.7.1-1.tar.gz"; - sha256 = "3309768025e0d8934e089f41c9d20379e202879d8f2fd0c20dd246adac6ddbf3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_dds_common-release"; + rev = "release/rolling/rmw_dds_common/1.7.1-1"; + sha256 = "sha256-oLNl+r1xe16XEwUqRU2JgCbasANUL1IAAXRYHwssLAY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rmw-fastrtps-cpp/default.nix b/distros/rolling/rmw-fastrtps-cpp/default.nix index 7f3f803aa4..289ee68323 100644 --- a/distros/rolling/rmw-fastrtps-cpp/default.nix +++ b/distros/rolling/rmw-fastrtps-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-fastrtps-cpp"; version = "6.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/rolling/rmw_fastrtps_cpp/6.5.0-1.tar.gz"; - name = "6.5.0-1.tar.gz"; - sha256 = "3d764626907ff86578ccca7ccc04a2ec4b1dfa214130ca480c664bcc0a6d591d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/rolling/rmw_fastrtps_cpp/6.5.0-1"; + sha256 = "sha256-TYWVQSsfeR2cbfOBLXsZnvK3ts2O+pwILUQ424cQqF8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rmw-fastrtps-dynamic-cpp/default.nix b/distros/rolling/rmw-fastrtps-dynamic-cpp/default.nix index 261fa2910d..2f607ce335 100644 --- a/distros/rolling/rmw-fastrtps-dynamic-cpp/default.nix +++ b/distros/rolling/rmw-fastrtps-dynamic-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-fastrtps-dynamic-cpp"; version = "6.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/rolling/rmw_fastrtps_dynamic_cpp/6.5.0-1.tar.gz"; - name = "6.5.0-1.tar.gz"; - sha256 = "c6ba8295a55ff21d25c2a03ce19dd0ead2ad55e8f023518dd4da62acceceae98"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/rolling/rmw_fastrtps_dynamic_cpp/6.5.0-1"; + sha256 = "sha256-3HFvWV4CWTOnsOfkX51fjGWHN64PNk4mluv+wgy0S8M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rmw-fastrtps-shared-cpp/default.nix b/distros/rolling/rmw-fastrtps-shared-cpp/default.nix index c11ad17270..723f26c3e6 100644 --- a/distros/rolling/rmw-fastrtps-shared-cpp/default.nix +++ b/distros/rolling/rmw-fastrtps-shared-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-fastrtps-shared-cpp"; version = "6.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/rolling/rmw_fastrtps_shared_cpp/6.5.0-1.tar.gz"; - name = "6.5.0-1.tar.gz"; - sha256 = "7d155901e1b4d17e67560b6100efda09896767dc2f77bb38d9eff4de110e6a29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_fastrtps-release"; + rev = "release/rolling/rmw_fastrtps_shared_cpp/6.5.0-1"; + sha256 = "sha256-S7llzNMM7jDE7jKEbs7i2sjiSbmaXhf6+9jPIUfT7h0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rmw-implementation-cmake/default.nix b/distros/rolling/rmw-implementation-cmake/default.nix index 4a93455c88..0401d2e5e8 100644 --- a/distros/rolling/rmw-implementation-cmake/default.nix +++ b/distros/rolling/rmw-implementation-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-implementation-cmake"; version = "6.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw-release/archive/release/rolling/rmw_implementation_cmake/6.4.0-1.tar.gz"; - name = "6.4.0-1.tar.gz"; - sha256 = "896f1b8d37525e769bf7b47559ec65100581e73520c2393cfa5972f1fb900002"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw-release"; + rev = "release/rolling/rmw_implementation_cmake/6.4.0-1"; + sha256 = "sha256-V7Pc+SOrZMkAZJyPXrxAz6Yfx6/ixOhubG1v6WDrdzs="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/rmw-implementation/default.nix b/distros/rolling/rmw-implementation/default.nix index 02283dfe20..a031b8ffcc 100644 --- a/distros/rolling/rmw-implementation/default.nix +++ b/distros/rolling/rmw-implementation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw-implementation"; version = "2.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_implementation-release/archive/release/rolling/rmw_implementation/2.10.0-1.tar.gz"; - name = "2.10.0-1.tar.gz"; - sha256 = "589d6d92a968832928c01d6c90cf07b9bed4ceb0fbc6bdd1d925f9b3e5c8c9e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_implementation-release"; + rev = "release/rolling/rmw_implementation/2.10.0-1"; + sha256 = "sha256-2OdD8fO/P6IHuUU8PoL0rCdJEo5pg6UlyJ8GPQHXvPg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rmw rmw-connextdds rmw-cyclonedds-cpp rmw-fastrtps-cpp rmw-fastrtps-dynamic-cpp ]; diff --git a/distros/rolling/rmw/default.nix b/distros/rolling/rmw/default.nix index 8e1c0fd738..e2a66ad6fa 100644 --- a/distros/rolling/rmw/default.nix +++ b/distros/rolling/rmw/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rmw"; version = "6.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw-release/archive/release/rolling/rmw/6.4.0-1.tar.gz"; - name = "6.4.0-1.tar.gz"; - sha256 = "ebfcf29eb53d4a6c8b6518dfa91b2a57e4b47e4c934a984706a47c3e831a10b9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw-release"; + rev = "release/rolling/rmw/6.4.0-1"; + sha256 = "sha256-slzNx7fqI7DfIStnYVYzbRvP7b7K3MwNC+OaDnmgXHU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ament-cmake-version ]; diff --git a/distros/rolling/robot-calibration-msgs/default.nix b/distros/rolling/robot-calibration-msgs/default.nix index 5b60093ddc..2535641ea1 100644 --- a/distros/rolling/robot-calibration-msgs/default.nix +++ b/distros/rolling/robot-calibration-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-robot-calibration-msgs"; version = "0.8.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_calibration-release/archive/release/rolling/robot_calibration_msgs/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "3c69add4c2bf0b22aa1174a7c9ea14c3dc0bdcc8f5c1036cc60bb1a702222a7f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_calibration-release"; + rev = "release/rolling/robot_calibration_msgs/0.8.0-1"; + sha256 = "sha256-DTC4fHYediXuBlv9ZfjpeWB0ynuOhiQcJyCxBN1Ob+s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/robot-calibration/default.nix b/distros/rolling/robot-calibration/default.nix index 84d5a56408..495ad58903 100644 --- a/distros/rolling/robot-calibration/default.nix +++ b/distros/rolling/robot-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-robot-calibration"; version = "0.8.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_calibration-release/archive/release/rolling/robot_calibration/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "dc982ff3566ee7d4b128cae07b0ca0e642a09ec691263630af262f550486881f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_calibration-release"; + rev = "release/rolling/robot_calibration/0.8.0-1"; + sha256 = "sha256-VOm9ljE353W1G3t2bZ1BzjYsZi0oM0ln7GnGjKtwT1M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake boost eigen ]; diff --git a/distros/rolling/robot-localization/default.nix b/distros/rolling/robot-localization/default.nix index a1d0d47e3c..c34a6abff5 100644 --- a/distros/rolling/robot-localization/default.nix +++ b/distros/rolling/robot-localization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-robot-localization"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_localization-release/archive/release/rolling/robot_localization/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "da700e625dc433d51ce964ff61e05d8cc25af701481ae3731270467adf3b877e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_localization-release"; + rev = "release/rolling/robot_localization/3.5.0-1"; + sha256 = "sha256-W1A5rT+Bny3ncng0MhAIgSlK6YSS09vb7Pu/kPOsdpI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces rosidl-default-generators ]; diff --git a/distros/rolling/robot-state-publisher/default.nix b/distros/rolling/robot-state-publisher/default.nix index 668e40075a..d040c9d7a2 100644 --- a/distros/rolling/robot-state-publisher/default.nix +++ b/distros/rolling/robot-state-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-robot-state-publisher"; version = "3.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/robot_state_publisher-release/archive/release/rolling/robot_state_publisher/3.1.1-1.tar.gz"; - name = "3.1.1-1.tar.gz"; - sha256 = "e6fba5520292923589252bfaa5ddfc442637d31afaa8a1252b001e9e94bc8970"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "robot_state_publisher-release"; + rev = "release/rolling/robot_state_publisher/3.1.1-1"; + sha256 = "sha256-kJHKGw+yVKL31lJU7yJIHIEM+iGCcZNVL9Qcoa1Dt9g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros-base/default.nix b/distros/rolling/ros-base/default.nix index 5ed4fb4baf..1165eca4fc 100644 --- a/distros/rolling/ros-base/default.nix +++ b/distros/rolling/ros-base/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros-base"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/rolling/ros_base/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "d48eb81e4163c748bd57fcb390bf86d93e4056d81d9cd18eb412ae9d5695fb79"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/rolling/ros_base/0.10.0-1"; + sha256 = "sha256-qTPrFPcFntKAifYcXqjryFyhWK0SgTD9g57SPOb7S9U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros-core/default.nix b/distros/rolling/ros-core/default.nix index e61e014bba..fccbea95c1 100644 --- a/distros/rolling/ros-core/default.nix +++ b/distros/rolling/ros-core/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros-core"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/rolling/ros_core/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "b27b376def41f69dabf4db06dab3df7e66155b6e40d5b9ec856554c8f2bcb275"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/rolling/ros_core/0.10.0-1"; + sha256 = "sha256-Oq1qKMDCrNKnoDWlaZtBuCMhiDEWEaPoyvkumjxWuFg="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake ament-cmake-auto ament-cmake-gmock ament-cmake-gtest ament-cmake-pytest ament-cmake-ros ament-index-cpp ament-index-python ament-lint-auto ament-lint-common class-loader common-interfaces launch launch-ros launch-testing launch-testing-ament-cmake launch-testing-ros launch-xml launch-yaml pluginlib rcl-lifecycle rclcpp rclcpp-action rclcpp-lifecycle rclpy ros-environment ros2cli-common-extensions ros2launch rosidl-default-generators rosidl-default-runtime sros2 sros2-cmake ]; diff --git a/distros/rolling/ros-environment/default.nix b/distros/rolling/ros-environment/default.nix index d6b47cf90b..c4526b28b7 100644 --- a/distros/rolling/ros-environment/default.nix +++ b/distros/rolling/ros-environment/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros-environment"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_environment-release/archive/release/rolling/ros_environment/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "35d96ecf4835c77c884a337c7da3401d4157604f617674f9aed33f01e6f22dda"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_environment-release"; + rev = "release/rolling/ros_environment/4.0.0-1"; + sha256 = "sha256-jt3CJrw8btP3sylhYwYuXEMelSBgaKRKvbcazLu+fmM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/ros-ign-interfaces/default.nix b/distros/rolling/ros-ign-interfaces/default.nix index ba6ccd4b03..db1ae07ce4 100644 --- a/distros/rolling/ros-ign-interfaces/default.nix +++ b/distros/rolling/ros-ign-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros-ign-interfaces"; version = "0.244.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/rolling/ros_ign_interfaces/0.244.3-1.tar.gz"; - name = "0.244.3-1.tar.gz"; - sha256 = "cda4c629f59a111943cd951d95af85f0ba9458ec5efe284108903f9ca9e87dce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/rolling/ros_ign_interfaces/0.244.3-1"; + sha256 = "sha256-HlS1qqso7iVK46yRxrZHa4IZdqqua/guyzhMTNidpi0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/ros-ign/default.nix b/distros/rolling/ros-ign/default.nix index ff392780b6..7ec4a2737c 100644 --- a/distros/rolling/ros-ign/default.nix +++ b/distros/rolling/ros-ign/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros-ign"; version = "0.244.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_ign-release/archive/release/rolling/ros_ign/0.244.3-1.tar.gz"; - name = "0.244.3-1.tar.gz"; - sha256 = "227d5ad5a468d083e1271890daa0a2eadcdc318b84b20cb3106b6cb40957fff9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_ign-release"; + rev = "release/rolling/ros_ign/0.244.3-1"; + sha256 = "sha256-1HlJo5816Gidf4bD33hgKsxG/ioOCXFwUs/r2Ry+1mI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros-image-to-qimage/default.nix b/distros/rolling/ros-image-to-qimage/default.nix index fb3870b820..518a9ab68a 100644 --- a/distros/rolling/ros-image-to-qimage/default.nix +++ b/distros/rolling/ros-image-to-qimage/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros-image-to-qimage"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_image_to_qimage-release/archive/release/rolling/ros_image_to_qimage/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "a527afc12c12b9e84cc7185f4d2b0925b82033bdded3bc373b3330413c2f49a3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_image_to_qimage-release"; + rev = "release/rolling/ros_image_to_qimage/0.4.1-1"; + sha256 = "sha256-qxt94vxyKVhWR64DyvjU5D5xKcJcflZdDd/jA2e0d9U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-pytest ament-cmake-python ]; diff --git a/distros/rolling/ros-testing/default.nix b/distros/rolling/ros-testing/default.nix index a00796555e..f10eb4cda3 100644 --- a/distros/rolling/ros-testing/default.nix +++ b/distros/rolling/ros-testing/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros-testing"; version = "0.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_testing-release/archive/release/rolling/ros_testing/0.5.1-1.tar.gz"; - name = "0.5.1-1.tar.gz"; - sha256 = "1d7520271a26c66ce74e5c47e102b648abf61513e6bf1f98e1a4c7cc34f4cd40"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_testing-release"; + rev = "release/rolling/ros_testing/0.5.1-1"; + sha256 = "sha256-wcx4E4Cli5Vd8Z9FxBz85aara7OcxPWxFM1ALrQ9u/E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-core ament-cmake-export-dependencies ]; diff --git a/distros/rolling/ros-workspace/default.nix b/distros/rolling/ros-workspace/default.nix index ee7f781cf5..4674692ae9 100644 --- a/distros/rolling/ros-workspace/default.nix +++ b/distros/rolling/ros-workspace/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros-workspace"; version = "1.0.2-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_workspace-release/archive/release/rolling/ros_workspace/1.0.2-5.tar.gz"; - name = "1.0.2-5.tar.gz"; - sha256 = "6bbc9429ee4b00bf29feeb73f2c123035fd1967cc2ac698fadd7fd6bd286af59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_workspace-release"; + rev = "release/rolling/ros_workspace/1.0.2-5"; + sha256 = "sha256-FXiyjTZx5N94wlqTFY6bxysv+eiH6noKxFlYXOwcV2M="; + }; buildType = "cmake"; buildInputs = [ ament-cmake-core ament-package cmake ]; diff --git a/distros/rolling/ros2-control-test-assets/default.nix b/distros/rolling/ros2-control-test-assets/default.nix index 6f698251dc..7a7f9c635a 100644 --- a/distros/rolling/ros2-control-test-assets/default.nix +++ b/distros/rolling/ros2-control-test-assets/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake }: buildRosPackage { pname = "ros-rolling-ros2-control-test-assets"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/ros2_control_test_assets/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "6ed939f9b752581a08ff990fb97f7cd5dbf5ce941ecb4e24fc48d51d89f4e6e8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/ros2_control_test_assets/3.7.0-1"; + sha256 = "sha256-YNwnUmqFrOaP0hvcsFikfFW1xZbmTemG0E00hivjYEE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros2-control/default.nix b/distros/rolling/ros2-control/default.nix index 1f77a6e690..cabb840a8d 100644 --- a/distros/rolling/ros2-control/default.nix +++ b/distros/rolling/ros2-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, controller-interface, controller-manager, controller-manager-msgs, hardware-interface, joint-limits, ros2-control-test-assets, ros2controlcli, transmission-interface }: buildRosPackage { pname = "ros-rolling-ros2-control"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/ros2_control/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "e6c5c38689c5db714007cea6771b7ff07e87b87b05e5332b030f6d16723616a4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/ros2_control/3.7.0-1"; + sha256 = "sha256-CM4dTXk1FAKau5NFnsye5ATr3l8I3FrmI5Y8daU8BQ4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros2-controllers-test-nodes/default.nix b/distros/rolling/ros2-controllers-test-nodes/default.nix index 3bc759f10c..ba60b3051c 100644 --- a/distros/rolling/ros2-controllers-test-nodes/default.nix +++ b/distros/rolling/ros2-controllers-test-nodes/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, pythonPackages, rclpy, std-msgs, trajectory-msgs }: buildRosPackage { pname = "ros-rolling-ros2-controllers-test-nodes"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/ros2_controllers_test_nodes/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "71d89b2bab0a45dc70eb2c8d79f935e351be076c40c380839d131d7f234ead6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/ros2_controllers_test_nodes/3.1.0-1"; + sha256 = "sha256-oEzQqZpqAKh81ADpiu5z8wnxD2KYlezXfUMrnlfybTI="; + }; buildType = "ament_python"; checkInputs = [ pythonPackages.pytest ]; diff --git a/distros/rolling/ros2-controllers/default.nix b/distros/rolling/ros2-controllers/default.nix index 7f7b26721f..22d1768235 100644 --- a/distros/rolling/ros2-controllers/default.nix +++ b/distros/rolling/ros2-controllers/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, admittance-controller, ament-cmake, diff-drive-controller, effort-controllers, force-torque-sensor-broadcaster, forward-command-controller, imu-sensor-broadcaster, joint-state-broadcaster, joint-trajectory-controller, position-controllers, tricycle-controller, velocity-controllers }: buildRosPackage { pname = "ros-rolling-ros2-controllers"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/ros2_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "8ba6c71dafebdeb0a8dcdd254c4f6318bf14b982648b6671f4c3d0bbb7e5e35e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/ros2_controllers/3.1.0-1"; + sha256 = "sha256-Q8FreNM/0dclRuVJ++WyNrNJJe9nvuxm1oCJkTDy0tc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros2-socketcan/default.nix b/distros/rolling/ros2-socketcan/default.nix index 22a8431e9a..8944e972af 100644 --- a/distros/rolling/ros2-socketcan/default.nix +++ b/distros/rolling/ros2-socketcan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2-socketcan"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_socketcan-release/archive/release/rolling/ros2_socketcan/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "6f1dd16c7e8e8ca39049a65df16f1e8e468467a19378750f94a6863eac652bb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_socketcan-release"; + rev = "release/rolling/ros2_socketcan/1.1.0-2"; + sha256 = "sha256-5X1Zt8nQDN5Bp9dZgz8CzQW6gMNhDsjMt0D6P1X/JSg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/ros2acceleration/default.nix b/distros/rolling/ros2acceleration/default.nix index bbb58b8d1b..1e9fdb6388 100644 --- a/distros/rolling/ros2acceleration/default.nix +++ b/distros/rolling/ros2acceleration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2acceleration"; version = "0.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2acceleration-release/archive/release/rolling/ros2acceleration/0.5.1-1.tar.gz"; - name = "0.5.1-1.tar.gz"; - sha256 = "2b2e9e4220a28bd14889ef86c84ba6b1ee6642b74bda93d73d3558734466b0c1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2acceleration-release"; + rev = "release/rolling/ros2acceleration/0.5.1-1"; + sha256 = "sha256-DRkaUv6JAKKbX1+DqnpK8wTDm1+jlEoHal/0i6rhA6I="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest test-msgs ]; diff --git a/distros/rolling/ros2action/default.nix b/distros/rolling/ros2action/default.nix index 41bb4a210f..46505fc9de 100644 --- a/distros/rolling/ros2action/default.nix +++ b/distros/rolling/ros2action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2action"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2action/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "f3ac5abaf1006bef743a6566be2793d9e869cd3dc57c6e17a66b0c0e454b3526"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2action/0.21.0-1"; + sha256 = "sha256-RFekj2+hBPcJdCcxgqyife+PPT4hLgfn9GyFYsi2Kjs="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest test-msgs ]; diff --git a/distros/rolling/ros2bag/default.nix b/distros/rolling/ros2bag/default.nix index 62cecf7498..8314289833 100644 --- a/distros/rolling/ros2bag/default.nix +++ b/distros/rolling/ros2bag/default.nix @@ -2,19 +2,23 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, launch-testing, launch-testing-ros, pythonPackages, ros2cli, rosbag2-py, rosbag2-transport }: +{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, launch-testing, launch-testing-ros, pythonPackages, ros2cli, rosbag2-py, rosbag2-storage-default-plugins, rosbag2-test-common, rosbag2-transport }: buildRosPackage { pname = "ros-rolling-ros2bag"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/ros2bag/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "958cd8f0766d39e9be0e284ac3f5da0b691fef0fb0052976caccfc282ef6f121"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/ros2bag/0.19.0-1"; + sha256 = "sha256-g2tsiaHGMxDYLe856AdZdi+2JcTnkdJlNHvD1Y9HJ7I="; + }; buildType = "ament_python"; - checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch-testing launch-testing-ros pythonPackages.pytest ]; + checkInputs = [ ament-copyright ament-flake8 ament-pep257 launch-testing launch-testing-ros pythonPackages.pytest rosbag2-storage-default-plugins rosbag2-test-common ]; propagatedBuildInputs = [ ros2cli rosbag2-py rosbag2-transport ]; meta = { diff --git a/distros/rolling/ros2cli-common-extensions/default.nix b/distros/rolling/ros2cli-common-extensions/default.nix index b299217ea8..5dd1083c49 100644 --- a/distros/rolling/ros2cli-common-extensions/default.nix +++ b/distros/rolling/ros2cli-common-extensions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2cli-common-extensions"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli_common_extensions-release/archive/release/rolling/ros2cli_common_extensions/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "7a1178ca776bf466a3e3cc87c30b5565cd07a3191238694b317bb56d10064fe7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli_common_extensions-release"; + rev = "release/rolling/ros2cli_common_extensions/0.2.1-1"; + sha256 = "sha256-Os3/j/JAqt49PwJK5Rw08TvuKV4HqFDD8/7eI/bgoWc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros2cli-test-interfaces/default.nix b/distros/rolling/ros2cli-test-interfaces/default.nix index e43de7e905..a4323a77f7 100644 --- a/distros/rolling/ros2cli-test-interfaces/default.nix +++ b/distros/rolling/ros2cli-test-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2cli-test-interfaces"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2cli_test_interfaces/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "8fad452f68707e09791314b715a2dc3658d901338ed38193da4e45d083ec2dd7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2cli_test_interfaces/0.21.0-1"; + sha256 = "sha256-QnfceNOcEYoIcJdajYKzOmJ8de2svPF8laYJ9AeKk/Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/ros2cli/default.nix b/distros/rolling/ros2cli/default.nix index dc3c3d52aa..74b502cccd 100644 --- a/distros/rolling/ros2cli/default.nix +++ b/distros/rolling/ros2cli/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2cli"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2cli/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "c8af42a3c9ca49e3a2f8e246241f28329e6286b776af4d5f5fd83f8ca08622e2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2cli/0.21.0-1"; + sha256 = "sha256-kEEO61PBmuaYJqeRw8qDgEMLtS+FFJUF9wz52oHPvCM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint python3Packages.pytest-timeout pythonPackages.pytest test-msgs ]; diff --git a/distros/rolling/ros2component/default.nix b/distros/rolling/ros2component/default.nix index 33b1989d5b..856e914fbf 100644 --- a/distros/rolling/ros2component/default.nix +++ b/distros/rolling/ros2component/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2component"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2component/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "c93291c6fb3689a1df5099e177e9f82a7e846bc74ba98be1e6843f66014b283e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2component/0.21.0-1"; + sha256 = "sha256-ZuIyb5xgnynOwoYfCWQoaMO7mwlcXDL9e6rZ5VN2VeM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/rolling/ros2controlcli/default.nix b/distros/rolling/ros2controlcli/default.nix index 1b62f9c79b..5b56eb910a 100644 --- a/distros/rolling/ros2controlcli/default.nix +++ b/distros/rolling/ros2controlcli/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, controller-manager, controller-manager-msgs, python3Packages, rclpy, ros2cli, ros2node, ros2param, rosidl-runtime-py }: +{ lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, ament-xmllint, controller-manager, controller-manager-msgs, python3Packages, rcl-interfaces, rclpy, ros2cli, ros2node, ros2param, rosidl-runtime-py }: buildRosPackage { pname = "ros-rolling-ros2controlcli"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/ros2controlcli/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "f7abe30e7bc7d33231f52572570c9c3eceb395a05dbd0ad0c2ac8f14e899605c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/ros2controlcli/3.7.0-1"; + sha256 = "sha256-QlHhAqLWKroNJSrU+c7xVzzJYdc8CS24SBe1cob52FE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint ]; - propagatedBuildInputs = [ controller-manager controller-manager-msgs python3Packages.pygraphviz rclpy ros2cli ros2node ros2param rosidl-runtime-py ]; + propagatedBuildInputs = [ controller-manager controller-manager-msgs python3Packages.pygraphviz rcl-interfaces rclpy ros2cli ros2node ros2param rosidl-runtime-py ]; meta = { description = ''The ROS 2 command line tools for ROS2 Control.''; diff --git a/distros/rolling/ros2doctor/default.nix b/distros/rolling/ros2doctor/default.nix index 627aaedd97..7d196804ea 100644 --- a/distros/rolling/ros2doctor/default.nix +++ b/distros/rolling/ros2doctor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2doctor"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2doctor/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "fee4266baa7128d92fae4c3e42631e5266e336fe8a64052b8cc6db2c9628ff03"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2doctor/0.21.0-1"; + sha256 = "sha256-wYvRbitIvI9ZpdZjFnPtedDg7buQFbq7H9gMJcTMrjs="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest std-msgs ]; diff --git a/distros/rolling/ros2interface/default.nix b/distros/rolling/ros2interface/default.nix index 4cd2487219..f67a344da3 100644 --- a/distros/rolling/ros2interface/default.nix +++ b/distros/rolling/ros2interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2interface"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2interface/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "31603f8fccf01b1bb2dba198cdecfa21c27d8a7970e4155cafe38321c3961546"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2interface/0.21.0-1"; + sha256 = "sha256-pUnL2+2uOjwPZOz1BK740gPmx4d08q1IAsU5OUCmPjo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest ros2cli-test-interfaces test-msgs ]; diff --git a/distros/rolling/ros2launch-security-examples/default.nix b/distros/rolling/ros2launch-security-examples/default.nix index 1e5919ee93..4c37c75f79 100644 --- a/distros/rolling/ros2launch-security-examples/default.nix +++ b/distros/rolling/ros2launch-security-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2launch-security-examples"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2launch_security-release/archive/release/rolling/ros2launch_security_examples/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "5ae3b3f59596f3594ca745b45e97626cbb562aeabe31119f367d944bd9b32ebf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2launch_security-release"; + rev = "release/rolling/ros2launch_security_examples/1.0.0-2"; + sha256 = "sha256-NWaQ/UIv5e//ahvk4u8zBHDsw6po6o9VLTnHTmXsQR8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros2launch-security/default.nix b/distros/rolling/ros2launch-security/default.nix index 8bdb01d8a8..8866b77c47 100644 --- a/distros/rolling/ros2launch-security/default.nix +++ b/distros/rolling/ros2launch-security/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2launch-security"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2launch_security-release/archive/release/rolling/ros2launch_security/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "663e3ab054092002cc88ccd8aad644da8abee7f0abdba4d9e6b6a7aba3127b80"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2launch_security-release"; + rev = "release/rolling/ros2launch_security/1.0.0-2"; + sha256 = "sha256-MM1mvGLVBpSePXEUKQScahRPpulucGxMTaTp+jSKbNo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 demo-nodes-py launch-ros pythonPackages.pytest ros2launch sros2 ]; diff --git a/distros/rolling/ros2launch/default.nix b/distros/rolling/ros2launch/default.nix index 565adecd21..6654313eda 100644 --- a/distros/rolling/ros2launch/default.nix +++ b/distros/rolling/ros2launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2launch"; version = "0.22.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/launch_ros-release/archive/release/rolling/ros2launch/0.22.0-1.tar.gz"; - name = "0.22.0-1.tar.gz"; - sha256 = "f90241be4c37c4f5441a5c811df5c52c8abf3cbc3812f59c306428bb7dcb8bfa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "launch_ros-release"; + rev = "release/rolling/ros2launch/0.22.0-1"; + sha256 = "sha256-iroAp5ujn6hwcSuW6FA5FkPvZGdlTWWWJp5vYTwbsWE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ros2lifecycle-test-fixtures/default.nix b/distros/rolling/ros2lifecycle-test-fixtures/default.nix index 782cd0f942..4ace8bb573 100644 --- a/distros/rolling/ros2lifecycle-test-fixtures/default.nix +++ b/distros/rolling/ros2lifecycle-test-fixtures/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2lifecycle-test-fixtures"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2lifecycle_test_fixtures/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "da04e82c2b24c516e41a0b05f183bf104fe768ae9bd46473ed6fbcf8502d1c3c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2lifecycle_test_fixtures/0.21.0-1"; + sha256 = "sha256-cLr0UQX/D9xw4tw4CWdQsKHdTz0HGO4lIplzXqBqSiY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ros2lifecycle/default.nix b/distros/rolling/ros2lifecycle/default.nix index 89ad6e2887..2bb10dcb49 100644 --- a/distros/rolling/ros2lifecycle/default.nix +++ b/distros/rolling/ros2lifecycle/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2lifecycle"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2lifecycle/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "fec1a57b952f31cc4d7a5ae509d0a93f22e3a849d9def515b894b5f7bf34d4a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2lifecycle/0.21.0-1"; + sha256 = "sha256-A6RUr/++3vyX/M3MjWHVdBHVxzsSWotQg4vU8CPQQEM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest ros2lifecycle-test-fixtures ]; diff --git a/distros/rolling/ros2multicast/default.nix b/distros/rolling/ros2multicast/default.nix index bc4e6a3bde..b7294ba58b 100644 --- a/distros/rolling/ros2multicast/default.nix +++ b/distros/rolling/ros2multicast/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2multicast"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2multicast/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "a81ab63868596baafdea59c7d4ee5611b0be3181f57ad898442ba69be574318b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2multicast/0.21.0-1"; + sha256 = "sha256-BTcwGMFZ5RBKrZQ1unRU8B+Gai2aC1KWKhcQksH8LZE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/rolling/ros2node/default.nix b/distros/rolling/ros2node/default.nix index 7ff0598b24..e95f33fbe1 100644 --- a/distros/rolling/ros2node/default.nix +++ b/distros/rolling/ros2node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2node"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2node/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "17390f979eafb37ff2722e5ce2e93fbe614555b96a7f3f17a236299107f0e76c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2node/0.21.0-1"; + sha256 = "sha256-gp979VdXZ9/q3FeC3UGuaXuxAj7Eg6i4S58yVNwNELw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest rclpy test-msgs ]; diff --git a/distros/rolling/ros2nodl/default.nix b/distros/rolling/ros2nodl/default.nix index c733007f8a..b45728a441 100644 --- a/distros/rolling/ros2nodl/default.nix +++ b/distros/rolling/ros2nodl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2nodl"; version = "0.3.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/nodl-release/archive/release/rolling/ros2nodl/0.3.1-2.tar.gz"; - name = "0.3.1-2.tar.gz"; - sha256 = "ed7b1bbae444a8ef3a950e2f1c81602f9b9e67f8502f2eb34f7c6edae9daf513"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "nodl-release"; + rev = "release/rolling/ros2nodl/0.3.1-2"; + sha256 = "sha256-8JQgseO9AxfsDy2YuxQ/dojS/6MOLaCKwBGUX8hIgwk="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-lint-auto ament-lint-common ament-mypy python3Packages.pytest-mock pythonPackages.pytest ]; diff --git a/distros/rolling/ros2param/default.nix b/distros/rolling/ros2param/default.nix index cb22b74cc8..5406dda880 100644 --- a/distros/rolling/ros2param/default.nix +++ b/distros/rolling/ros2param/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2param"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2param/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "80a28f909482116995903d8d0b63287a33efa14b6671743778b43dc47e7cc87b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2param/0.21.0-1"; + sha256 = "sha256-6J6K8I8JSdnvYdVba2QHKA9LoQEusn8aYmBGQ8NNNjM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/rolling/ros2pkg/default.nix b/distros/rolling/ros2pkg/default.nix index 5447aba289..48f2fbd7a6 100644 --- a/distros/rolling/ros2pkg/default.nix +++ b/distros/rolling/ros2pkg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2pkg"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2pkg/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "bb8467fa2b6ab5e5f8c5a6b86edd833b0995091703c4de6a8dd574c235c0cbcf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2pkg/0.21.0-1"; + sha256 = "sha256-7c7UYQYketS+zVFzroWuiKW//Q4q1vx7zIrus0zWUao="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 ament-xmllint launch launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/rolling/ros2run/default.nix b/distros/rolling/ros2run/default.nix index d292b9126a..eec9e8ddc6 100644 --- a/distros/rolling/ros2run/default.nix +++ b/distros/rolling/ros2run/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2run"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2run/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "475cae79c1b4cafae9156a73db72d1510b5a057e903601e8a4856255b0417ca1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2run/0.21.0-1"; + sha256 = "sha256-2Y+4/sfEId3UQRpvYxmUI83dkw95X+ZABQ7TRb6n3qc="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint python3Packages.pytest-timeout pythonPackages.pytest ]; diff --git a/distros/rolling/ros2service/default.nix b/distros/rolling/ros2service/default.nix index 920008ada3..8a20447f73 100644 --- a/distros/rolling/ros2service/default.nix +++ b/distros/rolling/ros2service/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2service"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2service/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "029bbd6fde01b394305adafd9fd58314754cd2b9a26fd8d1111858e154551226"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2service/0.21.0-1"; + sha256 = "sha256-Iu2YtoJitbAl/GgWE6wgJSHhgf2lDIynpRTJFmBdins="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest test-msgs ]; diff --git a/distros/rolling/ros2test/default.nix b/distros/rolling/ros2test/default.nix index c71d1c2a4e..de0383fd84 100644 --- a/distros/rolling/ros2test/default.nix +++ b/distros/rolling/ros2test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2test"; version = "0.5.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_testing-release/archive/release/rolling/ros2test/0.5.1-1.tar.gz"; - name = "0.5.1-1.tar.gz"; - sha256 = "42246a59398b599e605e5e8db4fa339b51f090bee9c28ae1e9e468dfcb00aa17"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_testing-release"; + rev = "release/rolling/ros2test/0.5.1-1"; + sha256 = "sha256-DvtM7VdDeMEuBRrcIlaOHwabJ8TvJWqMJFel7P9rY4s="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ros2topic/default.nix b/distros/rolling/ros2topic/default.nix index aeffd7c6e7..dbc205ac12 100644 --- a/distros/rolling/ros2topic/default.nix +++ b/distros/rolling/ros2topic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2topic"; version = "0.21.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/rolling/ros2topic/0.21.0-1.tar.gz"; - name = "0.21.0-1.tar.gz"; - sha256 = "b1e9484b72545dc82cc249d05dfaec6a2c6beba1671008aeaf256799d9cefad6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2cli-release"; + rev = "release/rolling/ros2topic/0.21.0-1"; + sha256 = "sha256-kFIHSXpIwUKHfb/oUa4XJfauXWHDeaN9D8MqEX4gFQY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint geometry-msgs launch launch-ros launch-testing launch-testing-ros python3Packages.pytest-timeout pythonPackages.pytest rosgraph-msgs std-msgs test-msgs ]; diff --git a/distros/rolling/ros2trace-analysis/default.nix b/distros/rolling/ros2trace-analysis/default.nix index 2537b292c9..25d1da2dd2 100644 --- a/distros/rolling/ros2trace-analysis/default.nix +++ b/distros/rolling/ros2trace-analysis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2trace-analysis"; version = "3.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tracetools_analysis-release/archive/release/rolling/ros2trace_analysis/3.0.0-3.tar.gz"; - name = "3.0.0-3.tar.gz"; - sha256 = "914f42ae6fbead502d3f3c911c5d57d6139b3747799ffacec6c2200224cc5f38"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tracetools_analysis-release"; + rev = "release/rolling/ros2trace_analysis/3.0.0-3"; + sha256 = "sha256-88nEQ39lxqn4A5k9lH63DZqI0nV7umn2QUpbOCQyVpE="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/rolling/ros2trace/default.nix b/distros/rolling/ros2trace/default.nix index 37cb58d573..1611ebba78 100644 --- a/distros/rolling/ros2trace/default.nix +++ b/distros/rolling/ros2trace/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ros2trace"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/rolling/ros2trace/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "e641d2ffe67d9c48049e2133b6fad2c91c156232c6d42f7b03f089ddb66b111e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/rolling/ros2trace/4.1.0-1"; + sha256 = "sha256-bCf/VwX3PWx0ZERfmZE3w2yD68L8c8OMPpuXAQjSYoc="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/rolling/rosapi-msgs/default.nix b/distros/rolling/rosapi-msgs/default.nix index 50109d7dd2..e7f0bacafb 100644 --- a/distros/rolling/rosapi-msgs/default.nix +++ b/distros/rolling/rosapi-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosapi-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/rolling/rosapi_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "ad15c7a45af499b7b601a2fb8ec0f7ac6dc24bf2c761ac3a1e926858cd1c612f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/rolling/rosapi_msgs/1.3.1-1"; + sha256 = "sha256-Q4dTs68oi8RWGF2fto9PtQNCnoH23yoHPnNZkMLJBRE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-default-generators ]; diff --git a/distros/rolling/rosapi/default.nix b/distros/rolling/rosapi/default.nix index 432f45bba8..05d373e035 100644 --- a/distros/rolling/rosapi/default.nix +++ b/distros/rolling/rosapi/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosapi"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/rolling/rosapi/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "8407172cb766f26ee3370a3b02713e563dafb11f63c9a72a49f31c61affdef76"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/rolling/rosapi/1.3.1-1"; + sha256 = "sha256-xyStRT/4J+A6f1qaIk41X5un6h8s/aFEGdHcIQofWHg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rosbag2-compression-zstd/default.nix b/distros/rolling/rosbag2-compression-zstd/default.nix index 16f7e4d365..a671584601 100644 --- a/distros/rolling/rosbag2-compression-zstd/default.nix +++ b/distros/rolling/rosbag2-compression-zstd/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, pluginlib, rclcpp, rcpputils, rcutils, rosbag2-compression, rosbag2-test-common, zstd-vendor }: buildRosPackage { pname = "ros-rolling-rosbag2-compression-zstd"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_compression_zstd/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "6ac8ade1433939e652fdbcffc6cdb1f2fd703cf5c7a6cb32617eeda715ca7e60"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_compression_zstd/0.19.0-1"; + sha256 = "sha256-LKctObrk06fWrF38w3S6gACeHlApN7pfbf5LEL+56V4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosbag2-compression/default.nix b/distros/rolling/rosbag2-compression/default.nix index 18aa00c952..e769807b95 100644 --- a/distros/rolling/rosbag2-compression/default.nix +++ b/distros/rolling/rosbag2-compression/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, rclcpp, rcpputils, rcutils, rosbag2-cpp, rosbag2-storage, rosbag2-test-common }: buildRosPackage { pname = "ros-rolling-rosbag2-compression"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_compression/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "2659b9e0bedbf3bba24de2df6240e5330583476e185217fbb064e977fd69afcb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_compression/0.19.0-1"; + sha256 = "sha256-39Y+J6zvpOvfQgBi0jowMEIz/pTlv0i9WHED1aAVkW8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosbag2-cpp/default.nix b/distros/rolling/rosbag2-cpp/default.nix index 6e271505b0..00db1ce1ca 100644 --- a/distros/rolling/rosbag2-cpp/default.nix +++ b/distros/rolling/rosbag2-cpp/default.nix @@ -5,18 +5,22 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-index-cpp, ament-lint-auto, ament-lint-common, pluginlib, rclcpp, rcpputils, rcutils, rmw, rmw-implementation, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-test-common, rosidl-runtime-c, rosidl-runtime-cpp, rosidl-typesupport-cpp, rosidl-typesupport-introspection-cpp, shared-queues-vendor, test-msgs }: buildRosPackage { pname = "ros-rolling-rosbag2-cpp"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_cpp/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "136e2afd09041afffe0475fa8f8605003eb0611118c3ea94025e97d418415740"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_cpp/0.19.0-1"; + sha256 = "sha256-3eF+BrTaXMQjzGXNqtJ3g+3m5F5cVTFLHPwo1n5hWFE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; - checkInputs = [ ament-cmake-gmock ament-lint-auto ament-lint-common rosbag2-test-common test-msgs ]; - propagatedBuildInputs = [ ament-index-cpp pluginlib rclcpp rcpputils rcutils rmw rmw-implementation rosbag2-storage rosbag2-storage-default-plugins rosidl-runtime-c rosidl-runtime-cpp rosidl-typesupport-cpp rosidl-typesupport-introspection-cpp shared-queues-vendor ]; + checkInputs = [ ament-cmake-gmock ament-lint-auto ament-lint-common rosbag2-storage-default-plugins rosbag2-test-common test-msgs ]; + propagatedBuildInputs = [ ament-index-cpp pluginlib rclcpp rcpputils rcutils rmw rmw-implementation rosbag2-storage rosidl-runtime-c rosidl-runtime-cpp rosidl-typesupport-cpp rosidl-typesupport-introspection-cpp shared-queues-vendor ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/rosbag2-examples-cpp/default.nix b/distros/rolling/rosbag2-examples-cpp/default.nix index b52b0988cd..e9493bac1f 100644 --- a/distros/rolling/rosbag2-examples-cpp/default.nix +++ b/distros/rolling/rosbag2-examples-cpp/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, example-interfaces, rclcpp, rosbag2-cpp }: buildRosPackage { pname = "ros-rolling-rosbag2-examples-cpp"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_examples_cpp/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "2764052656ed91c75d9f9473340848e5f345aeabae2e666c7559355a834a420d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_examples_cpp/0.19.0-1"; + sha256 = "sha256-TdXXIK5fxdTGtgPuo5Bsa79spEwl4sv42xJN9ftZ24Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosbag2-interfaces/default.nix b/distros/rolling/rosbag2-interfaces/default.nix index 5cb3e778d6..2ef9629819 100644 --- a/distros/rolling/rosbag2-interfaces/default.nix +++ b/distros/rolling/rosbag2-interfaces/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime }: buildRosPackage { pname = "ros-rolling-rosbag2-interfaces"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_interfaces/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "614ecf9ffc51b29879951fc4f83fb5c1f7a5a11335c33da6a5af31a9c2093632"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_interfaces/0.19.0-1"; + sha256 = "sha256-nWQxTrDwRmR1pAzauTkKYCnI2OCkkfMttazUb6qJ3Ic="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rosbag2-performance-benchmarking-msgs/default.nix b/distros/rolling/rosbag2-performance-benchmarking-msgs/default.nix new file mode 100644 index 0000000000..8edd2af016 --- /dev/null +++ b/distros/rolling/rosbag2-performance-benchmarking-msgs/default.nix @@ -0,0 +1,30 @@ + +# Copyright 2023 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, rosidl-cmake, rosidl-default-generators, rosidl-default-runtime, rosidl-typesupport-cpp }: +buildRosPackage { + pname = "ros-rolling-rosbag2-performance-benchmarking-msgs"; + version = "0.19.0-r1"; + + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_performance_benchmarking_msgs/0.19.0-1"; + sha256 = "sha256-QSqRjXiWM0o9JjnliRAKkfGzEWpi3CIK9yfB78O+KNY="; + }; + + buildType = "ament_cmake"; + buildInputs = [ ament-cmake rosidl-default-generators ]; + checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common rosidl-cmake rosidl-typesupport-cpp ]; + propagatedBuildInputs = [ rosidl-default-runtime ]; + nativeBuildInputs = [ ament-cmake rosidl-default-generators ]; + + meta = { + description = ''A package containing rosbag2 performance benchmarking specific messages.''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/rolling/rosbag2-performance-benchmarking/default.nix b/distros/rolling/rosbag2-performance-benchmarking/default.nix index 60541ce473..a75ab98c01 100644 --- a/distros/rolling/rosbag2-performance-benchmarking/default.nix +++ b/distros/rolling/rosbag2-performance-benchmarking/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rclcpp, rmw, rosbag2-compression, rosbag2-cpp, rosbag2-storage, std-msgs, yaml-cpp-vendor }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rclcpp, rmw, rosbag2-compression, rosbag2-cpp, rosbag2-performance-benchmarking-msgs, rosbag2-storage, sensor-msgs, yaml-cpp-vendor }: buildRosPackage { pname = "ros-rolling-rosbag2-performance-benchmarking"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_performance_benchmarking/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "ff33383a7bf2a6680de933e01d243eb84a95df3f58a8d7d6446e8f3f974677b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_performance_benchmarking/0.19.0-1"; + sha256 = "sha256-9sjlL+HiBSeMBp45paQuxLNg1hRHkLH7M0Ywe2yO5O4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; checkInputs = [ ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ rclcpp rmw rosbag2-compression rosbag2-cpp rosbag2-storage std-msgs yaml-cpp-vendor ]; + propagatedBuildInputs = [ rclcpp rmw rosbag2-compression rosbag2-cpp rosbag2-performance-benchmarking-msgs rosbag2-storage sensor-msgs yaml-cpp-vendor ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/rosbag2-py/default.nix b/distros/rolling/rosbag2-py/default.nix index a060967d21..4030897d29 100644 --- a/distros/rolling/rosbag2-py/default.nix +++ b/distros/rolling/rosbag2-py/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-python, ament-cmake-ros, ament-lint-auto, ament-lint-common, pybind11-vendor, python-cmake-module, pythonPackages, rcl-interfaces, rclpy, rosbag2-compression, rosbag2-cpp, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-transport, rosidl-runtime-py, rpyutils, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake-python, ament-cmake-ros, ament-lint-auto, ament-lint-common, pybind11-vendor, python-cmake-module, pythonPackages, rcl-interfaces, rclpy, rosbag2-compression, rosbag2-cpp, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-test-common, rosbag2-transport, rosidl-runtime-py, rpyutils, std-msgs }: buildRosPackage { pname = "ros-rolling-rosbag2-py"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_py/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "7b2d7ee79f6aeb579bdcccb126b61e57bbc73b04de45fd4adef88ae1c3e91212"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_py/0.19.0-1"; + sha256 = "sha256-lESxUcwW6LxNT9oO6gRo9YaL6Kh8k0r7GbJHIjYfjC4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros python-cmake-module ]; - checkInputs = [ ament-lint-auto ament-lint-common pythonPackages.pytest rcl-interfaces rclpy rosbag2-storage-default-plugins rosidl-runtime-py std-msgs ]; + checkInputs = [ ament-lint-auto ament-lint-common pythonPackages.pytest rcl-interfaces rclpy rosbag2-storage-default-plugins rosbag2-test-common rosidl-runtime-py std-msgs ]; propagatedBuildInputs = [ pybind11-vendor rosbag2-compression rosbag2-cpp rosbag2-storage rosbag2-transport rpyutils ]; nativeBuildInputs = [ ament-cmake-python ament-cmake-ros python-cmake-module ]; diff --git a/distros/rolling/rosbag2-storage-default-plugins/default.nix b/distros/rolling/rosbag2-storage-default-plugins/default.nix index 9ef66fd271..d3dc2e04f4 100644 --- a/distros/rolling/rosbag2-storage-default-plugins/default.nix +++ b/distros/rolling/rosbag2-storage-default-plugins/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, rosbag2-storage-sqlite3 }: +{ lib, buildRosPackage, fetchurl, ament-cmake, rosbag2-storage-mcap, rosbag2-storage-sqlite3 }: buildRosPackage { pname = "ros-rolling-rosbag2-storage-default-plugins"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_storage_default_plugins/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "d19c69c578eba935f707b11b682a03ec19627bf21fc4b0429071fd5f01216776"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_storage_default_plugins/0.19.0-1"; + sha256 = "sha256-1pYP0ZxliPqFtcRUuD5pBKSWdM2S6cIYLSATY5EyslU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; - propagatedBuildInputs = [ rosbag2-storage-sqlite3 ]; + propagatedBuildInputs = [ rosbag2-storage-mcap rosbag2-storage-sqlite3 ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/rosbag2-storage-mcap-testdata/default.nix b/distros/rolling/rosbag2-storage-mcap-testdata/default.nix index da20728bd6..e0a65a32a5 100644 --- a/distros/rolling/rosbag2-storage-mcap-testdata/default.nix +++ b/distros/rolling/rosbag2-storage-mcap-testdata/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rosidl-default-generators }: buildRosPackage { pname = "ros-rolling-rosbag2-storage-mcap-testdata"; - version = "0.5.0-r1"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/rolling/rosbag2_storage_mcap_testdata/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "77a89df48d44b2e02806de8573a127dbecfbf50c68bc4afedff17ea8ff6f8c6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_storage_mcap_testdata/0.19.0-1"; + sha256 = "sha256-j8xLZJFhcg/k3xvBsoTe43fCJmTLkYYlFfWLAtLE0ZM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rosbag2-storage-mcap/default.nix b/distros/rolling/rosbag2-storage-mcap/default.nix index 8218ac82bf..1a119aed58 100644 --- a/distros/rolling/rosbag2-storage-mcap/default.nix +++ b/distros/rolling/rosbag2-storage-mcap/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-clang-format, ament-cmake-gmock, ament-index-cpp, ament-lint-auto, ament-lint-common, mcap-vendor, pluginlib, rcpputils, rcutils, rosbag2-cpp, rosbag2-storage, rosbag2-storage-mcap-testdata, rosbag2-test-common, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-clang-format, ament-cmake-gmock, ament-index-cpp, ament-lint-auto, ament-lint-common, mcap-vendor, pluginlib, rcpputils, rcutils, rosbag2-storage, rosbag2-storage-mcap-testdata, rosbag2-test-common, std-msgs }: buildRosPackage { pname = "ros-rolling-rosbag2-storage-mcap"; - version = "0.5.0-r1"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2_storage_mcap-release/archive/release/rolling/rosbag2_storage_mcap/0.5.0-1.tar.gz"; - name = "0.5.0-1.tar.gz"; - sha256 = "6e4fd52ea6952bb629eb6945144b48f7c142e5f54ec222ee0c8fab6d5a648251"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_storage_mcap/0.19.0-1"; + sha256 = "sha256-/FjivKPu6H7WwCv7HHPHsk91Gp6RWoqiT4ZrPAjCVl0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; - checkInputs = [ ament-cmake-clang-format ament-cmake-gmock ament-lint-auto ament-lint-common rcpputils rosbag2-cpp rosbag2-storage-mcap-testdata rosbag2-test-common std-msgs ]; + checkInputs = [ ament-cmake-clang-format ament-cmake-gmock ament-lint-auto ament-lint-common rcpputils rosbag2-storage-mcap-testdata rosbag2-test-common std-msgs ]; propagatedBuildInputs = [ ament-index-cpp mcap-vendor pluginlib rcutils rosbag2-storage ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosbag2-storage-sqlite3/default.nix b/distros/rolling/rosbag2-storage-sqlite3/default.nix index 2e4d921816..eea007e78b 100644 --- a/distros/rolling/rosbag2-storage-sqlite3/default.nix +++ b/distros/rolling/rosbag2-storage-sqlite3/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-lint-auto, ament-lint-common, pluginlib, rcpputils, rcutils, rosbag2-storage, rosbag2-test-common, sqlite3-vendor, yaml-cpp-vendor }: buildRosPackage { pname = "ros-rolling-rosbag2-storage-sqlite3"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_storage_sqlite3/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "fd0127550a2bf9d57b2c5f754c1400efd29fbe6063eaf93d612635b590aeb789"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_storage_sqlite3/0.19.0-1"; + sha256 = "sha256-jvKzHy4bFIiJU5MMO2BdcBNklYtdmdScd1My5Ih6PjU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosbag2-storage/default.nix b/distros/rolling/rosbag2-storage/default.nix index f3847a6a27..4eb525dbf2 100644 --- a/distros/rolling/rosbag2-storage/default.nix +++ b/distros/rolling/rosbag2-storage/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-cmake-gtest, ament-lint-auto, ament-lint-common, pluginlib, rcpputils, rcutils, rosbag2-test-common, yaml-cpp-vendor }: buildRosPackage { pname = "ros-rolling-rosbag2-storage"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_storage/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "eed07f2adaec90a555f27eee44fd10fc0fd047f6d0b327d5a360193b923d8d12"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_storage/0.19.0-1"; + sha256 = "sha256-JbX1hZ0M+FmmAWomcJR/I+/357fO3UMi5PWhnbFzpmc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosbag2-test-common/default.nix b/distros/rolling/rosbag2-test-common/default.nix index bad222a3e8..1655c6c545 100644 --- a/distros/rolling/rosbag2-test-common/default.nix +++ b/distros/rolling/rosbag2-test-common/default.nix @@ -2,22 +2,26 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, rclcpp, rcutils }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, ament-lint-auto, ament-lint-common, python-cmake-module, rclcpp, rcutils }: buildRosPackage { pname = "ros-rolling-rosbag2-test-common"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_test_common/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "76e921aa4950b3e4bf055e73b3b31694272fd481f036a7cc05524dbbde75d524"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_test_common/0.19.0-1"; + sha256 = "sha256-bS88Fu1rWL8fIXnCkJZ1xuxzBPuAMEhViHatlS+0ne4="; + }; buildType = "ament_cmake"; - buildInputs = [ ament-cmake ]; + buildInputs = [ ament-cmake ament-cmake-python python-cmake-module ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ rclcpp rcutils ]; - nativeBuildInputs = [ ament-cmake ]; + nativeBuildInputs = [ ament-cmake ament-cmake-python python-cmake-module ]; meta = { description = ''Commonly used test helper classes and fixtures for rosbag2''; diff --git a/distros/rolling/rosbag2-tests/default.nix b/distros/rolling/rosbag2-tests/default.nix index e26a32c2e1..abf0330194 100644 --- a/distros/rolling/rosbag2-tests/default.nix +++ b/distros/rolling/rosbag2-tests/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, ament-index-cpp, ament-lint-auto, ament-lint-common, rclcpp, rcpputils, ros2bag, rosbag2-compression, rosbag2-compression-zstd, rosbag2-cpp, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-test-common, std-msgs, test-msgs }: buildRosPackage { pname = "ros-rolling-rosbag2-tests"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_tests/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "1c50781e1a14d752a81b64838824a73ed295e589a690be4a4dfcb6f659121f5e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_tests/0.19.0-1"; + sha256 = "sha256-FZUEGozq2uTILRLwZOyIJQakrQ8UPvBrmttc7VxaEtk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosbag2-transport/default.nix b/distros/rolling/rosbag2-transport/default.nix index 9e36b13905..8a1727dd4d 100644 --- a/distros/rolling/rosbag2-transport/default.nix +++ b/distros/rolling/rosbag2-transport/default.nix @@ -2,20 +2,24 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-gmock, ament-cmake-ros, ament-index-cpp, ament-lint-auto, ament-lint-common, keyboard-handler, rclcpp, rmw, rmw-implementation-cmake, rosbag2-compression, rosbag2-compression-zstd, rosbag2-cpp, rosbag2-interfaces, rosbag2-storage, rosbag2-test-common, shared-queues-vendor, test-msgs, yaml-cpp-vendor }: +{ lib, buildRosPackage, fetchurl, ament-cmake-gmock, ament-cmake-ros, ament-index-cpp, ament-lint-auto, ament-lint-common, keyboard-handler, rclcpp, rmw, rmw-implementation-cmake, rosbag2-compression, rosbag2-compression-zstd, rosbag2-cpp, rosbag2-interfaces, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-test-common, shared-queues-vendor, test-msgs, yaml-cpp-vendor }: buildRosPackage { pname = "ros-rolling-rosbag2-transport"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2_transport/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "2b451e8e853f8ac7caccefc0727dc10ee62c5118996579008fa5768d33f27611"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2_transport/0.19.0-1"; + sha256 = "sha256-2B49z7wFC0urX3wD3F2uU8cs+lNaN6JV1zBMsqhgyBQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; - checkInputs = [ ament-cmake-gmock ament-index-cpp ament-lint-auto ament-lint-common rmw-implementation-cmake rosbag2-compression-zstd rosbag2-test-common test-msgs ]; + checkInputs = [ ament-cmake-gmock ament-index-cpp ament-lint-auto ament-lint-common rmw-implementation-cmake rosbag2-compression-zstd rosbag2-storage-default-plugins rosbag2-test-common test-msgs ]; propagatedBuildInputs = [ keyboard-handler rclcpp rmw rosbag2-compression rosbag2-cpp rosbag2-interfaces rosbag2-storage shared-queues-vendor yaml-cpp-vendor ]; nativeBuildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rosbag2/default.nix b/distros/rolling/rosbag2/default.nix index 73577747fb..d374c3c809 100644 --- a/distros/rolling/rosbag2/default.nix +++ b/distros/rolling/rosbag2/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ros2bag, rosbag2-compression, rosbag2-compression-zstd, rosbag2-cpp, rosbag2-py, rosbag2-storage, rosbag2-storage-default-plugins, rosbag2-test-common, rosbag2-tests, rosbag2-transport, shared-queues-vendor }: buildRosPackage { pname = "ros-rolling-rosbag2"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/rosbag2/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "6e0e017c65efa31a0aaf1a398f39936be18cac4cf3ef5f0f3ce03df1df89f412"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/rosbag2/0.19.0-1"; + sha256 = "sha256-ZyLjZM0fV0UBfQBWlFbl8ST9J31nPDtcvVa/eKA/zkY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosbridge-library/default.nix b/distros/rolling/rosbridge-library/default.nix index 651abbc5df..874ce5bf8f 100644 --- a/distros/rolling/rosbridge-library/default.nix +++ b/distros/rolling/rosbridge-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosbridge-library"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/rolling/rosbridge_library/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "590999586b5d40e348868376efc1e438e7945e011d9d12b64660fed9732c5764"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/rolling/rosbridge_library/1.3.1-1"; + sha256 = "sha256-N/PN8jn57yPt/8PpynUAVchkFfftkKbyDD0SUeiNDRA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/rolling/rosbridge-msgs/default.nix b/distros/rolling/rosbridge-msgs/default.nix index d5c9c0ed00..e3cb0ec3b8 100644 --- a/distros/rolling/rosbridge-msgs/default.nix +++ b/distros/rolling/rosbridge-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosbridge-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/rolling/rosbridge_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "888500868ab722cd4de3acd20c2abf13003ff99d468f57f07cd21cd934f488a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/rolling/rosbridge_msgs/1.3.1-1"; + sha256 = "sha256-fa8a7XqxoY7IgwXCc994LiFABO2+hCdOVKmPRxpT3PQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros builtin-interfaces rosidl-default-generators ]; diff --git a/distros/rolling/rosbridge-server/default.nix b/distros/rolling/rosbridge-server/default.nix index 33b4a09990..65414e99e5 100644 --- a/distros/rolling/rosbridge-server/default.nix +++ b/distros/rolling/rosbridge-server/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosbridge-server"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/rolling/rosbridge_server/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "3bc1229daa7f01d918e14e2283a7e3e7e80c3e467785801afa15425f99e176d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/rolling/rosbridge_server/1.3.1-1"; + sha256 = "sha256-+/YXaqhSZxsnXK/roPCndJ03rrcWji3q1guEQ09g4jE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-ros ]; diff --git a/distros/rolling/rosbridge-suite/default.nix b/distros/rolling/rosbridge-suite/default.nix index dd887ba96c..434d72c82c 100644 --- a/distros/rolling/rosbridge-suite/default.nix +++ b/distros/rolling/rosbridge-suite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosbridge-suite"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/rolling/rosbridge_suite/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "5cbf48fe5c29f1fc1f356cb1917a8c62b2e4a1cd13f65374668cd9d215c0325c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/rolling/rosbridge_suite/1.3.1-1"; + sha256 = "sha256-GCCnTrZrj1fE7QXPG5N1kyb5GiaunUe6YsYLdnGRJJ8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/rosbridge-test-msgs/default.nix b/distros/rolling/rosbridge-test-msgs/default.nix index 4b285002b9..5c980e347f 100644 --- a/distros/rolling/rosbridge-test-msgs/default.nix +++ b/distros/rolling/rosbridge-test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosbridge-test-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbridge_suite-release/archive/release/rolling/rosbridge_test_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "998781963cdcdee3b1da9e2f3875cdb84e79a5de65fb54d402178778a01cc4ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbridge_suite-release"; + rev = "release/rolling/rosbridge_test_msgs/1.3.1-1"; + sha256 = "sha256-QbIObUjU3gN7gPnoKMc6Yu+ZEnUDP+vtpzT81rjq2xg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rosgraph-msgs/default.nix b/distros/rolling/rosgraph-msgs/default.nix index a5e03f40e9..15e29e8fe6 100644 --- a/distros/rolling/rosgraph-msgs/default.nix +++ b/distros/rolling/rosgraph-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosgraph-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/rolling/rosgraph_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "137ab9e6f2de0bc7cf4734dc2a3d90715fccfe38935ecb0303051883702bd8ce"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/rolling/rosgraph_msgs/1.3.1-1"; + sha256 = "sha256-Trykqri76qwgc+wiHRXodOno6LuP0IGvuhr/tJ+z3PQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rosidl-adapter/default.nix b/distros/rolling/rosidl-adapter/default.nix index c19ea458c2..ad8fe4b013 100644 --- a/distros/rolling/rosidl-adapter/default.nix +++ b/distros/rolling/rosidl-adapter/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-adapter"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_adapter/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "a86bad6b24e604726b706e5bf52cad7a303e9ba887927e8daccf403e595951eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_adapter/3.3.1-1"; + sha256 = "sha256-uVMDbhSmz27CkcG57qVA/Uz7yXcGl3COuDSKJpTBd9E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosidl-cli/default.nix b/distros/rolling/rosidl-cli/default.nix index 8792263ce2..a9119189f3 100644 --- a/distros/rolling/rosidl-cli/default.nix +++ b/distros/rolling/rosidl-cli/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-cli"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_cli/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "d623bd357b3f0a6b959f952baeb9d1dffab76b550e940cd1501d6e6e904792f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_cli/3.3.1-1"; + sha256 = "sha256-cmJ+qVgQTLvp51CnnE5MpE2t83YBDfw+R1b9G/i7Svg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/rolling/rosidl-cmake/default.nix b/distros/rolling/rosidl-cmake/default.nix index eb372448ef..79c5beca39 100644 --- a/distros/rolling/rosidl-cmake/default.nix +++ b/distros/rolling/rosidl-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-cmake"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_cmake/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "67c44494b5c97ee194cf9fc701b19e7b7cfc57c82c1ed5032c852dda1f510b59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_cmake/3.3.1-1"; + sha256 = "sha256-0BqV33Y3VWqayOBb81d/MYNEabk8yPPkyUsvSeH8fRo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/rolling/rosidl-core-generators/default.nix b/distros/rolling/rosidl-core-generators/default.nix index 9856f0acd7..60854a64f0 100644 --- a/distros/rolling/rosidl-core-generators/default.nix +++ b/distros/rolling/rosidl-core-generators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-core-generators"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_core-release/archive/release/rolling/rosidl_core_generators/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "ca954dc6241468dd242006f43d9547c70d79f77f513e2ad7a776651f7d5b9f57"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_core-release"; + rev = "release/rolling/rosidl_core_generators/0.1.0-1"; + sha256 = "sha256-pTf4ex47Teh6zrv+Wmf3aw44qA64IWThnXl3J4RykQk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosidl-core-runtime/default.nix b/distros/rolling/rosidl-core-runtime/default.nix index 885f317ed7..ed5da70142 100644 --- a/distros/rolling/rosidl-core-runtime/default.nix +++ b/distros/rolling/rosidl-core-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-core-runtime"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_core-release/archive/release/rolling/rosidl_core_runtime/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "71ff68f284ccb518f88de795a37fa77027a43a8f27822452d664332ff58ab1aa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_core-release"; + rev = "release/rolling/rosidl_core_runtime/0.1.0-1"; + sha256 = "sha256-WuLJ0hdRr4AaJpzLZ17d9cyU4KpKEQ33Z8Y63PEFDEw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosidl-default-generators/default.nix b/distros/rolling/rosidl-default-generators/default.nix index 76ec299f38..1742ca2e59 100644 --- a/distros/rolling/rosidl-default-generators/default.nix +++ b/distros/rolling/rosidl-default-generators/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-default-generators"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/rolling/rosidl_default_generators/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "f56d90894660e975ec4841a9b4d73480584c4848381ffc0b5929d457797bcadd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_defaults-release"; + rev = "release/rolling/rosidl_default_generators/1.4.0-1"; + sha256 = "sha256-LLXS4Kmu4Mzu0Fksz4W/iTtiNeabFXAVgElRFi7yfBk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosidl-default-runtime/default.nix b/distros/rolling/rosidl-default-runtime/default.nix index f44a40d656..4ae6b227f2 100644 --- a/distros/rolling/rosidl-default-runtime/default.nix +++ b/distros/rolling/rosidl-default-runtime/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-default-runtime"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/rolling/rosidl_default_runtime/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "9d17392d46ed005d748ab95ee986a6463581bf3f5d65e3b66d5ee5ecb8e02782"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_defaults-release"; + rev = "release/rolling/rosidl_default_runtime/1.4.0-1"; + sha256 = "sha256-hzkWoxfe2SnGhoBZRxlazjjwlQCTk9SRBUsegqTo9a4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosidl-generator-c/default.nix b/distros/rolling/rosidl-generator-c/default.nix index 462d20c4f0..4c82792757 100644 --- a/distros/rolling/rosidl-generator-c/default.nix +++ b/distros/rolling/rosidl-generator-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-generator-c"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_generator_c/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "fc868543f9be5f7657b0f389c05d97df719d5ccbbde36fe5d33ef01f5c697962"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_generator_c/3.3.1-1"; + sha256 = "sha256-qNttjEVCcVfSuLv9lCvbPlC2aWFbtaHt6F32AgtjJWM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ament-cmake-ros ]; diff --git a/distros/rolling/rosidl-generator-cpp/default.nix b/distros/rolling/rosidl-generator-cpp/default.nix index 2e524f7fbc..2e6b511c27 100644 --- a/distros/rolling/rosidl-generator-cpp/default.nix +++ b/distros/rolling/rosidl-generator-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-generator-cpp"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_generator_cpp/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "491427a30f12c8de97752c3715ee3b22902320c076da547f759ab4b30cdaad46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_generator_cpp/3.3.1-1"; + sha256 = "sha256-hB2cXrdc3YeG1peftvzmZrjUe/LyQi5oeNDA1MgEnIw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosidl-generator-dds-idl/default.nix b/distros/rolling/rosidl-generator-dds-idl/default.nix index 3f5d862006..64bfcd0d03 100644 --- a/distros/rolling/rosidl-generator-dds-idl/default.nix +++ b/distros/rolling/rosidl-generator-dds-idl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-generator-dds-idl"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_dds-release/archive/release/rolling/rosidl_generator_dds_idl/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "9b8c0ef6eddcadab9bf5fb7b2f85812e2c53b896da2be6461026b48a22eb65e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_dds-release"; + rev = "release/rolling/rosidl_generator_dds_idl/0.10.0-1"; + sha256 = "sha256-G8vsH3OxgiwMixxeqdbZC6PePivhnvmF7gfWSHej2qo="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-pytest ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/rosidl-generator-py/default.nix b/distros/rolling/rosidl-generator-py/default.nix index 45b35a059c..b9b19db714 100644 --- a/distros/rolling/rosidl-generator-py/default.nix +++ b/distros/rolling/rosidl-generator-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-generator-py"; version = "0.16.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_python-release/archive/release/rolling/rosidl_generator_py/0.16.1-1.tar.gz"; - name = "0.16.1-1.tar.gz"; - sha256 = "9a9cef86511d8e30d8def2bc04b0ff40850435bbb9a7970932eba9a47cb000e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_python-release"; + rev = "release/rolling/rosidl_generator_py/0.16.1-1"; + sha256 = "sha256-nGGIQqTJCnseOlsr4VOQ6wS0ePraozHy7DOauIEpuv8="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-pytest ament-index-python ament-lint-auto ament-lint-common python-cmake-module python3Packages.numpy pythonPackages.pytest rmw rosidl-cmake rosidl-generator-c rosidl-generator-cpp rosidl-parser rosidl-typesupport-c rosidl-typesupport-fastrtps-c rosidl-typesupport-introspection-c rpyutils test-interface-files ]; diff --git a/distros/rolling/rosidl-parser/default.nix b/distros/rolling/rosidl-parser/default.nix index b7fbd08036..ace7cfb1c1 100644 --- a/distros/rolling/rosidl-parser/default.nix +++ b/distros/rolling/rosidl-parser/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-parser"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_parser/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "85b825de7ccc4c60d218c8777621dd22381124d09d32c87b70423e8740b308b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_parser/3.3.1-1"; + sha256 = "sha256-kv7+buD1OO7+1+JxPLWjcmWgGu1ccJbJx8ZnWYnpzQw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosidl-pycommon/default.nix b/distros/rolling/rosidl-pycommon/default.nix index e58867bb3d..7205cc6c42 100644 --- a/distros/rolling/rosidl-pycommon/default.nix +++ b/distros/rolling/rosidl-pycommon/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-pycommon"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_pycommon/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "9386e7072b831377f49d495bc8ebab13d247fd97d7d604998b21167d7ca51ac2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_pycommon/3.3.1-1"; + sha256 = "sha256-6jHw7Rmf5klSDVgFTYeaGjllTNPgME8LeYRusARSLvA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/rosidl-runtime-c/default.nix b/distros/rolling/rosidl-runtime-c/default.nix index b337a87b86..46aa008f65 100644 --- a/distros/rolling/rosidl-runtime-c/default.nix +++ b/distros/rolling/rosidl-runtime-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-runtime-c"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_runtime_c/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "2e0b50d6333644cd78c4cbae0c4e4d0589d74cf939b091019e3d02d0e2c04e3c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_runtime_c/3.3.1-1"; + sha256 = "sha256-wI66q8X43qvVigDJPzFfR1Z6CakSj8oGGO7wMW+yCCk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rosidl-runtime-cpp/default.nix b/distros/rolling/rosidl-runtime-cpp/default.nix index 6e66dd551a..1fa0934502 100644 --- a/distros/rolling/rosidl-runtime-cpp/default.nix +++ b/distros/rolling/rosidl-runtime-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-runtime-cpp"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_runtime_cpp/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "cae9327ab5d79bb518cab59e65e3b4b29b9ae155542b1a5a39275855609d0499"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_runtime_cpp/3.3.1-1"; + sha256 = "sha256-N0Xa4zx33XW6FF/1Y/TFxw6IrXjzAzON4VgbmkluWIU="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common performance-test-fixture ]; diff --git a/distros/rolling/rosidl-runtime-py/default.nix b/distros/rolling/rosidl-runtime-py/default.nix index 5b583cb7b4..1db6e6788a 100644 --- a/distros/rolling/rosidl-runtime-py/default.nix +++ b/distros/rolling/rosidl-runtime-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-runtime-py"; version = "0.11.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_runtime_py-release/archive/release/rolling/rosidl_runtime_py/0.11.0-1.tar.gz"; - name = "0.11.0-1.tar.gz"; - sha256 = "c1ee13beb5bf5678494babe51785f5198593a502f16db54a22d3a5999a6d8238"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_runtime_py-release"; + rev = "release/rolling/rosidl_runtime_py/0.11.0-1"; + sha256 = "sha256-LIYbGekAqz1nY7Xs4k8Bo9/+LeLhQPZPJRHpulhq8yw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest std-msgs std-srvs test-msgs ]; diff --git a/distros/rolling/rosidl-typesupport-c/default.nix b/distros/rolling/rosidl-typesupport-c/default.nix index 0ea4e29644..0713bd590b 100644 --- a/distros/rolling/rosidl-typesupport-c/default.nix +++ b/distros/rolling/rosidl-typesupport-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-typesupport-c"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/rolling/rosidl_typesupport_c/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "2fc706b9ffbf1ed2e92b60360dc3dff215739560c53572f214ae3b533376a74d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport-release"; + rev = "release/rolling/rosidl_typesupport_c/2.2.0-1"; + sha256 = "sha256-LIQEF2qwCBazmAhpThKkHd12kqlgcrTlGfx6viWa4XA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-introspection-c ]; diff --git a/distros/rolling/rosidl-typesupport-cpp/default.nix b/distros/rolling/rosidl-typesupport-cpp/default.nix index 0e7b239c78..d6714b698e 100644 --- a/distros/rolling/rosidl-typesupport-cpp/default.nix +++ b/distros/rolling/rosidl-typesupport-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-typesupport-cpp"; version = "2.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/rolling/rosidl_typesupport_cpp/2.2.0-1.tar.gz"; - name = "2.2.0-1.tar.gz"; - sha256 = "5577d80f3c322e3068d4235c38b15fac651e04d98f0680d932479915a9fbd21a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport-release"; + rev = "release/rolling/rosidl_typesupport_cpp/2.2.0-1"; + sha256 = "sha256-vPL3jW3+1VVWkOhlsyTn7zjKHWSn14EqP2wgqdPctt8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-typesupport-introspection-cpp ]; diff --git a/distros/rolling/rosidl-typesupport-fastrtps-c/default.nix b/distros/rolling/rosidl-typesupport-fastrtps-c/default.nix index f73a584087..c9c9dd5b40 100644 --- a/distros/rolling/rosidl-typesupport-fastrtps-c/default.nix +++ b/distros/rolling/rosidl-typesupport-fastrtps-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-typesupport-fastrtps-c"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/rolling/rosidl_typesupport_fastrtps_c/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "a5ad8318e83e6e591ce8374ebbb62ccad5b5e77663fc5801fe86afeca6d62a2e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/rolling/rosidl_typesupport_fastrtps_c/2.4.0-1"; + sha256 = "sha256-SOMFUA92OmRPAR/DULfNdyZOTuC3taMvQ6QDlPwdpj0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-python ]; diff --git a/distros/rolling/rosidl-typesupport-fastrtps-cpp/default.nix b/distros/rolling/rosidl-typesupport-fastrtps-cpp/default.nix index cae6da1975..6d62a9986f 100644 --- a/distros/rolling/rosidl-typesupport-fastrtps-cpp/default.nix +++ b/distros/rolling/rosidl-typesupport-fastrtps-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-typesupport-fastrtps-cpp"; version = "2.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/rolling/rosidl_typesupport_fastrtps_cpp/2.4.0-1.tar.gz"; - name = "2.4.0-1.tar.gz"; - sha256 = "67034675d14b71c6fd2d8d2f867c7606137bbbd6072493ddf91eefcbf665fb59"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl_typesupport_fastrtps-release"; + rev = "release/rolling/rosidl_typesupport_fastrtps_cpp/2.4.0-1"; + sha256 = "sha256-r/rpIgHXrG+lmZPJ9wBWGjQGPmb+g1kbowBGUsbjdNk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/rosidl-typesupport-interface/default.nix b/distros/rolling/rosidl-typesupport-interface/default.nix index fd9ffef445..cd28b2733b 100644 --- a/distros/rolling/rosidl-typesupport-interface/default.nix +++ b/distros/rolling/rosidl-typesupport-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-typesupport-interface"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_typesupport_interface/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "4bd5e3ee07825a13ec8d4c3c094de0357579fc95d8e3c0d490245fcf63adb648"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_typesupport_interface/3.3.1-1"; + sha256 = "sha256-61lc6/2G8//xP51P4LB5RnOAeaZQDyiR6MjcvnF5B5M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rosidl-typesupport-introspection-c/default.nix b/distros/rolling/rosidl-typesupport-introspection-c/default.nix index 8a8232d539..a9cfaa1f63 100644 --- a/distros/rolling/rosidl-typesupport-introspection-c/default.nix +++ b/distros/rolling/rosidl-typesupport-introspection-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-typesupport-introspection-c"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_typesupport_introspection_c/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "22d64c681389dff0f3b363b4ff5efc2f3ce9c30a0d11c1ae1c9bdc1b13556e93"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_typesupport_introspection_c/3.3.1-1"; + sha256 = "sha256-naLr+6d/mPOwvvK1HUnX4pZBfK3ARZqhfOGtfOu63dk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rosidl-typesupport-introspection-cpp/default.nix b/distros/rolling/rosidl-typesupport-introspection-cpp/default.nix index a1c2bf267e..a1255506bd 100644 --- a/distros/rolling/rosidl-typesupport-introspection-cpp/default.nix +++ b/distros/rolling/rosidl-typesupport-introspection-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rosidl-typesupport-introspection-cpp"; version = "3.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosidl-release/archive/release/rolling/rosidl_typesupport_introspection_cpp/3.3.1-1.tar.gz"; - name = "3.3.1-1.tar.gz"; - sha256 = "7c2329f99668a91acaf2432179f98042882b7b30a44d956ab347c5da7b317d1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosidl-release"; + rev = "release/rolling/rosidl_typesupport_introspection_cpp/3.3.1-1"; + sha256 = "sha256-sQK+DLDyz6NH5AKStsloyKtgEo2RMuQ1IEOt7HQ/qvc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/rot-conv/default.nix b/distros/rolling/rot-conv/default.nix index e5969d3783..dc4cebd891 100644 --- a/distros/rolling/rot-conv/default.nix +++ b/distros/rolling/rot-conv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rot-conv"; version = "1.0.11-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rot_conv_lib-release/archive/release/rolling/rot_conv/1.0.11-1.tar.gz"; - name = "1.0.11-1.tar.gz"; - sha256 = "4ab0513c64b78ab832f4e3750d764cbec73b7af6fb6d76db07a44957eaec45f0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rot_conv_lib-release"; + rev = "release/rolling/rot_conv/1.0.11-1"; + sha256 = "sha256-6/6mfqRarCEYQCMc18m5vFDCS0UjiBqGWsoHUEB7LiU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rplidar-ros/default.nix b/distros/rolling/rplidar-ros/default.nix index 54e46f1f73..3bb3bbb184 100644 --- a/distros/rolling/rplidar-ros/default.nix +++ b/distros/rolling/rplidar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rplidar-ros"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rplidar_ros-release/archive/release/rolling/rplidar_ros/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "63a4f5e52e276264d0749a33acf62eafcb385b018e63aabd8118f5cc8713bfb0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rplidar_ros-release"; + rev = "release/rolling/rplidar_ros/2.1.0-1"; + sha256 = "sha256-lOiYrTggsDiQb9sCYtWAup4+kVoMnpSYqKqWGtnb2AU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ament-cmake-ros ]; diff --git a/distros/rolling/rpyutils/default.nix b/distros/rolling/rpyutils/default.nix index 2e8001167f..f2f396a1e9 100644 --- a/distros/rolling/rpyutils/default.nix +++ b/distros/rolling/rpyutils/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rpyutils"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rpyutils-release/archive/release/rolling/rpyutils/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "5c728a76b3bf818ec57afd058ead508dbc12c569769c511802e6e60b86ca0f55"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rpyutils-release"; + rev = "release/rolling/rpyutils/0.3.1-1"; + sha256 = "sha256-XaOv+L/jkcb0PDUWSAGFHLhn2cmJG7MGz0GyD84PZMA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/rolling/rqt-action/default.nix b/distros/rolling/rqt-action/default.nix index 4fdb1578fc..8fac875d37 100644 --- a/distros/rolling/rqt-action/default.nix +++ b/distros/rolling/rqt-action/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-action"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_action-release/archive/release/rolling/rqt_action/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "1edec3fc52cf489d3dacaa36b5594add756f265f788279e7ef1a474f4386c637"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_action-release"; + rev = "release/rolling/rqt_action/2.1.1-1"; + sha256 = "sha256-rSpYG45HXlFygUw+LnMfcvpnly9I89nceS4TPSLCzM4="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-xmllint ]; diff --git a/distros/rolling/rqt-bag-plugins/default.nix b/distros/rolling/rqt-bag-plugins/default.nix index c2bc3f8b60..44a4f3e687 100644 --- a/distros/rolling/rqt-bag-plugins/default.nix +++ b/distros/rolling/rqt-bag-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-bag-plugins"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_bag-release/archive/release/rolling/rqt_bag_plugins/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "0563fa19a6cbcb78fdb6b6886227ae8d90deeb1a58620ff959fab2b98745b1e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_bag-release"; + rev = "release/rolling/rqt_bag_plugins/1.2.1-1"; + sha256 = "sha256-tmG2lu4DWSrcFlD0AUPbB+kxcVFt5j5aaTIIBsxVEE4="; + }; buildType = "ament_python"; propagatedBuildInputs = [ geometry-msgs python3Packages.pillow python3Packages.pycairo rclpy rosbag2 rqt-bag rqt-gui rqt-gui-py rqt-plot sensor-msgs std-msgs ]; diff --git a/distros/rolling/rqt-bag/default.nix b/distros/rolling/rqt-bag/default.nix index 893bda08d9..1f60212927 100644 --- a/distros/rolling/rqt-bag/default.nix +++ b/distros/rolling/rqt-bag/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-bag"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_bag-release/archive/release/rolling/rqt_bag/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "506a270f305d406c7419cf0b4e04707655fa8403612f53d7939772529586fef2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_bag-release"; + rev = "release/rolling/rqt_bag/1.2.1-1"; + sha256 = "sha256-5Wjy2g40XKxG61Vp+bC+GmXTaXeofb7qeJz8j32Ynks="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding rclpy rosbag2-py rqt-gui rqt-gui-py ]; diff --git a/distros/rolling/rqt-common-plugins/default.nix b/distros/rolling/rqt-common-plugins/default.nix index 8b01726f0d..2ddb84abbc 100644 --- a/distros/rolling/rqt-common-plugins/default.nix +++ b/distros/rolling/rqt-common-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-common-plugins"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_common_plugins-release/archive/release/rolling/rqt_common_plugins/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "c466b11c67de5b27ecaa132d4f1b1c5cf887a3b49aee17c1c6bef32dace53a2a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_common_plugins-release"; + rev = "release/rolling/rqt_common_plugins/1.2.0-1"; + sha256 = "sha256-rSJ8tB78EOgjtaHw8wleVvW+Rx9+z5d0IAznXj0aKmg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rqt-console/default.nix b/distros/rolling/rqt-console/default.nix index 9cacce7c45..28586f8116 100644 --- a/distros/rolling/rqt-console/default.nix +++ b/distros/rolling/rqt-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-console"; version = "2.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_console-release/archive/release/rolling/rqt_console/2.1.0-1.tar.gz"; - name = "2.1.0-1.tar.gz"; - sha256 = "b8bc6bc1cb81caa1bc9c1f9e3f474684b6f9355bebb1257b171f7798703ee64e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_console-release"; + rev = "release/rolling/rqt_console/2.1.0-1"; + sha256 = "sha256-Sb1l2gSeaASN3+9YzIDC3VEc8xncvr0gCxDUXLhs6QY="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding rcl-interfaces rclpy rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/rolling/rqt-controller-manager/default.nix b/distros/rolling/rqt-controller-manager/default.nix index 2eec43b310..2f85216205 100644 --- a/distros/rolling/rqt-controller-manager/default.nix +++ b/distros/rolling/rqt-controller-manager/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, controller-manager-msgs, rclpy, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-rolling-rqt-controller-manager"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/rqt_controller_manager/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "5b6a25daa3435a78d89f749c70d862075de0ecbf504ade979ab1e1e725f5e8ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/rqt_controller_manager/3.7.0-1"; + sha256 = "sha256-6lqZtj5B7K8/KmfU053VXYD5j495Tzps20tvHV3YKdI="; + }; buildType = "ament_python"; propagatedBuildInputs = [ controller-manager-msgs rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/rolling/rqt-graph/default.nix b/distros/rolling/rqt-graph/default.nix index a1c46f2c3f..a446bb3b6d 100644 --- a/distros/rolling/rqt-graph/default.nix +++ b/distros/rolling/rqt-graph/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-graph"; version = "1.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_graph-release/archive/release/rolling/rqt_graph/1.4.0-1.tar.gz"; - name = "1.4.0-1.tar.gz"; - sha256 = "1e14d746651f852fc3d811913f6f51efea2e2ea44e29888bd56844dbd117fbb8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_graph-release"; + rev = "release/rolling/rqt_graph/1.4.0-1"; + sha256 = "sha256-/uzwlYKV+MVk/4Ct9zSkNhAb2RFz5JGlSnlpWcgYcRA="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding qt-dotgraph rqt-gui rqt-gui-py ]; diff --git a/distros/rolling/rqt-gui-cpp/default.nix b/distros/rolling/rqt-gui-cpp/default.nix index b6a4fe6d73..5df7a87110 100644 --- a/distros/rolling/rqt-gui-cpp/default.nix +++ b/distros/rolling/rqt-gui-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-gui-cpp"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/rolling/rqt_gui_cpp/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "4c1702dc6ad29068dca145682b98a4d736945fa777e2fad29df4a7172f59129c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/rolling/rqt_gui_cpp/1.2.0-1"; + sha256 = "sha256-iMMpgkcjQgu+TCUtpCCo3uLSK75VVzlO63YLKfguTD8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/rolling/rqt-gui-py/default.nix b/distros/rolling/rqt-gui-py/default.nix index efd3922b27..3c1f52948d 100644 --- a/distros/rolling/rqt-gui-py/default.nix +++ b/distros/rolling/rqt-gui-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-gui-py"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/rolling/rqt_gui_py/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "8689fee8baed5913d49710f4918ec761a055fc3d84784d77bef9089a5ef32348"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/rolling/rqt_gui_py/1.2.0-1"; + sha256 = "sha256-Zyh15ECVzj+Tww8tunzoUzjmvhmGrBm6CooNJgnv/gE="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/rqt-gui/default.nix b/distros/rolling/rqt-gui/default.nix index 6204c422d6..da154584b1 100644 --- a/distros/rolling/rqt-gui/default.nix +++ b/distros/rolling/rqt-gui/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-gui"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/rolling/rqt_gui/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "771a58448c93f29085340128e36d8053a7a4ab97275e4017c2fd7c0fa689efb6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/rolling/rqt_gui/1.2.0-1"; + sha256 = "sha256-5eUu+jTljjTYXRiIJ5e9ohOIkC6X2inCpnKJpPTKG2E="; + }; buildType = "ament_python"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/rqt-image-overlay-layer/default.nix b/distros/rolling/rqt-image-overlay-layer/default.nix index 244f263a19..e5e8cd11a9 100644 --- a/distros/rolling/rqt-image-overlay-layer/default.nix +++ b/distros/rolling/rqt-image-overlay-layer/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-image-overlay-layer"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_overlay-release/archive/release/rolling/rqt_image_overlay_layer/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "d34a2f88070d226125e8bab9a7ca7e444e749b2e9bbe5544006aa541aacfbe3e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_image_overlay-release"; + rev = "release/rolling/rqt_image_overlay_layer/0.3.1-1"; + sha256 = "sha256-w86vqlc7t/EJJOh8aI+DT1ECcEMdvidOeDtsyDhjTXc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rqt-image-overlay/default.nix b/distros/rolling/rqt-image-overlay/default.nix index e58ef5540c..c3b849fa59 100644 --- a/distros/rolling/rqt-image-overlay/default.nix +++ b/distros/rolling/rqt-image-overlay/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-image-overlay"; version = "0.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_overlay-release/archive/release/rolling/rqt_image_overlay/0.3.1-1.tar.gz"; - name = "0.3.1-1.tar.gz"; - sha256 = "41da1a8fe1b28cec9699c44793822db1f21d84e1fdc592aed066fa9223bbdbdd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_image_overlay-release"; + rev = "release/rolling/rqt_image_overlay/0.3.1-1"; + sha256 = "sha256-rjv8Zxu7V4qDtMRcwMdiYByPpFiYIRJL8N+KK/Gte+E="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rqt-image-view/default.nix b/distros/rolling/rqt-image-view/default.nix index 0097eff4e0..790196f101 100644 --- a/distros/rolling/rqt-image-view/default.nix +++ b/distros/rolling/rqt-image-view/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-image-view"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_view-release/archive/release/rolling/rqt_image_view/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "6a002934c2e0d00f1bbaec1748ba41ca2d0c2954cc5312badb3325946ab7a94b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_image_view-release"; + rev = "release/rolling/rqt_image_view/1.2.0-1"; + sha256 = "sha256-X3GHcEegbG/Z45tA1fhYO3xlE1Fr0WKRaNpZRXYhF2Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/rolling/rqt-joint-trajectory-controller/default.nix b/distros/rolling/rqt-joint-trajectory-controller/default.nix index 52e29e3c3a..e5684720e4 100644 --- a/distros/rolling/rqt-joint-trajectory-controller/default.nix +++ b/distros/rolling/rqt-joint-trajectory-controller/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, control-msgs, controller-manager-msgs, python-qt-binding, python3Packages, qt-gui, rclpy, rqt-gui, rqt-gui-py, trajectory-msgs }: buildRosPackage { pname = "ros-rolling-rqt-joint-trajectory-controller"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/rqt_joint_trajectory_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "431fb13eb631a04c665d0883db9a307aad04769d6b8778cd90f3f5427269e8e5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/rqt_joint_trajectory_controller/3.1.0-1"; + sha256 = "sha256-8bBkX3qsZDUjI/8jFubUvZt+kjTXHsbB5Tajd0aJqiI="; + }; buildType = "ament_python"; propagatedBuildInputs = [ control-msgs controller-manager-msgs python-qt-binding python3Packages.rospkg qt-gui rclpy rqt-gui rqt-gui-py trajectory-msgs ]; diff --git a/distros/rolling/rqt-moveit/default.nix b/distros/rolling/rqt-moveit/default.nix index 34ec9e95e2..b2dff364b6 100644 --- a/distros/rolling/rqt-moveit/default.nix +++ b/distros/rolling/rqt-moveit/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-moveit"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_moveit-release/archive/release/rolling/rqt_moveit/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "a4299d4407a782e35270aae512b768af1d1b7a0322ded10bc76600ba0f6e31b2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_moveit-release"; + rev = "release/rolling/rqt_moveit/1.0.1-2"; + sha256 = "sha256-A4bGoHfpokKaYjSrBzvtYgzyf6sJGECfPJCIM0iZgYU="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.setuptools rosidl-default-generators ]; diff --git a/distros/rolling/rqt-msg/default.nix b/distros/rolling/rqt-msg/default.nix index b89b18556f..1939f8a5c6 100644 --- a/distros/rolling/rqt-msg/default.nix +++ b/distros/rolling/rqt-msg/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-msg"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_msg-release/archive/release/rolling/rqt_msg/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "52551d16d63180afd39174bff02bd5e61b1c43b5eb6c8110fd67dfe2f93dac1d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_msg-release"; + rev = "release/rolling/rqt_msg/1.3.0-1"; + sha256 = "sha256-hrI9MpWKg2FosleOEqx56VxFweTC0PHMYHGOtKaBXCg="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg rclpy rqt-console rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/rolling/rqt-plot/default.nix b/distros/rolling/rqt-plot/default.nix index 8567165cc3..d7a16e8430 100644 --- a/distros/rolling/rqt-plot/default.nix +++ b/distros/rolling/rqt-plot/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-plot"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_plot-release/archive/release/rolling/rqt_plot/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "848be295eae20f6773361f22d2153514ad13fd705424bccea9ee601110fae027"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_plot-release"; + rev = "release/rolling/rqt_plot/1.2.0-1"; + sha256 = "sha256-PJU2kackdJeYUl2WYo1gPwH9Hy9+V1/OJwIPGqA58oo="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg python3Packages.matplotlib python3Packages.numpy qt-gui-py-common rclpy rqt-gui rqt-gui-py rqt-py-common std-msgs ]; diff --git a/distros/rolling/rqt-publisher/default.nix b/distros/rolling/rqt-publisher/default.nix index 91c2240c69..76be0f2ed5 100644 --- a/distros/rolling/rqt-publisher/default.nix +++ b/distros/rolling/rqt-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-publisher"; version = "1.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_publisher-release/archive/release/rolling/rqt_publisher/1.6.1-1.tar.gz"; - name = "1.6.1-1.tar.gz"; - sha256 = "37ca0229639dc923f77d11277b61227d5a41c940cce6be6b02b1e4e8d28582c6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_publisher-release"; + rev = "release/rolling/rqt_publisher/1.6.1-1"; + sha256 = "sha256-L0ob+7Oo6fpYbaLusInknnH0RKzQg1tzH8UvRByYBXo="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding python3Packages.numpy qt-gui-py-common rclpy rosidl-runtime-py rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/rolling/rqt-py-common/default.nix b/distros/rolling/rqt-py-common/default.nix index 129af48c32..50caed35f9 100644 --- a/distros/rolling/rqt-py-common/default.nix +++ b/distros/rolling/rqt-py-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-py-common"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/rolling/rqt_py_common/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "663bc67a9092d2c8657ad38e222209b2381d35e99504a1c38638716f33d5ef22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/rolling/rqt_py_common/1.2.0-1"; + sha256 = "sha256-UmIGsL+/OyA7dGQ9SNuoujeMjHxA6+KnMBWqiKDKkGk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rqt-py-console/default.nix b/distros/rolling/rqt-py-console/default.nix index 8d9b319167..643b136074 100644 --- a/distros/rolling/rqt-py-console/default.nix +++ b/distros/rolling/rqt-py-console/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-py-console"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_py_console-release/archive/release/rolling/rqt_py_console/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "4f82602ae32f00fb7d331cfead3d2c000a1b95a2ad05116a821536f222a8c0e3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_py_console-release"; + rev = "release/rolling/rqt_py_console/1.1.0-1"; + sha256 = "sha256-0VrFeEk9W7/cS0jH2HpeiJSvClmwz+2LmBjgD6JhmHA="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python python-qt-binding qt-gui qt-gui-py-common rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/rolling/rqt-reconfigure/default.nix b/distros/rolling/rqt-reconfigure/default.nix index 64e743c669..c354b814ef 100644 --- a/distros/rolling/rqt-reconfigure/default.nix +++ b/distros/rolling/rqt-reconfigure/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-reconfigure"; version = "1.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_reconfigure-release/archive/release/rolling/rqt_reconfigure/1.3.0-1.tar.gz"; - name = "1.3.0-1.tar.gz"; - sha256 = "ccfafba30324330e7f6f9e7417a8b697803daf0445f64a3b9ce50f3e46d3c70c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_reconfigure-release"; + rev = "release/rolling/rqt_reconfigure/1.3.0-1"; + sha256 = "sha256-imyCM9Mvm/eGzYdTLUH0yhaKTw/+vyKTGdQ0AyPpHjo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-xmllint ]; diff --git a/distros/rolling/rqt-robot-dashboard/default.nix b/distros/rolling/rqt-robot-dashboard/default.nix index d5f25d8219..5416d27d0a 100644 --- a/distros/rolling/rqt-robot-dashboard/default.nix +++ b/distros/rolling/rqt-robot-dashboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-robot-dashboard"; version = "0.6.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_dashboard-release/archive/release/rolling/rqt_robot_dashboard/0.6.1-2.tar.gz"; - name = "0.6.1-2.tar.gz"; - sha256 = "1a255e77f4b52a9a39ef09d266084ed9aeb0bcf0173ac580716d82d212d1404e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_robot_dashboard-release"; + rev = "release/rolling/rqt_robot_dashboard/0.6.1-2"; + sha256 = "sha256-QhqtnAJiE+IWyeXqbS4Lp3MogLfmf6LHOZ3+yy9WNVA="; + }; buildType = "ament_python"; buildInputs = [ python3Packages.setuptools ]; diff --git a/distros/rolling/rqt-robot-monitor/default.nix b/distros/rolling/rqt-robot-monitor/default.nix index e5a12bd782..512ef45962 100644 --- a/distros/rolling/rqt-robot-monitor/default.nix +++ b/distros/rolling/rqt-robot-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-robot-monitor"; version = "1.0.5-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_monitor-release/archive/release/rolling/rqt_robot_monitor/1.0.5-1.tar.gz"; - name = "1.0.5-1.tar.gz"; - sha256 = "82ae8a7091131530d0248e5c4159e0fb7775d5c153c9a5970ad348b541f5e802"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_robot_monitor-release"; + rev = "release/rolling/rqt_robot_monitor/1.0.5-1"; + sha256 = "sha256-4cOwsLyW7ouFZM1kNCA3d/8k1Ogm6pt51x0xuWtGqcA="; + }; buildType = "ament_python"; buildInputs = [ rosidl-default-generators ]; diff --git a/distros/rolling/rqt-robot-steering/default.nix b/distros/rolling/rqt-robot-steering/default.nix index 0b39b07763..114780dbe3 100644 --- a/distros/rolling/rqt-robot-steering/default.nix +++ b/distros/rolling/rqt-robot-steering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-robot-steering"; version = "1.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_steering-release/archive/release/rolling/rqt_robot_steering/1.0.0-3.tar.gz"; - name = "1.0.0-3.tar.gz"; - sha256 = "f8ab4d820377fa702d814a0a72ef060087d1042f06e2dee1c3a2efce06978862"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_robot_steering-release"; + rev = "release/rolling/rqt_robot_steering/1.0.0-3"; + sha256 = "sha256-GQCdfFYxE/yR3Eostcf+T9VKwP2N45EzidAhXz5uVrw="; + }; buildType = "ament_python"; propagatedBuildInputs = [ ament-index-python geometry-msgs python-qt-binding rclpy rqt-gui rqt-gui-py ]; diff --git a/distros/rolling/rqt-runtime-monitor/default.nix b/distros/rolling/rqt-runtime-monitor/default.nix index 2305ca9c9f..617c82c194 100644 --- a/distros/rolling/rqt-runtime-monitor/default.nix +++ b/distros/rolling/rqt-runtime-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-runtime-monitor"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_runtime_monitor-release/archive/release/rolling/rqt_runtime_monitor/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "2e95fdc0c55146999c591f3353c9e85780f6c539346c4d83f0d2fe50fc5aaee7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_runtime_monitor-release"; + rev = "release/rolling/rqt_runtime_monitor/1.0.0-2"; + sha256 = "sha256-7LyebmhKcj1ltMsj4LbDUxXX5v9ejuW4g4lIKitP28Q="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/rqt-service-caller/default.nix b/distros/rolling/rqt-service-caller/default.nix index 12d55e35e9..c9597ec21b 100644 --- a/distros/rolling/rqt-service-caller/default.nix +++ b/distros/rolling/rqt-service-caller/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-service-caller"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_service_caller-release/archive/release/rolling/rqt_service_caller/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "51fcb295753d6aee52ed745294e01dd0a3851c2e659b2f3a70d77163e6a8e141"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_service_caller-release"; + rev = "release/rolling/rqt_service_caller/1.1.0-1"; + sha256 = "sha256-2XhRmFJ8b7jagZ0zf8uEnSlqm84xUSQfJ0HmZuAz7YY="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rqt-gui rqt-gui-py rqt-py-common ]; diff --git a/distros/rolling/rqt-shell/default.nix b/distros/rolling/rqt-shell/default.nix index da41c960e7..93733b380a 100644 --- a/distros/rolling/rqt-shell/default.nix +++ b/distros/rolling/rqt-shell/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-shell"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_shell-release/archive/release/rolling/rqt_shell/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "8b98cf07cbabe5ddb1bc2cd344934b26a9ecc19d13632ad9dda57636cf7cf443"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_shell-release"; + rev = "release/rolling/rqt_shell/1.1.0-1"; + sha256 = "sha256-sRyNFwX7PDl+hxv1KAbOS9A74mIiGi5gob9r68lzsDo="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python-qt-binding python3Packages.catkin-pkg qt-gui qt-gui-py-common rqt-gui rqt-gui-py ]; diff --git a/distros/rolling/rqt-srv/default.nix b/distros/rolling/rqt-srv/default.nix index 8e197afa10..6b9f75c6d5 100644 --- a/distros/rolling/rqt-srv/default.nix +++ b/distros/rolling/rqt-srv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-srv"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_srv-release/archive/release/rolling/rqt_srv/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "f10e11c6b2ef7777fe995e3937f57293412426f6c34bcb5819aea520c66702e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_srv-release"; + rev = "release/rolling/rqt_srv/1.1.0-1"; + sha256 = "sha256-Jv/6lxXlyzb72XmJ4cz5XVBB4JbXfLomCvb5bPuEaHM="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rclpy rqt-gui rqt-gui-py rqt-msg ]; diff --git a/distros/rolling/rqt-tf-tree/default.nix b/distros/rolling/rqt-tf-tree/default.nix index c760759b68..afa53556bc 100644 --- a/distros/rolling/rqt-tf-tree/default.nix +++ b/distros/rolling/rqt-tf-tree/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-tf-tree"; version = "1.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_tf_tree-release/archive/release/rolling/rqt_tf_tree/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "686a18de011d1082ae52282d6f19aeb8ab9ec23c47b843a5272ddd9002e74e2b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_tf_tree-release"; + rev = "release/rolling/rqt_tf_tree/1.0.4-1"; + sha256 = "sha256-lSihCkueyTt2JXyG3jG9jZwxU5/m1zSimSfNldkQjiM="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.mock ]; diff --git a/distros/rolling/rqt-topic/default.nix b/distros/rolling/rqt-topic/default.nix index 2b075396c1..6e8b4c22a5 100644 --- a/distros/rolling/rqt-topic/default.nix +++ b/distros/rolling/rqt-topic/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt-topic"; version = "1.6.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_topic-release/archive/release/rolling/rqt_topic/1.6.0-1.tar.gz"; - name = "1.6.0-1.tar.gz"; - sha256 = "6f223e74db765c3deb0c675aae716b3763cfa7607d11a47861f510ea4c45e7c2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt_topic-release"; + rev = "release/rolling/rqt_topic/1.6.0-1"; + sha256 = "sha256-wM1QsMeL6auxkFo8I8TBZGqtYbjPXdepFUbS4larg3g="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-xmllint ]; diff --git a/distros/rolling/rqt/default.nix b/distros/rolling/rqt/default.nix index a7e7394ad6..96325b7083 100644 --- a/distros/rolling/rqt/default.nix +++ b/distros/rolling/rqt/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rqt"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rqt-release/archive/release/rolling/rqt/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "32e497a60b5cd0528713d616d4d04b0491d056ed6c51ef504e5e0fc7878e4b22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rqt-release"; + rev = "release/rolling/rqt/1.2.0-1"; + sha256 = "sha256-ARYs8+X0WAte6q17cjGAJh4D7q8AIMVHWwoUw4tmJtU="; + }; buildType = "ament_python"; propagatedBuildInputs = [ rqt-gui rqt-gui-cpp rqt-gui-py rqt-py-common ]; diff --git a/distros/rolling/rt-manipulators-cpp/default.nix b/distros/rolling/rt-manipulators-cpp/default.nix index 9885877967..cdeb18065b 100644 --- a/distros/rolling/rt-manipulators-cpp/default.nix +++ b/distros/rolling/rt-manipulators-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rt-manipulators-cpp"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_manipulators_cpp-release/archive/release/rolling/rt_manipulators_cpp/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "b17f62e4518f6156f8e021bc698076b934bc1460d86e1902e14fc69d07b854fa"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_manipulators_cpp-release"; + rev = "release/rolling/rt_manipulators_cpp/1.0.0-1"; + sha256 = "sha256-YUJkRUHMLukwe5vyCr9kFhmmkkBb/ezgelg3SKIop3w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rt-manipulators-examples/default.nix b/distros/rolling/rt-manipulators-examples/default.nix index 6401989f7a..64fa4a31a6 100644 --- a/distros/rolling/rt-manipulators-examples/default.nix +++ b/distros/rolling/rt-manipulators-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rt-manipulators-examples"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/rt-net-gbp/rt_manipulators_cpp-release/archive/release/rolling/rt_manipulators_examples/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "64314c4f4fc407e563dcbd9f6c5cb563f088add33c064d8b2da966b66e4dbee8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "rt-net-gbp"; + repo = "rt_manipulators_cpp-release"; + rev = "release/rolling/rt_manipulators_examples/1.0.0-1"; + sha256 = "sha256-dHVhmshZaD7z/hfD5tLkvXw6mehXEQSlivgKwLZ4YZM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rtcm-msgs/default.nix b/distros/rolling/rtcm-msgs/default.nix index 96dea30a8d..ac16991248 100644 --- a/distros/rolling/rtcm-msgs/default.nix +++ b/distros/rolling/rtcm-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rtcm-msgs"; version = "1.1.6-r1"; - src = fetchurl { - url = "https://github.com/nobleo/rtcm_msgs-release/archive/release/rolling/rtcm_msgs/1.1.6-1.tar.gz"; - name = "1.1.6-1.tar.gz"; - sha256 = "89bd1036e6ef01479ed4f7b8b29dda34ecc71c5bb6b3e51f191fb2f05136f07f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "nobleo"; + repo = "rtcm_msgs-release"; + rev = "release/rolling/rtcm_msgs/1.1.6-1"; + sha256 = "sha256-5yTtIdGostlOwChSlKKL4JivCyK284g0KYZxB6GBtBY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake builtin-interfaces ros-environment rosidl-default-generators ]; diff --git a/distros/rolling/rti-connext-dds-cmake-module/default.nix b/distros/rolling/rti-connext-dds-cmake-module/default.nix index 5c9a4ff554..e05e21f8f2 100644 --- a/distros/rolling/rti-connext-dds-cmake-module/default.nix +++ b/distros/rolling/rti-connext-dds-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rti-connext-dds-cmake-module"; version = "0.13.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rmw_connextdds-release/archive/release/rolling/rti_connext_dds_cmake_module/0.13.0-1.tar.gz"; - name = "0.13.0-1.tar.gz"; - sha256 = "8b62e18e24690914305c21cec6b8981f5bc35b8080c39750f033b9d93b607f22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rmw_connextdds-release"; + rev = "release/rolling/rti_connext_dds_cmake_module/0.13.0-1"; + sha256 = "sha256-571J0ZzgTscO3/qC9SCYh3GCiWNd9iauupnXda6CkB8="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/rttest/default.nix b/distros/rolling/rttest/default.nix index e0f02ceaaf..103e306998 100644 --- a/distros/rolling/rttest/default.nix +++ b/distros/rolling/rttest/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rttest"; version = "0.14.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/realtime_support-release/archive/release/rolling/rttest/0.14.1-1.tar.gz"; - name = "0.14.1-1.tar.gz"; - sha256 = "92bfe5d8352f9e3bf26196c3ff1866e4f762a45de4992555bb27373dd81b2d84"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "realtime_support-release"; + rev = "release/rolling/rttest/0.14.1-1"; + sha256 = "sha256-+pg3m3ocOtLwSjzADrzjMdupsUaQLv8ZMTPYgw+qRVI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ruckig/default.nix b/distros/rolling/ruckig/default.nix index 057bf7e14b..02cc3cabbd 100644 --- a/distros/rolling/ruckig/default.nix +++ b/distros/rolling/ruckig/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, cmake }: buildRosPackage { pname = "ros-rolling-ruckig"; - version = "0.6.3-r6"; + version = "0.9.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ruckig-release/archive/release/rolling/ruckig/0.6.3-6.tar.gz"; - name = "0.6.3-6.tar.gz"; - sha256 = "4031fe125b7b93023a90fa783a9bcf717ea98223e18cb0b267674e7df2cb9fd5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ruckig-release"; + rev = "release/rolling/ruckig/0.9.2-2"; + sha256 = "sha256-xzv0PejVB2frTXtd7fnF72E49MOQaARx6boGHYzyVnQ="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/rviz-2d-overlay-msgs/default.nix b/distros/rolling/rviz-2d-overlay-msgs/default.nix index 657373fe09..4feda03e2f 100644 --- a/distros/rolling/rviz-2d-overlay-msgs/default.nix +++ b/distros/rolling/rviz-2d-overlay-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-2d-overlay-msgs"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz_2d_overlay_plugins-release/archive/release/rolling/rviz_2d_overlay_msgs/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "f8b7d47c19dc44949768aeec5516048728c73d6cf823c0b823c140b39f39238b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz_2d_overlay_plugins-release"; + rev = "release/rolling/rviz_2d_overlay_msgs/1.2.1-1"; + sha256 = "sha256-C7S+lCIduBpuVmNNB6nFZ7LkOw2X/TQKq5tqZAkMElk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/rviz-2d-overlay-plugins/default.nix b/distros/rolling/rviz-2d-overlay-plugins/default.nix index 82e95c9182..bf01bf2e1b 100644 --- a/distros/rolling/rviz-2d-overlay-plugins/default.nix +++ b/distros/rolling/rviz-2d-overlay-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-2d-overlay-plugins"; version = "1.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz_2d_overlay_plugins-release/archive/release/rolling/rviz_2d_overlay_plugins/1.2.1-1.tar.gz"; - name = "1.2.1-1.tar.gz"; - sha256 = "d80fe007edc7061b3f94639a305bf1300eeb53833363277ae64306675d4152e1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz_2d_overlay_plugins-release"; + rev = "release/rolling/rviz_2d_overlay_plugins/1.2.1-1"; + sha256 = "sha256-rIew6GpO1eY12AZkzSr3GYbOYianUUp0PzJeDzXQg2U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rviz-assimp-vendor/default.nix b/distros/rolling/rviz-assimp-vendor/default.nix index 18926523fb..7eb1b07478 100644 --- a/distros/rolling/rviz-assimp-vendor/default.nix +++ b/distros/rolling/rviz-assimp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-assimp-vendor"; version = "12.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/rolling/rviz_assimp_vendor/12.2.0-1.tar.gz"; - name = "12.2.0-1.tar.gz"; - sha256 = "c7522a1cf6d1179b4b92307d0f05f1904218b922adddbe41559e15c776ac48be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/rolling/rviz_assimp_vendor/12.2.0-1"; + sha256 = "sha256-YDGCJkm1keoJ8sFzYhvnRXSL20xTAZnXntwslRHEpBA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rviz-common/default.nix b/distros/rolling/rviz-common/default.nix index 0fbb9a0975..99160e2cd1 100644 --- a/distros/rolling/rviz-common/default.nix +++ b/distros/rolling/rviz-common/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-common"; version = "12.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/rolling/rviz_common/12.2.0-1.tar.gz"; - name = "12.2.0-1.tar.gz"; - sha256 = "5cebc630accd8f897f41ab02fe01ff80371a437e709a12c128901817a061086a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/rolling/rviz_common/12.2.0-1"; + sha256 = "sha256-NFRRPYlBK7/QP/BLPV0MTvPrdN/sgLk7XvCV9c5U5IA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rviz-default-plugins/default.nix b/distros/rolling/rviz-default-plugins/default.nix index df79863ec7..99fa55dbc7 100644 --- a/distros/rolling/rviz-default-plugins/default.nix +++ b/distros/rolling/rviz-default-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-default-plugins"; version = "12.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/rolling/rviz_default_plugins/12.2.0-1.tar.gz"; - name = "12.2.0-1.tar.gz"; - sha256 = "3a6141534dd711c5850ed7e6eddc2c7d97c8848104b38d617c019a0d03da36fb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/rolling/rviz_default_plugins/12.2.0-1"; + sha256 = "sha256-00gp/+yNUt29UxfyKE4mKlQa9lMSsUFBjorkiB/4erU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rviz-imu-plugin/default.nix b/distros/rolling/rviz-imu-plugin/default.nix index f9f7384a47..b72c547628 100644 --- a/distros/rolling/rviz-imu-plugin/default.nix +++ b/distros/rolling/rviz-imu-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-imu-plugin"; version = "2.1.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/imu_tools-release/archive/release/rolling/rviz_imu_plugin/2.1.3-1.tar.gz"; - name = "2.1.3-1.tar.gz"; - sha256 = "a9c52043b06f527e76868ede1c5106634da02fb707f976ea2432ded32c9a59b0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "imu_tools-release"; + rev = "release/rolling/rviz_imu_plugin/2.1.3-1"; + sha256 = "sha256-PTP1jn127e3dBx0iCfyHU2gcO709T+HE0I+CZyIHCJY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rviz-ogre-vendor/default.nix b/distros/rolling/rviz-ogre-vendor/default.nix index 1f7b0eecc2..7a1de6769e 100644 --- a/distros/rolling/rviz-ogre-vendor/default.nix +++ b/distros/rolling/rviz-ogre-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-ogre-vendor"; version = "12.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/rolling/rviz_ogre_vendor/12.2.0-1.tar.gz"; - name = "12.2.0-1.tar.gz"; - sha256 = "ad252d22a0bb20eb4be7c5ecf71fdd2c9013d409f2d00139b0d192f7f316181c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/rolling/rviz_ogre_vendor/12.2.0-1"; + sha256 = "sha256-o3r8qmy2MlIJQLDiEpNEWYxQXsPLKZIWmgq3XT3prZg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git pkg-config ]; diff --git a/distros/rolling/rviz-rendering-tests/default.nix b/distros/rolling/rviz-rendering-tests/default.nix index 6685b5eb56..bd80f075c5 100644 --- a/distros/rolling/rviz-rendering-tests/default.nix +++ b/distros/rolling/rviz-rendering-tests/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-rendering-tests"; version = "12.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/rolling/rviz_rendering_tests/12.2.0-1.tar.gz"; - name = "12.2.0-1.tar.gz"; - sha256 = "65fd7a6e681ee2077ee8777758762a415bb3ab7af1697b833919d810e032907d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/rolling/rviz_rendering_tests/12.2.0-1"; + sha256 = "sha256-HGoNsYzDyO1yumkwKy9ikCkyRjFa789pEG69+RUAOZI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/rolling/rviz-rendering/default.nix b/distros/rolling/rviz-rendering/default.nix index 2b5c4d95dd..fe95d042d3 100644 --- a/distros/rolling/rviz-rendering/default.nix +++ b/distros/rolling/rviz-rendering/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-rendering"; version = "12.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/rolling/rviz_rendering/12.2.0-1.tar.gz"; - name = "12.2.0-1.tar.gz"; - sha256 = "6c3e63818d5c199a68f0d40f2140339152cb1a9724abf266688d4f4a0d26e22d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/rolling/rviz_rendering/12.2.0-1"; + sha256 = "sha256-ZdH5laEVHOFkIJeQpP6Vo4F8K9hP8gW+jUySa/bvsbs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rviz-visual-testing-framework/default.nix b/distros/rolling/rviz-visual-testing-framework/default.nix index 33a0af542a..c4bd6161f6 100644 --- a/distros/rolling/rviz-visual-testing-framework/default.nix +++ b/distros/rolling/rviz-visual-testing-framework/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz-visual-testing-framework"; version = "12.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/rolling/rviz_visual_testing_framework/12.2.0-1.tar.gz"; - name = "12.2.0-1.tar.gz"; - sha256 = "982003595f09eba1366d5fba92668eb93e2fc71e586d92ed5eb43eaaffd38997"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/rolling/rviz_visual_testing_framework/12.2.0-1"; + sha256 = "sha256-VMtmT3gJTUNMH+pVC4ncOruyjdI0M8c1xfwjrB0WJwM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/rolling/rviz-visual-tools/default.nix b/distros/rolling/rviz-visual-tools/default.nix index dc8766f631..f07d7df664 100644 --- a/distros/rolling/rviz-visual-tools/default.nix +++ b/distros/rolling/rviz-visual-tools/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-python, ament-lint-auto, ament-lint-common, eigen, eigen-stl-containers, eigen3-cmake-module, geometry-msgs, interactive-markers, launch, launch-ros, pluginlib, qt5, rclcpp, rclcpp-components, rviz-common, rviz-default-plugins, rviz-ogre-vendor, rviz-rendering, rviz2, sensor-msgs, shape-msgs, std-msgs, tf2, tf2-eigen, tf2-geometry-msgs, trajectory-msgs, visualization-msgs }: buildRosPackage { pname = "ros-rolling-rviz-visual-tools"; - version = "4.1.3-r1"; + version = "4.1.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz_visual_tools-release/archive/release/rolling/rviz_visual_tools/4.1.3-1.tar.gz"; - name = "4.1.3-1.tar.gz"; - sha256 = "cf8e3941156b0d8439e37d85b78f188d51dc745a5fbc7515b9abfbdb9abe16f8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz_visual_tools-release"; + rev = "release/rolling/rviz_visual_tools/4.1.4-1"; + sha256 = "sha256-tVfPKQNpM962nm3D4nPbalanEed98pZ6A4v4ySC79yI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/rviz2/default.nix b/distros/rolling/rviz2/default.nix index 312ae2e522..4c38965273 100644 --- a/distros/rolling/rviz2/default.nix +++ b/distros/rolling/rviz2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-rviz2"; version = "12.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rviz-release/archive/release/rolling/rviz2/12.2.0-1.tar.gz"; - name = "12.2.0-1.tar.gz"; - sha256 = "0b0071493ce556d014a21713ce7b64f4e77876dde58a97eab4fd168fc99e6323"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rviz-release"; + rev = "release/rolling/rviz2/12.2.0-1"; + sha256 = "sha256-gTgYljYIsjjerJQsq3CmindV2Lx2sdU+hmLw5acRanc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake qt5.qtbase ]; diff --git a/distros/rolling/sdformat-test-files/default.nix b/distros/rolling/sdformat-test-files/default.nix index f1b515cdab..522ecdb3f3 100644 --- a/distros/rolling/sdformat-test-files/default.nix +++ b/distros/rolling/sdformat-test-files/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-sdformat-test-files"; version = "1.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/sdformat_urdf-release/archive/release/rolling/sdformat_test_files/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "f719291a3123cd92e2649c2f3af901d1882b17a3fe45d8f0e6853ef1726942ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "sdformat_urdf-release"; + rev = "release/rolling/sdformat_test_files/1.0.1-1"; + sha256 = "sha256-+3nL+Njboe0apHQrf0wM7r53YuOAoG8MjCOOoyhCG1c="; + }; buildType = "cmake"; propagatedBuildInputs = [ cmake ]; diff --git a/distros/rolling/sdl2-vendor/default.nix b/distros/rolling/sdl2-vendor/default.nix index 40e1284c26..c08a7d3acf 100644 --- a/distros/rolling/sdl2-vendor/default.nix +++ b/distros/rolling/sdl2-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-sdl2-vendor"; version = "3.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/rolling/sdl2_vendor/3.1.0-2.tar.gz"; - name = "3.1.0-2.tar.gz"; - sha256 = "4e5bd6daf4379fc80635f4ff2fb491250d3b8136fad6a6cce8e1aa89222a12fe"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/rolling/sdl2_vendor/3.1.0-2"; + sha256 = "sha256-yK9/I8H81uj13ica+FzxQlDpD4xNsbe3+OtP4FWAv1M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/self-test/default.nix b/distros/rolling/self-test/default.nix index 83d561fe0b..78673bd827 100644 --- a/distros/rolling/self-test/default.nix +++ b/distros/rolling/self-test/default.nix @@ -2,25 +2,29 @@ # Copyright 2023 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, diagnostic-msgs, diagnostic-updater, rclcpp }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, diagnostic-msgs, diagnostic-updater, rclcpp, ros-environment }: buildRosPackage { pname = "ros-rolling-self-test"; - version = "3.0.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/diagnostics-release/archive/release/rolling/self_test/3.0.0-1.tar.gz"; - name = "3.0.0-1.tar.gz"; - sha256 = "6771598989986442c5eca165a5b09ca8286ee44447fe99489d828f43f41f6713"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "diagnostics-release"; + rev = "release/rolling/self_test/3.1.0-1"; + sha256 = "sha256-1wNulwlhDpJbtfsi74Fq0lbouCl5TKsL3+ynHZAxyew="; + }; buildType = "ament_cmake"; - buildInputs = [ ament-cmake ]; + buildInputs = [ ament-cmake ros-environment ]; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ diagnostic-msgs diagnostic-updater rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { description = ''self_test''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ bsd3 ]; }; } diff --git a/distros/rolling/sensor-msgs-py/default.nix b/distros/rolling/sensor-msgs-py/default.nix index a775a80312..ba913304ff 100644 --- a/distros/rolling/sensor-msgs-py/default.nix +++ b/distros/rolling/sensor-msgs-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-sensor-msgs-py"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/sensor_msgs_py/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "37793a2ec34c3f62240f2055b967e52606c86b69cce1bcfaffd816c53872ac7f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/sensor_msgs_py/4.6.1-1"; + sha256 = "sha256-etgqRp/QIwYymDTE9HvIEPAZbfdrtp0SsTJs31lIke0="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/sensor-msgs/default.nix b/distros/rolling/sensor-msgs/default.nix index acd3cfe5d8..6946b966d1 100644 --- a/distros/rolling/sensor-msgs/default.nix +++ b/distros/rolling/sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-sensor-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/sensor_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "09335419a263f68f8a5475529676c2a52517c4acebf4f4c74852aeb8561ed095"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/sensor_msgs/4.6.1-1"; + sha256 = "sha256-JHMc2qqhmwYY6jRWmjDLLonIQPxHdKUxIgamMIUqm3s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/septentrio-gnss-driver/default.nix b/distros/rolling/septentrio-gnss-driver/default.nix index 5b80996895..79e8e256cd 100644 --- a/distros/rolling/septentrio-gnss-driver/default.nix +++ b/distros/rolling/septentrio-gnss-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-septentrio-gnss-driver"; version = "1.2.3-r1"; - src = fetchurl { - url = "https://github.com/septentrio-users/septentrio_gnss_driver_ros2-release/archive/release/rolling/septentrio_gnss_driver/1.2.3-1.tar.gz"; - name = "1.2.3-1.tar.gz"; - sha256 = "8b9b3c6f265932e681f22ae67c955f2904a1c4ab8b487764a67e54c2025d8dab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "septentrio-users"; + repo = "septentrio_gnss_driver_ros2-release"; + rev = "release/rolling/septentrio_gnss_driver/1.2.3-1"; + sha256 = "sha256-kCTbqq1KzuGhmwyJcXz5kKbZ7+9maCG6AATdtFnvZ8Y="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/serial-driver/default.nix b/distros/rolling/serial-driver/default.nix index e89b763d25..9bceba74a6 100644 --- a/distros/rolling/serial-driver/default.nix +++ b/distros/rolling/serial-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-serial-driver"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/rolling/serial_driver/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "5b3855fd8c39635291c6283f2cbe45ad1525bb7de66d22b0a46f5d902a020f4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "transport_drivers-release"; + rev = "release/rolling/serial_driver/1.2.0-1"; + sha256 = "sha256-1Oc6jtsGEX0Jaxqs7jdlxu/nZJxZPxvagRST+L9bdwI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/rolling/shape-msgs/default.nix b/distros/rolling/shape-msgs/default.nix index a4dcb766cb..474cb994bd 100644 --- a/distros/rolling/shape-msgs/default.nix +++ b/distros/rolling/shape-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-shape-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/shape_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "3594ac87cc260996d2c358c788f2f8b75d8e25d429d0a648796699993685d2dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/shape_msgs/4.6.1-1"; + sha256 = "sha256-cN4QzCzTvkQIURIR84PFjfU3BxfcHRT/Z646GdF53yE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/shared-queues-vendor/default.nix b/distros/rolling/shared-queues-vendor/default.nix index 11517f594d..a8572d75e9 100644 --- a/distros/rolling/shared-queues-vendor/default.nix +++ b/distros/rolling/shared-queues-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake }: buildRosPackage { pname = "ros-rolling-shared-queues-vendor"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/shared_queues_vendor/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "4a319e8dbb45728015076e433d3863ffb5db88f2e9e46ac370c420aef6941779"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/shared_queues_vendor/0.19.0-1"; + sha256 = "sha256-0HqCvvg+JUX0dBH9YBB+vu3wK1VD2oMO0c8lRARI/JU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/simple-actions/default.nix b/distros/rolling/simple-actions/default.nix index e23731835e..afed5d14c3 100644 --- a/distros/rolling/simple-actions/default.nix +++ b/distros/rolling/simple-actions/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-simple-actions"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/DLu/simple_actions-release/archive/release/rolling/simple_actions/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "62e3d348b705bfc026779ff95bbc1ba8668c3f08dd82fdc7b58a0f053f16c339"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "DLu"; + repo = "simple_actions-release"; + rev = "release/rolling/simple_actions/0.2.1-1"; + sha256 = "sha256-NwJn4jspMkn8bZdj3z4bwQmkm017B0FXkjiGFfIl+cY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/simple-launch/default.nix b/distros/rolling/simple-launch/default.nix index 29c3822dbb..b0e7383527 100644 --- a/distros/rolling/simple-launch/default.nix +++ b/distros/rolling/simple-launch/default.nix @@ -2,19 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-index-python, launch, launch-ros, xacro }: +{ lib, buildRosPackage, fetchurl, ament-cmake-python, ament-index-python, launch, launch-ros, xacro }: buildRosPackage { pname = "ros-rolling-simple-launch"; - version = "1.2.1-r2"; + version = "1.6.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/simple_launch-release/archive/release/rolling/simple_launch/1.2.1-2.tar.gz"; - name = "1.2.1-2.tar.gz"; - sha256 = "f51e67d1d8402becaba76b41df1ff2e10633427644728396aef538f1f8d9f2a7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "simple_launch-release"; + rev = "release/rolling/simple_launch/1.6.2-1"; + sha256 = "sha256-mTdpp9QdRapkSJ5ElRJHiiDhAQKp9/ggLFQa+iXtTu0="; + }; - buildType = "ament_python"; + buildType = "ament_cmake"; + buildInputs = [ ament-cmake-python ]; propagatedBuildInputs = [ ament-index-python launch launch-ros xacro ]; + nativeBuildInputs = [ ament-cmake-python ]; meta = { description = ''Python helper class for the ROS 2 launch system''; diff --git a/distros/rolling/simulation/default.nix b/distros/rolling/simulation/default.nix index 6b1b3657db..419924abc0 100644 --- a/distros/rolling/simulation/default.nix +++ b/distros/rolling/simulation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-simulation"; version = "0.10.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/variants-release/archive/release/rolling/simulation/0.10.0-1.tar.gz"; - name = "0.10.0-1.tar.gz"; - sha256 = "9b1c301a009af090e50841a0be676c381a237c2f391c78b9da89c546c5c0a44b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "variants-release"; + rev = "release/rolling/simulation/0.10.0-1"; + sha256 = "sha256-bvicFtHnIqmwZPfpdtNprdkWQWqSKGs+cezebLL0sUs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/slider-publisher/default.nix b/distros/rolling/slider-publisher/default.nix index 9e7fad1119..e5c919ac25 100644 --- a/distros/rolling/slider-publisher/default.nix +++ b/distros/rolling/slider-publisher/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-slider-publisher"; version = "2.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/slider_publisher-release/archive/release/rolling/slider_publisher/2.2.1-1.tar.gz"; - name = "2.2.1-1.tar.gz"; - sha256 = "0dae9e59bd57384a57e417ff17611136c3eae01ff3d2f104a86f684f0e9ac6cd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "slider_publisher-release"; + rev = "release/rolling/slider_publisher/2.2.1-1"; + sha256 = "sha256-szAUkWe0eQFk40CMBvoSKEw/Ut9x17ULIwx90BhW/TY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/smacc2-msgs/default.nix b/distros/rolling/smacc2-msgs/default.nix index bbe6869629..a5702fb1e2 100644 --- a/distros/rolling/smacc2-msgs/default.nix +++ b/distros/rolling/smacc2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-smacc2-msgs"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/SMACC2-release/archive/release/rolling/smacc2_msgs/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "1922f017e26dfaa39ecc4a0465d78d434ee25d8997d084c68d44e62dd2e93e5c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "SMACC2-release"; + rev = "release/rolling/smacc2_msgs/0.4.0-1"; + sha256 = "sha256-tY/UoVoVSZ2FyHW7T+eKrXBqfK1KVQiZatRamEO/K6M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/smacc2/default.nix b/distros/rolling/smacc2/default.nix index a558cc98a4..96ecd13013 100644 --- a/distros/rolling/smacc2/default.nix +++ b/distros/rolling/smacc2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-smacc2"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/SMACC2-release/archive/release/rolling/smacc2/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "4fe8371092104b0e61840ed60d99b5c0a21fbd77b1c75543f7471679470ea895"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "SMACC2-release"; + rev = "release/rolling/smacc2/0.4.0-1"; + sha256 = "sha256-yI0OXFGrQ42OcS1v1pv7VdeoqmflWYkFqHfGbacMe+Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/smclib/default.nix b/distros/rolling/smclib/default.nix index e2d1ffa3af..51fa2fbecd 100644 --- a/distros/rolling/smclib/default.nix +++ b/distros/rolling/smclib/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-smclib"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/rolling/smclib/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "7e31f4211d5d2632cb8de1adc2811cfd7e259c7409809a23cd2c263dab3cb45b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/rolling/smclib/4.0.0-1"; + sha256 = "sha256-F73Murx7nsDKLtgPHJ5EAjpH67fZ7LZMHDas6Up4fk0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/snowbot-operating-system/default.nix b/distros/rolling/snowbot-operating-system/default.nix index ebadd93566..60c66435ff 100644 --- a/distros/rolling/snowbot-operating-system/default.nix +++ b/distros/rolling/snowbot-operating-system/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-snowbot-operating-system"; version = "0.1.2-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/snowbot_release/archive/release/rolling/snowbot_operating_system/0.1.2-2.tar.gz"; - name = "0.1.2-2.tar.gz"; - sha256 = "5cd619e7afcd212003e7000d3787b873de018b04cf5d4e554e2bac2261cd25a1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "snowbot_release"; + rev = "release/rolling/snowbot_operating_system/0.1.2-2"; + sha256 = "sha256-jsc6W+E4XVtTLGd+ZSn45ChfZmV6/c9nUg1FpqA6d8s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/soccer-interfaces/default.nix b/distros/rolling/soccer-interfaces/default.nix index 516797608d..67c0807b6c 100644 --- a/distros/rolling/soccer-interfaces/default.nix +++ b/distros/rolling/soccer-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-soccer-interfaces"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_interfaces-release/archive/release/rolling/soccer_interfaces/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "85382b377d68e765a313c183f07a9c8fbdebfa34d63941505608a495479403e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_interfaces-release"; + rev = "release/rolling/soccer_interfaces/0.2.0-1"; + sha256 = "sha256-vk/EmhgP6OQYIn59GYk85ZeW+QHa7gYOhl7TcQ9T4p4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/soccer-marker-generation/default.nix b/distros/rolling/soccer-marker-generation/default.nix index 4552a9c5e4..1732e6bcfb 100644 --- a/distros/rolling/soccer-marker-generation/default.nix +++ b/distros/rolling/soccer-marker-generation/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-soccer-marker-generation"; version = "0.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_visualization-release/archive/release/rolling/soccer_marker_generation/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "321771d411d49b84fb5ea75ab1fdfa5fad75d97040bf86b8ac7e7a814be3b2ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_visualization-release"; + rev = "release/rolling/soccer_marker_generation/0.1.0-1"; + sha256 = "sha256-j3rFXdz5u/W7Cp66bF6y4unx0IjnBPnIlO6J3N1M9yI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/soccer-object-msgs/default.nix b/distros/rolling/soccer-object-msgs/default.nix index 93f251396a..1a89f54376 100644 --- a/distros/rolling/soccer-object-msgs/default.nix +++ b/distros/rolling/soccer-object-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-soccer-object-msgs"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_object_msgs-release/archive/release/rolling/soccer_object_msgs/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "2a13b3bab5a6c5c1d50e24ff43d2012433a74d2cf798af74d5d7aa2d58878bda"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_object_msgs-release"; + rev = "release/rolling/soccer_object_msgs/1.1.0-1"; + sha256 = "sha256-osJgWvej6UcU+BYi2uVgk/0T+Llr1DrpMYyN7Ct91oc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/soccer-vision-2d-msgs/default.nix b/distros/rolling/soccer-vision-2d-msgs/default.nix index 4e3358b3a4..cabd73e7b6 100644 --- a/distros/rolling/soccer-vision-2d-msgs/default.nix +++ b/distros/rolling/soccer-vision-2d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-soccer-vision-2d-msgs"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_interfaces-release/archive/release/rolling/soccer_vision_2d_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "dfa6fca2e2030550ebf035e6c889d240fa1f5c79111c520b4608b4144d489b51"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_interfaces-release"; + rev = "release/rolling/soccer_vision_2d_msgs/0.2.0-1"; + sha256 = "sha256-B0DEByS/KtGeJ5tgLeZpHPg/mMQ7h8ULzAuLc94c0Pk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/soccer-vision-3d-msgs/default.nix b/distros/rolling/soccer-vision-3d-msgs/default.nix index ce759c3a93..38a7883403 100644 --- a/distros/rolling/soccer-vision-3d-msgs/default.nix +++ b/distros/rolling/soccer-vision-3d-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-soccer-vision-3d-msgs"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_interfaces-release/archive/release/rolling/soccer_vision_3d_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "cb052be006a3d564cb6d8b2a1aca13c3328721183b3d4962bfc208d94f43e055"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_interfaces-release"; + rev = "release/rolling/soccer_vision_3d_msgs/0.2.0-1"; + sha256 = "sha256-BmHEqbMOIzeghp7fm/Yonck3resi4rrIM/DnBsSkKvo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/soccer-vision-3d-rviz-markers/default.nix b/distros/rolling/soccer-vision-3d-rviz-markers/default.nix index be977e5900..ee681b92fc 100644 --- a/distros/rolling/soccer-vision-3d-rviz-markers/default.nix +++ b/distros/rolling/soccer-vision-3d-rviz-markers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-soccer-vision-3d-rviz-markers"; version = "0.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_vision_3d_rviz_markers-release/archive/release/rolling/soccer_vision_3d_rviz_markers/0.0.1-1.tar.gz"; - name = "0.0.1-1.tar.gz"; - sha256 = "bc720f29951a679396056053a4f3bfe18412a5913ea6dc8a97c5d56b97b383dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_vision_3d_rviz_markers-release"; + rev = "release/rolling/soccer_vision_3d_rviz_markers/0.0.1-1"; + sha256 = "sha256-lMv9aUB99LdKEBLWkrN0iD1tZAXUkRcEnB/dizyH9js="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/soccer-vision-attribute-msgs/default.nix b/distros/rolling/soccer-vision-attribute-msgs/default.nix index fb7e7a5bbc..e2c8d1f6bd 100644 --- a/distros/rolling/soccer-vision-attribute-msgs/default.nix +++ b/distros/rolling/soccer-vision-attribute-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-soccer-vision-attribute-msgs"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/soccer_interfaces-release/archive/release/rolling/soccer_vision_attribute_msgs/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "6cd60c51f198aa6c690ee9fd6a0be5d94aedd01f50142dba6e8f31970653182e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "soccer_interfaces-release"; + rev = "release/rolling/soccer_vision_attribute_msgs/0.2.0-1"; + sha256 = "sha256-kne9VeA5cVtLI1cd5i9nD338Z11EdYoA28JFBWwWUD4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/sol-vendor/default.nix b/distros/rolling/sol-vendor/default.nix index 0206f7f353..531de845f2 100644 --- a/distros/rolling/sol-vendor/default.nix +++ b/distros/rolling/sol-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-sol-vendor"; version = "0.0.3-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/sol_vendor-release/archive/release/rolling/sol_vendor/0.0.3-2.tar.gz"; - name = "0.0.3-2.tar.gz"; - sha256 = "25d2f646141cde5dbb4e7c3054bf5d735edde6c542dedee7ee209bc2a2e8dcef"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "sol_vendor-release"; + rev = "release/rolling/sol_vendor/0.0.3-2"; + sha256 = "sha256-OJUnC0ys2Skzp15ABwTAk6kvOh0Q0tOfO3vQ9jmhxa4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/sophus/default.nix b/distros/rolling/sophus/default.nix index 8f2dfa1436..c816ec4e5e 100644 --- a/distros/rolling/sophus/default.nix +++ b/distros/rolling/sophus/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-sophus"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/yujinrobot-release/sophus-release/archive/release/rolling/sophus/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "0b01bf06f4972347940e569569a0b064ca930e3536f89862a728a09286b4de29"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "yujinrobot-release"; + repo = "sophus-release"; + rev = "release/rolling/sophus/1.3.1-1"; + sha256 = "sha256-sU6bD+gx60Z2gmHijXI86GiPbz64jCt6tMrNfxUwAHM="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/spacenav/default.nix b/distros/rolling/spacenav/default.nix index 216a66a524..97c4807a82 100644 --- a/distros/rolling/spacenav/default.nix +++ b/distros/rolling/spacenav/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-spacenav"; version = "3.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/rolling/spacenav/3.1.0-2.tar.gz"; - name = "3.1.0-2.tar.gz"; - sha256 = "8fbf483adfd65b1074de189ae71c1be33e6d6ad81e578e166f96deca4dbb7b64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/rolling/spacenav/3.1.0-2"; + sha256 = "sha256-d8guUvrJtcVxegS4Mkqn+xLrNWRv7V1Ctq2b6gWSzuQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/spdlog-vendor/default.nix b/distros/rolling/spdlog-vendor/default.nix index 28ea281cb6..5d8eb85582 100644 --- a/distros/rolling/spdlog-vendor/default.nix +++ b/distros/rolling/spdlog-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-spdlog-vendor"; version = "1.4.2-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/spdlog_vendor-release/archive/release/rolling/spdlog_vendor/1.4.2-1.tar.gz"; - name = "1.4.2-1.tar.gz"; - sha256 = "8dcaeada0e126d8bdee56d01311ddc026867405e72fa55df758f1213cc0641d7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "spdlog_vendor-release"; + rev = "release/rolling/spdlog_vendor/1.4.2-1"; + sha256 = "sha256-yAP7CDsco1Uuyn6/98H8fz6P3aZSLVJLafqR2ODLl+w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/splsm-7-conversion/default.nix b/distros/rolling/splsm-7-conversion/default.nix index e333fa4e88..276eda8b0a 100644 --- a/distros/rolling/splsm-7-conversion/default.nix +++ b/distros/rolling/splsm-7-conversion/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-splsm-7-conversion"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/r2r_spl-release/archive/release/rolling/splsm_7_conversion/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "38e30d3ef0fffac0af0c445703df95e8608b02f6f3781dbe9904c5334612ead4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "r2r_spl-release"; + rev = "release/rolling/splsm_7_conversion/3.0.1-1"; + sha256 = "sha256-hot8TlsdjVjgyVkdoUFaIy47vVP67OUYUwJHsdfSm0M="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/splsm-7/default.nix b/distros/rolling/splsm-7/default.nix index 3b2baf01a9..cc55d06cdf 100644 --- a/distros/rolling/splsm-7/default.nix +++ b/distros/rolling/splsm-7/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-splsm-7"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/r2r_spl-release/archive/release/rolling/splsm_7/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "e169bdbebd40b8501344f07469ec5238aa9da7a10381841e425c6c27fff22bf6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "r2r_spl-release"; + rev = "release/rolling/splsm_7/3.0.1-1"; + sha256 = "sha256-mJ9R0CRbOAigpJZL+lmcW5OrC4wfPc83FiMx8+NKjwY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/sqlite3-vendor/default.nix b/distros/rolling/sqlite3-vendor/default.nix index 3b8a8452d9..9a5ab2046c 100644 --- a/distros/rolling/sqlite3-vendor/default.nix +++ b/distros/rolling/sqlite3-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, sqlite }: buildRosPackage { pname = "ros-rolling-sqlite3-vendor"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/sqlite3_vendor/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "f75c05844cd8ae2260067d18088f2154b42e139ad2fc3a06ea8b494b1457b762"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/sqlite3_vendor/0.19.0-1"; + sha256 = "sha256-XVMsZqxmNu7+mSVF9rDkgTN/wxONT/9hRGNBJZmZ9wI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/srdfdom/default.nix b/distros/rolling/srdfdom/default.nix index 017ea8f6ad..9c44ad8112 100644 --- a/distros/rolling/srdfdom/default.nix +++ b/distros/rolling/srdfdom/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-srdfdom"; version = "2.0.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/srdfdom-release/archive/release/rolling/srdfdom/2.0.4-1.tar.gz"; - name = "2.0.4-1.tar.gz"; - sha256 = "8bf953f5999f5612ef8d93eb3930263e1f97de837801ab36a80bac8f057462cf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "srdfdom-release"; + rev = "release/rolling/srdfdom/2.0.4-1"; + sha256 = "sha256-4SrjgL5tauV2LvLisilSnXwyD2qTdhVdYDtH8D/69yg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python boost urdfdom-headers ]; diff --git a/distros/rolling/sros2-cmake/default.nix b/distros/rolling/sros2-cmake/default.nix index a3973bcace..db47bfab60 100644 --- a/distros/rolling/sros2-cmake/default.nix +++ b/distros/rolling/sros2-cmake/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-sros2-cmake"; version = "0.11.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/sros2-release/archive/release/rolling/sros2_cmake/0.11.1-1.tar.gz"; - name = "0.11.1-1.tar.gz"; - sha256 = "909f0de466a00d24966143b626337044814a2808c2365774744f3df82d556403"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "sros2-release"; + rev = "release/rolling/sros2_cmake/0.11.1-1"; + sha256 = "sha256-AAXL8nDTsYxXxBec37xSCSO29W1CdfCOftJTQJ3Byws="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-test ]; diff --git a/distros/rolling/sros2/default.nix b/distros/rolling/sros2/default.nix index c1d405bb1e..8cd7cc4076 100644 --- a/distros/rolling/sros2/default.nix +++ b/distros/rolling/sros2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-sros2"; version = "0.11.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/sros2-release/archive/release/rolling/sros2/0.11.1-1.tar.gz"; - name = "0.11.1-1.tar.gz"; - sha256 = "3736cfea1007877fd433fe6320fab0d3457a55b703a3f507019a1960e830e953"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "sros2-release"; + rev = "release/rolling/sros2/0.11.1-1"; + sha256 = "sha256-iIP4FpLm9H8ZzL4NurKCQZszYHwFsSGj5vyog19gmpk="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 pythonPackages.pytest ros-testing test-msgs ]; diff --git a/distros/rolling/statistics-msgs/default.nix b/distros/rolling/statistics-msgs/default.nix index a74dee91ef..d1dc0be2e6 100644 --- a/distros/rolling/statistics-msgs/default.nix +++ b/distros/rolling/statistics-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-statistics-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/rolling/statistics_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "ac81a94c088aea74268cda9dadf1227a373a0674c9b322b1db71dc6b9071ff34"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/rolling/statistics_msgs/1.3.1-1"; + sha256 = "sha256-cBADg0sJq27itEoY/MUbpPxjoo1kwRhxtYo1yCWN8G0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/std-msgs/default.nix b/distros/rolling/std-msgs/default.nix index 786b0cfd92..717fa64ee5 100644 --- a/distros/rolling/std-msgs/default.nix +++ b/distros/rolling/std-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-std-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/std_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "87eee895c2c60a8335ae2a63b05f99773f0897e451e5bf7f45a14a6c36295640"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/std_msgs/4.6.1-1"; + sha256 = "sha256-PtxJVUP+atWaOKX0dfW+wc/Cnt0VYYxI3UHIh+RGoFo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/std-srvs/default.nix b/distros/rolling/std-srvs/default.nix index bdabda3416..4cc31310f9 100644 --- a/distros/rolling/std-srvs/default.nix +++ b/distros/rolling/std-srvs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-std-srvs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/std_srvs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "895490d443aacba01213bc274e2f5fc889b7cff9eb8dd2dfe2a6a51a65b857d0"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/std_srvs/4.6.1-1"; + sha256 = "sha256-0n5t+y6q+SNWey8GemELyAZNkC0+1il3JCiTxtPEI7M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/stereo-image-proc/default.nix b/distros/rolling/stereo-image-proc/default.nix index 2a56c3bc45..5879621daa 100644 --- a/distros/rolling/stereo-image-proc/default.nix +++ b/distros/rolling/stereo-image-proc/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-stereo-image-proc"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/stereo_image_proc/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "10b2e7033f2115baf648425f65b4fece946cd7fa46465d9908615aabd791dc97"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/stereo_image_proc/3.0.1-1"; + sha256 = "sha256-XrzzM40qgmzxEn2ziJiUiBFzXTBso2p/imQzDNl1ja8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/stereo-msgs/default.nix b/distros/rolling/stereo-msgs/default.nix index 5c3471eaa8..78ad23895c 100644 --- a/distros/rolling/stereo-msgs/default.nix +++ b/distros/rolling/stereo-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-stereo-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/stereo_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "d816280ad30a940b487b0a30f4676fcce96552c3376a225f7bb26307bd77dd07"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/stereo_msgs/4.6.1-1"; + sha256 = "sha256-yjrkYKt5sMK6hTRRJM8IxF737hSY84bZr+Ni5Mn33/I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/stubborn-buddies-msgs/default.nix b/distros/rolling/stubborn-buddies-msgs/default.nix index 7f1cda18b7..3a3fd6e75e 100644 --- a/distros/rolling/stubborn-buddies-msgs/default.nix +++ b/distros/rolling/stubborn-buddies-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-stubborn-buddies-msgs"; version = "1.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/stubborn_buddies-release/archive/release/rolling/stubborn_buddies_msgs/1.0.0-4.tar.gz"; - name = "1.0.0-4.tar.gz"; - sha256 = "611a221cacd9921f5badeaefa48facd2215a269d84fde871eac5c2c261d6c760"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "stubborn_buddies-release"; + rev = "release/rolling/stubborn_buddies_msgs/1.0.0-4"; + sha256 = "sha256-ca+tBYzurY7xkoSry24RR8HaTLuuHAEKuBOxT57QSXY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/stubborn-buddies/default.nix b/distros/rolling/stubborn-buddies/default.nix index 5b8896fe6f..4e71b6e326 100644 --- a/distros/rolling/stubborn-buddies/default.nix +++ b/distros/rolling/stubborn-buddies/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-stubborn-buddies"; version = "1.0.0-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/stubborn_buddies-release/archive/release/rolling/stubborn_buddies/1.0.0-4.tar.gz"; - name = "1.0.0-4.tar.gz"; - sha256 = "d6a4412dd8c0e698e83f27cb71f600256ab2337ae0a5dbe9a40b15df43b5333e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "stubborn_buddies-release"; + rev = "release/rolling/stubborn_buddies/1.0.0-4"; + sha256 = "sha256-gR08XIszXNwbw343ie74jForyMoXvqCbhynmzAN+Y/w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-console-util/default.nix b/distros/rolling/swri-console-util/default.nix index 7843e32e2b..acc13e4149 100644 --- a/distros/rolling/swri-console-util/default.nix +++ b/distros/rolling/swri-console-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-console-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_console_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "107290cfa09bdc7da1a20fd8e9472924e5951ff5c8f7427b35c6707acba6dead"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_console_util/3.5.0-1"; + sha256 = "sha256-ZH32tPitHyM8QwDOEH/eFIRSWfFAjERyrUOXxIpM6LE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-dbw-interface/default.nix b/distros/rolling/swri-dbw-interface/default.nix index f09fd61b66..b0f0507609 100644 --- a/distros/rolling/swri-dbw-interface/default.nix +++ b/distros/rolling/swri-dbw-interface/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-dbw-interface"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_dbw_interface/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "53410ff7371208fc0773a29e1a554be8aea5bf5df635bd5343ad0f498dc75a05"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_dbw_interface/3.5.0-1"; + sha256 = "sha256-35WnQWZ5aKJ69dL8Bg4iySWFqeGjdjZhts5rmuyn+SU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-geometry-util/default.nix b/distros/rolling/swri-geometry-util/default.nix index f4fd7e58cc..7adbd6b9c7 100644 --- a/distros/rolling/swri-geometry-util/default.nix +++ b/distros/rolling/swri-geometry-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-geometry-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_geometry_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "836b15a363e31356113399f39d1cd287dec4037013e8c3de8d0bbe5073509ae7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_geometry_util/3.5.0-1"; + sha256 = "sha256-JAuTqdp0R5i+LbVJwPthq4mwI5kIBabdggi5d8IHS+g="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/rolling/swri-image-util/default.nix b/distros/rolling/swri-image-util/default.nix index 554ec0389a..19966544bb 100644 --- a/distros/rolling/swri-image-util/default.nix +++ b/distros/rolling/swri-image-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-image-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_image_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "e9546c42a69e5ccce79370a917278741b7788f1f88cfcca19ac47477a685ebe8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_image_util/3.5.0-1"; + sha256 = "sha256-t5r0vx+gkDoD6U0WmTwyHDLTeyw3BGBY59LMChY/+yA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/rolling/swri-math-util/default.nix b/distros/rolling/swri-math-util/default.nix index 048c6bef71..9316b072a9 100644 --- a/distros/rolling/swri-math-util/default.nix +++ b/distros/rolling/swri-math-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-math-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_math_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "4bb71450bc91edf080b24d3630e298a7ea61999034fac4313f1147ebad177834"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_math_util/3.5.0-1"; + sha256 = "sha256-LMN/kFCh+IzKuiqfJ62WGlQH5iXamdyX0abZVtuEZf0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-opencv-util/default.nix b/distros/rolling/swri-opencv-util/default.nix index ee572a1d3d..d10f32c9e8 100644 --- a/distros/rolling/swri-opencv-util/default.nix +++ b/distros/rolling/swri-opencv-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-opencv-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_opencv_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "f1fad766b652dc8eb02cfd161436aed34fc9d1b06cca9e8af04f0fa2c762cb78"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_opencv_util/3.5.0-1"; + sha256 = "sha256-u1ykAFs+fGYbr3snUioAGivk0DYsUqDo282YqIKqaK0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-prefix-tools/default.nix b/distros/rolling/swri-prefix-tools/default.nix index 0e5777a87e..1b57ea79af 100644 --- a/distros/rolling/swri-prefix-tools/default.nix +++ b/distros/rolling/swri-prefix-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-prefix-tools"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_prefix_tools/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "0291626f67ddc364a648103aac553d21dff885d05ec51ea7475bc757eca307e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_prefix_tools/3.5.0-1"; + sha256 = "sha256-YPzzks6tZxt8XyudUe5w3ph/ys/wbFvqRoqK54Mmnbw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-roscpp/default.nix b/distros/rolling/swri-roscpp/default.nix index 7b5328e99a..1f211ca3d7 100644 --- a/distros/rolling/swri-roscpp/default.nix +++ b/distros/rolling/swri-roscpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-roscpp"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_roscpp/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "a128f247e8bb7917c4cb97f9acb6c0ee3430805a79d40484fafe83acf1dd498c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_roscpp/3.5.0-1"; + sha256 = "sha256-nWJX9PpGrByxGVM3yK8l5QAN6H1Kpdbny7/gkXQMuv4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-cmake rosidl-default-generators ]; diff --git a/distros/rolling/swri-route-util/default.nix b/distros/rolling/swri-route-util/default.nix index bed924505b..97c7693e5e 100644 --- a/distros/rolling/swri-route-util/default.nix +++ b/distros/rolling/swri-route-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-route-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_route_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "9fff9daa045b39b6cc6cb79b048c05e14c95b09d35361dc6b897c3b8ef2d94be"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_route_util/3.5.0-1"; + sha256 = "sha256-WnSzpqSIo5T1gBQEoQnK4M5AS/BIdjR9P+EN7S82TkU="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-serial-util/default.nix b/distros/rolling/swri-serial-util/default.nix index b7cb8cc4fc..cbd3510e74 100644 --- a/distros/rolling/swri-serial-util/default.nix +++ b/distros/rolling/swri-serial-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-serial-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_serial_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "4889fffc716e16871b25e3bb00c2d5c3c6507391e0ddbf275407b6ec528ac92a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_serial_util/3.5.0-1"; + sha256 = "sha256-Ff2Ie0YxBvt2geQf80N9cMCuWEHMc5xd/PzHzrZgtpo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-system-util/default.nix b/distros/rolling/swri-system-util/default.nix index 2273c45e1d..1fed7faf36 100644 --- a/distros/rolling/swri-system-util/default.nix +++ b/distros/rolling/swri-system-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-system-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_system_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "edf464054d300ad29816828e2febf36905c71737727f17931b6df62dae8c57df"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_system_util/3.5.0-1"; + sha256 = "sha256-zXMGodXgwqZkchA0JzvsMY78XdSv5vA0dolw+ihWJlw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/swri-transform-util/default.nix b/distros/rolling/swri-transform-util/default.nix index 716bcd794d..4ab2c07ee8 100644 --- a/distros/rolling/swri-transform-util/default.nix +++ b/distros/rolling/swri-transform-util/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-swri-transform-util"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/marti_common-release/archive/release/rolling/swri_transform_util/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "d8de7ae29965683adc62c9c571dbb2b28496bab14946ec596816ce466e9dc1ba"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "marti_common-release"; + rev = "release/rolling/swri_transform_util/3.5.0-1"; + sha256 = "sha256-mHPtcyvnfeH8fmbssk2y7165KvtP55qdfYHwM6z173I="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python pkg-config ]; diff --git a/distros/rolling/system-fingerprint/default.nix b/distros/rolling/system-fingerprint/default.nix index 2d60cc6f92..50eee4a6a3 100644 --- a/distros/rolling/system-fingerprint/default.nix +++ b/distros/rolling/system-fingerprint/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-system-fingerprint"; version = "0.7.0-r1"; - src = fetchurl { - url = "https://github.com/MetroRobots/ros_system_fingerprint-release/archive/release/rolling/system_fingerprint/0.7.0-1.tar.gz"; - name = "0.7.0-1.tar.gz"; - sha256 = "ebb0db783c2b5bce842577ba9ead1c06f7391863d9990c74e0a3447936605950"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "MetroRobots"; + repo = "ros_system_fingerprint-release"; + rev = "release/rolling/system_fingerprint/0.7.0-1"; + sha256 = "sha256-swG8fwjiFc0LXSlbA6Lml0jlh/VyNS//insRqM01fr0="; + }; buildType = "ament_python"; propagatedBuildInputs = [ python3Packages.GitPython rcl-interfaces rclpy ros2action ros2cli ros2node ros2param ros2topic ]; diff --git a/distros/rolling/system-modes-examples/default.nix b/distros/rolling/system-modes-examples/default.nix index 0d61785b36..587f00357c 100644 --- a/distros/rolling/system-modes-examples/default.nix +++ b/distros/rolling/system-modes-examples/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-system-modes-examples"; version = "0.9.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/system_modes-release/archive/release/rolling/system_modes_examples/0.9.0-3.tar.gz"; - name = "0.9.0-3.tar.gz"; - sha256 = "22a8d0370d2b34b612304128f1167759746aa25f40e11146b3229e8d5349827b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "system_modes-release"; + rev = "release/rolling/system_modes_examples/0.9.0-3"; + sha256 = "sha256-0kfAi8ExAnUicuzTFtWKNQwRZP8qipcdbz4XUrg7EQM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/system-modes-msgs/default.nix b/distros/rolling/system-modes-msgs/default.nix index 14daa723d6..51b8d695e1 100644 --- a/distros/rolling/system-modes-msgs/default.nix +++ b/distros/rolling/system-modes-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-system-modes-msgs"; version = "0.9.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/system_modes-release/archive/release/rolling/system_modes_msgs/0.9.0-3.tar.gz"; - name = "0.9.0-3.tar.gz"; - sha256 = "4566e1cc4c0230373e60ad564de466dc696a6e5edd4b1e872abf33aaaf289721"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "system_modes-release"; + rev = "release/rolling/system_modes_msgs/0.9.0-3"; + sha256 = "sha256-UcVnvMWo1lcz8PljlXg4m53YoUKsphq4TbfgB7Z3dgw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/system-modes/default.nix b/distros/rolling/system-modes/default.nix index 66a6a41f96..ae27a2af70 100644 --- a/distros/rolling/system-modes/default.nix +++ b/distros/rolling/system-modes/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-system-modes"; version = "0.9.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/system_modes-release/archive/release/rolling/system_modes/0.9.0-3.tar.gz"; - name = "0.9.0-3.tar.gz"; - sha256 = "b4a3b3ffaac80752c681c7b2a207934ba67f4215611f822c3730755e99f451ab"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "system_modes-release"; + rev = "release/rolling/system_modes/0.9.0-3"; + sha256 = "sha256-0KjnR6c32kc4yM0vwAGYI1LgRZn4tLfIZSO+UE2llbM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tango-icons-vendor/default.nix b/distros/rolling/tango-icons-vendor/default.nix index e58640c2df..c1c442c987 100644 --- a/distros/rolling/tango-icons-vendor/default.nix +++ b/distros/rolling/tango-icons-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tango-icons-vendor"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tango_icons_vendor-release/archive/release/rolling/tango_icons_vendor/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "131e64ffb3a16805b2c10681ca76ce9bc7a31caa145e29c1d380138d1c6e587d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tango_icons_vendor-release"; + rev = "release/rolling/tango_icons_vendor/0.2.1-1"; + sha256 = "sha256-jO6mYV2nlsljrlsrb3l6CZBT+7cL/PYAMIIRu8V/lxA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tcb-span/default.nix b/distros/rolling/tcb-span/default.nix index 92d4edab00..1db71ee8ed 100644 --- a/distros/rolling/tcb-span/default.nix +++ b/distros/rolling/tcb-span/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tcb-span"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/cpp_polyfills-release/archive/release/rolling/tcb_span/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "a3b5dc73bf67232ba81e762ab2a20e323da48b4ceb75666df1970d5962bf4c64"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "cpp_polyfills-release"; + rev = "release/rolling/tcb_span/1.0.2-1"; + sha256 = "sha256-61JrUYgWw+LJJmryzDfZte0H+hhzDbHqOY1wEyk996Q="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/teleop-tools-msgs/default.nix b/distros/rolling/teleop-tools-msgs/default.nix index 2787b7ac8e..388e4e89e4 100644 --- a/distros/rolling/teleop-tools-msgs/default.nix +++ b/distros/rolling/teleop-tools-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-teleop-tools-msgs"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/rolling/teleop_tools_msgs/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "50e72ddd17c50388d18fa5a6e6de8cf2677fc497d2970ec58a82c0a496cea707"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/rolling/teleop_tools_msgs/1.3.0-2"; + sha256 = "sha256-aJPfIXQj3fiXkpH0V5nGEywzdRvtnKtp2K1qWb/fw30="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/teleop-tools/default.nix b/distros/rolling/teleop-tools/default.nix index cdccd503eb..feda9cd3b6 100644 --- a/distros/rolling/teleop-tools/default.nix +++ b/distros/rolling/teleop-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-teleop-tools"; version = "1.3.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_tools-release/archive/release/rolling/teleop_tools/1.3.0-2.tar.gz"; - name = "1.3.0-2.tar.gz"; - sha256 = "8d254ea63a796f4297a984fce40cb4af29b7f31d763c0bb25a3ac550aa769ea9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_tools-release"; + rev = "release/rolling/teleop_tools/1.3.0-2"; + sha256 = "sha256-48SoF+QzzXtlB3WMrx9sEvMiaOJa+/JBmdQQBKMuTKg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/teleop-twist-joy/default.nix b/distros/rolling/teleop-twist-joy/default.nix index 8ffe31f881..1803980bd2 100644 --- a/distros/rolling/teleop-twist-joy/default.nix +++ b/distros/rolling/teleop-twist-joy/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-teleop-twist-joy"; version = "2.4.3-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_twist_joy-release/archive/release/rolling/teleop_twist_joy/2.4.3-3.tar.gz"; - name = "2.4.3-3.tar.gz"; - sha256 = "f62850479c9b126e35b005294108c56f1f25e01b9fd97abbe9eb5753d129191e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_twist_joy-release"; + rev = "release/rolling/teleop_twist_joy/2.4.3-3"; + sha256 = "sha256-dL2vcoGwprRfLIcvS2fa9spvG3HHSGWWI8YYjmC5MVo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/teleop-twist-keyboard/default.nix b/distros/rolling/teleop-twist-keyboard/default.nix index 9ccbceb5f0..14039473f3 100644 --- a/distros/rolling/teleop-twist-keyboard/default.nix +++ b/distros/rolling/teleop-twist-keyboard/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-teleop-twist-keyboard"; version = "2.3.2-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/teleop_twist_keyboard-release/archive/release/rolling/teleop_twist_keyboard/2.3.2-3.tar.gz"; - name = "2.3.2-3.tar.gz"; - sha256 = "0bd1ab987fa15fde4a131f248bb78bb2790a42ae135ee5e05947bc9cb80fcb3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "teleop_twist_keyboard-release"; + rev = "release/rolling/teleop_twist_keyboard/2.3.2-3"; + sha256 = "sha256-lxwiaJp3eRsvCIRQzNZmogFEOdO5fLDA35rX8PgLx4s="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 ]; diff --git a/distros/rolling/tensorrt-cmake-module/default.nix b/distros/rolling/tensorrt-cmake-module/default.nix index 4f63e181ac..4e6a7f32b8 100644 --- a/distros/rolling/tensorrt-cmake-module/default.nix +++ b/distros/rolling/tensorrt-cmake-module/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tensorrt-cmake-module"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tensorrt_cmake_module-release/archive/release/rolling/tensorrt_cmake_module/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "ff0bfe4b04bb4f508926f7ed610831f120d9650a385ed3b83ff4acaf61236662"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tensorrt_cmake_module-release"; + rev = "release/rolling/tensorrt_cmake_module/0.0.3-1"; + sha256 = "sha256-S620gK89qsxhq1mo2yFSZCD1LP45mJBLXJbCTiT5VZk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/test-apex-test-tools/default.nix b/distros/rolling/test-apex-test-tools/default.nix index 6c90a77574..c7bb56772d 100644 --- a/distros/rolling/test-apex-test-tools/default.nix +++ b/distros/rolling/test-apex-test-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-test-apex-test-tools"; version = "0.0.2-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/apex_test_tools-release/archive/release/rolling/test_apex_test_tools/0.0.2-5.tar.gz"; - name = "0.0.2-5.tar.gz"; - sha256 = "a5befaa9cd938deab9e04f345a492114884a5ba6a4cf399ea9d2c1dd7d9f51b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "apex_test_tools-release"; + rev = "release/rolling/test_apex_test_tools/0.0.2-5"; + sha256 = "sha256-ZB2lhFknuQ+9fA1s+tCKrhHEUOnSLF2ogSsE0tVMrjE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ]; diff --git a/distros/rolling/test-bond/default.nix b/distros/rolling/test-bond/default.nix index afc41ba13e..4261bb681d 100644 --- a/distros/rolling/test-bond/default.nix +++ b/distros/rolling/test-bond/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-test-bond"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/bond_core-release/archive/release/rolling/test_bond/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "2e284328b5de955acf505f9f5aab6ed59a764393912ac48ffd2fc44466e08eaf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "bond_core-release"; + rev = "release/rolling/test_bond/4.0.0-1"; + sha256 = "sha256-fHi349x6QDk41rEy2eRf220CkcMmPbS/gLmad/CmxGQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rclcpp-lifecycle rosidl-default-generators ]; diff --git a/distros/rolling/test-interface-files/default.nix b/distros/rolling/test-interface-files/default.nix index 16b88caf46..8d0a3f432e 100644 --- a/distros/rolling/test-interface-files/default.nix +++ b/distros/rolling/test-interface-files/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-test-interface-files"; version = "0.10.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/test_interface_files-release/archive/release/rolling/test_interface_files/0.10.1-1.tar.gz"; - name = "0.10.1-1.tar.gz"; - sha256 = "1381fdfdce8f744677e61f53033037dc350097d13f134465e18ef427420db44d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "test_interface_files-release"; + rev = "release/rolling/test_interface_files/0.10.1-1"; + sha256 = "sha256-3AU/i9QT2B3zKuYX9lWB57Dl5S8yvThPmGZtZnV0oSY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-core ]; diff --git a/distros/rolling/test-msgs/default.nix b/distros/rolling/test-msgs/default.nix index 15a2613c3d..47c96c9041 100644 --- a/distros/rolling/test-msgs/default.nix +++ b/distros/rolling/test-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-test-msgs"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/rolling/test_msgs/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "e290ba8105408143570cf0b7ac2fadfc71b3ed58160610789e025c46bd0526dc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rcl_interfaces-release"; + rev = "release/rolling/test_msgs/1.3.1-1"; + sha256 = "sha256-IwaV4hm/GwEqM8hkXCGMoJy6lh9Mcij+8hiLUfMGUXs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators test-interface-files ]; diff --git a/distros/rolling/tf-transformations/default.nix b/distros/rolling/tf-transformations/default.nix index 10dac09df2..6eaff0b45c 100644 --- a/distros/rolling/tf-transformations/default.nix +++ b/distros/rolling/tf-transformations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf-transformations"; version = "1.0.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tf_transformations_release/archive/release/rolling/tf_transformations/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "881e752d94bea16e3dcf29fcaea03f5dc71dc1b43c0c7e2d69a294424d5d83eb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tf_transformations_release"; + rev = "release/rolling/tf_transformations/1.0.1-2"; + sha256 = "sha256-ZpntCNRY//B8eLWdIgouelBtxzP77cHw4dIl0MVnAig="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/tf2-bullet/default.nix b/distros/rolling/tf2-bullet/default.nix index 40a5268758..52d0161a72 100644 --- a/distros/rolling/tf2-bullet/default.nix +++ b/distros/rolling/tf2-bullet/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-bullet"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_bullet/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "6ca824e9174b2a7720b0ea5a7bee08014cfda520dfc30b4b068428e38a594101"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_bullet/0.29.0-1"; + sha256 = "sha256-5KYkpLqKvr4NNwQAKWTPGG9ylNeoyPCFOjTf2UVgzpE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tf2-eigen-kdl/default.nix b/distros/rolling/tf2-eigen-kdl/default.nix index 32a7f97e93..cc6bf41dfc 100644 --- a/distros/rolling/tf2-eigen-kdl/default.nix +++ b/distros/rolling/tf2-eigen-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-eigen-kdl"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_eigen_kdl/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "468c4242953d578805858f50d8d5de2fbd90ef05c0ad218ac24db6621cbf82b8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_eigen_kdl/0.29.0-1"; + sha256 = "sha256-f9saPItSyN9G2sJlZ34kBt2m/rigobB7b/mRIA627K8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tf2-eigen/default.nix b/distros/rolling/tf2-eigen/default.nix index 23e2f5d2cf..6903de2daa 100644 --- a/distros/rolling/tf2-eigen/default.nix +++ b/distros/rolling/tf2-eigen/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-eigen"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_eigen/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "4af4ac0e9b1732cc53139c777aa3e166a1ebb6660e169c34130cf0934a734037"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_eigen/0.29.0-1"; + sha256 = "sha256-v6dq93FGe3tGFom0Ft8dcylyyyIS8muA9a4aKXloqO4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tf2-geometry-msgs/default.nix b/distros/rolling/tf2-geometry-msgs/default.nix index 8f2888fab6..2b813f186e 100644 --- a/distros/rolling/tf2-geometry-msgs/default.nix +++ b/distros/rolling/tf2-geometry-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-geometry-msgs"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_geometry_msgs/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "e02df49fe08675b842f30f05a78e871b162c18a5f2139400c50ce7e4989b0044"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_geometry_msgs/0.29.0-1"; + sha256 = "sha256-gSlFfkzd7KVeWtkYWVDq7XbhceeXZM7B8LBwZgMeGeY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python-cmake-module ]; diff --git a/distros/rolling/tf2-kdl/default.nix b/distros/rolling/tf2-kdl/default.nix index 02eeaa215b..b60cf99537 100644 --- a/distros/rolling/tf2-kdl/default.nix +++ b/distros/rolling/tf2-kdl/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-kdl"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_kdl/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "ee688ba79605cd0d33c62f59feec2c211fd28b83b2cc61ceb4d84588cf605ec5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_kdl/0.29.0-1"; + sha256 = "sha256-Bb84mdCPsjVWEYSdbcRO7VNUri2To+A9hMV7Q3YURuA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tf2-msgs/default.nix b/distros/rolling/tf2-msgs/default.nix index ef7e6b93d3..3dd895017e 100644 --- a/distros/rolling/tf2-msgs/default.nix +++ b/distros/rolling/tf2-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-msgs"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_msgs/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "ef3895772ac6312f16db23322f020bf1953dbcd0bd9df969359e2feef953c701"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_msgs/0.29.0-1"; + sha256 = "sha256-woppNm12UxJ9sMq1IFIWk2xiqmyOz17WEQFwexRQQi4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/tf2-py/default.nix b/distros/rolling/tf2-py/default.nix index 6307a658e6..7b5fad38ae 100644 --- a/distros/rolling/tf2-py/default.nix +++ b/distros/rolling/tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-py"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_py/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "b16b2d2a0fc9dd745a3fafa555be5674c107bf4ad059bd8032f8023566d1ddde"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_py/0.29.0-1"; + sha256 = "sha256-rs4ka1ct3bbdhA6YymqPATe5lt+tAHab8Pgb0wCutgs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python-cmake-module ]; diff --git a/distros/rolling/tf2-ros-py/default.nix b/distros/rolling/tf2-ros-py/default.nix index 2f3f33ff08..43ec15a44e 100644 --- a/distros/rolling/tf2-ros-py/default.nix +++ b/distros/rolling/tf2-ros-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-ros-py"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_ros_py/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "edb7111f99ffba4adaeed5b0e55e7ccb2cac4f6b54c84e31fabf9181ad2006b1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_ros_py/0.29.0-1"; + sha256 = "sha256-XEe/38vzwrzVML7dlmALrPbzFct3lasYyHaZ1RHu2Tw="; + }; buildType = "ament_python"; checkInputs = [ pythonPackages.pytest sensor-msgs ]; diff --git a/distros/rolling/tf2-ros/default.nix b/distros/rolling/tf2-ros/default.nix index d20da41efe..f1abc6dab0 100644 --- a/distros/rolling/tf2-ros/default.nix +++ b/distros/rolling/tf2-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-ros"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_ros/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "7c123aa8657c4d1e82ac0f4f48920326c08cb4d61a996189ee18927beaa8e2dd"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_ros/0.29.0-1"; + sha256 = "sha256-y3Oj6Q+lHAz6ZwLM93EYKmZ32/IQ06khevKZo679Byg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tf2-sensor-msgs/default.nix b/distros/rolling/tf2-sensor-msgs/default.nix index 04bafd11cf..8b4767e5ec 100644 --- a/distros/rolling/tf2-sensor-msgs/default.nix +++ b/distros/rolling/tf2-sensor-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-sensor-msgs"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_sensor_msgs/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "7afd19d48890fe77c1afb9a28429ad9fb3ff44d688ce56573332b889183b088c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_sensor_msgs/0.29.0-1"; + sha256 = "sha256-FC5I4DahvJX2jvPM7YWC6jxWvd8JVDgadk/xJUuY2o0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake python-cmake-module ]; diff --git a/distros/rolling/tf2-tools/default.nix b/distros/rolling/tf2-tools/default.nix index fe0ffd5d01..efee743e73 100644 --- a/distros/rolling/tf2-tools/default.nix +++ b/distros/rolling/tf2-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2-tools"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2_tools/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "3403deb722906a74db62d300554b46b512f61c7984cb0ce489fe457788c4601e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2_tools/0.29.0-1"; + sha256 = "sha256-O2GhnxgwFki92CFtEg6GQ+TrcCSDFxv7ECCp+iSkAk4="; + }; buildType = "ament_python"; propagatedBuildInputs = [ graphviz python3Packages.pyyaml rclpy tf2-msgs tf2-py tf2-ros-py ]; diff --git a/distros/rolling/tf2/default.nix b/distros/rolling/tf2/default.nix index 8fedd204f0..77cc15e977 100644 --- a/distros/rolling/tf2/default.nix +++ b/distros/rolling/tf2/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tf2"; version = "0.29.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry2-release/archive/release/rolling/tf2/0.29.0-1.tar.gz"; - name = "0.29.0-1.tar.gz"; - sha256 = "415f7b12414cea936c20cf798729de24e2fbc5baa7219bfafbe7e1eba5e3daa8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry2-release"; + rev = "release/rolling/tf2/0.29.0-1"; + sha256 = "sha256-eVyRohfZ5B3j7pGDRfyJ98sCVFpEx7o+z+mN/NMG2nE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tinyxml-vendor/default.nix b/distros/rolling/tinyxml-vendor/default.nix index 5d79225fd5..6671a9ac52 100644 --- a/distros/rolling/tinyxml-vendor/default.nix +++ b/distros/rolling/tinyxml-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tinyxml-vendor"; version = "0.9.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tinyxml_vendor-release/archive/release/rolling/tinyxml_vendor/0.9.1-1.tar.gz"; - name = "0.9.1-1.tar.gz"; - sha256 = "d5ede0887a3eec472759424a80b91e944ba7098e3800199ed5deb1564528edbf"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tinyxml_vendor-release"; + rev = "release/rolling/tinyxml_vendor/0.9.1-1"; + sha256 = "sha256-Nu4qfaOy6X+DDo9qaDyc2LftGnnBxK/EJnqym/RW6FI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tinyxml2-vendor/default.nix b/distros/rolling/tinyxml2-vendor/default.nix index d129be4697..9d963cec07 100644 --- a/distros/rolling/tinyxml2-vendor/default.nix +++ b/distros/rolling/tinyxml2-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tinyxml2-vendor"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tinyxml2_vendor-release/archive/release/rolling/tinyxml2_vendor/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "f54cbbf818d34a36c5894db97ff270e407b5ee93969525f37f1fc6c2dea9e55c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tinyxml2_vendor-release"; + rev = "release/rolling/tinyxml2_vendor/0.8.1-1"; + sha256 = "sha256-KtntTZbTyH3vrPTou+RXHuYNydh+B86DklG6RaPcsAc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tl-expected/default.nix b/distros/rolling/tl-expected/default.nix index 0b110d5fc0..3c953c8e53 100644 --- a/distros/rolling/tl-expected/default.nix +++ b/distros/rolling/tl-expected/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tl-expected"; version = "1.0.2-r1"; - src = fetchurl { - url = "https://github.com/PickNikRobotics/cpp_polyfills-release/archive/release/rolling/tl_expected/1.0.2-1.tar.gz"; - name = "1.0.2-1.tar.gz"; - sha256 = "56ee09a50d15df38d60afd8a432504d32a7d7953d0322721bac3a70e1e84354b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "PickNikRobotics"; + repo = "cpp_polyfills-release"; + rev = "release/rolling/tl_expected/1.0.2-1"; + sha256 = "sha256-MRDjBU0WqHHPomrtLuNox0zVGvy6aMGTGO8WBV04bF8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tlsf-cpp/default.nix b/distros/rolling/tlsf-cpp/default.nix index f38e770dbb..40ff23ae95 100644 --- a/distros/rolling/tlsf-cpp/default.nix +++ b/distros/rolling/tlsf-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tlsf-cpp"; version = "0.14.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/realtime_support-release/archive/release/rolling/tlsf_cpp/0.14.1-1.tar.gz"; - name = "0.14.1-1.tar.gz"; - sha256 = "a08a84c1b4591b68588fd2c3bd00026ff47b04d658e888d11863d78c37102b45"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "realtime_support-release"; + rev = "release/rolling/tlsf_cpp/0.14.1-1"; + sha256 = "sha256-DaWV684+Cm/krMM9DsgjeESgnjez55kDXWUaa6tgG1E="; + }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common rmw-implementation-cmake ]; diff --git a/distros/rolling/tlsf/default.nix b/distros/rolling/tlsf/default.nix index aab4586d2b..8bd6a1d749 100644 --- a/distros/rolling/tlsf/default.nix +++ b/distros/rolling/tlsf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tlsf"; version = "0.8.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tlsf-release/archive/release/rolling/tlsf/0.8.1-1.tar.gz"; - name = "0.8.1-1.tar.gz"; - sha256 = "630646dacfdc23ca3289df562f57adb46da49b7209eb463785c2b1acb4c9c2bb"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tlsf-release"; + rev = "release/rolling/tlsf/0.8.1-1"; + sha256 = "sha256-J3uDqguM6UDt7W7TOtGgqhQzGzuPTqZkX5b7Tt1Fdfg="; + }; buildType = "ament_cmake"; checkInputs = [ ament-lint-auto ament-lint-common ]; diff --git a/distros/rolling/topic-monitor/default.nix b/distros/rolling/topic-monitor/default.nix index 61f367dc1d..5bf9cfceb7 100644 --- a/distros/rolling/topic-monitor/default.nix +++ b/distros/rolling/topic-monitor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-topic-monitor"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/topic_monitor/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "76108729ebbccf3613948b001eccf56661fc6a8d00c33d98aaefeaab5d7b0211"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/topic_monitor/0.23.0-1"; + sha256 = "sha256-OYeZobhVw+QaDP92iqKpZjmenG+lHGZzFuL01dn/h6g="; + }; buildType = "ament_python"; checkInputs = [ ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/topic-statistics-demo/default.nix b/distros/rolling/topic-statistics-demo/default.nix index 10c63c4963..a3ff47d80c 100644 --- a/distros/rolling/topic-statistics-demo/default.nix +++ b/distros/rolling/topic-statistics-demo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-topic-statistics-demo"; version = "0.23.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/demos-release/archive/release/rolling/topic_statistics_demo/0.23.0-1.tar.gz"; - name = "0.23.0-1.tar.gz"; - sha256 = "73ffe4f6373f0ec1b2020f141a7c27ba5f847178aad6a5fbd20a876a6048f3ee"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "demos-release"; + rev = "release/rolling/topic_statistics_demo/0.23.0-1"; + sha256 = "sha256-2krbIqGwq9e8J53bMsgeYfq9FswD7VYIt/WKu7wtph4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/topic-tools-interfaces/default.nix b/distros/rolling/topic-tools-interfaces/default.nix index 671460a5b7..b0c9a05df5 100644 --- a/distros/rolling/topic-tools-interfaces/default.nix +++ b/distros/rolling/topic-tools-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-topic-tools-interfaces"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/topic_tools-release/archive/release/rolling/topic_tools_interfaces/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "429bed561689b19695ca2526153de526b5ffd49aa7a8c7dc22bdc3a91dd5ff86"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "topic_tools-release"; + rev = "release/rolling/topic_tools_interfaces/1.0.0-1"; + sha256 = "sha256-jgnfd+kmIaH/wQmVa5MUEaJ9j+SDBphMz9LbGAr2uIA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto rosidl-default-generators ]; diff --git a/distros/rolling/topic-tools/default.nix b/distros/rolling/topic-tools/default.nix index 7637bb0664..1c308bac15 100644 --- a/distros/rolling/topic-tools/default.nix +++ b/distros/rolling/topic-tools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-topic-tools"; version = "1.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/topic_tools-release/archive/release/rolling/topic_tools/1.0.0-1.tar.gz"; - name = "1.0.0-1.tar.gz"; - sha256 = "85f47a054aa1965e91a1da22c9d675720c104c0b8854ca910f603234348a11d4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "topic_tools-release"; + rev = "release/rolling/topic_tools/1.0.0-1"; + sha256 = "sha256-FKDmeNP+ucx8c0/wK+m+jHfA3Z/uF5ea6w7yeYPbJMo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto ament-cmake-python rosidl-default-generators ]; diff --git a/distros/rolling/tracetools-acceleration/default.nix b/distros/rolling/tracetools-acceleration/default.nix index e382045eef..3b4eb57f12 100644 --- a/distros/rolling/tracetools-acceleration/default.nix +++ b/distros/rolling/tracetools-acceleration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tracetools-acceleration"; version = "0.4.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tracetools_acceleration-release/archive/release/rolling/tracetools_acceleration/0.4.1-1.tar.gz"; - name = "0.4.1-1.tar.gz"; - sha256 = "79cae6147e1348fbe46ced09cb993e2ec6ae3f320e1ea7d5da5c3acd7f08197a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tracetools_acceleration-release"; + rev = "release/rolling/tracetools_acceleration/0.4.1-1"; + sha256 = "sha256-8S7qrZQ1ohJoEVhAiMPHVKAD4lCTHCfRb1CD5hu4VWg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros pkg-config ]; diff --git a/distros/rolling/tracetools-analysis/default.nix b/distros/rolling/tracetools-analysis/default.nix index 0572ffb366..2eec35a5fe 100644 --- a/distros/rolling/tracetools-analysis/default.nix +++ b/distros/rolling/tracetools-analysis/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tracetools-analysis"; version = "3.0.0-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/tracetools_analysis-release/archive/release/rolling/tracetools_analysis/3.0.0-3.tar.gz"; - name = "3.0.0-3.tar.gz"; - sha256 = "acadde279f90147944b11c8a336b4a4a799c8d6ef90413e873bdf10910bfbab6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "tracetools_analysis-release"; + rev = "release/rolling/tracetools_analysis/3.0.0-3"; + sha256 = "sha256-DPKjLLYf07C3NN4cCJqYVc28MZaOWmDTrLO+g2oyGwA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/rolling/tracetools-image-pipeline/default.nix b/distros/rolling/tracetools-image-pipeline/default.nix index d57e764a3b..4d82c652e5 100644 --- a/distros/rolling/tracetools-image-pipeline/default.nix +++ b/distros/rolling/tracetools-image-pipeline/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tracetools-image-pipeline"; version = "3.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/rolling/tracetools_image_pipeline/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "7cf3dc79a8704ce41aa69f938dd6cd1d4d48bd4d62fb622755277f07c595c1ac"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "image_pipeline-release"; + rev = "release/rolling/tracetools_image_pipeline/3.0.1-1"; + sha256 = "sha256-wyhAnGA7HenH6HHnJ9FcPHXSRF+JySpYmGnjE0R3foM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros pkg-config ]; diff --git a/distros/rolling/tracetools-launch/default.nix b/distros/rolling/tracetools-launch/default.nix index 6a3da62a5c..c3627cff5e 100644 --- a/distros/rolling/tracetools-launch/default.nix +++ b/distros/rolling/tracetools-launch/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tracetools-launch"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/rolling/tracetools_launch/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "470e1940c4fcc6a849694b82a3dedbee9a978f26f57fae345e23532592d0e343"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/rolling/tracetools_launch/4.1.0-1"; + sha256 = "sha256-8a26JRc8MeDa195zozm0E+HQPOg6/ghnrua0du9vnfY="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/rolling/tracetools-test/default.nix b/distros/rolling/tracetools-test/default.nix index 2e4926d918..b1093e353e 100644 --- a/distros/rolling/tracetools-test/default.nix +++ b/distros/rolling/tracetools-test/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tracetools-test"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/rolling/tracetools_test/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "2e3fd452fdadbd3406b3695120a002bf2e1b0735a55c80143fbd37e4747a0126"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/rolling/tracetools_test/4.1.0-1"; + sha256 = "sha256-HSIzb715oYl4GQRBrkJsy10VrxM2HJU0h5sN9el4SOo="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-mypy ament-pep257 ament-xmllint pythonPackages.pytest ]; diff --git a/distros/rolling/tracetools/default.nix b/distros/rolling/tracetools/default.nix index 414b969f80..7abb6169b0 100644 --- a/distros/rolling/tracetools/default.nix +++ b/distros/rolling/tracetools/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-tracetools"; version = "4.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_tracing-release/archive/release/rolling/tracetools/4.1.0-1.tar.gz"; - name = "4.1.0-1.tar.gz"; - sha256 = "394116baf95abe5c0efe8f1237c6ad7416f46707e76f27744ce75d78718c7bc8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_tracing-release"; + rev = "release/rolling/tracetools/4.1.0-1"; + sha256 = "sha256-NRxED+zTyFcamurYD3nxROM/OhPqCnN6f3JAQOdLijY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros pkg-config ]; diff --git a/distros/rolling/trajectory-msgs/default.nix b/distros/rolling/trajectory-msgs/default.nix index 60fae7eaa3..bf2200e615 100644 --- a/distros/rolling/trajectory-msgs/default.nix +++ b/distros/rolling/trajectory-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-trajectory-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/trajectory_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "1382d82197e3c7bb52a50cfc520a9e865e887f059c5da558f0a9a21e64697f50"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/trajectory_msgs/4.6.1-1"; + sha256 = "sha256-wm1BYhiMrky7Klbuqe9V9g+px/RwqYe/YKf00d50h2o="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/transmission-interface/default.nix b/distros/rolling/transmission-interface/default.nix index c8c9f70977..c734aca1af 100644 --- a/distros/rolling/transmission-interface/default.nix +++ b/distros/rolling/transmission-interface/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, hardware-interface, pluginlib }: buildRosPackage { pname = "ros-rolling-transmission-interface"; - version = "3.5.0-r1"; + version = "3.7.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_control-release/archive/release/rolling/transmission_interface/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "d49ecad828052e37c84904cd1d9a2e89881d0e3c8562e75158eef03dc7ef6851"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_control-release"; + rev = "release/rolling/transmission_interface/3.7.0-1"; + sha256 = "sha256-SQkj0arvVNe7gWejjAUdNHMABjzQ1xPYRhcLn5WuKVc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/tricycle-controller/default.nix b/distros/rolling/tricycle-controller/default.nix index ddbcf07521..cfc45873e7 100644 --- a/distros/rolling/tricycle-controller/default.nix +++ b/distros/rolling/tricycle-controller/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ackermann-msgs, ament-cmake, ament-cmake-gmock, controller-interface, controller-manager, geometry-msgs, hardware-interface, nav-msgs, pluginlib, rclcpp, rclcpp-lifecycle, rcpputils, realtime-tools, ros2-control-test-assets, std-srvs, tf2, tf2-msgs }: +{ lib, buildRosPackage, fetchurl, ackermann-msgs, ament-cmake, ament-cmake-gmock, backward-ros, controller-interface, controller-manager, geometry-msgs, hardware-interface, nav-msgs, pluginlib, rclcpp, rclcpp-lifecycle, rcpputils, realtime-tools, ros2-control-test-assets, std-srvs, tf2, tf2-msgs }: buildRosPackage { pname = "ros-rolling-tricycle-controller"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/tricycle_controller/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "169cebd4d5d09f532665f242ab2bc5dfb96878cbb8dbd412730e768dd33d32f5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/tricycle_controller/3.1.0-1"; + sha256 = "sha256-3hBrVAT5i37p/DCyxyf6hcC3Q+LL2BQpyCZwW+Xjly4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager ros2-control-test-assets ]; - propagatedBuildInputs = [ ackermann-msgs controller-interface geometry-msgs hardware-interface nav-msgs rclcpp rclcpp-lifecycle rcpputils realtime-tools std-srvs tf2 tf2-msgs ]; + propagatedBuildInputs = [ ackermann-msgs backward-ros controller-interface geometry-msgs hardware-interface nav-msgs rclcpp rclcpp-lifecycle rcpputils realtime-tools std-srvs tf2 tf2-msgs ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/turbojpeg-compressed-image-transport/default.nix b/distros/rolling/turbojpeg-compressed-image-transport/default.nix index 783b622510..5aebb96451 100644 --- a/distros/rolling/turbojpeg-compressed-image-transport/default.nix +++ b/distros/rolling/turbojpeg-compressed-image-transport/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-turbojpeg-compressed-image-transport"; version = "0.2.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turbojpeg_compressed_image_transport-release/archive/release/rolling/turbojpeg_compressed_image_transport/0.2.1-1.tar.gz"; - name = "0.2.1-1.tar.gz"; - sha256 = "9a7b57d259cdc07818c669af5de471b764d7f3f2828b84f0669cd05ce3c0f065"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turbojpeg_compressed_image_transport-release"; + rev = "release/rolling/turbojpeg_compressed_image_transport/0.2.1-1"; + sha256 = "sha256-290O2WlZeS1IA0hOWZ0GYuYv0yt8SkAIxoz+P3YiVi8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/turtle-tf2-cpp/default.nix b/distros/rolling/turtle-tf2-cpp/default.nix index 6206475ac5..b22e2e2c16 100644 --- a/distros/rolling/turtle-tf2-cpp/default.nix +++ b/distros/rolling/turtle-tf2-cpp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-turtle-tf2-cpp"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/rolling/turtle_tf2_cpp/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "bac4839a62cc5c0a0ebc17d0ab67c53ccd6974b43a130f4102e308e4689e2243"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/rolling/turtle_tf2_cpp/0.3.6-1"; + sha256 = "sha256-/+vZZp6tpMuKd5xAZHma9sMN5Q0aWVwbu5ZnKW6t2nQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/turtle-tf2-py/default.nix b/distros/rolling/turtle-tf2-py/default.nix index 0b38660af6..96ae7bb2e4 100644 --- a/distros/rolling/turtle-tf2-py/default.nix +++ b/distros/rolling/turtle-tf2-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-turtle-tf2-py"; version = "0.3.6-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/geometry_tutorials-release/archive/release/rolling/turtle_tf2_py/0.3.6-1.tar.gz"; - name = "0.3.6-1.tar.gz"; - sha256 = "15393a230bdd0a378120853310cf9458435df11ffb848f741073e334363fa63b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "geometry_tutorials-release"; + rev = "release/rolling/turtle_tf2_py/0.3.6-1"; + sha256 = "sha256-KyrTt9hvh28k8MJ6EaD2AnuC3cH+nNMX5fYPjXkz6AA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/turtlebot3-fake-node/default.nix b/distros/rolling/turtlebot3-fake-node/default.nix index 9038fa5d3c..ccfbe3aabf 100644 --- a/distros/rolling/turtlebot3-fake-node/default.nix +++ b/distros/rolling/turtlebot3-fake-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-turtlebot3-fake-node"; version = "2.2.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turtlebot3_simulations-release/archive/release/rolling/turtlebot3_fake_node/2.2.5-2.tar.gz"; - name = "2.2.5-2.tar.gz"; - sha256 = "219a707a9e23fc6375d1c5be8c55860eea23adbc0d0793e2c517daddc299b05c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turtlebot3_simulations-release"; + rev = "release/rolling/turtlebot3_fake_node/2.2.5-2"; + sha256 = "sha256-RC56Xh4EBNwDvXTRDOIw1kV2Q9fZB4veFuXoOZI3KZA="; + }; buildType = "ament_cmake"; propagatedBuildInputs = [ ament-cmake geometry-msgs nav-msgs rclcpp robot-state-publisher sensor-msgs tf2 tf2-msgs turtlebot3-msgs ]; diff --git a/distros/rolling/turtlebot3-gazebo/default.nix b/distros/rolling/turtlebot3-gazebo/default.nix index f889923c2b..b5997a6668 100644 --- a/distros/rolling/turtlebot3-gazebo/default.nix +++ b/distros/rolling/turtlebot3-gazebo/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-turtlebot3-gazebo"; version = "2.2.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turtlebot3_simulations-release/archive/release/rolling/turtlebot3_gazebo/2.2.5-2.tar.gz"; - name = "2.2.5-2.tar.gz"; - sha256 = "5bcda560d52185893e52feaf9a5f4a00fd88960ee9da00901f28919b323af218"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turtlebot3_simulations-release"; + rev = "release/rolling/turtlebot3_gazebo/2.2.5-2"; + sha256 = "sha256-v6xnRm6M8asU/HVNlinmuyhrm7cTaIuA3aSHJzPeX6c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/turtlebot3-msgs/default.nix b/distros/rolling/turtlebot3-msgs/default.nix index dfb5baf40c..ba8c6e6eb8 100644 --- a/distros/rolling/turtlebot3-msgs/default.nix +++ b/distros/rolling/turtlebot3-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-turtlebot3-msgs"; version = "2.2.1-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turtlebot3_msgs-release/archive/release/rolling/turtlebot3_msgs/2.2.1-2.tar.gz"; - name = "2.2.1-2.tar.gz"; - sha256 = "90c6aaa76a89ec9c300fef177cdcf7944fc92677ee77b74ba2f1610b251785c3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turtlebot3_msgs-release"; + rev = "release/rolling/turtlebot3_msgs/2.2.1-2"; + sha256 = "sha256-AfTC3VY2EzfPdav7DvNaPrB+NM5laHjJRrpSaWfb2Cw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/turtlebot3-simulations/default.nix b/distros/rolling/turtlebot3-simulations/default.nix index 5c44f2c074..0a0555b109 100644 --- a/distros/rolling/turtlebot3-simulations/default.nix +++ b/distros/rolling/turtlebot3-simulations/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-turtlebot3-simulations"; version = "2.2.5-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/turtlebot3_simulations-release/archive/release/rolling/turtlebot3_simulations/2.2.5-2.tar.gz"; - name = "2.2.5-2.tar.gz"; - sha256 = "fead2502c484e06cefbd6681fa5a5b92b9a21af96d99bb608a392084f2a49c9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "turtlebot3_simulations-release"; + rev = "release/rolling/turtlebot3_simulations/2.2.5-2"; + sha256 = "sha256-W+h1Fb5Y9PXr/M12d+YOfwxWR1QaArnZtIDmkpQ95xI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/turtlesim/default.nix b/distros/rolling/turtlesim/default.nix index cad8b50eda..b083a59f4f 100644 --- a/distros/rolling/turtlesim/default.nix +++ b/distros/rolling/turtlesim/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-turtlesim"; version = "1.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros_tutorials-release/archive/release/rolling/turtlesim/1.5.0-1.tar.gz"; - name = "1.5.0-1.tar.gz"; - sha256 = "53ffcb39d35d2a0147ff076ff8d8470102af7fb08ca3af8c8da33be8fdb4e903"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros_tutorials-release"; + rev = "release/rolling/turtlesim/1.5.0-1"; + sha256 = "sha256-QSpCdO40Vz2iZ0bmwtzikSPQdurC/h7YDtDS3LZdP/8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/twist-mux/default.nix b/distros/rolling/twist-mux/default.nix index f467d40553..212c5bbc5d 100644 --- a/distros/rolling/twist-mux/default.nix +++ b/distros/rolling/twist-mux/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-twist-mux"; version = "4.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/twist_mux-release/archive/release/rolling/twist_mux/4.1.0-2.tar.gz"; - name = "4.1.0-2.tar.gz"; - sha256 = "48124c254756d8363be450559ebba526cdb2213c8dff400d3052835694663a3d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "twist_mux-release"; + rev = "release/rolling/twist_mux/4.1.0-2"; + sha256 = "sha256-BoZjLes6uwKLIV+Tt84oPmHntg1LPbq87iB0fQUKtm8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/twist-stamper/default.nix b/distros/rolling/twist-stamper/default.nix index 138a6c2546..cdd1b78296 100644 --- a/distros/rolling/twist-stamper/default.nix +++ b/distros/rolling/twist-stamper/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-twist-stamper"; version = "0.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/twist_stamper-release/archive/release/rolling/twist_stamper/0.0.3-1.tar.gz"; - name = "0.0.3-1.tar.gz"; - sha256 = "8e0dfc633bd1089c68ec3d2a92e58121af884cf1baf6ff44756dca04931f2040"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "twist_stamper-release"; + rev = "release/rolling/twist_stamper/0.0.3-1"; + sha256 = "sha256-AE3PKMNhcFfc7nbMllXSYBoKhQmRVHLCirRpDAEknEQ="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/ublox-dgnss-node/default.nix b/distros/rolling/ublox-dgnss-node/default.nix index afc0c7a0be..6dc1593ae2 100644 --- a/distros/rolling/ublox-dgnss-node/default.nix +++ b/distros/rolling/ublox-dgnss-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ublox-dgnss-node"; version = "0.3.5-r3"; - src = fetchurl { - url = "https://github.com/aussierobots/ublox_dgnss-release/archive/release/rolling/ublox_dgnss_node/0.3.5-3.tar.gz"; - name = "0.3.5-3.tar.gz"; - sha256 = "2b7b44120c15e63f89a029226994dd34986dff7279869d789b920c576a9f2947"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aussierobots"; + repo = "ublox_dgnss-release"; + rev = "release/rolling/ublox_dgnss_node/0.3.5-3"; + sha256 = "sha256-dgX6n6jvaBL2uHtDfImzoDMIddLnQMleaf0VMdCrpTk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pkg-config ]; diff --git a/distros/rolling/ublox-dgnss/default.nix b/distros/rolling/ublox-dgnss/default.nix index 9243cf5346..35e327a55f 100644 --- a/distros/rolling/ublox-dgnss/default.nix +++ b/distros/rolling/ublox-dgnss/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ublox-dgnss"; version = "0.3.5-r3"; - src = fetchurl { - url = "https://github.com/aussierobots/ublox_dgnss-release/archive/release/rolling/ublox_dgnss/0.3.5-3.tar.gz"; - name = "0.3.5-3.tar.gz"; - sha256 = "bc1705b81508739a893d9026d9d0fb2924f58e992cb7811566afbc4411442519"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aussierobots"; + repo = "ublox_dgnss-release"; + rev = "release/rolling/ublox_dgnss/0.3.5-3"; + sha256 = "sha256-J3Q7I3WLW0elfgK+8If2tGBuxll769RKvn278cNuhpI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ublox-gps/default.nix b/distros/rolling/ublox-gps/default.nix index 81af1883df..153e691448 100644 --- a/distros/rolling/ublox-gps/default.nix +++ b/distros/rolling/ublox-gps/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ublox-gps"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/rolling/ublox_gps/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "2a5f1d4ddf93f66e30698517ffbdfc12165576d8e56eb5d831536d47982af5d1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/rolling/ublox_gps/2.3.0-1"; + sha256 = "sha256-reZXChxPuNCtJNjWaATs7ozW63ldzYenGz4KQv8rJ1M="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/ublox-msgs/default.nix b/distros/rolling/ublox-msgs/default.nix index e1bee42c3d..6cf3ed1f32 100644 --- a/distros/rolling/ublox-msgs/default.nix +++ b/distros/rolling/ublox-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ublox-msgs"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/rolling/ublox_msgs/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "61219582db60f388d4058a1ad7729ed3a28681c4f603bf47dea2801025a885a8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/rolling/ublox_msgs/2.3.0-1"; + sha256 = "sha256-y+4Wac/LAoobvoFcSIJ2PGoih6+tPbrMnRKVg6BxUgM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros rosidl-default-generators ]; diff --git a/distros/rolling/ublox-serialization/default.nix b/distros/rolling/ublox-serialization/default.nix index c4c8258af0..170bf7e19d 100644 --- a/distros/rolling/ublox-serialization/default.nix +++ b/distros/rolling/ublox-serialization/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ublox-serialization"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/rolling/ublox_serialization/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "0e4d6445f2910c3235aa35fed4be538d2fac2ff02d8a70f4349ebde10bb25b63"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/rolling/ublox_serialization/2.3.0-1"; + sha256 = "sha256-b2kP01irILk8Ct0RNRYsczUU7sgdAugMNejSpNFPdGE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ublox-ubx-interfaces/default.nix b/distros/rolling/ublox-ubx-interfaces/default.nix index acce9ec83b..0bfc0699a3 100644 --- a/distros/rolling/ublox-ubx-interfaces/default.nix +++ b/distros/rolling/ublox-ubx-interfaces/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ublox-ubx-interfaces"; version = "0.3.5-r3"; - src = fetchurl { - url = "https://github.com/aussierobots/ublox_dgnss-release/archive/release/rolling/ublox_ubx_interfaces/0.3.5-3.tar.gz"; - name = "0.3.5-3.tar.gz"; - sha256 = "5d5a43710b5cdc4f64eb894e6d281c9d36f25c6775d520959c532abc0b10191f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aussierobots"; + repo = "ublox_dgnss-release"; + rev = "release/rolling/ublox_ubx_interfaces/0.3.5-3"; + sha256 = "sha256-LVY7sODWICiAO2EZPOmt5aTlu0ZqjHH4bIgAZfFKbpQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ublox-ubx-msgs/default.nix b/distros/rolling/ublox-ubx-msgs/default.nix index 129a8baa1b..9ba676d548 100644 --- a/distros/rolling/ublox-ubx-msgs/default.nix +++ b/distros/rolling/ublox-ubx-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ublox-ubx-msgs"; version = "0.3.5-r3"; - src = fetchurl { - url = "https://github.com/aussierobots/ublox_dgnss-release/archive/release/rolling/ublox_ubx_msgs/0.3.5-3.tar.gz"; - name = "0.3.5-3.tar.gz"; - sha256 = "bcf4dde70029b70274fee207a5ad71280eb2fa8f0c38e40db83dfd53abab4417"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "aussierobots"; + repo = "ublox_dgnss-release"; + rev = "release/rolling/ublox_ubx_msgs/0.3.5-3"; + sha256 = "sha256-rPeG/k/7UAr25C9ghUPya7+ZwS9svz66lkGJCDlEi6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ublox/default.nix b/distros/rolling/ublox/default.nix index 5ae7978ee8..7b55be9786 100644 --- a/distros/rolling/ublox/default.nix +++ b/distros/rolling/ublox/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ublox"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ublox-release/archive/release/rolling/ublox/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "4c3f56b8074c6e218b6eaf09b39114aaf05a995bef0e57ed8e104afc219f9cd7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ublox-release"; + rev = "release/rolling/ublox/2.3.0-1"; + sha256 = "sha256-tCPY6Wu0TQ0Auvkx3xW6yyreMV7K0GruiyS4AZ29LtI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/udp-driver/default.nix b/distros/rolling/udp-driver/default.nix index 61e52bfd18..1a717637c2 100644 --- a/distros/rolling/udp-driver/default.nix +++ b/distros/rolling/udp-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-udp-driver"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/rolling/udp_driver/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "b7018168c2b9e6696d90c05872bc4d3abcfcb47b79161a1bda9927d13a8efe7b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "transport_drivers-release"; + rev = "release/rolling/udp_driver/1.2.0-1"; + sha256 = "sha256-ufshq3ku5f0OLD1L+CJhsfg8tSqLiOzmXueZGXDO9+4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto asio-cmake-module ]; diff --git a/distros/rolling/udp-msgs/default.nix b/distros/rolling/udp-msgs/default.nix index 33a043084d..1fdfbca410 100644 --- a/distros/rolling/udp-msgs/default.nix +++ b/distros/rolling/udp-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-udp-msgs"; version = "0.0.3-r4"; - src = fetchurl { - url = "https://github.com/ros2-gbp/udp_msgs-release/archive/release/rolling/udp_msgs/0.0.3-4.tar.gz"; - name = "0.0.3-4.tar.gz"; - sha256 = "f24bf58a57cc1903e9902d4979dffb11fb6e10ea6db8b433a45d5d9dfdc5c0ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "udp_msgs-release"; + rev = "release/rolling/udp_msgs/0.0.3-4"; + sha256 = "sha256-sx4NElIdOAb6DTc7eYyAOoSrD8XcZwi129sQhF7Mo4U="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/uncrustify-vendor/default.nix b/distros/rolling/uncrustify-vendor/default.nix index 41b173f5f6..f56ff8b493 100644 --- a/distros/rolling/uncrustify-vendor/default.nix +++ b/distros/rolling/uncrustify-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-uncrustify-vendor"; version = "2.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/uncrustify_vendor-release/archive/release/rolling/uncrustify_vendor/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "cba45b61094b592c842e31b2a257791c7b761d71a0e2e9bfa2ed58ffcd7af89f"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "uncrustify_vendor-release"; + rev = "release/rolling/uncrustify_vendor/2.1.1-1"; + sha256 = "sha256-5Icjrr7e/+P2a/LdkWD50uxr5daT5M0SG04htoqkgPg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/unique-identifier-msgs/default.nix b/distros/rolling/unique-identifier-msgs/default.nix index 870d09e4e6..bff31dadc6 100644 --- a/distros/rolling/unique-identifier-msgs/default.nix +++ b/distros/rolling/unique-identifier-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-unique-identifier-msgs"; version = "2.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/unique_identifier_msgs-release/archive/release/rolling/unique_identifier_msgs/2.3.1-1.tar.gz"; - name = "2.3.1-1.tar.gz"; - sha256 = "8ccd77c6fca634f4511eadeef45eb4d8e841af3b6da932fb67817127dd0aa4a6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "unique_identifier_msgs-release"; + rev = "release/rolling/unique_identifier_msgs/2.3.1-1"; + sha256 = "sha256-FqmSJTXKhYJNGFfYzan04aouvqn5hmHygfypePyo4JM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-core-generators ]; diff --git a/distros/rolling/ur-bringup/default.nix b/distros/rolling/ur-bringup/default.nix index 62a20f1794..158ed546d3 100644 --- a/distros/rolling/ur-bringup/default.nix +++ b/distros/rolling/ur-bringup/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-bringup"; version = "2.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/rolling/ur_bringup/2.2.4-1.tar.gz"; - name = "2.2.4-1.tar.gz"; - sha256 = "6eb1a5bc7f6b707dd7c79af01e776c3be4dfbf21e6a7ab4a19881ba6c9fee75c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/rolling/ur_bringup/2.2.4-1"; + sha256 = "sha256-h6aj5ArlHEimZvvWpSUXLPCS7oqPOxCmhmm7DlF6VYs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/ur-calibration/default.nix b/distros/rolling/ur-calibration/default.nix index d1a84bd3a2..52c188b052 100644 --- a/distros/rolling/ur-calibration/default.nix +++ b/distros/rolling/ur-calibration/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-calibration"; version = "2.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/rolling/ur_calibration/2.2.4-1.tar.gz"; - name = "2.2.4-1.tar.gz"; - sha256 = "c31d4f23462a07b3dc999206312a359d30c18e48b392de5ea4af50f54d0b2d5b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/rolling/ur_calibration/2.2.4-1"; + sha256 = "sha256-Bn39uUtZpLHNwj8umuXrgN1punw8nQSRg2V+gFsRvtQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ur-client-library/default.nix b/distros/rolling/ur-client-library/default.nix index 511c60efd7..459cc0a983 100644 --- a/distros/rolling/ur-client-library/default.nix +++ b/distros/rolling/ur-client-library/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-client-library"; version = "1.3.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_Client_Library-release/archive/release/rolling/ur_client_library/1.3.1-1.tar.gz"; - name = "1.3.1-1.tar.gz"; - sha256 = "09587958067de85f779c5d34d5bea6e3609c0dd54bd80756c219773446fbf4b6"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_Client_Library-release"; + rev = "release/rolling/ur_client_library/1.3.1-1"; + sha256 = "sha256-AYfd94IM+Etv+B7ZUeZWVMNr98mHHmGlCi5CUh8hhWo="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/ur-controllers/default.nix b/distros/rolling/ur-controllers/default.nix index 2f073d9480..0e551f9e01 100644 --- a/distros/rolling/ur-controllers/default.nix +++ b/distros/rolling/ur-controllers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-controllers"; version = "2.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/rolling/ur_controllers/2.2.4-1.tar.gz"; - name = "2.2.4-1.tar.gz"; - sha256 = "3d3bf9102c06ef93e90e6f137ed70c277ab92d74f0b44a263a536216e31c1dd7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/rolling/ur_controllers/2.2.4-1"; + sha256 = "sha256-bexL780riJoMtifn5ZhRN6EgZADCdmVWkzkrJLYwppo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ur-dashboard-msgs/default.nix b/distros/rolling/ur-dashboard-msgs/default.nix index a56ce12a56..3de2826a1f 100644 --- a/distros/rolling/ur-dashboard-msgs/default.nix +++ b/distros/rolling/ur-dashboard-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-dashboard-msgs"; version = "2.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/rolling/ur_dashboard_msgs/2.2.4-1.tar.gz"; - name = "2.2.4-1.tar.gz"; - sha256 = "f68235f74547cf2ae5d441bd8441be5369c8c97ccec9457aa7939f6e81679b21"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/rolling/ur_dashboard_msgs/2.2.4-1"; + sha256 = "sha256-oGoC6bHw9Sp7+F34pKPTP88HzPBYD60UkXEj4GShLxY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/ur-description/default.nix b/distros/rolling/ur-description/default.nix index 9c4fee724f..e927026456 100644 --- a/distros/rolling/ur-description/default.nix +++ b/distros/rolling/ur-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-description"; version = "2.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ur_description-release/archive/release/rolling/ur_description/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "11aa69073665131d6ff777bce50a02327bdc937a0d548abf69034b5695649a22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ur_description-release"; + rev = "release/rolling/ur_description/2.0.1-1"; + sha256 = "sha256-HwCYUYhBBqglRndb1m6f+bgCzr6kJDUZRw43YvYOhMA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/ur-moveit-config/default.nix b/distros/rolling/ur-moveit-config/default.nix index 41c526dfdf..129fda2c89 100644 --- a/distros/rolling/ur-moveit-config/default.nix +++ b/distros/rolling/ur-moveit-config/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-moveit-config"; version = "2.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/rolling/ur_moveit_config/2.2.4-1.tar.gz"; - name = "2.2.4-1.tar.gz"; - sha256 = "0197108a01b800a45743810f559b187224305f6779db62465db2afc0a4b36e58"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/rolling/ur_moveit_config/2.2.4-1"; + sha256 = "sha256-/51Umwvv5YpoaA+PZ9o2Q1EyVjXL0pzDNI1lPH6bgEk="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/ur-msgs/default.nix b/distros/rolling/ur-msgs/default.nix index 2ef661bdc4..08033e78ed 100644 --- a/distros/rolling/ur-msgs/default.nix +++ b/distros/rolling/ur-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-msgs"; version = "2.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ur_msgs-release/archive/release/rolling/ur_msgs/2.0.0-1.tar.gz"; - name = "2.0.0-1.tar.gz"; - sha256 = "ab70bed69aeea1354f8bb31e363692748033d829670d867e3427545183f92d60"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ur_msgs-release"; + rev = "release/rolling/ur_msgs/2.0.0-1"; + sha256 = "sha256-JsglE/PolObyk2tuC9viw8JYmRlBJ8Ym7pjb5k+2EyQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/ur-robot-driver/default.nix b/distros/rolling/ur-robot-driver/default.nix index f3f83efa3a..059f34518a 100644 --- a/distros/rolling/ur-robot-driver/default.nix +++ b/distros/rolling/ur-robot-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur-robot-driver"; version = "2.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/rolling/ur_robot_driver/2.2.4-1.tar.gz"; - name = "2.2.4-1.tar.gz"; - sha256 = "8f2b7ac77a13c822d8b3a829562f8588fce6fec2e20c6e49f6670c7e25813634"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/rolling/ur_robot_driver/2.2.4-1"; + sha256 = "sha256-0/y7LlSJm1bOAHDcrO/Z72GEo5WyM4QXa742ZUM0/cc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/ur/default.nix b/distros/rolling/ur/default.nix index d1f8391cb1..bf0574998f 100644 --- a/distros/rolling/ur/default.nix +++ b/distros/rolling/ur/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-ur"; version = "2.2.4-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/Universal_Robots_ROS2_Driver-release/archive/release/rolling/ur/2.2.4-1.tar.gz"; - name = "2.2.4-1.tar.gz"; - sha256 = "14764db503ec18bea855eb652a7e3634c27d22a435c680b76a5a2c84c113b6d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "Universal_Robots_ROS2_Driver-release"; + rev = "release/rolling/ur/2.2.4-1"; + sha256 = "sha256-UfMmsvIk2Ljz7IA+AYOxC235Qhu+tHU2KYkmlPN8q3s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/urdf-parser-plugin/default.nix b/distros/rolling/urdf-parser-plugin/default.nix index 3804d1fd49..383e8f6a8e 100644 --- a/distros/rolling/urdf-parser-plugin/default.nix +++ b/distros/rolling/urdf-parser-plugin/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urdf-parser-plugin"; version = "2.8.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdf-release/archive/release/rolling/urdf_parser_plugin/2.8.1-1.tar.gz"; - name = "2.8.1-1.tar.gz"; - sha256 = "3b49fc2d265cd24c244d66a806d2dd113568de1a10fdd0c80925dfc559ca1746"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdf-release"; + rev = "release/rolling/urdf_parser_plugin/2.8.1-1"; + sha256 = "sha256-GvZVVTPU2dORkl68Ltsv/Tk1833GJOt6jTK/YE7XqVI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/urdf-tutorial/default.nix b/distros/rolling/urdf-tutorial/default.nix index 7f77d5fb76..75f0b46f7d 100644 --- a/distros/rolling/urdf-tutorial/default.nix +++ b/distros/rolling/urdf-tutorial/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urdf-tutorial"; version = "1.0.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdf_tutorial-release/archive/release/rolling/urdf_tutorial/1.0.0-2.tar.gz"; - name = "1.0.0-2.tar.gz"; - sha256 = "8acac890df9460447afa2164ff982b511f0bcc1f90c1c3d92fd1400a11ee62ec"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdf_tutorial-release"; + rev = "release/rolling/urdf_tutorial/1.0.0-2"; + sha256 = "sha256-dhLNYIbCsYEAiIdUFEka1ZMyW/sJOgJ3xw1t8xI4rhw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/urdf/default.nix b/distros/rolling/urdf/default.nix index fdf3f15271..c2756cf16b 100644 --- a/distros/rolling/urdf/default.nix +++ b/distros/rolling/urdf/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urdf"; version = "2.8.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdf-release/archive/release/rolling/urdf/2.8.1-1.tar.gz"; - name = "2.8.1-1.tar.gz"; - sha256 = "8602aec4cca0c0f6b1871070dd02cf53807d223871ff86a6b548bb4a77e7c3d3"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdf-release"; + rev = "release/rolling/urdf/2.8.1-1"; + sha256 = "sha256-/gqAr+laRZ0eq2iMxE1YCoKqwoFcDWZmBjPxhqL9/k0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/urdfdom-headers/default.nix b/distros/rolling/urdfdom-headers/default.nix index 8e9a839736..e5ff361a20 100644 --- a/distros/rolling/urdfdom-headers/default.nix +++ b/distros/rolling/urdfdom-headers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urdfdom-headers"; version = "1.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom_headers-release/archive/release/rolling/urdfdom_headers/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "ecbc4258054e58e619884f755f106b196d66b0af4ae1e71d7914c8be164fc64a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom_headers-release"; + rev = "release/rolling/urdfdom_headers/1.1.0-1"; + sha256 = "sha256-4mf3RaHsghGv697+Xb06kiguKz9LL0GGW0v7dbd7pBU="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/urdfdom-py/default.nix b/distros/rolling/urdfdom-py/default.nix index 1e1ca38124..76ff02c530 100644 --- a/distros/rolling/urdfdom-py/default.nix +++ b/distros/rolling/urdfdom-py/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urdfdom-py"; version = "1.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom_py-release/archive/release/rolling/urdfdom_py/1.2.0-1.tar.gz"; - name = "1.2.0-1.tar.gz"; - sha256 = "6e7482693ea9002a004b44a3b8db7c4377392a5749378480c519687e0c91b639"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom_py-release"; + rev = "release/rolling/urdfdom_py/1.2.0-1"; + sha256 = "sha256-Wqb94XN1fUWXLJ5rwzsmePzwagB+j2D66m2gHM+RIx4="; + }; buildType = "ament_python"; checkInputs = [ python3Packages.mock ]; diff --git a/distros/rolling/urdfdom/default.nix b/distros/rolling/urdfdom/default.nix index 2822265b35..a908467f91 100644 --- a/distros/rolling/urdfdom/default.nix +++ b/distros/rolling/urdfdom/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urdfdom"; version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urdfdom-release/archive/release/rolling/urdfdom/3.1.0-1.tar.gz"; - name = "3.1.0-1.tar.gz"; - sha256 = "dd657dbb15bca6ae1ab50377cdae82d40c28919e16ac358d86ec1cb4266743a9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urdfdom-release"; + rev = "release/rolling/urdfdom/3.1.0-1"; + sha256 = "sha256-uf1A8WiR0CUX++NOSAeS3g9D3ixzhY/rX9AVp0uBsfg="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/urg-c/default.nix b/distros/rolling/urg-c/default.nix index 2a46a95dcd..88eaa5f6bb 100644 --- a/distros/rolling/urg-c/default.nix +++ b/distros/rolling/urg-c/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urg-c"; version = "1.0.4001-r3"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_c-release/archive/release/rolling/urg_c/1.0.4001-3.tar.gz"; - name = "1.0.4001-3.tar.gz"; - sha256 = "26741360e399f73202bac31bacd0ee0f2b9ac531c22ee1c8eed8a8c528efe4b5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_c-release"; + rev = "release/rolling/urg_c/1.0.4001-3"; + sha256 = "sha256-mLPyvykduwQfjJnXdqEjfbvuc4jn37BwcetdxOLxEGQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/urg-node-msgs/default.nix b/distros/rolling/urg-node-msgs/default.nix index 10d768ef99..50797f9e41 100644 --- a/distros/rolling/urg-node-msgs/default.nix +++ b/distros/rolling/urg-node-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urg-node-msgs"; version = "1.0.1-r5"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_node_msgs-release/archive/release/rolling/urg_node_msgs/1.0.1-5.tar.gz"; - name = "1.0.1-5.tar.gz"; - sha256 = "c10689c2c42d31bd1ac27118547230246b73a4c3d5597d0462dd1019a7ca9071"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_node_msgs-release"; + rev = "release/rolling/urg_node_msgs/1.0.1-5"; + sha256 = "sha256-IBl7J8akPgn5ni5/8kPGDOh4Fklto+RggWCIxGald/w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/urg-node/default.nix b/distros/rolling/urg-node/default.nix index b53c70c7ce..2047d0f64a 100644 --- a/distros/rolling/urg-node/default.nix +++ b/distros/rolling/urg-node/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-urg-node"; version = "1.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/urg_node-release/archive/release/rolling/urg_node/1.1.0-2.tar.gz"; - name = "1.1.0-2.tar.gz"; - sha256 = "920ebf6f719357d93a0224c9a582ad2c4bf3b127b845f0a61fd3f6820ab508c9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "urg_node-release"; + rev = "release/rolling/urg_node/1.1.0-2"; + sha256 = "sha256-5I3MgR4LgAZZ1J5KC5KZBkdkC3dIOB3B+0br1tfGtTc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/usb-cam/default.nix b/distros/rolling/usb-cam/default.nix index 6e005a14ba..87e63a1d7a 100644 --- a/distros/rolling/usb-cam/default.nix +++ b/distros/rolling/usb-cam/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 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, camera-info-manager, ffmpeg, image-transport, image-transport-plugins, rclcpp, rclcpp-components, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, v4l-utils }: +{ lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, camera-info-manager, cv-bridge, ffmpeg, image-transport, image-transport-plugins, rclcpp, rclcpp-components, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs, std-srvs, v4l-utils }: buildRosPackage { pname = "ros-rolling-usb-cam"; - version = "0.4.2-r1"; + version = "0.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/usb_cam-release/archive/release/rolling/usb_cam/0.4.2-1.tar.gz"; - name = "0.4.2-1.tar.gz"; - sha256 = "df406713dce6db302e676d6bb15f5cef47c107b7c88e1bb003f7b9330b07e12c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "usb_cam-release"; + rev = "release/rolling/usb_cam/0.5.0-1"; + sha256 = "sha256-3wjtz8DMgg4mlm03YkmbNjtz/1KJoliSegTaaLLLuRw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-auto rosidl-default-generators ]; - checkInputs = [ ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ builtin-interfaces camera-info-manager ffmpeg image-transport image-transport-plugins rclcpp rclcpp-components rosidl-default-runtime sensor-msgs std-msgs std-srvs v4l-utils ]; + checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ builtin-interfaces camera-info-manager cv-bridge ffmpeg image-transport image-transport-plugins rclcpp rclcpp-components rosidl-default-runtime sensor-msgs std-msgs std-srvs v4l-utils ]; nativeBuildInputs = [ ament-cmake-auto rosidl-default-generators ]; meta = { diff --git a/distros/rolling/v4l2-camera/default.nix b/distros/rolling/v4l2-camera/default.nix index aa80921f51..c9fbb4c078 100644 --- a/distros/rolling/v4l2-camera/default.nix +++ b/distros/rolling/v4l2-camera/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-v4l2-camera"; version = "0.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_v4l2_camera-release/archive/release/rolling/v4l2_camera/0.6.1-1.tar.gz"; - name = "0.6.1-1.tar.gz"; - sha256 = "f5779d7281836abaabbd40b779be732b4d38b273c50c778d0165c7487886746d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_v4l2_camera-release"; + rev = "release/rolling/v4l2_camera/0.6.1-1"; + sha256 = "sha256-6S98n6I3/xURpJWEnmj4IbQ1MRqpVmM45olPZget7ac="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/velocity-controllers/default.nix b/distros/rolling/velocity-controllers/default.nix index 711bd42bc9..86596d39ea 100644 --- a/distros/rolling/velocity-controllers/default.nix +++ b/distros/rolling/velocity-controllers/default.nix @@ -2,21 +2,25 @@ # Copyright 2023 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, controller-manager, forward-command-controller, hardware-interface, pluginlib, rclcpp, ros2-control-test-assets }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gmock, backward-ros, controller-manager, forward-command-controller, hardware-interface, pluginlib, rclcpp, ros2-control-test-assets }: buildRosPackage { pname = "ros-rolling-velocity-controllers"; - version = "2.15.0-r1"; + version = "3.1.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/ros2_controllers-release/archive/release/rolling/velocity_controllers/2.15.0-1.tar.gz"; - name = "2.15.0-1.tar.gz"; - sha256 = "f7a813ae9b5151e007581730c682c45c42e13c010f16e89d05923bfcc105c686"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "ros2_controllers-release"; + rev = "release/rolling/velocity_controllers/3.1.0-1"; + sha256 = "sha256-fnzE2RmfFtAjh0ThMfit+XHEX11zv66e2Eb3gOsgKhg="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake pluginlib ]; checkInputs = [ ament-cmake-gmock controller-manager hardware-interface ros2-control-test-assets ]; - propagatedBuildInputs = [ forward-command-controller rclcpp ]; + propagatedBuildInputs = [ backward-ros forward-command-controller rclcpp ]; nativeBuildInputs = [ ament-cmake ]; meta = { diff --git a/distros/rolling/velodyne-description/default.nix b/distros/rolling/velodyne-description/default.nix index e17e0ef469..aa5c321244 100644 --- a/distros/rolling/velodyne-description/default.nix +++ b/distros/rolling/velodyne-description/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-velodyne-description"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/rolling/velodyne_description/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "da8478663e6a15130d1a4ebe103098d6f48362e2fcc02d7f401e39f4f410341e"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/rolling/velodyne_description/2.0.3-1"; + sha256 = "sha256-vYig3j3DqPeSuEmGlDfvaH64IGdK8x/Yxx40R/Sv5j4="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/velodyne-driver/default.nix b/distros/rolling/velodyne-driver/default.nix index 754373146a..d46570d64f 100644 --- a/distros/rolling/velodyne-driver/default.nix +++ b/distros/rolling/velodyne-driver/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-velodyne-driver"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/rolling/velodyne_driver/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "7d62b118cc1cb55a95af0ae98eef1b3380c9a841815cb70276c75b194ecd7700"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/rolling/velodyne_driver/2.3.0-1"; + sha256 = "sha256-9ysVDD9seg0Ss+VilOfbSs7ysVE2cxvVHaHR3kj+yKQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/velodyne-gazebo-plugins/default.nix b/distros/rolling/velodyne-gazebo-plugins/default.nix index 4580bc2cb4..7f9c780fe8 100644 --- a/distros/rolling/velodyne-gazebo-plugins/default.nix +++ b/distros/rolling/velodyne-gazebo-plugins/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-velodyne-gazebo-plugins"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/rolling/velodyne_gazebo_plugins/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "53869a13cc47a14758dca052b5fd042d7cbffbf05584d2e28e67f347579364e9"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/rolling/velodyne_gazebo_plugins/2.0.3-1"; + sha256 = "sha256-TFxh7d/7+m5z05amlR634rbaqZYAHs06SxUx3ZlM/NI="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/velodyne-laserscan/default.nix b/distros/rolling/velodyne-laserscan/default.nix index 233e2705c3..9cc95ab69e 100644 --- a/distros/rolling/velodyne-laserscan/default.nix +++ b/distros/rolling/velodyne-laserscan/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-velodyne-laserscan"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/rolling/velodyne_laserscan/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "8d80b21878b861daeac62b827dcbeb2df427d3aba44056c539e3564b4748c856"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/rolling/velodyne_laserscan/2.3.0-1"; + sha256 = "sha256-rSKlfJVrsBMOdfguEVxqRmL3bNJiRLJsyy6iTcxdfKY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/velodyne-msgs/default.nix b/distros/rolling/velodyne-msgs/default.nix index 18c423f0b8..0193a39241 100644 --- a/distros/rolling/velodyne-msgs/default.nix +++ b/distros/rolling/velodyne-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-velodyne-msgs"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/rolling/velodyne_msgs/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "2551431e32dd2da22050b1cd23fb7784771e58c2e592dc72ee1732caf6489e46"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/rolling/velodyne_msgs/2.3.0-1"; + sha256 = "sha256-5Ak6A/tW8O/xY1B8LoKlY6GJfvga1cnajGYEKb7eKFo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/velodyne-pointcloud/default.nix b/distros/rolling/velodyne-pointcloud/default.nix index e679e726ff..66aaf1aee6 100644 --- a/distros/rolling/velodyne-pointcloud/default.nix +++ b/distros/rolling/velodyne-pointcloud/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-velodyne-pointcloud"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/rolling/velodyne_pointcloud/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "d010b8bd6a056984bc45d8e37633ba882c74ad8b9b69d733d051d8728bcc3883"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/rolling/velodyne_pointcloud/2.3.0-1"; + sha256 = "sha256-hkvzuZw8cF8+XSVnSmlVOPLOTlg7vhtPoqd1gNK0mo8="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/velodyne-simulator/default.nix b/distros/rolling/velodyne-simulator/default.nix index 62dc2d717c..5c9a9b7ab5 100644 --- a/distros/rolling/velodyne-simulator/default.nix +++ b/distros/rolling/velodyne-simulator/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-velodyne-simulator"; version = "2.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne_simulator-release/archive/release/rolling/velodyne_simulator/2.0.3-1.tar.gz"; - name = "2.0.3-1.tar.gz"; - sha256 = "0cc9caba88cdb994911556e11f0a0eb02c8c788a84eefdb5b8c242a73e801bd8"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne_simulator-release"; + rev = "release/rolling/velodyne_simulator/2.0.3-1"; + sha256 = "sha256-Cu17nhMENoRv3E5+1HvQyw35oWBdZXPr9BQ3APt4Q0c="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/velodyne/default.nix b/distros/rolling/velodyne/default.nix index abc430c275..3d5c03ed0b 100644 --- a/distros/rolling/velodyne/default.nix +++ b/distros/rolling/velodyne/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-velodyne"; version = "2.3.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/velodyne-release/archive/release/rolling/velodyne/2.3.0-1.tar.gz"; - name = "2.3.0-1.tar.gz"; - sha256 = "eddf7726e9a0b0a7fb2f08ee1873c1da229c96e39c4cb65709d7ef945cb60df1"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "velodyne-release"; + rev = "release/rolling/velodyne/2.3.0-1"; + sha256 = "sha256-Wr9qH+muZay+hoPYPI7pJRs11jWr4I26LKKsmaWL/4A="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/vision-msgs-layers/default.nix b/distros/rolling/vision-msgs-layers/default.nix index 8bb78be960..4b08b80563 100644 --- a/distros/rolling/vision-msgs-layers/default.nix +++ b/distros/rolling/vision-msgs-layers/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-vision-msgs-layers"; version = "0.2.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_msgs_layers-release/archive/release/rolling/vision_msgs_layers/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "8b483e937d93f61877b6b8e62b9a23d828bd5ea0cfde19d689d43786dc3db8b4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_msgs_layers-release"; + rev = "release/rolling/vision_msgs_layers/0.2.0-1"; + sha256 = "sha256-/AF+whPTfuXAf3vP/iP6XQf4SZFSuJjxb7oQ61JEiGs="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake-ros ]; diff --git a/distros/rolling/vision-msgs/default.nix b/distros/rolling/vision-msgs/default.nix index 557ea63143..742ceee8f9 100644 --- a/distros/rolling/vision-msgs/default.nix +++ b/distros/rolling/vision-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-vision-msgs"; version = "4.0.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_msgs-release/archive/release/rolling/vision_msgs/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "866a8053e18846595c64fc071b11bd11e82a5757482b5cdc5852a16310bc7295"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_msgs-release"; + rev = "release/rolling/vision_msgs/4.0.0-1"; + sha256 = "sha256-eow1ZEywd5gzzb1zifOk/GXuWnmCrFL4gM1Iq7qN7wo="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/vision-opencv/default.nix b/distros/rolling/vision-opencv/default.nix index 23463e5b2f..da098569a3 100644 --- a/distros/rolling/vision-opencv/default.nix +++ b/distros/rolling/vision-opencv/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-vision-opencv"; version = "3.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/rolling/vision_opencv/3.4.0-1.tar.gz"; - name = "3.4.0-1.tar.gz"; - sha256 = "033dae23f69686b5ba893014c13da0d8163993dfa214df5c25db9986aa0614f7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vision_opencv-release"; + rev = "release/rolling/vision_opencv/3.4.0-1"; + sha256 = "sha256-2CylWlOKFX9tKPCMJAKCgM6cLIbp6UTLWTWgs+T2cm0="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/visp/default.nix b/distros/rolling/visp/default.nix index 2dddec5402..b6a5a6ca7c 100644 --- a/distros/rolling/visp/default.nix +++ b/distros/rolling/visp/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-visp"; version = "3.5.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/visp-release/archive/release/rolling/visp/3.5.0-1.tar.gz"; - name = "3.5.0-1.tar.gz"; - sha256 = "0998d6d4f7510b9af4b7f665ce6848bff094fb8889079c6e5467e00e74aade22"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "visp-release"; + rev = "release/rolling/visp/3.5.0-1"; + sha256 = "sha256-nMrdYB+RessgluLVeY69cP1jA4ucoAfcxyaNk1gyiSQ="; + }; buildType = "cmake"; buildInputs = [ bzip2 cmake doxygen ]; diff --git a/distros/rolling/visualization-msgs/default.nix b/distros/rolling/visualization-msgs/default.nix index e25b0d7492..8fad666bef 100644 --- a/distros/rolling/visualization-msgs/default.nix +++ b/distros/rolling/visualization-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-visualization-msgs"; version = "4.6.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/rolling/visualization_msgs/4.6.1-1.tar.gz"; - name = "4.6.1-1.tar.gz"; - sha256 = "b32f2a8fb12f49eff0956253264785bf7ebd36bb74cd822922fa33209e573e6c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "common_interfaces-release"; + rev = "release/rolling/visualization_msgs/4.6.1-1"; + sha256 = "sha256-KOzvLHLIOeAb2tSg9IABJXfRGKcu5Gk2KiaqNiWgX2s="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/vrpn-mocap/default.nix b/distros/rolling/vrpn-mocap/default.nix index dd347c0ae8..aecf665db6 100644 --- a/distros/rolling/vrpn-mocap/default.nix +++ b/distros/rolling/vrpn-mocap/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-vrpn-mocap"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vrpn_mocap-release/archive/release/rolling/vrpn_mocap/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "8a1397427621f3cfd5726641852ca87eeb312d74c6fe4101bc461f3a16393a95"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vrpn_mocap-release"; + rev = "release/rolling/vrpn_mocap/1.0.3-1"; + sha256 = "sha256-yghDg5y4lcHd2MvyCvl/reTksyFDaIp0sHv/j9nlSSQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake eigen eigen3-cmake-module ]; diff --git a/distros/rolling/vrpn/default.nix b/distros/rolling/vrpn/default.nix index 70dd6e1b13..ed3c762be7 100644 --- a/distros/rolling/vrpn/default.nix +++ b/distros/rolling/vrpn/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-vrpn"; version = "7.35.0-r11"; - src = fetchurl { - url = "https://github.com/ros2-gbp/vrpn-release/archive/release/rolling/vrpn/7.35.0-11.tar.gz"; - name = "7.35.0-11.tar.gz"; - sha256 = "3889148a382191cb13c669d54f56e4355c95c2ba27c0a351785b64e06ff940d2"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "vrpn-release"; + rev = "release/rolling/vrpn/7.35.0-11"; + sha256 = "sha256-gVABNgsOIA99lKIlrcjjsnCvXMYzmJtNB/5AH1Im0Wc="; + }; buildType = "cmake"; buildInputs = [ cmake ]; diff --git a/distros/rolling/warehouse-ros-sqlite/default.nix b/distros/rolling/warehouse-ros-sqlite/default.nix index 01e6f5996b..b8fc25de83 100644 --- a/distros/rolling/warehouse-ros-sqlite/default.nix +++ b/distros/rolling/warehouse-ros-sqlite/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-warehouse-ros-sqlite"; version = "1.0.3-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/warehouse_ros_sqlite-release/archive/release/rolling/warehouse_ros_sqlite/1.0.3-1.tar.gz"; - name = "1.0.3-1.tar.gz"; - sha256 = "26885ba506f88fc802d26132322855b21eee8b20c7a29b8549df363b585f7f4c"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "warehouse_ros_sqlite-release"; + rev = "release/rolling/warehouse_ros_sqlite/1.0.3-1"; + sha256 = "sha256-JavUpzsS5NkJHqZj/lSXLsAOzHX5D/KrEHOhGM/AgLc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake boost sqlite3-vendor ]; diff --git a/distros/rolling/warehouse-ros/default.nix b/distros/rolling/warehouse-ros/default.nix index 2bdb9bde01..ebc09dc11a 100644 --- a/distros/rolling/warehouse-ros/default.nix +++ b/distros/rolling/warehouse-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-warehouse-ros"; version = "2.0.4-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/warehouse_ros-release/archive/release/rolling/warehouse_ros/2.0.4-2.tar.gz"; - name = "2.0.4-2.tar.gz"; - sha256 = "6ae86a7e2b555e0834061b9613f22c6bc90d5c45940f46ddefa0dded49c6d9e7"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "warehouse_ros-release"; + rev = "release/rolling/warehouse_ros/2.0.4-2"; + sha256 = "sha256-89Ku8Zth68EgdS2DXIeyBjbm75ZItsbMZ0ZbKGlw6Fw="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/webots-ros2-control/default.nix b/distros/rolling/webots-ros2-control/default.nix index 3ba5249f9b..bf4cfa7c8c 100644 --- a/distros/rolling/webots-ros2-control/default.nix +++ b/distros/rolling/webots-ros2-control/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, controller-manager, hardware-interface, pluginlib, rclcpp, rclcpp-lifecycle, ros-environment, webots-ros2-driver }: buildRosPackage { pname = "ros-rolling-webots-ros2-control"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_control/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "9829d9837ecee66d3b458860d2d3f128d654cd3b7a5219b87d417f0de069035b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_control/2023.0.1-1"; + sha256 = "sha256-SM/EQUSPfLDsUAKMxiDclz2mOrICDzzifBh2mcsYkkQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ros-environment ]; diff --git a/distros/rolling/webots-ros2-driver/default.nix b/distros/rolling/webots-ros2-driver/default.nix index 4d14731017..c1f30c2adf 100644 --- a/distros/rolling/webots-ros2-driver/default.nix +++ b/distros/rolling/webots-ros2-driver/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-python, ament-lint-auto, ament-lint-common, geometry-msgs, pluginlib, python-cmake-module, rclcpp, rclpy, ros-environment, sensor-msgs, std-msgs, tf2-geometry-msgs, tf2-ros, tinyxml2-vendor, vision-msgs, webots-ros2-importer, webots-ros2-msgs }: buildRosPackage { pname = "ros-rolling-webots-ros2-driver"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_driver/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "06c2eef595e5765c73b6e66494c33fff173358e2f6e05907a96b5878cc783b0d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_driver/2023.0.1-1"; + sha256 = "sha256-cGbN+t3wzKf69CSiaHXDIKrCXGt169XkVBz35UVgpOY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python python-cmake-module ros-environment ]; diff --git a/distros/rolling/webots-ros2-epuck/default.nix b/distros/rolling/webots-ros2-epuck/default.nix index 1f0af72de1..5b06b095db 100644 --- a/distros/rolling/webots-ros2-epuck/default.nix +++ b/distros/rolling/webots-ros2-epuck/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, geometry-msgs, joint-state-broadcaster, nav-msgs, pythonPackages, rclpy, robot-state-publisher, rviz2, sensor-msgs, std-msgs, tf2-ros, webots-ros2-control, webots-ros2-driver, webots-ros2-msgs }: buildRosPackage { pname = "ros-rolling-webots-ros2-epuck"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_epuck/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "7e61e15302aa0d33fd23e83d2749a0ffdca4f850ba416f61109ec8a5a4b3bd9b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_epuck/2023.0.1-1"; + sha256 = "sha256-BjZSzpiGfYr8DnNk9Vsqbf1kSB2Yu1uLi+BozXj9esM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/webots-ros2-importer/default.nix b/distros/rolling/webots-ros2-importer/default.nix index 957fde458c..8047d579d6 100644 --- a/distros/rolling/webots-ros2-importer/default.nix +++ b/distros/rolling/webots-ros2-importer/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, python3Packages, pythonPackages, xacro }: buildRosPackage { pname = "ros-rolling-webots-ros2-importer"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_importer/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "b1cc85c7ffc9ad9e317ab1fc3674882b2edfa475a7956373a21465cdf925065d"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_importer/2023.0.1-1"; + sha256 = "sha256-IBlBrHZwPwyVdg6JNxe62ePHR18YugJysO0Tj1IpF54="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 python3Packages.numpy python3Packages.pillow python3Packages.pycodestyle pythonPackages.pytest ]; diff --git a/distros/rolling/webots-ros2-mavic/default.nix b/distros/rolling/webots-ros2-mavic/default.nix index 324b132251..bdcf15f902 100644 --- a/distros/rolling/webots-ros2-mavic/default.nix +++ b/distros/rolling/webots-ros2-mavic/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, pythonPackages, rclpy, webots-ros2-driver }: buildRosPackage { pname = "ros-rolling-webots-ros2-mavic"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_mavic/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "421e1ef732d1f737fd78731d6c605578722c3548cfc013d7b0c5b3dc0a553b6a"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_mavic/2023.0.1-1"; + sha256 = "sha256-7yYbTKp0l3xBdOTQ507AzzgUdMeAXb9IqUsJrzmMi6g="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/webots-ros2-msgs/default.nix b/distros/rolling/webots-ros2-msgs/default.nix index bbced9080c..58f068b821 100644 --- a/distros/rolling/webots-ros2-msgs/default.nix +++ b/distros/rolling/webots-ros2-msgs/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, builtin-interfaces, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs, vision-msgs }: buildRosPackage { pname = "ros-rolling-webots-ros2-msgs"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_msgs/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "3c29b5200e3a8c15f6ad29d2606edd9391d12d34e889999feeca35d1859bdfd4"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_msgs/2023.0.1-1"; + sha256 = "sha256-iu6eAQ1PiJ375beMsfM6eWJrynXiZaWP7m5Qo9zGhbA="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake rosidl-default-generators ]; diff --git a/distros/rolling/webots-ros2-tesla/default.nix b/distros/rolling/webots-ros2-tesla/default.nix index eed9025f66..5b1bdfa714 100644 --- a/distros/rolling/webots-ros2-tesla/default.nix +++ b/distros/rolling/webots-ros2-tesla/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ackermann-msgs, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, python3Packages, pythonPackages, rclpy, webots-ros2-driver }: buildRosPackage { pname = "ros-rolling-webots-ros2-tesla"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_tesla/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "1d3f05900d82995ee2fb0e5ca0a7c8f78c9609833ceb48cfb1c8c055fc396692"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_tesla/2023.0.1-1"; + sha256 = "sha256-ExnlF/FXLh6KhkMekyuMXzd6+Xj+Umqh/KgcWZEb4Fg="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/webots-ros2-tests/default.nix b/distros/rolling/webots-ros2-tests/default.nix index 896a5dafaa..4a76ac554b 100644 --- a/distros/rolling/webots-ros2-tests/default.nix +++ b/distros/rolling/webots-ros2-tests/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, geometry-msgs, launch, launch-testing, launch-testing-ament-cmake, launch-testing-ros, pythonPackages, rclpy, ros2bag, rosbag2-storage-default-plugins, sensor-msgs, std-msgs, std-srvs, tf2-ros, webots-ros2-driver, webots-ros2-epuck, webots-ros2-mavic, webots-ros2-tesla, webots-ros2-tiago, webots-ros2-turtlebot, webots-ros2-universal-robot }: buildRosPackage { pname = "ros-rolling-webots-ros2-tests"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_tests/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "f9613c80fb5a58bd37a9d66b40f32f2ff2edeac5524ef8c0cff1c9b9df0bc6ed"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_tests/2023.0.1-1"; + sha256 = "sha256-G4fCYbkt7CFYrvblNCbmbPHftEI7DANBT+de3OKx2L4="; + }; buildType = "ament_python"; buildInputs = [ rclpy ros2bag rosbag2-storage-default-plugins webots-ros2-driver ]; diff --git a/distros/rolling/webots-ros2-tiago/default.nix b/distros/rolling/webots-ros2-tiago/default.nix index b4b453f35d..c330728cae 100644 --- a/distros/rolling/webots-ros2-tiago/default.nix +++ b/distros/rolling/webots-ros2-tiago/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, geometry-msgs, joint-state-broadcaster, pythonPackages, rclpy, robot-state-publisher, rviz2, tf2-ros, webots-ros2-control, webots-ros2-driver }: buildRosPackage { pname = "ros-rolling-webots-ros2-tiago"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_tiago/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "3af3ed22b0c61b0e52b1d1cc885fd002d6777efa19ff97c18798fa7f6900f665"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_tiago/2023.0.1-1"; + sha256 = "sha256-DIeE3GdW11x3tV1eygCv/wGQFQ9kQYE/OTOs7h930HM="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/webots-ros2-turtlebot/default.nix b/distros/rolling/webots-ros2-turtlebot/default.nix index f180894915..912009e435 100644 --- a/distros/rolling/webots-ros2-turtlebot/default.nix +++ b/distros/rolling/webots-ros2-turtlebot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, controller-manager, diff-drive-controller, joint-state-broadcaster, pythonPackages, rclpy, robot-state-publisher, rviz2, tf2-ros, webots-ros2-control, webots-ros2-driver }: buildRosPackage { pname = "ros-rolling-webots-ros2-turtlebot"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_turtlebot/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "afcc4b45d75d69e456cc99dd315291c63aae2bca04627d1894f5482ab56d8e6b"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_turtlebot/2023.0.1-1"; + sha256 = "sha256-HgqpqoYT1hvAjoFRmb0Q0hpGDTc0UaGTfBYnhG+FRaw="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/webots-ros2-universal-robot/default.nix b/distros/rolling/webots-ros2-universal-robot/default.nix index 133999efcc..551ee3b59e 100644 --- a/distros/rolling/webots-ros2-universal-robot/default.nix +++ b/distros/rolling/webots-ros2-universal-robot/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, control-msgs, controller-manager, joint-state-broadcaster, joint-trajectory-controller, pythonPackages, rclpy, robot-state-publisher, rviz2, trajectory-msgs, webots-ros2-control, webots-ros2-driver, xacro }: buildRosPackage { pname = "ros-rolling-webots-ros2-universal-robot"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2_universal_robot/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "92bf3d3a0d578903b125cd429149f60eb5798d24d8f6129e41e32eb5fe34e254"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2_universal_robot/2023.0.1-1"; + sha256 = "sha256-2f5hfF2f1jSIUgifFrAFNdhBGbbVLMijz5WZm5udcWA="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest ]; diff --git a/distros/rolling/webots-ros2/default.nix b/distros/rolling/webots-ros2/default.nix index a876e558e8..246df40575 100644 --- a/distros/rolling/webots-ros2/default.nix +++ b/distros/rolling/webots-ros2/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-copyright, ament-flake8, ament-pep257, builtin-interfaces, pythonPackages, rclpy, std-msgs, webots-ros2-control, webots-ros2-driver, webots-ros2-epuck, webots-ros2-importer, webots-ros2-mavic, webots-ros2-msgs, webots-ros2-tesla, webots-ros2-tests, webots-ros2-tiago, webots-ros2-turtlebot, webots-ros2-universal-robot }: buildRosPackage { pname = "ros-rolling-webots-ros2"; - version = "2023.0.0-r3"; + version = "2023.0.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/webots_ros2-release/archive/release/rolling/webots_ros2/2023.0.0-3.tar.gz"; - name = "2023.0.0-3.tar.gz"; - sha256 = "37a15dac9f7ae809b6b179f26e7caa4bbe69fabae37ce43f6111ff0596583d16"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "webots_ros2-release"; + rev = "release/rolling/webots_ros2/2023.0.1-1"; + sha256 = "sha256-qI4kmyOLqwwHbHNjhcO59V7MW2hTRVKCma8v1h4GUds="; + }; buildType = "ament_python"; checkInputs = [ ament-copyright ament-flake8 ament-pep257 pythonPackages.pytest webots-ros2-tests ]; diff --git a/distros/rolling/wiimote-msgs/default.nix b/distros/rolling/wiimote-msgs/default.nix index 53861228ee..dbd956a8c5 100644 --- a/distros/rolling/wiimote-msgs/default.nix +++ b/distros/rolling/wiimote-msgs/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-wiimote-msgs"; version = "3.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/rolling/wiimote_msgs/3.1.0-2.tar.gz"; - name = "3.1.0-2.tar.gz"; - sha256 = "b5e8949a83c8873eb26e80e5c4e32755e86b1d0e56b8613494bff75b6cb20383"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/rolling/wiimote_msgs/3.1.0-2"; + sha256 = "sha256-KavdFBcL1SCgiOn8dA8NfytenhAUvYfbx6ij02ufZyE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto rosidl-default-generators ]; diff --git a/distros/rolling/wiimote/default.nix b/distros/rolling/wiimote/default.nix index d73d3604b3..0b19351f1e 100644 --- a/distros/rolling/wiimote/default.nix +++ b/distros/rolling/wiimote/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-wiimote"; version = "3.1.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/rolling/wiimote/3.1.0-2.tar.gz"; - name = "3.1.0-2.tar.gz"; - sha256 = "6b4fe2c189f4a1215c02728c2eefe9814586fb88921e6afc221f30fffb9f2a92"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "joystick_drivers-release"; + rev = "release/rolling/wiimote/3.1.0-2"; + sha256 = "sha256-tmTuJsuid0a70I48V0kdL+odWCPg4/C6sdR519Ur1LE="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-auto ]; diff --git a/distros/rolling/xacro/default.nix b/distros/rolling/xacro/default.nix index 11182e6bb2..505c7c084a 100644 --- a/distros/rolling/xacro/default.nix +++ b/distros/rolling/xacro/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-xacro"; version = "2.0.8-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/xacro-release/archive/release/rolling/xacro/2.0.8-1.tar.gz"; - name = "2.0.8-1.tar.gz"; - sha256 = "c6e2d4b00816c2120528bd8d22495a4b8b0694198805c9a8796054d1a3c8b512"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "xacro-release"; + rev = "release/rolling/xacro/2.0.8-1"; + sha256 = "sha256-eAuqlK08Wgyt7c0NWvvi60x2oEt++k2Ppnn8YOQoufc="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ament-cmake-python ]; diff --git a/distros/rolling/yaml-cpp-vendor/default.nix b/distros/rolling/yaml-cpp-vendor/default.nix index 2e32ead8bf..2f29db451b 100644 --- a/distros/rolling/yaml-cpp-vendor/default.nix +++ b/distros/rolling/yaml-cpp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-yaml-cpp-vendor"; version = "8.1.1-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/yaml_cpp_vendor-release/archive/release/rolling/yaml_cpp_vendor/8.1.1-1.tar.gz"; - name = "8.1.1-1.tar.gz"; - sha256 = "0ba2a5db2f0068505303360ba14cea5c4a537e303679ec97aa4565b7a05a39a5"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "yaml_cpp_vendor-release"; + rev = "release/rolling/yaml_cpp_vendor/8.1.1-1"; + sha256 = "sha256-r5BsVUE1jkb6vXEI4N+nkM7M4XIzIjvW9Yflnx013AM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/zbar-ros/default.nix b/distros/rolling/zbar-ros/default.nix index 5fc226845e..31ab3bc9b6 100644 --- a/distros/rolling/zbar-ros/default.nix +++ b/distros/rolling/zbar-ros/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-zbar-ros"; version = "0.4.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/zbar_ros-release/archive/release/rolling/zbar_ros/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "c57f69f1e06ea8ecdae50b7c23775df7c92911170ec2cf23b798c47d350126ff"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "zbar_ros-release"; + rev = "release/rolling/zbar_ros/0.4.0-1"; + sha256 = "sha256-VbtkI6w674F8iQfEUF7oqkRf33wX0JYpbeoKk3vGQpQ="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake ]; diff --git a/distros/rolling/zenoh-bridge-dds/default.nix b/distros/rolling/zenoh-bridge-dds/default.nix index a1354037fd..fc6c8f871a 100644 --- a/distros/rolling/zenoh-bridge-dds/default.nix +++ b/distros/rolling/zenoh-bridge-dds/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-zenoh-bridge-dds"; version = "0.5.0-r2"; - src = fetchurl { - url = "https://github.com/ros2-gbp/zenoh_bridge_dds-release/archive/release/rolling/zenoh_bridge_dds/0.5.0-2.tar.gz"; - name = "0.5.0-2.tar.gz"; - sha256 = "58389e40aca8f5c33e678f148fe803e34d6408c181623828325f5030920da993"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "zenoh_bridge_dds-release"; + rev = "release/rolling/zenoh_bridge_dds/0.5.0-2"; + sha256 = "sha256-f7l+qyV5vSYtTVBV57bVQUV49odL51NPVkvmo00gimY="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake cargo clang ]; diff --git a/distros/rolling/zmqpp-vendor/default.nix b/distros/rolling/zmqpp-vendor/default.nix index 14b858b6e2..e30c46d136 100644 --- a/distros/rolling/zmqpp-vendor/default.nix +++ b/distros/rolling/zmqpp-vendor/default.nix @@ -7,11 +7,15 @@ buildRosPackage { pname = "ros-rolling-zmqpp-vendor"; version = "0.0.2-r1"; - src = fetchurl { - url = "https://github.com/tier4/zmqpp_vendor-release/archive/release/rolling/zmqpp_vendor/0.0.2-1.tar.gz"; - name = "0.0.2-1.tar.gz"; - sha256 = "f005cd5834c9d18366bca1285168e076040d46aa68f827042cb0ee3eac2b4310"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "tier4"; + repo = "zmqpp_vendor-release"; + rev = "release/rolling/zmqpp_vendor/0.0.2-1"; + sha256 = "sha256-OHJpSJAua016kXvKxcD1ay55wprlXnqSL19uzz/el6w="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ]; diff --git a/distros/rolling/zstd-vendor/default.nix b/distros/rolling/zstd-vendor/default.nix index a1cfe89ef2..d967c165ad 100644 --- a/distros/rolling/zstd-vendor/default.nix +++ b/distros/rolling/zstd-vendor/default.nix @@ -5,13 +5,17 @@ { lib, buildRosPackage, fetchurl, ament-cmake, git, zstd }: buildRosPackage { pname = "ros-rolling-zstd-vendor"; - version = "0.18.0-r3"; + version = "0.19.0-r1"; - src = fetchurl { - url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/rolling/zstd_vendor/0.18.0-3.tar.gz"; - name = "0.18.0-3.tar.gz"; - sha256 = "5ddf92e8d5ac2e432eef58290915ec4900985e02700b64303f534bd29ea33cdc"; - }; + src = let + fetchFromGithub = (builtins.import (builtins.fetchTarball ({ url = "https://github.com/NixOS/nixpkgs/archive/aa0e8072a57e879073cee969a780e586dbe57997.tar.gz"; })) ({})).fetchFromGitHub; + in + fetchFromGithub { + owner = "ros2-gbp"; + repo = "rosbag2-release"; + rev = "release/rolling/zstd_vendor/0.19.0-1"; + sha256 = "sha256-5xdW6+pLHEx8bH15R2pj6LTuTV1vByfpfwCoUi7FsQM="; + }; buildType = "ament_cmake"; buildInputs = [ ament-cmake git ];