From 24e3f83ed6d874de25e9d42e1b2cec12b5991fde Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 6 Sep 2019 12:21:13 -0400
Subject: [PATCH] regenerate ros-crystal, Fri Sep  6 12:21:13 2019

---
 crystal/action-msgs/default.nix                          | 3 ++-
 crystal/actionlib-msgs/default.nix                       | 3 ++-
 crystal/ament-clang-format/default.nix                   | 3 ++-
 crystal/ament-cmake-auto/default.nix                     | 3 ++-
 crystal/ament-cmake-clang-format/default.nix             | 3 ++-
 crystal/ament-cmake-copyright/default.nix                | 3 ++-
 crystal/ament-cmake-core/default.nix                     | 3 ++-
 crystal/ament-cmake-cppcheck/default.nix                 | 3 ++-
 crystal/ament-cmake-cpplint/default.nix                  | 3 ++-
 crystal/ament-cmake-export-definitions/default.nix       | 3 ++-
 crystal/ament-cmake-export-dependencies/default.nix      | 3 ++-
 .../ament-cmake-export-include-directories/default.nix   | 3 ++-
 crystal/ament-cmake-export-interfaces/default.nix        | 3 ++-
 crystal/ament-cmake-export-libraries/default.nix         | 3 ++-
 crystal/ament-cmake-export-link-flags/default.nix        | 3 ++-
 crystal/ament-cmake-flake8/default.nix                   | 3 ++-
 crystal/ament-cmake-gmock/default.nix                    | 3 ++-
 crystal/ament-cmake-gtest/default.nix                    | 3 ++-
 crystal/ament-cmake-include-directories/default.nix      | 3 ++-
 crystal/ament-cmake-libraries/default.nix                | 3 ++-
 crystal/ament-cmake-lint-cmake/default.nix               | 3 ++-
 crystal/ament-cmake-nose/default.nix                     | 3 ++-
 crystal/ament-cmake-pclint/default.nix                   | 3 ++-
 crystal/ament-cmake-pep257/default.nix                   | 3 ++-
 crystal/ament-cmake-pep8/default.nix                     | 3 ++-
 crystal/ament-cmake-pyflakes/default.nix                 | 3 ++-
 crystal/ament-cmake-pytest/default.nix                   | 3 ++-
 crystal/ament-cmake-python/default.nix                   | 3 ++-
 crystal/ament-cmake-ros/default.nix                      | 3 ++-
 crystal/ament-cmake-target-dependencies/default.nix      | 3 ++-
 crystal/ament-cmake-test/default.nix                     | 3 ++-
 crystal/ament-cmake-uncrustify/default.nix               | 3 ++-
 crystal/ament-cmake-xmllint/default.nix                  | 3 ++-
 crystal/ament-cmake/default.nix                          | 3 ++-
 crystal/ament-copyright/default.nix                      | 3 ++-
 crystal/ament-cppcheck/default.nix                       | 3 ++-
 crystal/ament-cpplint/default.nix                        | 3 ++-
 crystal/ament-flake8/default.nix                         | 3 ++-
 crystal/ament-index-cpp/default.nix                      | 3 ++-
 crystal/ament-index-python/default.nix                   | 3 ++-
 crystal/ament-lint-auto/default.nix                      | 3 ++-
 crystal/ament-lint-cmake/default.nix                     | 3 ++-
 crystal/ament-lint-common/default.nix                    | 3 ++-
 crystal/ament-package/default.nix                        | 3 ++-
 crystal/ament-pclint/default.nix                         | 3 ++-
 crystal/ament-pep257/default.nix                         | 3 ++-
 crystal/ament-pep8/default.nix                           | 3 ++-
 crystal/ament-pyflakes/default.nix                       | 3 ++-
 crystal/ament-uncrustify/default.nix                     | 3 ++-
 crystal/ament-xmllint/default.nix                        | 3 ++-
 crystal/angles/default.nix                               | 3 ++-
 crystal/apriltag-msgs/default.nix                        | 3 ++-
 crystal/apriltag/default.nix                             | 3 ++-
 crystal/apriltag2-node/default.nix                       | 3 ++-
 crystal/behaviortree-cpp-v3/default.nix                  | 9 +++++----
 crystal/behaviortree-cpp/default.nix                     | 9 +++++----
 crystal/builtin-interfaces/default.nix                   | 3 ++-
 crystal/camera-calibration-parsers/default.nix           | 3 ++-
 crystal/camera-info-manager/default.nix                  | 3 ++-
 crystal/cartographer/default.nix                         | 3 ++-
 crystal/class-loader/default.nix                         | 3 ++-
 crystal/common-interfaces/default.nix                    | 3 ++-
 crystal/composition/default.nix                          | 3 ++-
 crystal/compressed-depth-image-transport/default.nix     | 3 ++-
 crystal/compressed-image-transport/default.nix           | 3 ++-
 crystal/connext-cmake-module/default.nix                 | 3 ++-
 crystal/console-bridge-vendor/default.nix                | 3 ++-
 crystal/control-msgs/default.nix                         | 3 ++-
 crystal/costmap-queue/default.nix                        | 3 ++-
 crystal/cv-bridge/default.nix                            | 3 ++-
 crystal/demo-nodes-cpp-native/default.nix                | 3 ++-
 crystal/demo-nodes-cpp/default.nix                       | 3 ++-
 crystal/demo-nodes-py/default.nix                        | 3 ++-
 crystal/depth-image-proc/default.nix                     | 3 ++-
 crystal/depthimage-to-laserscan/default.nix              | 3 ++-
 crystal/desktop/default.nix                              | 3 ++-
 crystal/diagnostic-msgs/default.nix                      | 3 ++-
 crystal/dummy-map-server/default.nix                     | 3 ++-
 crystal/dummy-robot-bringup/default.nix                  | 3 ++-
 crystal/dummy-sensors/default.nix                        | 3 ++-
 crystal/dwb-controller/default.nix                       | 3 ++-
 crystal/dwb-core/default.nix                             | 3 ++-
 crystal/dwb-critics/default.nix                          | 3 ++-
 crystal/dwb-msgs/default.nix                             | 3 ++-
 crystal/dwb-plugins/default.nix                          | 3 ++-
 crystal/ecl-build/default.nix                            | 3 ++-
 crystal/ecl-command-line/default.nix                     | 3 ++-
 crystal/ecl-concepts/default.nix                         | 3 ++-
 crystal/ecl-config/default.nix                           | 3 ++-
 crystal/ecl-console/default.nix                          | 3 ++-
 crystal/ecl-containers/default.nix                       | 3 ++-
 crystal/ecl-converters-lite/default.nix                  | 3 ++-
 crystal/ecl-converters/default.nix                       | 3 ++-
 crystal/ecl-core-apps/default.nix                        | 3 ++-
 crystal/ecl-core/default.nix                             | 3 ++-
 crystal/ecl-devices/default.nix                          | 3 ++-
 crystal/ecl-eigen/default.nix                            | 3 ++-
 crystal/ecl-errors/default.nix                           | 3 ++-
 crystal/ecl-exceptions/default.nix                       | 3 ++-
 crystal/ecl-filesystem/default.nix                       | 3 ++-
 crystal/ecl-formatters/default.nix                       | 3 ++-
 crystal/ecl-geometry/default.nix                         | 3 ++-
 crystal/ecl-io/default.nix                               | 3 ++-
 crystal/ecl-ipc/default.nix                              | 3 ++-
 crystal/ecl-license/default.nix                          | 3 ++-
 crystal/ecl-linear-algebra/default.nix                   | 3 ++-
 crystal/ecl-lite/default.nix                             | 3 ++-
 crystal/ecl-manipulators/default.nix                     | 3 ++-
 crystal/ecl-math/default.nix                             | 3 ++-
 crystal/ecl-mobile-robot/default.nix                     | 3 ++-
 crystal/ecl-mpl/default.nix                              | 3 ++-
 crystal/ecl-sigslots-lite/default.nix                    | 3 ++-
 crystal/ecl-sigslots/default.nix                         | 3 ++-
 crystal/ecl-statistics/default.nix                       | 3 ++-
 crystal/ecl-streams/default.nix                          | 3 ++-
 crystal/ecl-threads/default.nix                          | 3 ++-
 crystal/ecl-time-lite/default.nix                        | 3 ++-
 crystal/ecl-time/default.nix                             | 3 ++-
 crystal/ecl-tools/default.nix                            | 3 ++-
 crystal/ecl-type-traits/default.nix                      | 3 ++-
 crystal/ecl-utilities/default.nix                        | 3 ++-
 crystal/eigen-stl-containers/default.nix                 | 3 ++-
 crystal/ets-cpp-client/default.nix                       | 3 ++-
 crystal/ets-msgs/default.nix                             | 3 ++-
 crystal/ets-plugin/default.nix                           | 3 ++-
 crystal/example-interfaces/default.nix                   | 3 ++-
 .../examples-rclcpp-minimal-action-client/default.nix    | 3 ++-
 .../examples-rclcpp-minimal-action-server/default.nix    | 3 ++-
 crystal/examples-rclcpp-minimal-client/default.nix       | 3 ++-
 crystal/examples-rclcpp-minimal-composition/default.nix  | 3 ++-
 crystal/examples-rclcpp-minimal-publisher/default.nix    | 3 ++-
 crystal/examples-rclcpp-minimal-service/default.nix      | 3 ++-
 crystal/examples-rclcpp-minimal-subscriber/default.nix   | 3 ++-
 crystal/examples-rclcpp-minimal-timer/default.nix        | 3 ++-
 crystal/examples-rclpy-executors/default.nix             | 3 ++-
 crystal/examples-rclpy-minimal-action-client/default.nix | 3 ++-
 crystal/examples-rclpy-minimal-action-server/default.nix | 3 ++-
 crystal/examples-rclpy-minimal-client/default.nix        | 3 ++-
 crystal/examples-rclpy-minimal-publisher/default.nix     | 3 ++-
 crystal/examples-rclpy-minimal-service/default.nix       | 3 ++-
 crystal/examples-rclpy-minimal-subscriber/default.nix    | 3 ++-
 crystal/fastcdr/default.nix                              | 3 ++-
 crystal/fastrtps-cmake-module/default.nix                | 3 ++-
 crystal/fastrtps/default.nix                             | 3 ++-
 crystal/fmi-adapter-examples/default.nix                 | 3 ++-
 crystal/fmi-adapter/default.nix                          | 3 ++-
 crystal/gazebo-dev/default.nix                           | 3 ++-
 crystal/gazebo-msgs/default.nix                          | 3 ++-
 crystal/gazebo-plugins/default.nix                       | 3 ++-
 crystal/gazebo-ros-pkgs/default.nix                      | 3 ++-
 crystal/gazebo-ros/default.nix                           | 3 ++-
 crystal/geometry-msgs/default.nix                        | 3 ++-
 crystal/gmock-vendor/default.nix                         | 3 ++-
 crystal/gtest-vendor/default.nix                         | 3 ++-
 crystal/image-geometry/default.nix                       | 3 ++-
 crystal/image-publisher/default.nix                      | 3 ++-
 crystal/image-tools/default.nix                          | 3 ++-
 crystal/image-transport-plugins/default.nix              | 3 ++-
 crystal/image-transport/default.nix                      | 3 ++-
 crystal/intra-process-demo/default.nix                   | 3 ++-
 crystal/joy/default.nix                                  | 3 ++-
 crystal/kdl-parser/default.nix                           | 3 ++-
 crystal/keystroke/default.nix                            | 3 ++-
 crystal/laser-geometry/default.nix                       | 3 ++-
 crystal/launch-ros/default.nix                           | 3 ++-
 crystal/launch-testing/default.nix                       | 3 ++-
 crystal/launch/default.nix                               | 3 ++-
 crystal/libcurl-vendor/default.nix                       | 3 ++-
 crystal/librealsense2/default.nix                        | 3 ++-
 crystal/libyaml-vendor/default.nix                       | 3 ++-
 crystal/lifecycle-msgs/default.nix                       | 3 ++-
 crystal/lifecycle/default.nix                            | 3 ++-
 crystal/logging-demo/default.nix                         | 3 ++-
 crystal/map-msgs/default.nix                             | 3 ++-
 crystal/message-filters/default.nix                      | 3 ++-
 crystal/micro-ros-agent/default.nix                      | 3 ++-
 crystal/microxrcedds-agent/default.nix                   | 3 ++-
 crystal/ml-classifiers/default.nix                       | 3 ++-
 crystal/mrpt2/default.nix                                | 3 ++-
 crystal/nav-2d-msgs/default.nix                          | 3 ++-
 crystal/nav-2d-utils/default.nix                         | 3 ++-
 crystal/nav-msgs/default.nix                             | 3 ++-
 crystal/nav2-amcl/default.nix                            | 3 ++-
 crystal/nav2-bringup/default.nix                         | 3 ++-
 crystal/nav2-bt-navigator/default.nix                    | 3 ++-
 crystal/nav2-common/default.nix                          | 3 ++-
 crystal/nav2-costmap-2d/default.nix                      | 3 ++-
 crystal/nav2-dwb-controller/default.nix                  | 3 ++-
 crystal/nav2-dynamic-params/default.nix                  | 3 ++-
 crystal/nav2-map-server/default.nix                      | 3 ++-
 crystal/nav2-mission-executor/default.nix                | 3 ++-
 crystal/nav2-motion-primitives/default.nix               | 3 ++-
 crystal/nav2-msgs/default.nix                            | 3 ++-
 crystal/nav2-navfn-planner/default.nix                   | 3 ++-
 crystal/nav2-robot/default.nix                           | 3 ++-
 crystal/nav2-simple-navigator/default.nix                | 3 ++-
 crystal/nav2-tasks/default.nix                           | 3 ++-
 crystal/nav2-util/default.nix                            | 3 ++-
 crystal/nav2-voxel-grid/default.nix                      | 3 ++-
 crystal/nav2-world-model/default.nix                     | 3 ++-
 crystal/navigation2/default.nix                          | 3 ++-
 crystal/nmea-msgs/default.nix                            | 3 ++-
 crystal/object-analytics-msgs/default.nix                | 3 ++-
 crystal/object-analytics-node/default.nix                | 3 ++-
 crystal/object-analytics-rviz/default.nix                | 3 ++-
 crystal/object-msgs/default.nix                          | 3 ++-
 crystal/opensplice-cmake-module/default.nix              | 3 ++-
 crystal/orocos-kdl/default.nix                           | 3 ++-
 crystal/osrf-pycommon/default.nix                        | 3 ++-
 crystal/osrf-testing-tools-cpp/default.nix               | 3 ++-
 crystal/pcl-conversions/default.nix                      | 3 ++-
 crystal/pendulum-control/default.nix                     | 3 ++-
 crystal/pendulum-msgs/default.nix                        | 3 ++-
 crystal/pluginlib/default.nix                            | 3 ++-
 crystal/poco-vendor/default.nix                          | 3 ++-
 crystal/py-trees-ros-interfaces/default.nix              | 3 ++-
 crystal/python-cmake-module/default.nix                  | 3 ++-
 crystal/python-qt-binding/default.nix                    | 3 ++-
 crystal/qt-dotgraph/default.nix                          | 3 ++-
 crystal/qt-gui-app/default.nix                           | 3 ++-
 crystal/qt-gui-core/default.nix                          | 3 ++-
 crystal/qt-gui-cpp/default.nix                           | 3 ++-
 crystal/qt-gui-py-common/default.nix                     | 3 ++-
 crystal/qt-gui/default.nix                               | 3 ++-
 crystal/rcl-action/default.nix                           | 3 ++-
 crystal/rcl-interfaces/default.nix                       | 3 ++-
 crystal/rcl-lifecycle/default.nix                        | 3 ++-
 crystal/rcl-logging-log4cxx/default.nix                  | 3 ++-
 crystal/rcl-logging-noop/default.nix                     | 3 ++-
 crystal/rcl-yaml-param-parser/default.nix                | 3 ++-
 crystal/rcl/default.nix                                  | 3 ++-
 crystal/rclcpp-action/default.nix                        | 3 ++-
 crystal/rclcpp-lifecycle/default.nix                     | 3 ++-
 crystal/rclcpp/default.nix                               | 3 ++-
 crystal/rclpy/default.nix                                | 3 ++-
 crystal/rcutils/default.nix                              | 3 ++-
 crystal/realsense-camera-msgs/default.nix                | 3 ++-
 crystal/realsense-ros2-camera/default.nix                | 3 ++-
 crystal/resource-retriever/default.nix                   | 3 ++-
 crystal/rmw-connext-cpp/default.nix                      | 3 ++-
 crystal/rmw-connext-shared-cpp/default.nix               | 3 ++-
 crystal/rmw-fastrtps-cpp/default.nix                     | 3 ++-
 crystal/rmw-fastrtps-dynamic-cpp/default.nix             | 3 ++-
 crystal/rmw-fastrtps-shared-cpp/default.nix              | 3 ++-
 crystal/rmw-implementation-cmake/default.nix             | 3 ++-
 crystal/rmw-implementation/default.nix                   | 3 ++-
 crystal/rmw-opensplice-cpp/default.nix                   | 3 ++-
 crystal/rmw/default.nix                                  | 3 ++-
 crystal/robot-state-publisher/default.nix                | 3 ++-
 crystal/ros-base/default.nix                             | 3 ++-
 crystal/ros-core/default.nix                             | 3 ++-
 crystal/ros-environment/default.nix                      | 3 ++-
 crystal/ros-workspace/default.nix                        | 3 ++-
 crystal/ros1-bridge/default.nix                          | 3 ++-
 crystal/ros1-rosbag-storage-vendor/default.nix           | 3 ++-
 crystal/ros2bag/default.nix                              | 3 ++-
 crystal/ros2cli/default.nix                              | 3 ++-
 crystal/ros2launch/default.nix                           | 3 ++-
 crystal/ros2lifecycle/default.nix                        | 3 ++-
 crystal/ros2msg/default.nix                              | 3 ++-
 crystal/ros2multicast/default.nix                        | 3 ++-
 crystal/ros2node/default.nix                             | 3 ++-
 crystal/ros2param/default.nix                            | 3 ++-
 crystal/ros2pkg/default.nix                              | 3 ++-
 crystal/ros2run/default.nix                              | 3 ++-
 crystal/ros2service/default.nix                          | 3 ++-
 crystal/ros2srv/default.nix                              | 3 ++-
 crystal/ros2topic/default.nix                            | 3 ++-
 crystal/rosbag2-bag-v2-plugins/default.nix               | 3 ++-
 crystal/rosbag2-converter-default-plugins/default.nix    | 3 ++-
 crystal/rosbag2-storage-default-plugins/default.nix      | 3 ++-
 crystal/rosbag2-storage/default.nix                      | 3 ++-
 crystal/rosbag2-test-common/default.nix                  | 3 ++-
 crystal/rosbag2-tests/default.nix                        | 3 ++-
 crystal/rosbag2-transport/default.nix                    | 3 ++-
 crystal/rosbag2/default.nix                              | 3 ++-
 crystal/rosgraph-msgs/default.nix                        | 3 ++-
 crystal/rosidl-actions/default.nix                       | 3 ++-
 crystal/rosidl-adapter/default.nix                       | 3 ++-
 crystal/rosidl-cmake/default.nix                         | 3 ++-
 crystal/rosidl-default-generators/default.nix            | 3 ++-
 crystal/rosidl-default-runtime/default.nix               | 3 ++-
 crystal/rosidl-generator-c/default.nix                   | 3 ++-
 crystal/rosidl-generator-cpp/default.nix                 | 3 ++-
 crystal/rosidl-generator-dds-idl/default.nix             | 3 ++-
 crystal/rosidl-generator-py/default.nix                  | 3 ++-
 crystal/rosidl-parser/default.nix                        | 3 ++-
 crystal/rosidl-typesupport-c/default.nix                 | 3 ++-
 crystal/rosidl-typesupport-connext-c/default.nix         | 3 ++-
 crystal/rosidl-typesupport-connext-cpp/default.nix       | 3 ++-
 crystal/rosidl-typesupport-cpp/default.nix               | 3 ++-
 crystal/rosidl-typesupport-fastrtps-c/default.nix        | 3 ++-
 crystal/rosidl-typesupport-fastrtps-cpp/default.nix      | 3 ++-
 crystal/rosidl-typesupport-interface/default.nix         | 3 ++-
 crystal/rosidl-typesupport-introspection-c/default.nix   | 3 ++-
 crystal/rosidl-typesupport-introspection-cpp/default.nix | 3 ++-
 crystal/rosidl-typesupport-opensplice-c/default.nix      | 3 ++-
 crystal/rosidl-typesupport-opensplice-cpp/default.nix    | 3 ++-
 crystal/rqt-action/default.nix                           | 3 ++-
 crystal/rqt-console/default.nix                          | 3 ++-
 crystal/rqt-graph/default.nix                            | 3 ++-
 crystal/rqt-gui-cpp/default.nix                          | 3 ++-
 crystal/rqt-gui-py/default.nix                           | 3 ++-
 crystal/rqt-gui/default.nix                              | 3 ++-
 crystal/rqt-image-view/default.nix                       | 3 ++-
 crystal/rqt-msg/default.nix                              | 3 ++-
 crystal/rqt-plot/default.nix                             | 3 ++-
 crystal/rqt-publisher/default.nix                        | 3 ++-
 crystal/rqt-py-common/default.nix                        | 3 ++-
 crystal/rqt-py-console/default.nix                       | 3 ++-
 crystal/rqt-service-caller/default.nix                   | 3 ++-
 crystal/rqt-shell/default.nix                            | 3 ++-
 crystal/rqt-srv/default.nix                              | 3 ++-
 crystal/rqt-top/default.nix                              | 3 ++-
 crystal/rqt-topic/default.nix                            | 3 ++-
 crystal/rqt/default.nix                                  | 3 ++-
 crystal/rttest/default.nix                               | 3 ++-
 crystal/rviz-assimp-vendor/default.nix                   | 3 ++-
 crystal/rviz-common/default.nix                          | 3 ++-
 crystal/rviz-default-plugins/default.nix                 | 3 ++-
 crystal/rviz-ogre-vendor/default.nix                     | 7 ++++---
 crystal/rviz-rendering-tests/default.nix                 | 3 ++-
 crystal/rviz-rendering/default.nix                       | 3 ++-
 crystal/rviz-visual-testing-framework/default.nix        | 3 ++-
 crystal/rviz2/default.nix                                | 3 ++-
 crystal/sensor-msgs/default.nix                          | 3 ++-
 crystal/shape-msgs/default.nix                           | 3 ++-
 crystal/shared-queues-vendor/default.nix                 | 3 ++-
 crystal/sophus/default.nix                               | 3 ++-
 crystal/sqlite3-vendor/default.nix                       | 3 ++-
 crystal/sros2-cmake/default.nix                          | 3 ++-
 crystal/sros2/default.nix                                | 3 ++-
 crystal/std-msgs/default.nix                             | 3 ++-
 crystal/std-srvs/default.nix                             | 3 ++-
 crystal/stereo-msgs/default.nix                          | 3 ++-
 crystal/system-modes-examples/default.nix                | 3 ++-
 crystal/system-modes/default.nix                         | 3 ++-
 crystal/teleop-twist-joy/default.nix                     | 3 ++-
 crystal/teleop-twist-keyboard/default.nix                | 3 ++-
 crystal/test-msgs/default.nix                            | 3 ++-
 crystal/test-osrf-testing-tools-cpp/default.nix          | 3 ++-
 crystal/tf2-eigen/default.nix                            | 3 ++-
 crystal/tf2-geometry-msgs/default.nix                    | 3 ++-
 crystal/tf2-msgs/default.nix                             | 3 ++-
 crystal/tf2-ros/default.nix                              | 3 ++-
 crystal/tf2-sensor-msgs/default.nix                      | 3 ++-
 crystal/tf2/default.nix                                  | 3 ++-
 crystal/theora-image-transport/default.nix               | 3 ++-
 crystal/tinydir-vendor/default.nix                       | 3 ++-
 crystal/tinyxml-vendor/default.nix                       | 3 ++-
 crystal/tinyxml2-vendor/default.nix                      | 3 ++-
 crystal/tlsf-cpp/default.nix                             | 3 ++-
 crystal/tlsf/default.nix                                 | 3 ++-
 crystal/topic-monitor/default.nix                        | 3 ++-
 crystal/trajectory-msgs/default.nix                      | 3 ++-
 crystal/uncrustify-vendor/default.nix                    | 3 ++-
 crystal/unique-identifier-msgs/default.nix               | 3 ++-
 crystal/urdf/default.nix                                 | 3 ++-
 crystal/urdfdom-headers/default.nix                      | 3 ++-
 crystal/urdfdom/default.nix                              | 3 ++-
 crystal/vision-opencv/default.nix                        | 3 ++-
 crystal/visualization-msgs/default.nix                   | 3 ++-
 crystal/webots-ros2-core/default.nix                     | 3 ++-
 crystal/webots-ros2-desktop/default.nix                  | 3 ++-
 crystal/webots-ros2-examples/default.nix                 | 3 ++-
 crystal/webots-ros2-msgs/default.nix                     | 3 ++-
 crystal/webots-ros2-universal-robot/default.nix          | 3 ++-
 crystal/webots-ros2/default.nix                          | 3 ++-
 crystal/yaml-cpp-vendor/default.nix                      | 3 ++-
 369 files changed, 746 insertions(+), 377 deletions(-)

diff --git a/crystal/action-msgs/default.nix b/crystal/action-msgs/default.nix
index b549cfa550..b2fb47ceed 100644
--- a/crystal/action-msgs/default.nix
+++ b/crystal/action-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/action_msgs/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/action_msgs/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "f2e941f36e7ab54f4f676606371c1ded0d3cc072721e14669c47cc66897fdd4d";
   };
 
diff --git a/crystal/actionlib-msgs/default.nix b/crystal/actionlib-msgs/default.nix
index 03abe5aebc..776d7c9175 100644
--- a/crystal/actionlib-msgs/default.nix
+++ b/crystal/actionlib-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/actionlib_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/actionlib_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "37d6e848b58289db815f06b0dfd3da6e53e9dc5af9e2cf9acb7f023a425cb814";
   };
 
diff --git a/crystal/ament-clang-format/default.nix b/crystal/ament-clang-format/default.nix
index 54d7879c22..10eafa2bc5 100644
--- a/crystal/ament-clang-format/default.nix
+++ b/crystal/ament-clang-format/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_clang_format/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_clang_format/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "fb0ce39426f8b95d721329f6ac0f86df6cc5603de6cec10df0e7d7b72caf3b3c";
   };
 
diff --git a/crystal/ament-cmake-auto/default.nix b/crystal/ament-cmake-auto/default.nix
index 3a5864c93a..4f3d2c6d28 100644
--- a/crystal/ament-cmake-auto/default.nix
+++ b/crystal/ament-cmake-auto/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_auto/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_auto/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "f086a76d34c50fa2911b64f9cb008056b851967739449fa2f1a735e440057145";
   };
 
diff --git a/crystal/ament-cmake-clang-format/default.nix b/crystal/ament-cmake-clang-format/default.nix
index 7de27f1f74..606b62a785 100644
--- a/crystal/ament-cmake-clang-format/default.nix
+++ b/crystal/ament-cmake-clang-format/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_clang_format/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_clang_format/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "31b14d3d99e6605e48b154a34ed51adeef553da71755edcbddcc3b79a1afcc70";
   };
 
diff --git a/crystal/ament-cmake-copyright/default.nix b/crystal/ament-cmake-copyright/default.nix
index 655f5260f1..78e06cd336 100644
--- a/crystal/ament-cmake-copyright/default.nix
+++ b/crystal/ament-cmake-copyright/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_copyright/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_copyright/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "d02c99554dabb82416c5fea8397c1404a420beb134a348f080086b7b4b5e42e9";
   };
 
diff --git a/crystal/ament-cmake-core/default.nix b/crystal/ament-cmake-core/default.nix
index b9aa320275..7ff76ca15b 100644
--- a/crystal/ament-cmake-core/default.nix
+++ b/crystal/ament-cmake-core/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_core/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_core/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "fdf241071c3f7151841f0ba54be21351e60c17571722644bac8df642587354ca";
   };
 
diff --git a/crystal/ament-cmake-cppcheck/default.nix b/crystal/ament-cmake-cppcheck/default.nix
index ecec99a1ec..17313b75fe 100644
--- a/crystal/ament-cmake-cppcheck/default.nix
+++ b/crystal/ament-cmake-cppcheck/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_cppcheck/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_cppcheck/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "b3f21a1bcec89475e45f41284987f6e661606677d7c924251756095c629fee14";
   };
 
diff --git a/crystal/ament-cmake-cpplint/default.nix b/crystal/ament-cmake-cpplint/default.nix
index c5809508af..196e233ca0 100644
--- a/crystal/ament-cmake-cpplint/default.nix
+++ b/crystal/ament-cmake-cpplint/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_cpplint/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_cpplint/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "e93ba94c0aade4db5b180e15e3bc5cb38692009ed1e722f88ba229a5a90613b2";
   };
 
diff --git a/crystal/ament-cmake-export-definitions/default.nix b/crystal/ament-cmake-export-definitions/default.nix
index bcf811ddd5..bd6de4ab97 100644
--- a/crystal/ament-cmake-export-definitions/default.nix
+++ b/crystal/ament-cmake-export-definitions/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_definitions/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_definitions/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "c2078ecbc9d65976f16b35b9afcae8ac4ad6e5b4b7665366773ae86e7e94053e";
   };
 
diff --git a/crystal/ament-cmake-export-dependencies/default.nix b/crystal/ament-cmake-export-dependencies/default.nix
index acc57e8cb8..a275879086 100644
--- a/crystal/ament-cmake-export-dependencies/default.nix
+++ b/crystal/ament-cmake-export-dependencies/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_dependencies/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_dependencies/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "ba891a576fbe4430d9c2f82152e56a1fff88d72c8b3a6eebd9aea1f7e7e81b99";
   };
 
diff --git a/crystal/ament-cmake-export-include-directories/default.nix b/crystal/ament-cmake-export-include-directories/default.nix
index a7b7b4cd43..a441ddf2a3 100644
--- a/crystal/ament-cmake-export-include-directories/default.nix
+++ b/crystal/ament-cmake-export-include-directories/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_include_directories/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_include_directories/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "950066e63b941eb05df48b9ef6ebf84666a331aa92d4e1b37a6a646b3e3b57cb";
   };
 
diff --git a/crystal/ament-cmake-export-interfaces/default.nix b/crystal/ament-cmake-export-interfaces/default.nix
index 728465b83e..b873f7b3a4 100644
--- a/crystal/ament-cmake-export-interfaces/default.nix
+++ b/crystal/ament-cmake-export-interfaces/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_interfaces/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_interfaces/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "239e260cd706e537974809c2310e4f8368ff3e714dc9c31aae64d82f830bfd9d";
   };
 
diff --git a/crystal/ament-cmake-export-libraries/default.nix b/crystal/ament-cmake-export-libraries/default.nix
index c929034cb9..9f5a8ccd18 100644
--- a/crystal/ament-cmake-export-libraries/default.nix
+++ b/crystal/ament-cmake-export-libraries/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_libraries/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_libraries/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "33037387d8ac0af0329716607dde7ad1532d91cc3a585cff344470f1e033ec81";
   };
 
diff --git a/crystal/ament-cmake-export-link-flags/default.nix b/crystal/ament-cmake-export-link-flags/default.nix
index af6047deea..9328229e32 100644
--- a/crystal/ament-cmake-export-link-flags/default.nix
+++ b/crystal/ament-cmake-export-link-flags/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_link_flags/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_export_link_flags/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "8b54185847f99157540ce3086ab551ba15b7dcd42c4ed10a19e9933e2de69c37";
   };
 
diff --git a/crystal/ament-cmake-flake8/default.nix b/crystal/ament-cmake-flake8/default.nix
index a253672f90..96f6d72c35 100644
--- a/crystal/ament-cmake-flake8/default.nix
+++ b/crystal/ament-cmake-flake8/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_flake8/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_flake8/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "248fb44c61e814feac712493cd5e69b67b6c01d9c66a69505cd6075c4503471e";
   };
 
diff --git a/crystal/ament-cmake-gmock/default.nix b/crystal/ament-cmake-gmock/default.nix
index ad2dd2377f..8daa7b9bdc 100644
--- a/crystal/ament-cmake-gmock/default.nix
+++ b/crystal/ament-cmake-gmock/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_gmock/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_gmock/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "4117982aa38392d3fdb94a27f46863791d7885ddef97ae4a156a9375dc2a4367";
   };
 
diff --git a/crystal/ament-cmake-gtest/default.nix b/crystal/ament-cmake-gtest/default.nix
index 19208d385b..14636f05a3 100644
--- a/crystal/ament-cmake-gtest/default.nix
+++ b/crystal/ament-cmake-gtest/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_gtest/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_gtest/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "6fe61d406969f7576d21a3b43906813b932426ba44b83663a1e380cd320b37a4";
   };
 
diff --git a/crystal/ament-cmake-include-directories/default.nix b/crystal/ament-cmake-include-directories/default.nix
index a57b864b30..c5eb72531f 100644
--- a/crystal/ament-cmake-include-directories/default.nix
+++ b/crystal/ament-cmake-include-directories/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_include_directories/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_include_directories/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "7d6e34603f43754020726b6674f705ca43703256437c1a2e809b6e159e898c1b";
   };
 
diff --git a/crystal/ament-cmake-libraries/default.nix b/crystal/ament-cmake-libraries/default.nix
index 980ed6d3e5..1e4f8b8a27 100644
--- a/crystal/ament-cmake-libraries/default.nix
+++ b/crystal/ament-cmake-libraries/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_libraries/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_libraries/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "46209d3b0b471e2b4aa957a931a5edea0b7ad3d837cde55dec489a3bd353596d";
   };
 
diff --git a/crystal/ament-cmake-lint-cmake/default.nix b/crystal/ament-cmake-lint-cmake/default.nix
index c8f4036ebf..56cebbe298 100644
--- a/crystal/ament-cmake-lint-cmake/default.nix
+++ b/crystal/ament-cmake-lint-cmake/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_lint_cmake/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_lint_cmake/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "28560ee58db56a7792eecab075a151c98d6b6c442c96c63dd82104d5ef8dcdec";
   };
 
diff --git a/crystal/ament-cmake-nose/default.nix b/crystal/ament-cmake-nose/default.nix
index 40e3d8efd9..60439dbff1 100644
--- a/crystal/ament-cmake-nose/default.nix
+++ b/crystal/ament-cmake-nose/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_nose/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_nose/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "0fec7ba4af531935db3cb1fd4f6c03273639e52cf792df5deeda081f49c3bfd1";
   };
 
diff --git a/crystal/ament-cmake-pclint/default.nix b/crystal/ament-cmake-pclint/default.nix
index f878503848..137eb75248 100644
--- a/crystal/ament-cmake-pclint/default.nix
+++ b/crystal/ament-cmake-pclint/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_pclint/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_pclint/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "89f5ba8c6f6917e479fae3548c1595fd255a839c00564dd79c689f6c62cb7cbc";
   };
 
diff --git a/crystal/ament-cmake-pep257/default.nix b/crystal/ament-cmake-pep257/default.nix
index a89afaa2d1..d528fcd68e 100644
--- a/crystal/ament-cmake-pep257/default.nix
+++ b/crystal/ament-cmake-pep257/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_pep257/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_pep257/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "a3f1c7e38ba783e0b380b7af7daf437afe04eb3495d19556e6e7e45e465cb976";
   };
 
diff --git a/crystal/ament-cmake-pep8/default.nix b/crystal/ament-cmake-pep8/default.nix
index 2bc62e92ad..6a5367b443 100644
--- a/crystal/ament-cmake-pep8/default.nix
+++ b/crystal/ament-cmake-pep8/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_pep8/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_pep8/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "068579b247325a0186817e0c1f5cac02a8089691fdf50553ca65b230525e6a99";
   };
 
diff --git a/crystal/ament-cmake-pyflakes/default.nix b/crystal/ament-cmake-pyflakes/default.nix
index e5bb062422..26ae0f0810 100644
--- a/crystal/ament-cmake-pyflakes/default.nix
+++ b/crystal/ament-cmake-pyflakes/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_pyflakes/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_pyflakes/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "d0a1cae175c33fa6c188f724bbf7aaadbdc0f2fbb250c10c7248d65567ac31e0";
   };
 
diff --git a/crystal/ament-cmake-pytest/default.nix b/crystal/ament-cmake-pytest/default.nix
index 0398a2727f..068ac70873 100644
--- a/crystal/ament-cmake-pytest/default.nix
+++ b/crystal/ament-cmake-pytest/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_pytest/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_pytest/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "a3ec48306706c8dcdfe3e3a5b2cef99e4faae7ff2273f3c8eef746b9d0be1c73";
   };
 
diff --git a/crystal/ament-cmake-python/default.nix b/crystal/ament-cmake-python/default.nix
index 42d1580522..538cfb4915 100644
--- a/crystal/ament-cmake-python/default.nix
+++ b/crystal/ament-cmake-python/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_python/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_python/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "196e1acf5e949daae5d1fa6822ab126abe7c4fa8001bb610132e374977ef0922";
   };
 
diff --git a/crystal/ament-cmake-ros/default.nix b/crystal/ament-cmake-ros/default.nix
index 158298b4cc..3ec7316cda 100644
--- a/crystal/ament-cmake-ros/default.nix
+++ b/crystal/ament-cmake-ros/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.5.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake_ros-release/archive/release/crystal/ament_cmake_ros/0.5.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake_ros-release/archive/release/crystal/ament_cmake_ros/0.5.0-0.tar.gz";
+    name = "0.5.0-0.tar.gz";
     sha256 = "dbbe845687229efffa115f1d88111fb766276cb7eaf4dd8d55b91149e76f6349";
   };
 
diff --git a/crystal/ament-cmake-target-dependencies/default.nix b/crystal/ament-cmake-target-dependencies/default.nix
index 6d2755a66d..d7c528e0c5 100644
--- a/crystal/ament-cmake-target-dependencies/default.nix
+++ b/crystal/ament-cmake-target-dependencies/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_target_dependencies/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_target_dependencies/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "796b09108958c81160c6bdaaadc180d3a85b00ae65400368ede1e26bdb8a717f";
   };
 
diff --git a/crystal/ament-cmake-test/default.nix b/crystal/ament-cmake-test/default.nix
index ecc463e425..ef363eb357 100644
--- a/crystal/ament-cmake-test/default.nix
+++ b/crystal/ament-cmake-test/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_test/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake_test/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "464c3a333ab241426588ec2fc30acacd88084bab1308abc6ffe9d75e04d0ef1d";
   };
 
diff --git a/crystal/ament-cmake-uncrustify/default.nix b/crystal/ament-cmake-uncrustify/default.nix
index 0b286edb25..325ac22129 100644
--- a/crystal/ament-cmake-uncrustify/default.nix
+++ b/crystal/ament-cmake-uncrustify/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_uncrustify/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_uncrustify/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "4c034005cf6ca1a21e87cc3a6bd1a9835ec0101ca54ae95e68fdc753171926e9";
   };
 
diff --git a/crystal/ament-cmake-xmllint/default.nix b/crystal/ament-cmake-xmllint/default.nix
index 565b4eed47..cb086f96db 100644
--- a/crystal/ament-cmake-xmllint/default.nix
+++ b/crystal/ament-cmake-xmllint/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_xmllint/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cmake_xmllint/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "3c62c07aa1f927358d19975e1efc9252b74b3e087cde3ce38a09772b5e629aca";
   };
 
diff --git a/crystal/ament-cmake/default.nix b/crystal/ament-cmake/default.nix
index d98becdcb7..e1139c2119 100644
--- a/crystal/ament-cmake/default.nix
+++ b/crystal/ament-cmake/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_cmake-release/archive/release/crystal/ament_cmake/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "bf2fd9fe87c115775fe65edc3ac86e01770a979300da2d962053541681bc69ee";
   };
 
diff --git a/crystal/ament-copyright/default.nix b/crystal/ament-copyright/default.nix
index bec23a2782..24043ca2b6 100644
--- a/crystal/ament-copyright/default.nix
+++ b/crystal/ament-copyright/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_copyright/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_copyright/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "3ff8c5e00112dd4024dd76eb261662386100e6ba21ff545d230aee15913f5d5e";
   };
 
diff --git a/crystal/ament-cppcheck/default.nix b/crystal/ament-cppcheck/default.nix
index 951deb5c22..a282c7d0b5 100644
--- a/crystal/ament-cppcheck/default.nix
+++ b/crystal/ament-cppcheck/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cppcheck/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cppcheck/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "bb321d98c2d9bf483046b10d43e62bbefdbd50a3e9653037d39e545a59b43ff0";
   };
 
diff --git a/crystal/ament-cpplint/default.nix b/crystal/ament-cpplint/default.nix
index 21ba3a26f2..f865313543 100644
--- a/crystal/ament-cpplint/default.nix
+++ b/crystal/ament-cpplint/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cpplint/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_cpplint/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "ac452583f5777569d2cb054248455bf44dc453803333114bd262e5793e3f4334";
   };
 
diff --git a/crystal/ament-flake8/default.nix b/crystal/ament-flake8/default.nix
index 0cf1db35a5..f0ae899f81 100644
--- a/crystal/ament-flake8/default.nix
+++ b/crystal/ament-flake8/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_flake8/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_flake8/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "6ca0be3c8b206bba1c02c67147ac5a3fb36abda8dec3b867d397dfa123ecbe1a";
   };
 
diff --git a/crystal/ament-index-cpp/default.nix b/crystal/ament-index-cpp/default.nix
index c3b8fa24c2..6d4abd663b 100644
--- a/crystal/ament-index-cpp/default.nix
+++ b/crystal/ament-index-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.5.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_index-release/archive/release/crystal/ament_index_cpp/0.5.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_index-release/archive/release/crystal/ament_index_cpp/0.5.1-0.tar.gz";
+    name = "0.5.1-0.tar.gz";
     sha256 = "ce2cffe1a63b5fa10c1fa8569b30bb1831addeb247a9d69147f5542d4958aeb4";
   };
 
diff --git a/crystal/ament-index-python/default.nix b/crystal/ament-index-python/default.nix
index 5290e09476..5e891ccff6 100644
--- a/crystal/ament-index-python/default.nix
+++ b/crystal/ament-index-python/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.5.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_index-release/archive/release/crystal/ament_index_python/0.5.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_index-release/archive/release/crystal/ament_index_python/0.5.1-0.tar.gz";
+    name = "0.5.1-0.tar.gz";
     sha256 = "2c72c61f27599e5d25900d22ad6e70116552e5eea1570e00b519b5b2d730a97e";
   };
 
diff --git a/crystal/ament-lint-auto/default.nix b/crystal/ament-lint-auto/default.nix
index ed8c074b42..fd400b230c 100644
--- a/crystal/ament-lint-auto/default.nix
+++ b/crystal/ament-lint-auto/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_lint_auto/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_lint_auto/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "8b28146a32d2183e576af9961a78146b3e485a9b47d979c01655df7238a977e3";
   };
 
diff --git a/crystal/ament-lint-cmake/default.nix b/crystal/ament-lint-cmake/default.nix
index 749c12d319..84096fcef9 100644
--- a/crystal/ament-lint-cmake/default.nix
+++ b/crystal/ament-lint-cmake/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_lint_cmake/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_lint_cmake/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "7acb95f4084aa67dba627c65fb30b77d38bac682fa1006f6b4691c72af75f5eb";
   };
 
diff --git a/crystal/ament-lint-common/default.nix b/crystal/ament-lint-common/default.nix
index f94b873730..20645bdf28 100644
--- a/crystal/ament-lint-common/default.nix
+++ b/crystal/ament-lint-common/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_lint_common/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_lint_common/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "91f4a7f259165adea29e391b8ff97c091d12e0f112dcc6b93cb2f616653f8eb1";
   };
 
diff --git a/crystal/ament-package/default.nix b/crystal/ament-package/default.nix
index d294762212..2e5293843b 100644
--- a/crystal/ament-package/default.nix
+++ b/crystal/ament-package/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_package-release/archive/release/crystal/ament_package/0.6.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_package-release/archive/release/crystal/ament_package/0.6.0-0.tar.gz";
+    name = "0.6.0-0.tar.gz";
     sha256 = "93eb732b8925aa6e1c265ef6c803225354debff818830762cc887729d8e47f6b";
   };
 
diff --git a/crystal/ament-pclint/default.nix b/crystal/ament-pclint/default.nix
index 8999265910..a556b58793 100644
--- a/crystal/ament-pclint/default.nix
+++ b/crystal/ament-pclint/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_pclint/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_pclint/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "a08c29729914d6bed1c19c6f4db8372abb0c76318a20d901af6432e517bc62e2";
   };
 
diff --git a/crystal/ament-pep257/default.nix b/crystal/ament-pep257/default.nix
index 64ff968b74..c79f2b1ed9 100644
--- a/crystal/ament-pep257/default.nix
+++ b/crystal/ament-pep257/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_pep257/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_pep257/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "43ef83c5ba4b2c52dc3894c4155efb794a7d376a69dc0b4142f6e3da22d61e59";
   };
 
diff --git a/crystal/ament-pep8/default.nix b/crystal/ament-pep8/default.nix
index ad52166bbb..da14816b3d 100644
--- a/crystal/ament-pep8/default.nix
+++ b/crystal/ament-pep8/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_pep8/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_pep8/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "0e32fad5d0415c3f3c752fef5cec0254d9c2bfee07cddedad4df37aa3c920497";
   };
 
diff --git a/crystal/ament-pyflakes/default.nix b/crystal/ament-pyflakes/default.nix
index 899a56a116..567852f2cc 100644
--- a/crystal/ament-pyflakes/default.nix
+++ b/crystal/ament-pyflakes/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_pyflakes/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_pyflakes/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "cd644a2d4b018df7f1ad0a61a29e866da634fd0358c46c399bcfc41fddfd035c";
   };
 
diff --git a/crystal/ament-uncrustify/default.nix b/crystal/ament-uncrustify/default.nix
index 3d30e4648e..58973b5e24 100644
--- a/crystal/ament-uncrustify/default.nix
+++ b/crystal/ament-uncrustify/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_uncrustify/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_uncrustify/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "4303f28d8848fb7120b71011fbd4288245952a807d4d6f7e95aaf2193f804e78";
   };
 
diff --git a/crystal/ament-xmllint/default.nix b/crystal/ament-xmllint/default.nix
index 1c965bd2e6..f446d3aa89 100644
--- a/crystal/ament-xmllint/default.nix
+++ b/crystal/ament-xmllint/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_xmllint/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ament_lint-release/archive/release/crystal/ament_xmllint/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "e6f9065ffb8db0a928a3c8a4215baa085723a20628839d39274e359ec4bd3650";
   };
 
diff --git a/crystal/angles/default.nix b/crystal/angles/default.nix
index f4d259005a..56e77970ba 100644
--- a/crystal/angles/default.nix
+++ b/crystal/angles/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.12.1-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/angles-release/archive/release/crystal/angles/1.12.1-1.tar.gz;
+    url = "https://github.com/ros2-gbp/angles-release/archive/release/crystal/angles/1.12.1-1.tar.gz";
+    name = "1.12.1-1.tar.gz";
     sha256 = "e3c90023c90d9597d863351a77b147dc86aabf26c6ea2d44cbd5e8bf2c69ebb0";
   };
 
diff --git a/crystal/apriltag-msgs/default.nix b/crystal/apriltag-msgs/default.nix
index 7ab4de60d9..d5d391ef15 100644
--- a/crystal/apriltag-msgs/default.nix
+++ b/crystal/apriltag-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/christianrauch/apriltag2_node-release/archive/release/crystal/apriltag_msgs/1.0.1-0.tar.gz;
+    url = "https://github.com/christianrauch/apriltag2_node-release/archive/release/crystal/apriltag_msgs/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "af7792e34c22e34c7cf69608d103c3d27cb182bb5741a3848fb21d4eb59cc028";
   };
 
diff --git a/crystal/apriltag/default.nix b/crystal/apriltag/default.nix
index 801964e15a..6b10665cd9 100644
--- a/crystal/apriltag/default.nix
+++ b/crystal/apriltag/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.9.8-r1";
 
   src = fetchurl {
-    url = https://github.com/christianrauch/apriltag2-release/archive/release/crystal/apriltag/0.9.8-1.tar.gz;
+    url = "https://github.com/christianrauch/apriltag2-release/archive/release/crystal/apriltag/0.9.8-1.tar.gz";
+    name = "0.9.8-1.tar.gz";
     sha256 = "3f021fcda7c06021420a3edbd25dcac2df45bb01d90de64e6cade44e94f8b3e0";
   };
 
diff --git a/crystal/apriltag2-node/default.nix b/crystal/apriltag2-node/default.nix
index 656edee54e..f809ee16af 100644
--- a/crystal/apriltag2-node/default.nix
+++ b/crystal/apriltag2-node/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/christianrauch/apriltag2_node-release/archive/release/crystal/apriltag2_node/1.0.1-0.tar.gz;
+    url = "https://github.com/christianrauch/apriltag2_node-release/archive/release/crystal/apriltag2_node/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "096c7aba240c1767464228f85390ab0162b0443d470887944047d7b0b9e56f08";
   };
 
diff --git a/crystal/behaviortree-cpp-v3/default.nix b/crystal/behaviortree-cpp-v3/default.nix
index 55d1e235de..b95e76182c 100644
--- a/crystal/behaviortree-cpp-v3/default.nix
+++ b/crystal/behaviortree-cpp-v3/default.nix
@@ -2,20 +2,21 @@
 # Copyright 2019 Open Source Robotics Foundation
 # Distributed under the terms of the BSD license
 
-{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake, zeromq, elfutils }:
+{ lib, buildRosPackage, fetchurl, cppzmq, ament-cmake-gtest, ament-cmake, elfutils }:
 buildRosPackage {
   pname = "ros-crystal-behaviortree-cpp-v3";
   version = "3.0.4";
 
   src = fetchurl {
-    url = https://github.com/BehaviorTree/behaviortree_cpp_v3-release/archive/release/crystal/behaviortree_cpp_v3/3.0.4-0.tar.gz;
+    url = "https://github.com/BehaviorTree/behaviortree_cpp_v3-release/archive/release/crystal/behaviortree_cpp_v3/3.0.4-0.tar.gz";
+    name = "3.0.4-0.tar.gz";
     sha256 = "b2807d1238adbba82ece6d5045a0335bd3c461e7c38ec96cdc6e369b2be8e990";
   };
 
   buildType = "ament_cmake";
-  buildInputs = [ elfutils zeromq ];
+  buildInputs = [ cppzmq elfutils ];
   checkInputs = [ ament-cmake-gtest ];
-  propagatedBuildInputs = [ elfutils zeromq ];
+  propagatedBuildInputs = [ cppzmq elfutils ];
   nativeBuildInputs = [ ament-cmake ];
 
   meta = {
diff --git a/crystal/behaviortree-cpp/default.nix b/crystal/behaviortree-cpp/default.nix
index 67461097e5..3eeab5e74c 100644
--- a/crystal/behaviortree-cpp/default.nix
+++ b/crystal/behaviortree-cpp/default.nix
@@ -2,20 +2,21 @@
 # Copyright 2019 Open Source Robotics Foundation
 # Distributed under the terms of the BSD license
 
-{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake, zeromq }:
+{ lib, buildRosPackage, fetchurl, cppzmq, ament-cmake-gtest, ament-cmake }:
 buildRosPackage {
   pname = "ros-crystal-behaviortree-cpp";
   version = "2.4.3-r1";
 
   src = fetchurl {
-    url = https://github.com/BehaviorTree/behaviortree_cpp-release/archive/release/crystal/behaviortree_cpp/2.4.3-1.tar.gz;
+    url = "https://github.com/BehaviorTree/behaviortree_cpp-release/archive/release/crystal/behaviortree_cpp/2.4.3-1.tar.gz";
+    name = "2.4.3-1.tar.gz";
     sha256 = "119e8a57c251ae3979a0481b693f062941796764ee047eb40eff98789183a9aa";
   };
 
   buildType = "ament_cmake";
-  buildInputs = [ zeromq ];
+  buildInputs = [ cppzmq ];
   checkInputs = [ ament-cmake-gtest ];
-  propagatedBuildInputs = [ zeromq ];
+  propagatedBuildInputs = [ cppzmq ];
   nativeBuildInputs = [ ament-cmake ];
 
   meta = {
diff --git a/crystal/builtin-interfaces/default.nix b/crystal/builtin-interfaces/default.nix
index 26dc407474..e1fe6629fc 100644
--- a/crystal/builtin-interfaces/default.nix
+++ b/crystal/builtin-interfaces/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/builtin_interfaces/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/builtin_interfaces/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "249ef8ac57b8ee997b7de2d8be13a6c12f2785c7e3440f7f0c9171366b30b74a";
   };
 
diff --git a/crystal/camera-calibration-parsers/default.nix b/crystal/camera-calibration-parsers/default.nix
index b8dc1dd3a4..28aaa066eb 100644
--- a/crystal/camera-calibration-parsers/default.nix
+++ b/crystal/camera-calibration-parsers/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_common-release/archive/release/crystal/camera_calibration_parsers/2.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_common-release/archive/release/crystal/camera_calibration_parsers/2.0.1-0.tar.gz";
+    name = "2.0.1-0.tar.gz";
     sha256 = "5514c154dde82c64bfeb0429016be98dca06045908ab314727c0ef234615a26a";
   };
 
diff --git a/crystal/camera-info-manager/default.nix b/crystal/camera-info-manager/default.nix
index 4620e71271..a65a0e9677 100644
--- a/crystal/camera-info-manager/default.nix
+++ b/crystal/camera-info-manager/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_common-release/archive/release/crystal/camera_info_manager/2.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_common-release/archive/release/crystal/camera_info_manager/2.0.1-0.tar.gz";
+    name = "2.0.1-0.tar.gz";
     sha256 = "65a8f9750504734de8a7033629376d64487c7a0467394f8438b92ff98aee89ef";
   };
 
diff --git a/crystal/cartographer/default.nix b/crystal/cartographer/default.nix
index a44b8e6b93..519ba2f113 100644
--- a/crystal/cartographer/default.nix
+++ b/crystal/cartographer/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.0-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/cartographer-release/archive/release/crystal/cartographer/1.0.0-1.tar.gz;
+    url = "https://github.com/ros2-gbp/cartographer-release/archive/release/crystal/cartographer/1.0.0-1.tar.gz";
+    name = "1.0.0-1.tar.gz";
     sha256 = "8820033c5d07d4acc754b8fe40fb5aee18cdf065b3120e14e7c4fea5115b320c";
   };
 
diff --git a/crystal/class-loader/default.nix b/crystal/class-loader/default.nix
index 11ef881880..20f8261e36 100644
--- a/crystal/class-loader/default.nix
+++ b/crystal/class-loader/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/class_loader-release/archive/release/crystal/class_loader/1.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/class_loader-release/archive/release/crystal/class_loader/1.2.0-0.tar.gz";
+    name = "1.2.0-0.tar.gz";
     sha256 = "eb449f54bbf1fe37e38580e83446b523eb5891f4e187acd4fbce4ec3033c0c56";
   };
 
diff --git a/crystal/common-interfaces/default.nix b/crystal/common-interfaces/default.nix
index 773bc5c5a2..6dde850317 100644
--- a/crystal/common-interfaces/default.nix
+++ b/crystal/common-interfaces/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/common_interfaces/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/common_interfaces/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "ff57c8465eb21ae5a6d109da36edd8b13c31c475c9e0f18fcad0c8119889f136";
   };
 
diff --git a/crystal/composition/default.nix b/crystal/composition/default.nix
index f8d5add2d9..b3bfd7c631 100644
--- a/crystal/composition/default.nix
+++ b/crystal/composition/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/composition/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/composition/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "c85ad022454c92e1dd338ca1a30bf24033a260aa49eb582b4b022d35becba0e9";
   };
 
diff --git a/crystal/compressed-depth-image-transport/default.nix b/crystal/compressed-depth-image-transport/default.nix
index 26b2bc6e5d..756a0f6d43 100644
--- a/crystal/compressed-depth-image-transport/default.nix
+++ b/crystal/compressed-depth-image-transport/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/crystal/compressed_depth_image_transport/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/crystal/compressed_depth_image_transport/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "f4f1b34f97b7804c465ba8e3521c4040dad59873354b378db59b025aa5e54a1c";
   };
 
diff --git a/crystal/compressed-image-transport/default.nix b/crystal/compressed-image-transport/default.nix
index 9df2a93666..bf28c4e5d7 100644
--- a/crystal/compressed-image-transport/default.nix
+++ b/crystal/compressed-image-transport/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/crystal/compressed_image_transport/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/crystal/compressed_image_transport/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "aa631582dbcb9af820c40dd48c116d705b020b0f9fe5d49e660ba3bb078d87de";
   };
 
diff --git a/crystal/connext-cmake-module/default.nix b/crystal/connext-cmake-module/default.nix
index dc798226ca..77e1940297 100644
--- a/crystal/connext-cmake-module/default.nix
+++ b/crystal/connext-cmake-module/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/crystal/connext_cmake_module/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/crystal/connext_cmake_module/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "8caa23925fe887991096acad6bc11127a5db523d941a75e18782e122b7cb475c";
   };
 
diff --git a/crystal/console-bridge-vendor/default.nix b/crystal/console-bridge-vendor/default.nix
index 17d2b2afb6..3457ee5f36 100644
--- a/crystal/console-bridge-vendor/default.nix
+++ b/crystal/console-bridge-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/console_bridge_vendor-release/archive/release/crystal/console_bridge_vendor/1.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/console_bridge_vendor-release/archive/release/crystal/console_bridge_vendor/1.1.0-0.tar.gz";
+    name = "1.1.0-0.tar.gz";
     sha256 = "1a8eb7126fa9825f35ad4f5373646c2df8b68595d0d6e4c2a595c3916e8f7722";
   };
 
diff --git a/crystal/control-msgs/default.nix b/crystal/control-msgs/default.nix
index 695671353c..7bc38347fc 100644
--- a/crystal/control-msgs/default.nix
+++ b/crystal/control-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros-gbp/control_msgs-release/archive/release/crystal/control_msgs/2.1.0-0.tar.gz;
+    url = "https://github.com/ros-gbp/control_msgs-release/archive/release/crystal/control_msgs/2.1.0-0.tar.gz";
+    name = "2.1.0-0.tar.gz";
     sha256 = "1d934b64b7a9fbb74be9ce80d1b4f1791c8c40e1128abf787845853e10bd4842";
   };
 
diff --git a/crystal/costmap-queue/default.nix b/crystal/costmap-queue/default.nix
index fc373bd984..564b02f6c0 100644
--- a/crystal/costmap-queue/default.nix
+++ b/crystal/costmap-queue/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/costmap_queue/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/costmap_queue/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "b4d9d3b0b6b5447d9292858ee3a711bd91973ab3cb9b943945eea0b860ca1b7e";
   };
 
diff --git a/crystal/cv-bridge/default.nix b/crystal/cv-bridge/default.nix
index 5b54f33df3..07e601883c 100644
--- a/crystal/cv-bridge/default.nix
+++ b/crystal/cv-bridge/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/vision_opencv-release/archive/release/crystal/cv_bridge/2.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/crystal/cv_bridge/2.1.0-0.tar.gz";
+    name = "2.1.0-0.tar.gz";
     sha256 = "13c70c9ab1a1a243b1e8c6cd77384e9f037ef7e5b0daf94e1d70ffc6dda2ce53";
   };
 
diff --git a/crystal/demo-nodes-cpp-native/default.nix b/crystal/demo-nodes-cpp-native/default.nix
index 27c2aff4c8..3e81661871 100644
--- a/crystal/demo-nodes-cpp-native/default.nix
+++ b/crystal/demo-nodes-cpp-native/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/demo_nodes_cpp_native/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/demo_nodes_cpp_native/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "3a7bbe8783baab74faa5bfc7f49cc90e4ffa199f6cde8b83dcdf0146dcc0f5fe";
   };
 
diff --git a/crystal/demo-nodes-cpp/default.nix b/crystal/demo-nodes-cpp/default.nix
index 103db1cea4..98e0ed85c3 100644
--- a/crystal/demo-nodes-cpp/default.nix
+++ b/crystal/demo-nodes-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/demo_nodes_cpp/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/demo_nodes_cpp/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "5def106eb042cfb5259c31fac8c3a80da34a4949ea5f731fd4907f3606df812f";
   };
 
diff --git a/crystal/demo-nodes-py/default.nix b/crystal/demo-nodes-py/default.nix
index 4eb45bf809..f3f715806e 100644
--- a/crystal/demo-nodes-py/default.nix
+++ b/crystal/demo-nodes-py/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/demo_nodes_py/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/demo_nodes_py/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "cc1e237a66ebe61ff40c27723c53672c42ebc6afc8f292e422d648b60c394af5";
   };
 
diff --git a/crystal/depth-image-proc/default.nix b/crystal/depth-image-proc/default.nix
index 15a26098b9..f35462c780 100644
--- a/crystal/depth-image-proc/default.nix
+++ b/crystal/depth-image-proc/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_pipeline-release/archive/release/crystal/depth_image_proc/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/crystal/depth_image_proc/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "ffea92a4b087654cdee1786eda631c4a98b1e7725e9824630a5706a8309b2f58";
   };
 
diff --git a/crystal/depthimage-to-laserscan/default.nix b/crystal/depthimage-to-laserscan/default.nix
index adbbb98511..c8f66abcf1 100644
--- a/crystal/depthimage-to-laserscan/default.nix
+++ b/crystal/depthimage-to-laserscan/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.2.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/depthimage_to_laserscan-release/archive/release/crystal/depthimage_to_laserscan/2.2.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/depthimage_to_laserscan-release/archive/release/crystal/depthimage_to_laserscan/2.2.1-0.tar.gz";
+    name = "2.2.1-0.tar.gz";
     sha256 = "582d63c338ab61eaa11d0299ba51a6da91979a75877b6c72208f71891e6b13a1";
   };
 
diff --git a/crystal/desktop/default.nix b/crystal/desktop/default.nix
index b97cc353ce..44cad2d78f 100644
--- a/crystal/desktop/default.nix
+++ b/crystal/desktop/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/variants-release/archive/release/crystal/desktop/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/variants-release/archive/release/crystal/desktop/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "ea16bc7630a42e64f787bf24c164a20cbc7c22c66bcfe04f248e5c1c3d7615fd";
   };
 
diff --git a/crystal/diagnostic-msgs/default.nix b/crystal/diagnostic-msgs/default.nix
index a811caafaa..f1328226b9 100644
--- a/crystal/diagnostic-msgs/default.nix
+++ b/crystal/diagnostic-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/diagnostic_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/diagnostic_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "fb8bea9a6b213a575647cb0daa3ae1b271216a254babe767effec9c8b123ae1f";
   };
 
diff --git a/crystal/dummy-map-server/default.nix b/crystal/dummy-map-server/default.nix
index c0288d869e..3eb1442082 100644
--- a/crystal/dummy-map-server/default.nix
+++ b/crystal/dummy-map-server/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/dummy_map_server/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/dummy_map_server/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "90e3e9890a0b7f07e13a20da7af26cfb7fe15ff10b324080c20f9c4a1300563b";
   };
 
diff --git a/crystal/dummy-robot-bringup/default.nix b/crystal/dummy-robot-bringup/default.nix
index a4b1eb95cb..763e4f286f 100644
--- a/crystal/dummy-robot-bringup/default.nix
+++ b/crystal/dummy-robot-bringup/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/dummy_robot_bringup/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/dummy_robot_bringup/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "30e4072ba6f57663d61f629456bc07c74bd3a9678e9d94d85e7917f09781b468";
   };
 
diff --git a/crystal/dummy-sensors/default.nix b/crystal/dummy-sensors/default.nix
index 4b7fecf1c1..7dde12f9ae 100644
--- a/crystal/dummy-sensors/default.nix
+++ b/crystal/dummy-sensors/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/dummy_sensors/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/dummy_sensors/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "9ad027e3adbca974a195d5ef9140a6b3042333e39d017c0520590127884e494c";
   };
 
diff --git a/crystal/dwb-controller/default.nix b/crystal/dwb-controller/default.nix
index 6ac9c5a9f0..e3b948a330 100644
--- a/crystal/dwb-controller/default.nix
+++ b/crystal/dwb-controller/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_controller/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_controller/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "450f6b6b59a11f491adbd99d2ceaf1e150a11f337e4d64b84738e3159dd974d4";
   };
 
diff --git a/crystal/dwb-core/default.nix b/crystal/dwb-core/default.nix
index 2881110570..37c223c5f2 100644
--- a/crystal/dwb-core/default.nix
+++ b/crystal/dwb-core/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_core/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_core/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "eafb4f87e73d2f5c1d33a113563b09617903c56fcb721e661c54ec7632635693";
   };
 
diff --git a/crystal/dwb-critics/default.nix b/crystal/dwb-critics/default.nix
index 55d5dfb8a8..e860ad4311 100644
--- a/crystal/dwb-critics/default.nix
+++ b/crystal/dwb-critics/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_critics/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_critics/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "0e3089d57956c995c412f80fd13e621dc44777f3d006c4eaf0128f694e746987";
   };
 
diff --git a/crystal/dwb-msgs/default.nix b/crystal/dwb-msgs/default.nix
index dd0b3e22d5..9d37e8dbfa 100644
--- a/crystal/dwb-msgs/default.nix
+++ b/crystal/dwb-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_msgs/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_msgs/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "7c6481c5bee51568f7797885b0b4c2fe8ae830896c770644f8de11084f7bc04e";
   };
 
diff --git a/crystal/dwb-plugins/default.nix b/crystal/dwb-plugins/default.nix
index 73daedeb02..46a2fe8c0b 100644
--- a/crystal/dwb-plugins/default.nix
+++ b/crystal/dwb-plugins/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_plugins/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/dwb_plugins/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "bed22e1314016069e8dc619d7f6c557e156a3e353c370234fb349f0180b8bc56";
   };
 
diff --git a/crystal/ecl-build/default.nix b/crystal/ecl-build/default.nix
index d9e33369c3..f9b819895f 100644
--- a/crystal/ecl-build/default.nix
+++ b/crystal/ecl-build/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1-r1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_tools-release/archive/release/crystal/ecl_build/1.0.1-1.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/crystal/ecl_build/1.0.1-1.tar.gz";
+    name = "1.0.1-1.tar.gz";
     sha256 = "ab906dc70d7f2b7e3a145e192387984a328e0cea93c4cc28f73b6701c7a089d7";
   };
 
diff --git a/crystal/ecl-command-line/default.nix b/crystal/ecl-command-line/default.nix
index 55372d8d5d..d941136760 100644
--- a/crystal/ecl-command-line/default.nix
+++ b/crystal/ecl-command-line/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_command_line/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_command_line/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "b45934bc518ec3fb2db5679cc94ee22198ff0caa7bbb7302ee06f6faef9fa432";
   };
 
diff --git a/crystal/ecl-concepts/default.nix b/crystal/ecl-concepts/default.nix
index 3f64da04eb..e5f87b1ca8 100644
--- a/crystal/ecl-concepts/default.nix
+++ b/crystal/ecl-concepts/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_concepts/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_concepts/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "2c40dadf1d20d70d7a66e905b174d5159ca3d22bf6a474df5b155ec8e8c809d2";
   };
 
diff --git a/crystal/ecl-config/default.nix b/crystal/ecl-config/default.nix
index d19503160f..5b87cbd374 100644
--- a/crystal/ecl-config/default.nix
+++ b/crystal/ecl-config/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_config/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_config/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "8ad595aa9aed466ab1b8e62aa7da54d3694dfe6308695b27d18892807b940de6";
   };
 
diff --git a/crystal/ecl-console/default.nix b/crystal/ecl-console/default.nix
index f86804f1ff..c3dc309b45 100644
--- a/crystal/ecl-console/default.nix
+++ b/crystal/ecl-console/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_console/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_console/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "4c6c0d24df184f7b818373d6db1e430079772dfbf33741e96bdd589259708435";
   };
 
diff --git a/crystal/ecl-containers/default.nix b/crystal/ecl-containers/default.nix
index af3e195bbb..bc962e0e98 100644
--- a/crystal/ecl-containers/default.nix
+++ b/crystal/ecl-containers/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_containers/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_containers/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "a98dc17847066bd224c940ceec83f19382445a49a50436b6f2d2dbe41cfa9a44";
   };
 
diff --git a/crystal/ecl-converters-lite/default.nix b/crystal/ecl-converters-lite/default.nix
index 0e70c275d0..cb59953a69 100644
--- a/crystal/ecl-converters-lite/default.nix
+++ b/crystal/ecl-converters-lite/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_converters_lite/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_converters_lite/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "92cca05995fd5fa738bfbeb5ad9f49d5a77dedaef8c11ed7d59966bc0f8ce642";
   };
 
diff --git a/crystal/ecl-converters/default.nix b/crystal/ecl-converters/default.nix
index 4571bcc8fc..3479b3f340 100644
--- a/crystal/ecl-converters/default.nix
+++ b/crystal/ecl-converters/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_converters/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_converters/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "c7bcb0421318715a2360dfa77f08f6e45796beb5c8c9db62b19e722da3751671";
   };
 
diff --git a/crystal/ecl-core-apps/default.nix b/crystal/ecl-core-apps/default.nix
index cf451ee743..f54bdaa9da 100644
--- a/crystal/ecl-core-apps/default.nix
+++ b/crystal/ecl-core-apps/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_core_apps/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_core_apps/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "4ecaab4200b12304d57fd077b3027cd57ed8ea021cfd7ab1c8b4299f2ee41134";
   };
 
diff --git a/crystal/ecl-core/default.nix b/crystal/ecl-core/default.nix
index 6ad1133808..6b7bc57fd9 100644
--- a/crystal/ecl-core/default.nix
+++ b/crystal/ecl-core/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_core/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_core/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "00d05827ed189c57dba3950f6a68f25c3b5e3da5ff06e8390b0c117bac974a41";
   };
 
diff --git a/crystal/ecl-devices/default.nix b/crystal/ecl-devices/default.nix
index d229cf47c1..b8e7cd092e 100644
--- a/crystal/ecl-devices/default.nix
+++ b/crystal/ecl-devices/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_devices/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_devices/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "83dee83518c5937165ee4506d6358e714d9cf8fce2fa05c54ab922669e22ddb1";
   };
 
diff --git a/crystal/ecl-eigen/default.nix b/crystal/ecl-eigen/default.nix
index 84ac68e5fd..9f4b231545 100644
--- a/crystal/ecl-eigen/default.nix
+++ b/crystal/ecl-eigen/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_eigen/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_eigen/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "e3f94550689bffd30ec975d5a94c4ac7b521da5f59e5e14b19b1728d0af9c3b2";
   };
 
diff --git a/crystal/ecl-errors/default.nix b/crystal/ecl-errors/default.nix
index befff1f690..1be7daf471 100644
--- a/crystal/ecl-errors/default.nix
+++ b/crystal/ecl-errors/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_errors/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_errors/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "7253c6f1af5c15d658d23f14b52f07fa1bc48648b8dfa34eed0c95ba8875b186";
   };
 
diff --git a/crystal/ecl-exceptions/default.nix b/crystal/ecl-exceptions/default.nix
index 760d56bb3f..369f60cd2e 100644
--- a/crystal/ecl-exceptions/default.nix
+++ b/crystal/ecl-exceptions/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_exceptions/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_exceptions/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "c673d88f292daa245bfa460d0af1e3623e15f8c507adec03b28f9fc5ca82968b";
   };
 
diff --git a/crystal/ecl-filesystem/default.nix b/crystal/ecl-filesystem/default.nix
index b6d421015f..6acfea511a 100644
--- a/crystal/ecl-filesystem/default.nix
+++ b/crystal/ecl-filesystem/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_filesystem/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_filesystem/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "9b6fd490434d4a1a8f44f974f4f01ebfd5b6a2bef880fca7586b41d811a8aabc";
   };
 
diff --git a/crystal/ecl-formatters/default.nix b/crystal/ecl-formatters/default.nix
index 12e9cce753..a1ca5285a9 100644
--- a/crystal/ecl-formatters/default.nix
+++ b/crystal/ecl-formatters/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_formatters/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_formatters/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "b965714bbb869bbbfe9ecf925fa6e2f6e1275d8ff764f9e8f93110a00609cbe0";
   };
 
diff --git a/crystal/ecl-geometry/default.nix b/crystal/ecl-geometry/default.nix
index d629199f9e..eb41c4d3d4 100644
--- a/crystal/ecl-geometry/default.nix
+++ b/crystal/ecl-geometry/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_geometry/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_geometry/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "98e1c67a4da502cf83f49ba02364bf31a341082365569700466fcb01d3f269b3";
   };
 
diff --git a/crystal/ecl-io/default.nix b/crystal/ecl-io/default.nix
index a9a3e3af76..da1faab9e5 100644
--- a/crystal/ecl-io/default.nix
+++ b/crystal/ecl-io/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_io/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_io/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "415a4a10ce017151d21132c31d26f1dcac1cb80cae3fe6f5b5eb79241acd06e6";
   };
 
diff --git a/crystal/ecl-ipc/default.nix b/crystal/ecl-ipc/default.nix
index 22e0c8679c..6c68161284 100644
--- a/crystal/ecl-ipc/default.nix
+++ b/crystal/ecl-ipc/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_ipc/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_ipc/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "8b8c012ac5e1ad3893b3faa2985b7fe0c276271992adb1dbfc2f745a04e4063d";
   };
 
diff --git a/crystal/ecl-license/default.nix b/crystal/ecl-license/default.nix
index c143a4e804..c106234381 100644
--- a/crystal/ecl-license/default.nix
+++ b/crystal/ecl-license/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1-r1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_tools-release/archive/release/crystal/ecl_license/1.0.1-1.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/crystal/ecl_license/1.0.1-1.tar.gz";
+    name = "1.0.1-1.tar.gz";
     sha256 = "3a142f1a9e1aa1229979e45856ab06c6c923a9efd595dd616d2f04b2f5fbc721";
   };
 
diff --git a/crystal/ecl-linear-algebra/default.nix b/crystal/ecl-linear-algebra/default.nix
index d88562deb3..c9a5436b1c 100644
--- a/crystal/ecl-linear-algebra/default.nix
+++ b/crystal/ecl-linear-algebra/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_linear_algebra/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_linear_algebra/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "f5a5be624ca3ea6bc470d459a4395f3b74944c615c24987124e235922b8be9ea";
   };
 
diff --git a/crystal/ecl-lite/default.nix b/crystal/ecl-lite/default.nix
index 5fefe25a44..e27c24b210 100644
--- a/crystal/ecl-lite/default.nix
+++ b/crystal/ecl-lite/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_lite/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_lite/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "da24938f4d3fabe34a7d9e936cb274beb26f8070113c92fd3b3da54b7a127f75";
   };
 
diff --git a/crystal/ecl-manipulators/default.nix b/crystal/ecl-manipulators/default.nix
index b0988e6a16..160614fb27 100644
--- a/crystal/ecl-manipulators/default.nix
+++ b/crystal/ecl-manipulators/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_manipulators/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_manipulators/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "9072031429b88698f4f2afa98037077bbf0256aa6fc11512ea4220f7b15760be";
   };
 
diff --git a/crystal/ecl-math/default.nix b/crystal/ecl-math/default.nix
index 37cbf477cb..4ad813f874 100644
--- a/crystal/ecl-math/default.nix
+++ b/crystal/ecl-math/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_math/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_math/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "34a913f20b96c7a81741ede0f5af6b280089f100b273304efc328a9a2d738ae4";
   };
 
diff --git a/crystal/ecl-mobile-robot/default.nix b/crystal/ecl-mobile-robot/default.nix
index 3cef1df04d..1c86242cad 100644
--- a/crystal/ecl-mobile-robot/default.nix
+++ b/crystal/ecl-mobile-robot/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_mobile_robot/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_mobile_robot/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "6f5823539daecf82dd626c3bb0737a5e86d5726019d272171217fd7115890500";
   };
 
diff --git a/crystal/ecl-mpl/default.nix b/crystal/ecl-mpl/default.nix
index 8a15ef6996..6d63ac29c1 100644
--- a/crystal/ecl-mpl/default.nix
+++ b/crystal/ecl-mpl/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_mpl/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_mpl/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "b4200f6806db576ae61d0e4eddfb60286f0c8a9f4523abccbb72ae284cdd6f73";
   };
 
diff --git a/crystal/ecl-sigslots-lite/default.nix b/crystal/ecl-sigslots-lite/default.nix
index 8f0f2d47bc..f137a1ba30 100644
--- a/crystal/ecl-sigslots-lite/default.nix
+++ b/crystal/ecl-sigslots-lite/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_sigslots_lite/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_sigslots_lite/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "e9103435c3befa6c163051a944ca2964b5761d2db5697a288be95cc82aa6a423";
   };
 
diff --git a/crystal/ecl-sigslots/default.nix b/crystal/ecl-sigslots/default.nix
index bae72773c1..94b232cad0 100644
--- a/crystal/ecl-sigslots/default.nix
+++ b/crystal/ecl-sigslots/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_sigslots/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_sigslots/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "9f2f83fc23240e78693cb56a7abf2cb87b2bea9efbe6a9107299e0dd574db611";
   };
 
diff --git a/crystal/ecl-statistics/default.nix b/crystal/ecl-statistics/default.nix
index 131c2c4a12..66496c00b3 100644
--- a/crystal/ecl-statistics/default.nix
+++ b/crystal/ecl-statistics/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_statistics/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_statistics/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "a27f8fd665f798bb50774cf81cd42fa8139d3388c9df67db53d3e616144deba1";
   };
 
diff --git a/crystal/ecl-streams/default.nix b/crystal/ecl-streams/default.nix
index a7e9db6de9..a42825d6ce 100644
--- a/crystal/ecl-streams/default.nix
+++ b/crystal/ecl-streams/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_streams/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_streams/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "06275da6301894c7d669770ca6333a60b9b0ccd0ffeee6482464fd8c1924a34e";
   };
 
diff --git a/crystal/ecl-threads/default.nix b/crystal/ecl-threads/default.nix
index 500203562d..aa03f4ce23 100644
--- a/crystal/ecl-threads/default.nix
+++ b/crystal/ecl-threads/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_threads/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_threads/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "04e4e9d7cd8b64c1d3169d0f018f14ddde749db5fb7acccc0184371cee0bf078";
   };
 
diff --git a/crystal/ecl-time-lite/default.nix b/crystal/ecl-time-lite/default.nix
index a94b710c86..6b83d5c600 100644
--- a/crystal/ecl-time-lite/default.nix
+++ b/crystal/ecl-time-lite/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_time_lite/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_lite-release/archive/release/crystal/ecl_time_lite/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "0e008aa72773384f0da2906b6562477ca47abdef604076529eac6a19ca179997";
   };
 
diff --git a/crystal/ecl-time/default.nix b/crystal/ecl-time/default.nix
index 60726a00f3..10eb11431c 100644
--- a/crystal/ecl-time/default.nix
+++ b/crystal/ecl-time/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_time/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_time/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "f9c643be05bfe53d52aa9aafe0bc5b41620cace6fea343bb68578334905d799c";
   };
 
diff --git a/crystal/ecl-tools/default.nix b/crystal/ecl-tools/default.nix
index dab3633b98..0da6cc40b8 100644
--- a/crystal/ecl-tools/default.nix
+++ b/crystal/ecl-tools/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1-r1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_tools-release/archive/release/crystal/ecl_tools/1.0.1-1.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_tools-release/archive/release/crystal/ecl_tools/1.0.1-1.tar.gz";
+    name = "1.0.1-1.tar.gz";
     sha256 = "899c4f6f93e12acdb6d81631ac8fdf56c45a54f565e68a4ce6a05030e4ddbbbd";
   };
 
diff --git a/crystal/ecl-type-traits/default.nix b/crystal/ecl-type-traits/default.nix
index 6cdc8d96d9..89c1f51140 100644
--- a/crystal/ecl-type-traits/default.nix
+++ b/crystal/ecl-type-traits/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_type_traits/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_type_traits/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "dba20da2c44d2b510db614738312ff31374fef5dee29c28efba4b1a69c7a29ff";
   };
 
diff --git a/crystal/ecl-utilities/default.nix b/crystal/ecl-utilities/default.nix
index d265527d37..025aa93c7b 100644
--- a/crystal/ecl-utilities/default.nix
+++ b/crystal/ecl-utilities/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_utilities/1.0.1-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/ecl_core-release/archive/release/crystal/ecl_utilities/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "393f6746ee0a4963fff724ea6f63c429e76f2beb5ef25e37e552134afe570b94";
   };
 
diff --git a/crystal/eigen-stl-containers/default.nix b/crystal/eigen-stl-containers/default.nix
index 8ab52c4a78..c805af3f8c 100644
--- a/crystal/eigen-stl-containers/default.nix
+++ b/crystal/eigen-stl-containers/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/eigen_stl_containers-release/archive/release/crystal/eigen_stl_containers/1.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/eigen_stl_containers-release/archive/release/crystal/eigen_stl_containers/1.0.0-0.tar.gz";
+    name = "1.0.0-0.tar.gz";
     sha256 = "dd870ca56fe118b51f00459340ffcf4cef968c1c6e27f8eab9326b9f02c95ee4";
   };
 
diff --git a/crystal/ets-cpp-client/default.nix b/crystal/ets-cpp-client/default.nix
index 3aac0ad13f..1c27cc1110 100644
--- a/crystal/ets-cpp-client/default.nix
+++ b/crystal/ets-cpp-client/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.2-r2";
 
   src = fetchurl {
-    url = https://github.com/brunodmt/ets_ros2-release/archive/release/crystal/ets_cpp_client/0.1.2-2.tar.gz;
+    url = "https://github.com/brunodmt/ets_ros2-release/archive/release/crystal/ets_cpp_client/0.1.2-2.tar.gz";
+    name = "0.1.2-2.tar.gz";
     sha256 = "fd8f72849064578c712fd7d106067af72c38aadfeb89fea2f19e90244df93b44";
   };
 
diff --git a/crystal/ets-msgs/default.nix b/crystal/ets-msgs/default.nix
index 29bdf9a896..75d2d808e3 100644
--- a/crystal/ets-msgs/default.nix
+++ b/crystal/ets-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.2-r2";
 
   src = fetchurl {
-    url = https://github.com/brunodmt/ets_ros2-release/archive/release/crystal/ets_msgs/0.1.2-2.tar.gz;
+    url = "https://github.com/brunodmt/ets_ros2-release/archive/release/crystal/ets_msgs/0.1.2-2.tar.gz";
+    name = "0.1.2-2.tar.gz";
     sha256 = "082495a82ab3acee57fc481d295a4926ac065b963b3f6a8dd4355fb25a1a1851";
   };
 
diff --git a/crystal/ets-plugin/default.nix b/crystal/ets-plugin/default.nix
index 2755278968..110daed096 100644
--- a/crystal/ets-plugin/default.nix
+++ b/crystal/ets-plugin/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.2-r2";
 
   src = fetchurl {
-    url = https://github.com/brunodmt/ets_ros2-release/archive/release/crystal/ets_plugin/0.1.2-2.tar.gz;
+    url = "https://github.com/brunodmt/ets_ros2-release/archive/release/crystal/ets_plugin/0.1.2-2.tar.gz";
+    name = "0.1.2-2.tar.gz";
     sha256 = "8287ec4889915a5aa9a8e1db5b55c6b95fefba310f11f31f594ad9e132f0391d";
   };
 
diff --git a/crystal/example-interfaces/default.nix b/crystal/example-interfaces/default.nix
index e6d610ed59..f13c30216d 100644
--- a/crystal/example-interfaces/default.nix
+++ b/crystal/example-interfaces/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/example_interfaces-release/archive/release/crystal/example_interfaces/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/example_interfaces-release/archive/release/crystal/example_interfaces/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "0c93953b378fdd65af4e4b68d46bb155e4dbb2ae469e8f04c9c445e3cdfb8224";
   };
 
diff --git a/crystal/examples-rclcpp-minimal-action-client/default.nix b/crystal/examples-rclcpp-minimal-action-client/default.nix
index 481a712c31..6b6955d3ca 100644
--- a/crystal/examples-rclcpp-minimal-action-client/default.nix
+++ b/crystal/examples-rclcpp-minimal-action-client/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_action_client/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_action_client/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "c0b4a4f04e4aa693e82c2091a69aef412fe5e99b2f6e5e23d179629f78a7e1a0";
   };
 
diff --git a/crystal/examples-rclcpp-minimal-action-server/default.nix b/crystal/examples-rclcpp-minimal-action-server/default.nix
index b17210c46d..52ee05b06a 100644
--- a/crystal/examples-rclcpp-minimal-action-server/default.nix
+++ b/crystal/examples-rclcpp-minimal-action-server/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_action_server/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_action_server/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "b05d0aabfa0ead11e5a42ebddb00917a0033ec7199cc21b1e93e262e4c9fcd64";
   };
 
diff --git a/crystal/examples-rclcpp-minimal-client/default.nix b/crystal/examples-rclcpp-minimal-client/default.nix
index d660b6c47a..17630d4d88 100644
--- a/crystal/examples-rclcpp-minimal-client/default.nix
+++ b/crystal/examples-rclcpp-minimal-client/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_client/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_client/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "f752e4565af0a8dab10f84d6a24c1220a30673f768b91cb82d3baab8231c563a";
   };
 
diff --git a/crystal/examples-rclcpp-minimal-composition/default.nix b/crystal/examples-rclcpp-minimal-composition/default.nix
index f0e49bc727..8cd74c6f93 100644
--- a/crystal/examples-rclcpp-minimal-composition/default.nix
+++ b/crystal/examples-rclcpp-minimal-composition/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_composition/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_composition/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "e52d9d3afa270e4a1c01f3dc1197578dd66a33d328a7789b186035338b86e4ca";
   };
 
diff --git a/crystal/examples-rclcpp-minimal-publisher/default.nix b/crystal/examples-rclcpp-minimal-publisher/default.nix
index 238fa97f55..bfd755c58a 100644
--- a/crystal/examples-rclcpp-minimal-publisher/default.nix
+++ b/crystal/examples-rclcpp-minimal-publisher/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_publisher/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_publisher/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "55927e19129e0ead3947981d10dceda95d9f9e979d35275ecd0d271f90c642be";
   };
 
diff --git a/crystal/examples-rclcpp-minimal-service/default.nix b/crystal/examples-rclcpp-minimal-service/default.nix
index ab196034b5..de722719c0 100644
--- a/crystal/examples-rclcpp-minimal-service/default.nix
+++ b/crystal/examples-rclcpp-minimal-service/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_service/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_service/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "62f7408c2a5d1afffe56efa4bff51318fbd63bfb50d22ec863d628a2d77d1841";
   };
 
diff --git a/crystal/examples-rclcpp-minimal-subscriber/default.nix b/crystal/examples-rclcpp-minimal-subscriber/default.nix
index cc4c962359..98526828a7 100644
--- a/crystal/examples-rclcpp-minimal-subscriber/default.nix
+++ b/crystal/examples-rclcpp-minimal-subscriber/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_subscriber/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_subscriber/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "d8f394fccb9c4844ab7b4bbd0af9b0d15642bab4dea934ad72f9fa5f152d8ea1";
   };
 
diff --git a/crystal/examples-rclcpp-minimal-timer/default.nix b/crystal/examples-rclcpp-minimal-timer/default.nix
index b5193237c6..b1f08a8f09 100644
--- a/crystal/examples-rclcpp-minimal-timer/default.nix
+++ b/crystal/examples-rclcpp-minimal-timer/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_timer/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclcpp_minimal_timer/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "0844580bbf14b2ac1bb4494ad84842edadff3252a491dda7087d5159e685fbdc";
   };
 
diff --git a/crystal/examples-rclpy-executors/default.nix b/crystal/examples-rclpy-executors/default.nix
index 5a06cf28f4..e6c6e0afa1 100644
--- a/crystal/examples-rclpy-executors/default.nix
+++ b/crystal/examples-rclpy-executors/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_executors/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_executors/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "c9d7cf286993d9694474145287a1b37acaceb6d37f2a4d7f5759adb08cb76b83";
   };
 
diff --git a/crystal/examples-rclpy-minimal-action-client/default.nix b/crystal/examples-rclpy-minimal-action-client/default.nix
index 98d1370543..09223ec72d 100644
--- a/crystal/examples-rclpy-minimal-action-client/default.nix
+++ b/crystal/examples-rclpy-minimal-action-client/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_action_client/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_action_client/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "761e476a76b0c8a640872e75449f43229aef8822bedef1c3f472464b52d6505d";
   };
 
diff --git a/crystal/examples-rclpy-minimal-action-server/default.nix b/crystal/examples-rclpy-minimal-action-server/default.nix
index 2655e226e6..9f68798795 100644
--- a/crystal/examples-rclpy-minimal-action-server/default.nix
+++ b/crystal/examples-rclpy-minimal-action-server/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_action_server/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_action_server/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "a1640fec00489dbe9a6832ba1fa9924bdb09eff1dabc721a035b028a9f15608d";
   };
 
diff --git a/crystal/examples-rclpy-minimal-client/default.nix b/crystal/examples-rclpy-minimal-client/default.nix
index dbb5a379d2..e5f106f979 100644
--- a/crystal/examples-rclpy-minimal-client/default.nix
+++ b/crystal/examples-rclpy-minimal-client/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_client/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_client/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "dd729504700ecf9699229a9537db7c2cde5976223ac12b319842bf5e83744ff6";
   };
 
diff --git a/crystal/examples-rclpy-minimal-publisher/default.nix b/crystal/examples-rclpy-minimal-publisher/default.nix
index 7709d0232e..67b0e3e2a5 100644
--- a/crystal/examples-rclpy-minimal-publisher/default.nix
+++ b/crystal/examples-rclpy-minimal-publisher/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_publisher/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_publisher/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "e73863a26c3235c8cc139b24c6c5ad84925ce099534ccf09dcb933ea6c34dffb";
   };
 
diff --git a/crystal/examples-rclpy-minimal-service/default.nix b/crystal/examples-rclpy-minimal-service/default.nix
index e68050a9ce..cfcafe7fb5 100644
--- a/crystal/examples-rclpy-minimal-service/default.nix
+++ b/crystal/examples-rclpy-minimal-service/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_service/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_service/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "e5f701fcf72f20f0e5e05dffb741d0f537e77daf58f5daa8e1227843ea98a18c";
   };
 
diff --git a/crystal/examples-rclpy-minimal-subscriber/default.nix b/crystal/examples-rclpy-minimal-subscriber/default.nix
index 1b9c7a0a00..1c0be3cb03 100644
--- a/crystal/examples-rclpy-minimal-subscriber/default.nix
+++ b/crystal/examples-rclpy-minimal-subscriber/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_subscriber/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/examples-release/archive/release/crystal/examples_rclpy_minimal_subscriber/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "549277190cb95b82551aa913eaf92b9e48aee264134c5fba42a6d248ae0f0596";
   };
 
diff --git a/crystal/fastcdr/default.nix b/crystal/fastcdr/default.nix
index 1d32f02454..90143611c5 100644
--- a/crystal/fastcdr/default.nix
+++ b/crystal/fastcdr/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.8";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/fastcdr-release/archive/release/crystal/fastcdr/1.0.8-0.tar.gz;
+    url = "https://github.com/ros2-gbp/fastcdr-release/archive/release/crystal/fastcdr/1.0.8-0.tar.gz";
+    name = "1.0.8-0.tar.gz";
     sha256 = "4ad70c34ca0db3146a4b1eaf0cefb85ffceb28087da57e4b0fd06345607d5935";
   };
 
diff --git a/crystal/fastrtps-cmake-module/default.nix b/crystal/fastrtps-cmake-module/default.nix
index 0992daf905..7503b211ae 100644
--- a/crystal/fastrtps-cmake-module/default.nix
+++ b/crystal/fastrtps-cmake-module/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/crystal/fastrtps_cmake_module/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/crystal/fastrtps_cmake_module/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "f2a152b916a700341bd1fdb6c2730e06f094e773fac5b42b3706cabbaf79ae93";
   };
 
diff --git a/crystal/fastrtps/default.nix b/crystal/fastrtps/default.nix
index 8a5f979ee0..20f7dfb995 100644
--- a/crystal/fastrtps/default.nix
+++ b/crystal/fastrtps/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.7.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/fastrtps-release/archive/release/crystal/fastrtps/1.7.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/fastrtps-release/archive/release/crystal/fastrtps/1.7.2-0.tar.gz";
+    name = "1.7.2-0.tar.gz";
     sha256 = "296305d8465e27e3cff4289865b15bf2bb40ccfb7a7d60e7c28b3a5df3a1a33a";
   };
 
diff --git a/crystal/fmi-adapter-examples/default.nix b/crystal/fmi-adapter-examples/default.nix
index 41fb026bf1..5584f3a81e 100644
--- a/crystal/fmi-adapter-examples/default.nix
+++ b/crystal/fmi-adapter-examples/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.4-r1";
 
   src = fetchurl {
-    url = https://github.com/boschresearch/fmi_adapter_ros2-release/archive/release/crystal/fmi_adapter_examples/0.1.4-1.tar.gz;
+    url = "https://github.com/boschresearch/fmi_adapter_ros2-release/archive/release/crystal/fmi_adapter_examples/0.1.4-1.tar.gz";
+    name = "0.1.4-1.tar.gz";
     sha256 = "a6ab41c00250033a1aa06e24c40929299dc51bd7842b8488195abdf3dc16fe15";
   };
 
diff --git a/crystal/fmi-adapter/default.nix b/crystal/fmi-adapter/default.nix
index 5cd831c5f9..caacbeb6a5 100644
--- a/crystal/fmi-adapter/default.nix
+++ b/crystal/fmi-adapter/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.4-r1";
 
   src = fetchurl {
-    url = https://github.com/boschresearch/fmi_adapter_ros2-release/archive/release/crystal/fmi_adapter/0.1.4-1.tar.gz;
+    url = "https://github.com/boschresearch/fmi_adapter_ros2-release/archive/release/crystal/fmi_adapter/0.1.4-1.tar.gz";
+    name = "0.1.4-1.tar.gz";
     sha256 = "25baebf9675f26c246a6a7608f48ac92f323bdbe129809007ad98f52191aec77";
   };
 
diff --git a/crystal/gazebo-dev/default.nix b/crystal/gazebo-dev/default.nix
index 2b82498cd8..5f2b35f8cd 100644
--- a/crystal/gazebo-dev/default.nix
+++ b/crystal/gazebo-dev/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "3.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_dev/3.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_dev/3.2.0-0.tar.gz";
+    name = "3.2.0-0.tar.gz";
     sha256 = "a7820291c149e6e678fe5b6b4076fc4aa4872ad674555d4f8ec3cc072fae6968";
   };
 
diff --git a/crystal/gazebo-msgs/default.nix b/crystal/gazebo-msgs/default.nix
index 3cb6c1d433..9ca0cec748 100644
--- a/crystal/gazebo-msgs/default.nix
+++ b/crystal/gazebo-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "3.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_msgs/3.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_msgs/3.2.0-0.tar.gz";
+    name = "3.2.0-0.tar.gz";
     sha256 = "2d9081921a5f60dd3cc5a886d1bf96e54d2a1d4620aa59e766f71b543e57f7f5";
   };
 
diff --git a/crystal/gazebo-plugins/default.nix b/crystal/gazebo-plugins/default.nix
index ecbcfbdeed..6497fd20b5 100644
--- a/crystal/gazebo-plugins/default.nix
+++ b/crystal/gazebo-plugins/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "3.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_plugins/3.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_plugins/3.2.0-0.tar.gz";
+    name = "3.2.0-0.tar.gz";
     sha256 = "51a0467974dfe60f044ee9ce790bf66bd17cd0c3c2f342aacc7711bb7673fe8c";
   };
 
diff --git a/crystal/gazebo-ros-pkgs/default.nix b/crystal/gazebo-ros-pkgs/default.nix
index bff39ef757..f24ac935df 100644
--- a/crystal/gazebo-ros-pkgs/default.nix
+++ b/crystal/gazebo-ros-pkgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "3.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_ros_pkgs/3.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_ros_pkgs/3.2.0-0.tar.gz";
+    name = "3.2.0-0.tar.gz";
     sha256 = "49aa4f9a95b2dc720b6c0494692aad11ab21b9626116ce4b28ef9c6f6c2e6e17";
   };
 
diff --git a/crystal/gazebo-ros/default.nix b/crystal/gazebo-ros/default.nix
index 712de4e0cb..a69cbab408 100644
--- a/crystal/gazebo-ros/default.nix
+++ b/crystal/gazebo-ros/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "3.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_ros/3.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/gazebo_ros_pkgs-release/archive/release/crystal/gazebo_ros/3.2.0-0.tar.gz";
+    name = "3.2.0-0.tar.gz";
     sha256 = "15951164aa4962195cbd701f7539de10a4da2133444a759426f22ed43de36905";
   };
 
diff --git a/crystal/geometry-msgs/default.nix b/crystal/geometry-msgs/default.nix
index c0fe2c2ce4..782a178e89 100644
--- a/crystal/geometry-msgs/default.nix
+++ b/crystal/geometry-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/geometry_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/geometry_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "b7f94748df58d15b6b2235a8be0e7ea51f2b72adb73c4f4ae137a38899a3a40f";
   };
 
diff --git a/crystal/gmock-vendor/default.nix b/crystal/gmock-vendor/default.nix
index 73fba232cf..b1290000da 100644
--- a/crystal/gmock-vendor/default.nix
+++ b/crystal/gmock-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.8.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/googletest-release/archive/release/crystal/gmock_vendor/1.8.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/googletest-release/archive/release/crystal/gmock_vendor/1.8.0-0.tar.gz";
+    name = "1.8.0-0.tar.gz";
     sha256 = "c992c3560bfbf7ea20a1eeb8330b99c796f180e7b9d33bf2ce9d5d2cad429810";
   };
 
diff --git a/crystal/gtest-vendor/default.nix b/crystal/gtest-vendor/default.nix
index 4291c26864..9e5ad3da2a 100644
--- a/crystal/gtest-vendor/default.nix
+++ b/crystal/gtest-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.8.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/googletest-release/archive/release/crystal/gtest_vendor/1.8.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/googletest-release/archive/release/crystal/gtest_vendor/1.8.0-0.tar.gz";
+    name = "1.8.0-0.tar.gz";
     sha256 = "f670a11cca4cf323c27c007c363ae1cdedcab5b04894fe9fb427075855c25854";
   };
 
diff --git a/crystal/image-geometry/default.nix b/crystal/image-geometry/default.nix
index 0a8963525d..59d013533e 100644
--- a/crystal/image-geometry/default.nix
+++ b/crystal/image-geometry/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/vision_opencv-release/archive/release/crystal/image_geometry/2.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/crystal/image_geometry/2.1.0-0.tar.gz";
+    name = "2.1.0-0.tar.gz";
     sha256 = "1fbf0988dbf901abd57568dc429988e5316f9184230dbe102d2cb783ccd7c913";
   };
 
diff --git a/crystal/image-publisher/default.nix b/crystal/image-publisher/default.nix
index 5a4c846447..98f286201e 100644
--- a/crystal/image-publisher/default.nix
+++ b/crystal/image-publisher/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_pipeline-release/archive/release/crystal/image_publisher/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_pipeline-release/archive/release/crystal/image_publisher/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "399a70053d065f616ea3b8a4dcc0b8aa5aba278c3e12d60be4dadfffe39dc7eb";
   };
 
diff --git a/crystal/image-tools/default.nix b/crystal/image-tools/default.nix
index d097ea3e0f..12c1c9505e 100644
--- a/crystal/image-tools/default.nix
+++ b/crystal/image-tools/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/image_tools/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/image_tools/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "6b7323ff77c5f2a3770d94e85e1d925ba6b657f5fd0110a644230aba2ad04287";
   };
 
diff --git a/crystal/image-transport-plugins/default.nix b/crystal/image-transport-plugins/default.nix
index 7e70863bd2..65d5fade75 100644
--- a/crystal/image-transport-plugins/default.nix
+++ b/crystal/image-transport-plugins/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/crystal/image_transport_plugins/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/crystal/image_transport_plugins/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "31adddd619d0be5f1561ae22d965b98da156ee9b5f0bfa0d7f06534c7eb743cc";
   };
 
diff --git a/crystal/image-transport/default.nix b/crystal/image-transport/default.nix
index 17f4ad3469..5418f19b8c 100644
--- a/crystal/image-transport/default.nix
+++ b/crystal/image-transport/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_common-release/archive/release/crystal/image_transport/2.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_common-release/archive/release/crystal/image_transport/2.0.1-0.tar.gz";
+    name = "2.0.1-0.tar.gz";
     sha256 = "80d28aee0a7cf9c2412f589e27638afab061a33740970935efeb990c31cea010";
   };
 
diff --git a/crystal/intra-process-demo/default.nix b/crystal/intra-process-demo/default.nix
index 25b9b61cd5..8c591cef92 100644
--- a/crystal/intra-process-demo/default.nix
+++ b/crystal/intra-process-demo/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/intra_process_demo/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/intra_process_demo/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "f40ccb7be71f24b0b87300e5198f3e721aa99a537c8cee8b3ee707bee901fbc9";
   };
 
diff --git a/crystal/joy/default.nix b/crystal/joy/default.nix
index 6b53dc6f24..a828b6b1c7 100644
--- a/crystal/joy/default.nix
+++ b/crystal/joy/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.2.1-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/joystick_drivers-release/archive/release/crystal/joy/2.2.1-1.tar.gz;
+    url = "https://github.com/ros2-gbp/joystick_drivers-release/archive/release/crystal/joy/2.2.1-1.tar.gz";
+    name = "2.2.1-1.tar.gz";
     sha256 = "28de8edab84c773926d75918d4dec56c844ff3273a61bbcd098ee0ba710d97dc";
   };
 
diff --git a/crystal/kdl-parser/default.nix b/crystal/kdl-parser/default.nix
index 3a1722ec9e..85a2bd15bd 100644
--- a/crystal/kdl-parser/default.nix
+++ b/crystal/kdl-parser/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/kdl_parser-release/archive/release/crystal/kdl_parser/2.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/kdl_parser-release/archive/release/crystal/kdl_parser/2.2.0-0.tar.gz";
+    name = "2.2.0-0.tar.gz";
     sha256 = "9f3e1d9af948522e30fceb48dc27cd55cf2726965b00b6d3f745f205e49c92bf";
   };
 
diff --git a/crystal/keystroke/default.nix b/crystal/keystroke/default.nix
index fedda0ec3f..edccb484bb 100644
--- a/crystal/keystroke/default.nix
+++ b/crystal/keystroke/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.3.0-r2";
 
   src = fetchurl {
-    url = https://github.com/RoverRobotics/ros2-keystroke-release/archive/release/crystal/keystroke/0.3.0-2.tar.gz;
+    url = "https://github.com/RoverRobotics/ros2-keystroke-release/archive/release/crystal/keystroke/0.3.0-2.tar.gz";
+    name = "0.3.0-2.tar.gz";
     sha256 = "7f8f328829b31d38c84025fc2e56eaa55c6e194ee25bcb9b8487fcc67fd19cc1";
   };
 
diff --git a/crystal/laser-geometry/default.nix b/crystal/laser-geometry/default.nix
index 0f6900fc99..9c46f08f19 100644
--- a/crystal/laser-geometry/default.nix
+++ b/crystal/laser-geometry/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/laser_geometry-release/archive/release/crystal/laser_geometry/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/laser_geometry-release/archive/release/crystal/laser_geometry/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "7eebd7deb07fcd802f465ded75470b19331e11795f26069a2d8ce438a316ff70";
   };
 
diff --git a/crystal/launch-ros/default.nix b/crystal/launch-ros/default.nix
index 28accad42b..44e8de8fcb 100644
--- a/crystal/launch-ros/default.nix
+++ b/crystal/launch-ros/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.7.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/launch-release/archive/release/crystal/launch_ros/0.7.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/launch-release/archive/release/crystal/launch_ros/0.7.4-0.tar.gz";
+    name = "0.7.4-0.tar.gz";
     sha256 = "480257659d78e901745518c17ae0e35e6def35dbb7bc7a1d5867a3f1f3f08bbb";
   };
 
diff --git a/crystal/launch-testing/default.nix b/crystal/launch-testing/default.nix
index 17b86ddcd1..5d8b42d4cd 100644
--- a/crystal/launch-testing/default.nix
+++ b/crystal/launch-testing/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.7.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/launch-release/archive/release/crystal/launch_testing/0.7.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/launch-release/archive/release/crystal/launch_testing/0.7.4-0.tar.gz";
+    name = "0.7.4-0.tar.gz";
     sha256 = "f2e76510b9b46a57150d902ba813ec46f8f9032e2d0152091bbddc7c37c0d959";
   };
 
diff --git a/crystal/launch/default.nix b/crystal/launch/default.nix
index f0fdf17552..4d07d16083 100644
--- a/crystal/launch/default.nix
+++ b/crystal/launch/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.7.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/launch-release/archive/release/crystal/launch/0.7.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/launch-release/archive/release/crystal/launch/0.7.4-0.tar.gz";
+    name = "0.7.4-0.tar.gz";
     sha256 = "5fc208fcf017a8bfe79594bb62cf434801683c5d01a9785b5b783b558528224a";
   };
 
diff --git a/crystal/libcurl-vendor/default.nix b/crystal/libcurl-vendor/default.nix
index b44506153a..e50464cd51 100644
--- a/crystal/libcurl-vendor/default.nix
+++ b/crystal/libcurl-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/resource_retriever-release/archive/release/crystal/libcurl_vendor/2.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/resource_retriever-release/archive/release/crystal/libcurl_vendor/2.1.0-0.tar.gz";
+    name = "2.1.0-0.tar.gz";
     sha256 = "904b586704ed7f517291b7e7a863772b6cc3c2819fd2a2f1d9fce1f2d1b26708";
   };
 
diff --git a/crystal/librealsense2/default.nix b/crystal/librealsense2/default.nix
index 5e11d1b92d..b771ee36f7 100644
--- a/crystal/librealsense2/default.nix
+++ b/crystal/librealsense2/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.16.5-r2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/librealsense-release/archive/release/crystal/librealsense2/2.16.5-2.tar.gz;
+    url = "https://github.com/ros2-gbp/librealsense-release/archive/release/crystal/librealsense2/2.16.5-2.tar.gz";
+    name = "2.16.5-2.tar.gz";
     sha256 = "cb95505e6a9a4d16ebb6ca7542eee7bca1afdfca36fd46aa6de30cb011d96b97";
   };
 
diff --git a/crystal/libyaml-vendor/default.nix b/crystal/libyaml-vendor/default.nix
index 5742106e21..11908318fa 100644
--- a/crystal/libyaml-vendor/default.nix
+++ b/crystal/libyaml-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/libyaml_vendor-release/archive/release/crystal/libyaml_vendor/1.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/libyaml_vendor-release/archive/release/crystal/libyaml_vendor/1.0.0-0.tar.gz";
+    name = "1.0.0-0.tar.gz";
     sha256 = "54515207095b2974e152995adc92a9d0bf88b885336bbefcc26ca404af305188";
   };
 
diff --git a/crystal/lifecycle-msgs/default.nix b/crystal/lifecycle-msgs/default.nix
index 44af3872c6..98e685cba8 100644
--- a/crystal/lifecycle-msgs/default.nix
+++ b/crystal/lifecycle-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/lifecycle_msgs/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/lifecycle_msgs/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "ec86038e23f1d594d28cd01935acc4c433f43b22aa0b07d6ffb1e09dd4a3c7f8";
   };
 
diff --git a/crystal/lifecycle/default.nix b/crystal/lifecycle/default.nix
index 8647f56535..dc52e58431 100644
--- a/crystal/lifecycle/default.nix
+++ b/crystal/lifecycle/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/lifecycle/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/lifecycle/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "ba439c587c69ca1c2a3ec569d7e3d9d4995aa98c2e7566ad316e8f6cfd3eaac5";
   };
 
diff --git a/crystal/logging-demo/default.nix b/crystal/logging-demo/default.nix
index c6115f443d..14234d7891 100644
--- a/crystal/logging-demo/default.nix
+++ b/crystal/logging-demo/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/logging_demo/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/logging_demo/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "7486e3acfc247d398ac0aaa8a89cec089c9dca1e9f2a542221c3cc894faa658c";
   };
 
diff --git a/crystal/map-msgs/default.nix b/crystal/map-msgs/default.nix
index 9457f041d0..df5ff7b5fb 100644
--- a/crystal/map-msgs/default.nix
+++ b/crystal/map-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/navigation_msgs-release/archive/release/crystal/map_msgs/2.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/navigation_msgs-release/archive/release/crystal/map_msgs/2.0.1-0.tar.gz";
+    name = "2.0.1-0.tar.gz";
     sha256 = "73777431375ad7b3d56e25f88ed4655e757047b218ae32ff4ce34affce8ee2bb";
   };
 
diff --git a/crystal/message-filters/default.nix b/crystal/message-filters/default.nix
index 9572ec3c2a..350c72b068 100644
--- a/crystal/message-filters/default.nix
+++ b/crystal/message-filters/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "3.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2_message_filters-release/archive/release/crystal/message_filters/3.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2_message_filters-release/archive/release/crystal/message_filters/3.0.0-0.tar.gz";
+    name = "3.0.0-0.tar.gz";
     sha256 = "8fe2f16068afc46bdb688496deda0717a80a87a0ec6730f1c6361c9176f63f9e";
   };
 
diff --git a/crystal/micro-ros-agent/default.nix b/crystal/micro-ros-agent/default.nix
index a9a33a8eea..604a19282e 100644
--- a/crystal/micro-ros-agent/default.nix
+++ b/crystal/micro-ros-agent/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.1-r2";
 
   src = fetchurl {
-    url = https://github.com/micro-ROS/micro-ROS-Agent-release/archive/release/crystal/micro_ros_agent/0.0.1-2.tar.gz;
+    url = "https://github.com/micro-ROS/micro-ROS-Agent-release/archive/release/crystal/micro_ros_agent/0.0.1-2.tar.gz";
+    name = "0.0.1-2.tar.gz";
     sha256 = "db09d137d08f374c6d6f0bfce90f0bad311ad4a809c5499866d3a5516a1ee6bb";
   };
 
diff --git a/crystal/microxrcedds-agent/default.nix b/crystal/microxrcedds-agent/default.nix
index 2d88695f5a..d86682cf1b 100644
--- a/crystal/microxrcedds-agent/default.nix
+++ b/crystal/microxrcedds-agent/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.3-r1";
 
   src = fetchurl {
-    url = https://github.com/micro-ROS/microxrcedds_agent-release/archive/release/crystal/microxrcedds_agent/1.0.3-1.tar.gz;
+    url = "https://github.com/micro-ROS/microxrcedds_agent-release/archive/release/crystal/microxrcedds_agent/1.0.3-1.tar.gz";
+    name = "1.0.3-1.tar.gz";
     sha256 = "e803c907ee996f9fe855a0eb232a56bdbdb0bb29b891abe8966c036683afc205";
   };
 
diff --git a/crystal/ml-classifiers/default.nix b/crystal/ml-classifiers/default.nix
index b2d71b61d1..f28c252b33 100644
--- a/crystal/ml-classifiers/default.nix
+++ b/crystal/ml-classifiers/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1-r1";
 
   src = fetchurl {
-    url = https://github.com/astuff/ml_classifiers-release/archive/release/crystal/ml_classifiers/1.0.1-1.tar.gz;
+    url = "https://github.com/astuff/ml_classifiers-release/archive/release/crystal/ml_classifiers/1.0.1-1.tar.gz";
+    name = "1.0.1-1.tar.gz";
     sha256 = "fe5ced50553b27c4c5ffd272d1d51ccc8264289d8c506eba7600efd82ff9bed8";
   };
 
diff --git a/crystal/mrpt2/default.nix b/crystal/mrpt2/default.nix
index 70eef58019..72b48b34cf 100644
--- a/crystal/mrpt2/default.nix
+++ b/crystal/mrpt2/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.9.9";
 
   src = fetchurl {
-    url = https://github.com/mrpt-ros2-pkg-release/mrpt2-release/archive/release/crystal/mrpt2/1.9.9-0.tar.gz;
+    url = "https://github.com/mrpt-ros2-pkg-release/mrpt2-release/archive/release/crystal/mrpt2/1.9.9-0.tar.gz";
+    name = "1.9.9-0.tar.gz";
     sha256 = "f53bc01e9cecf69776f34c50e4ca8e675327efca9f672b3cf5a4ef8ba5c2631d";
   };
 
diff --git a/crystal/nav-2d-msgs/default.nix b/crystal/nav-2d-msgs/default.nix
index f40794962b..a74ede6714 100644
--- a/crystal/nav-2d-msgs/default.nix
+++ b/crystal/nav-2d-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav_2d_msgs/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav_2d_msgs/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "d93199b6841e254723ea3512ddaefd8d134808f0baee70950a2755f483982d8f";
   };
 
diff --git a/crystal/nav-2d-utils/default.nix b/crystal/nav-2d-utils/default.nix
index c9c8ddaa9b..04bef3e653 100644
--- a/crystal/nav-2d-utils/default.nix
+++ b/crystal/nav-2d-utils/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav_2d_utils/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav_2d_utils/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "f1e3e83cf8dd7428606c5b231ba83df50dc6afeac3c2272684222b3d42f2482e";
   };
 
diff --git a/crystal/nav-msgs/default.nix b/crystal/nav-msgs/default.nix
index bff6259f56..4f0150cc73 100644
--- a/crystal/nav-msgs/default.nix
+++ b/crystal/nav-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/nav_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/nav_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "628eb72829db8cc3288b945e20524504398fb5da7925338dddb25a809976113f";
   };
 
diff --git a/crystal/nav2-amcl/default.nix b/crystal/nav2-amcl/default.nix
index 50ae4b4c44..5202f53f2a 100644
--- a/crystal/nav2-amcl/default.nix
+++ b/crystal/nav2-amcl/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_amcl/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_amcl/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "620d841b5f5db364761592c12a070d998a234a9fb44a94626f6f634486715ccf";
   };
 
diff --git a/crystal/nav2-bringup/default.nix b/crystal/nav2-bringup/default.nix
index 2f066b4666..6036d4a43a 100644
--- a/crystal/nav2-bringup/default.nix
+++ b/crystal/nav2-bringup/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_bringup/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_bringup/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "66b1e1f2fa567dc199c47dc31ef4c7167dd9c298bcb4758840e18a8a4b63ff2f";
   };
 
diff --git a/crystal/nav2-bt-navigator/default.nix b/crystal/nav2-bt-navigator/default.nix
index 4849131f45..6724008d4d 100644
--- a/crystal/nav2-bt-navigator/default.nix
+++ b/crystal/nav2-bt-navigator/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_bt_navigator/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_bt_navigator/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "fd2908b00d423212ddbaeacc31f3b27d048cb21cd200df18f2b9ec80bea1cef1";
   };
 
diff --git a/crystal/nav2-common/default.nix b/crystal/nav2-common/default.nix
index 3639a0d83f..1f653a05ac 100644
--- a/crystal/nav2-common/default.nix
+++ b/crystal/nav2-common/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_common/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_common/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "df5eb95e71ce146939b3caf3d98cfa2ecbab31a18680ad7404d756a88b74a551";
   };
 
diff --git a/crystal/nav2-costmap-2d/default.nix b/crystal/nav2-costmap-2d/default.nix
index 28a268197c..8fe6b5603a 100644
--- a/crystal/nav2-costmap-2d/default.nix
+++ b/crystal/nav2-costmap-2d/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_costmap_2d/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_costmap_2d/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "d334601046ce22f40bb0abe4f43ec89531f3a21890d4e678e98b4e3289fba330";
   };
 
diff --git a/crystal/nav2-dwb-controller/default.nix b/crystal/nav2-dwb-controller/default.nix
index bd03b8e8f1..4511188404 100644
--- a/crystal/nav2-dwb-controller/default.nix
+++ b/crystal/nav2-dwb-controller/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_dwb_controller/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_dwb_controller/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "2386ff364ba12b1c7075840d7e70f764f54f2bf2d2c93103fe57ae9703feba7e";
   };
 
diff --git a/crystal/nav2-dynamic-params/default.nix b/crystal/nav2-dynamic-params/default.nix
index d1f0f7880c..2c6af6b94c 100644
--- a/crystal/nav2-dynamic-params/default.nix
+++ b/crystal/nav2-dynamic-params/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_dynamic_params/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_dynamic_params/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "cbbeef8e4ffda61c9d7e6506541ccf10dd35653caaea585afe636dd39a9ae463";
   };
 
diff --git a/crystal/nav2-map-server/default.nix b/crystal/nav2-map-server/default.nix
index 9c5d2d3a88..53b86ae622 100644
--- a/crystal/nav2-map-server/default.nix
+++ b/crystal/nav2-map-server/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_map_server/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_map_server/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "6c27f751875f417cb7e257fcb21f3c616af90b6f4d215e4fae98c3bfa34587d9";
   };
 
diff --git a/crystal/nav2-mission-executor/default.nix b/crystal/nav2-mission-executor/default.nix
index ab86aec749..a28f6a3c14 100644
--- a/crystal/nav2-mission-executor/default.nix
+++ b/crystal/nav2-mission-executor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_mission_executor/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_mission_executor/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "cca9ce8e328491847ee0a5f1733c60f529d270e21040707b150dc68c431dbb74";
   };
 
diff --git a/crystal/nav2-motion-primitives/default.nix b/crystal/nav2-motion-primitives/default.nix
index cfb8baf34e..e973b8e543 100644
--- a/crystal/nav2-motion-primitives/default.nix
+++ b/crystal/nav2-motion-primitives/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_motion_primitives/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_motion_primitives/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "50a75ca6f7675e93030ea763839db9e8f4d02795c627dc06f8c0257154c667eb";
   };
 
diff --git a/crystal/nav2-msgs/default.nix b/crystal/nav2-msgs/default.nix
index f852529251..57c4cb7241 100644
--- a/crystal/nav2-msgs/default.nix
+++ b/crystal/nav2-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_msgs/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_msgs/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "8e9fea4bc061a90e57516cabb3b22badf16f496c002a6292b22a4ecf08954e33";
   };
 
diff --git a/crystal/nav2-navfn-planner/default.nix b/crystal/nav2-navfn-planner/default.nix
index eeff35dba5..c73a393782 100644
--- a/crystal/nav2-navfn-planner/default.nix
+++ b/crystal/nav2-navfn-planner/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_navfn_planner/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_navfn_planner/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "412542dcda7ba8032585d1d0ff7155c10051f76a66b2301d080b282d20503509";
   };
 
diff --git a/crystal/nav2-robot/default.nix b/crystal/nav2-robot/default.nix
index 92b1e6b003..f8d7f7da10 100644
--- a/crystal/nav2-robot/default.nix
+++ b/crystal/nav2-robot/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_robot/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_robot/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "924fde792c011a96dea86bc3db5454ca5290d392b758f93aa0a11621f7f092fe";
   };
 
diff --git a/crystal/nav2-simple-navigator/default.nix b/crystal/nav2-simple-navigator/default.nix
index 47d66e4ec2..b9a2da00d6 100644
--- a/crystal/nav2-simple-navigator/default.nix
+++ b/crystal/nav2-simple-navigator/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_simple_navigator/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_simple_navigator/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "40fd4cfb0a383c7e86ecc2c63a0093032757dc27c8e84a31d915c407660e94a0";
   };
 
diff --git a/crystal/nav2-tasks/default.nix b/crystal/nav2-tasks/default.nix
index 36060715e3..ecab589179 100644
--- a/crystal/nav2-tasks/default.nix
+++ b/crystal/nav2-tasks/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_tasks/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_tasks/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "b070fc9294edfb71eef1e6b0a3442f371d0e82521958328aa54e48d67428a4c4";
   };
 
diff --git a/crystal/nav2-util/default.nix b/crystal/nav2-util/default.nix
index 7466180db4..8d064db07c 100644
--- a/crystal/nav2-util/default.nix
+++ b/crystal/nav2-util/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_util/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_util/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "adbc4db869d72bdb3867c5d69caec08ca78918b7e4cb5cff07c244c9c4c5dbd6";
   };
 
diff --git a/crystal/nav2-voxel-grid/default.nix b/crystal/nav2-voxel-grid/default.nix
index 0a8c70efdb..4fdd3bf904 100644
--- a/crystal/nav2-voxel-grid/default.nix
+++ b/crystal/nav2-voxel-grid/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_voxel_grid/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_voxel_grid/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "e5fc2f003f86f1f6d180375dce15de6af9f80f8ac943daed4d4ce4bb178ec2c5";
   };
 
diff --git a/crystal/nav2-world-model/default.nix b/crystal/nav2-world-model/default.nix
index 1ce369f4fa..50c23ff019 100644
--- a/crystal/nav2-world-model/default.nix
+++ b/crystal/nav2-world-model/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_world_model/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/nav2_world_model/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "2908d8d758949f0cdb89461784c1c1200526b184203620d82dd226a663580ac4";
   };
 
diff --git a/crystal/navigation2/default.nix b/crystal/navigation2/default.nix
index fef4aa4fb3..137cd6a0a9 100644
--- a/crystal/navigation2/default.nix
+++ b/crystal/navigation2/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.7";
 
   src = fetchurl {
-    url = https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/navigation2/0.1.7-0.tar.gz;
+    url = "https://github.com/SteveMacenski/navigation2-release/archive/release/crystal/navigation2/0.1.7-0.tar.gz";
+    name = "0.1.7-0.tar.gz";
     sha256 = "a64c995199a6691b261ad3789606d0fdaf56f46c582a87ea488bee4c4228d7c0";
   };
 
diff --git a/crystal/nmea-msgs/default.nix b/crystal/nmea-msgs/default.nix
index 4ef3928632..76c9e9b7ee 100644
--- a/crystal/nmea-msgs/default.nix
+++ b/crystal/nmea-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/nmea_msgs-release/archive/release/crystal/nmea_msgs/2.0.0-1.tar.gz;
+    url = "https://github.com/ros2-gbp/nmea_msgs-release/archive/release/crystal/nmea_msgs/2.0.0-1.tar.gz";
+    name = "2.0.0-1.tar.gz";
     sha256 = "b8b45789e7f94f4153aef2bff6543ba2d51a2ab86836d74c8feb62df4253b230";
   };
 
diff --git a/crystal/object-analytics-msgs/default.nix b/crystal/object-analytics-msgs/default.nix
index 0ef3ea96ff..8f6d699145 100644
--- a/crystal/object-analytics-msgs/default.nix
+++ b/crystal/object-analytics-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.5.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2_object_analytics-release/archive/release/crystal/object_analytics_msgs/0.5.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2_object_analytics-release/archive/release/crystal/object_analytics_msgs/0.5.3-0.tar.gz";
+    name = "0.5.3-0.tar.gz";
     sha256 = "cfa7e51f2ab2c6e644bb41065ea62712cd8fc4b20e16741eda5d6512ab9619ae";
   };
 
diff --git a/crystal/object-analytics-node/default.nix b/crystal/object-analytics-node/default.nix
index 42dccf0df7..e863761cf8 100644
--- a/crystal/object-analytics-node/default.nix
+++ b/crystal/object-analytics-node/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.5.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2_object_analytics-release/archive/release/crystal/object_analytics_node/0.5.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2_object_analytics-release/archive/release/crystal/object_analytics_node/0.5.3-0.tar.gz";
+    name = "0.5.3-0.tar.gz";
     sha256 = "8028765babd1011acd8ee4ad27dd07903d43f482e862920544ba212be7186c80";
   };
 
diff --git a/crystal/object-analytics-rviz/default.nix b/crystal/object-analytics-rviz/default.nix
index f049b5e56f..165919c14a 100644
--- a/crystal/object-analytics-rviz/default.nix
+++ b/crystal/object-analytics-rviz/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.5.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2_object_analytics-release/archive/release/crystal/object_analytics_rviz/0.5.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2_object_analytics-release/archive/release/crystal/object_analytics_rviz/0.5.3-0.tar.gz";
+    name = "0.5.3-0.tar.gz";
     sha256 = "00f9f160d4740e7ca9799da65b83e5337aa482e4dac4cc151ce8c84deafcb65b";
   };
 
diff --git a/crystal/object-msgs/default.nix b/crystal/object-msgs/default.nix
index 92348ab84b..d87d9d3114 100644
--- a/crystal/object-msgs/default.nix
+++ b/crystal/object-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.3.0-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2_object_msgs-release/archive/release/crystal/object_msgs/0.3.0-1.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2_object_msgs-release/archive/release/crystal/object_msgs/0.3.0-1.tar.gz";
+    name = "0.3.0-1.tar.gz";
     sha256 = "0ff91ee611ff83f2c486675907db807660ca39f61db519a77b59543d627735c2";
   };
 
diff --git a/crystal/opensplice-cmake-module/default.nix b/crystal/opensplice-cmake-module/default.nix
index 625c263f41..10dbaa8b7c 100644
--- a/crystal/opensplice-cmake-module/default.nix
+++ b/crystal/opensplice-cmake-module/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_opensplice-release/archive/release/crystal/opensplice_cmake_module/0.6.3-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_opensplice-release/archive/release/crystal/opensplice_cmake_module/0.6.3-1.tar.gz";
+    name = "0.6.3-1.tar.gz";
     sha256 = "3f8dce3df6054604ead696534b9a9d47b7fc8ad6eb5ce2a9d9ca3dc16222cba0";
   };
 
diff --git a/crystal/orocos-kdl/default.nix b/crystal/orocos-kdl/default.nix
index b6bb761071..e28d0b33d8 100644
--- a/crystal/orocos-kdl/default.nix
+++ b/crystal/orocos-kdl/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "3.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/orocos_kinematics_dynamics-release/archive/release/crystal/orocos_kdl/3.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/orocos_kinematics_dynamics-release/archive/release/crystal/orocos_kdl/3.1.0-0.tar.gz";
+    name = "3.1.0-0.tar.gz";
     sha256 = "2c444773f68360b316d826a5bf7c0f12e9a3989d90eb2d350e703a6226a4303e";
   };
 
diff --git a/crystal/osrf-pycommon/default.nix b/crystal/osrf-pycommon/default.nix
index 058b6c18c3..1cbfcac356 100644
--- a/crystal/osrf-pycommon/default.nix
+++ b/crystal/osrf-pycommon/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.6";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/osrf_pycommon-release/archive/release/crystal/osrf_pycommon/0.1.6-0.tar.gz;
+    url = "https://github.com/ros2-gbp/osrf_pycommon-release/archive/release/crystal/osrf_pycommon/0.1.6-0.tar.gz";
+    name = "0.1.6-0.tar.gz";
     sha256 = "0b57f393c62abbe990c23c9b55272fc0e97d402ef68d2e9f7fc3c3a66f4c9d97";
   };
 
diff --git a/crystal/osrf-testing-tools-cpp/default.nix b/crystal/osrf-testing-tools-cpp/default.nix
index 5449a48ed9..7d8b72e043 100644
--- a/crystal/osrf-testing-tools-cpp/default.nix
+++ b/crystal/osrf-testing-tools-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/osrf_testings_tools_cpp-release/archive/release/crystal/osrf_testing_tools_cpp/1.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/osrf_testings_tools_cpp-release/archive/release/crystal/osrf_testing_tools_cpp/1.1.0-0.tar.gz";
+    name = "1.1.0-0.tar.gz";
     sha256 = "853939b29d8c0e8889459cd6bb22fdd69cba853bfaf2099bd4ae5a1b18ba235b";
   };
 
diff --git a/crystal/pcl-conversions/default.nix b/crystal/pcl-conversions/default.nix
index 249be756fd..b606e1f551 100644
--- a/crystal/pcl-conversions/default.nix
+++ b/crystal/pcl-conversions/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/pcl_conversions-release/archive/release/crystal/pcl_conversions/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/pcl_conversions-release/archive/release/crystal/pcl_conversions/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "10639c7bb949fbb1640fa0c27d8e4d3a98c05ce8d896314a9d68551b9d476c55";
   };
 
diff --git a/crystal/pendulum-control/default.nix b/crystal/pendulum-control/default.nix
index ec44a83bfa..2e5a222596 100644
--- a/crystal/pendulum-control/default.nix
+++ b/crystal/pendulum-control/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/pendulum_control/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/pendulum_control/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "160c00093e5a42d1b3a66f3000c322ee41dd3c43a04103b6372c99db57475f98";
   };
 
diff --git a/crystal/pendulum-msgs/default.nix b/crystal/pendulum-msgs/default.nix
index f47bc52c0e..31093dcb0c 100644
--- a/crystal/pendulum-msgs/default.nix
+++ b/crystal/pendulum-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/pendulum_msgs/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/pendulum_msgs/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "fdd12dbae8648dc5a8ca7d6ca10ce2e7a273de06391103bf4edd02adb71484c2";
   };
 
diff --git a/crystal/pluginlib/default.nix b/crystal/pluginlib/default.nix
index 225487e9e6..1ea5367e10 100644
--- a/crystal/pluginlib/default.nix
+++ b/crystal/pluginlib/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.2.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/pluginlib-release/archive/release/crystal/pluginlib/2.2.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/pluginlib-release/archive/release/crystal/pluginlib/2.2.1-0.tar.gz";
+    name = "2.2.1-0.tar.gz";
     sha256 = "f520bff44d60282657c97f75a9eee211d9e49e0ed605450997a0155f774adbaf";
   };
 
diff --git a/crystal/poco-vendor/default.nix b/crystal/poco-vendor/default.nix
index 79fd942993..9b016bc042 100644
--- a/crystal/poco-vendor/default.nix
+++ b/crystal/poco-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.1.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/poco_vendor-release/archive/release/crystal/poco_vendor/1.1.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/poco_vendor-release/archive/release/crystal/poco_vendor/1.1.1-0.tar.gz";
+    name = "1.1.1-0.tar.gz";
     sha256 = "81e48bbd06ea2658b572efa9e854fb233b6e02f7559ef0ab27ff7d93da0a8e1b";
   };
 
diff --git a/crystal/py-trees-ros-interfaces/default.nix b/crystal/py-trees-ros-interfaces/default.nix
index 5d15bad9ba..2a7684b1df 100644
--- a/crystal/py-trees-ros-interfaces/default.nix
+++ b/crystal/py-trees-ros-interfaces/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.1.1-r1";
 
   src = fetchurl {
-    url = https://github.com/stonier/py_trees_ros_interfaces-release/archive/release/crystal/py_trees_ros_interfaces/1.1.1-1.tar.gz;
+    url = "https://github.com/stonier/py_trees_ros_interfaces-release/archive/release/crystal/py_trees_ros_interfaces/1.1.1-1.tar.gz";
+    name = "1.1.1-1.tar.gz";
     sha256 = "d4792a78173a09b204e0f4bffc654a22b3401ff0bf8b6018930e085d18ea72ba";
   };
 
diff --git a/crystal/python-cmake-module/default.nix b/crystal/python-cmake-module/default.nix
index 780a178827..28ac36812e 100644
--- a/crystal/python-cmake-module/default.nix
+++ b/crystal/python-cmake-module/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_python-release/archive/release/crystal/python_cmake_module/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_python-release/archive/release/crystal/python_cmake_module/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "235463eab00214e06dfd277ca45e4866039703e46edb6747320e251f915bb622";
   };
 
diff --git a/crystal/python-qt-binding/default.nix b/crystal/python-qt-binding/default.nix
index 4b2a3bebff..0c4bd29562 100644
--- a/crystal/python-qt-binding/default.nix
+++ b/crystal/python-qt-binding/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/python_qt_binding-release/archive/release/crystal/python_qt_binding/1.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/python_qt_binding-release/archive/release/crystal/python_qt_binding/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "fdf6f093e4849aba0695f6fa8c9bbe628d7da9b9745f7274b0fcc5e004cd0b08";
   };
 
diff --git a/crystal/qt-dotgraph/default.nix b/crystal/qt-dotgraph/default.nix
index e2189293dd..6fb6e5ecb7 100644
--- a/crystal/qt-dotgraph/default.nix
+++ b/crystal/qt-dotgraph/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_dotgraph/1.0.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_dotgraph/1.0.6-1.tar.gz";
+    name = "1.0.6-1.tar.gz";
     sha256 = "f67cf44c9975de2788be0dce6898d2c7924516ae4e74f1354c94adceb3ed6d23";
   };
 
diff --git a/crystal/qt-gui-app/default.nix b/crystal/qt-gui-app/default.nix
index c4d92acaf2..d439ad674a 100644
--- a/crystal/qt-gui-app/default.nix
+++ b/crystal/qt-gui-app/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui_app/1.0.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui_app/1.0.6-1.tar.gz";
+    name = "1.0.6-1.tar.gz";
     sha256 = "292e714d858f8ba41b540fda47fdc3d726dc90dbcb7a915efa979c34f8a0d54e";
   };
 
diff --git a/crystal/qt-gui-core/default.nix b/crystal/qt-gui-core/default.nix
index 34421a2310..e944f21906 100644
--- a/crystal/qt-gui-core/default.nix
+++ b/crystal/qt-gui-core/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui_core/1.0.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui_core/1.0.6-1.tar.gz";
+    name = "1.0.6-1.tar.gz";
     sha256 = "b1b0b36d79f8a747c210b833864f5c311845ea35bdd7a41f7c4c387a897c9204";
   };
 
diff --git a/crystal/qt-gui-cpp/default.nix b/crystal/qt-gui-cpp/default.nix
index f76f5e5999..3084601fe4 100644
--- a/crystal/qt-gui-cpp/default.nix
+++ b/crystal/qt-gui-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui_cpp/1.0.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui_cpp/1.0.6-1.tar.gz";
+    name = "1.0.6-1.tar.gz";
     sha256 = "e96c60d3baab759e5bcbfb25f79d4a23bf901e99134d06dd01d2f25490c2abf6";
   };
 
diff --git a/crystal/qt-gui-py-common/default.nix b/crystal/qt-gui-py-common/default.nix
index 91032496d9..baedd6bbe0 100644
--- a/crystal/qt-gui-py-common/default.nix
+++ b/crystal/qt-gui-py-common/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui_py_common/1.0.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui_py_common/1.0.6-1.tar.gz";
+    name = "1.0.6-1.tar.gz";
     sha256 = "2efe759ce061e4add65650ada0c741963d04c8b59c988aa405636e34f5cdaeb6";
   };
 
diff --git a/crystal/qt-gui/default.nix b/crystal/qt-gui/default.nix
index e1bb41ee62..a23c7ecdb7 100644
--- a/crystal/qt-gui/default.nix
+++ b/crystal/qt-gui/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui/1.0.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/qt_gui_core-release/archive/release/crystal/qt_gui/1.0.6-1.tar.gz";
+    name = "1.0.6-1.tar.gz";
     sha256 = "e321214b3e5dd7308980cbdab72396d3fb387e3457ae67f55ab530096758627d";
   };
 
diff --git a/crystal/rcl-action/default.nix b/crystal/rcl-action/default.nix
index b10f168631..8c176a68c6 100644
--- a/crystal/rcl-action/default.nix
+++ b/crystal/rcl-action/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl-release/archive/release/crystal/rcl_action/0.6.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl-release/archive/release/crystal/rcl_action/0.6.6-1.tar.gz";
+    name = "0.6.6-1.tar.gz";
     sha256 = "494f14c3ec0492e2c21fe722391b5b7361e2250a4c841ec4b4839439f41b8bf3";
   };
 
diff --git a/crystal/rcl-interfaces/default.nix b/crystal/rcl-interfaces/default.nix
index 763c83aa00..feb1fa6c30 100644
--- a/crystal/rcl-interfaces/default.nix
+++ b/crystal/rcl-interfaces/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/rcl_interfaces/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/rcl_interfaces/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "600e4132a6d9f49b75eb6cd2d0ea17e227474529f2fad477e7f09eb2fd96525d";
   };
 
diff --git a/crystal/rcl-lifecycle/default.nix b/crystal/rcl-lifecycle/default.nix
index 2334f5ac18..1b304e01ea 100644
--- a/crystal/rcl-lifecycle/default.nix
+++ b/crystal/rcl-lifecycle/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl-release/archive/release/crystal/rcl_lifecycle/0.6.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl-release/archive/release/crystal/rcl_lifecycle/0.6.6-1.tar.gz";
+    name = "0.6.6-1.tar.gz";
     sha256 = "e10ccb57fc49fd78c8f892a991f2dbcf10ac160216b751ed3b66b87f26cb5d18";
   };
 
diff --git a/crystal/rcl-logging-log4cxx/default.nix b/crystal/rcl-logging-log4cxx/default.nix
index e7880eeefa..db6017f297 100644
--- a/crystal/rcl-logging-log4cxx/default.nix
+++ b/crystal/rcl-logging-log4cxx/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl_logging-release/archive/release/crystal/rcl_logging_log4cxx/0.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/crystal/rcl_logging_log4cxx/0.2.0-0.tar.gz";
+    name = "0.2.0-0.tar.gz";
     sha256 = "3b3814094f4ece619ceaf2f4da10e8727a961951ddc6f83812f355a8e86b888a";
   };
 
diff --git a/crystal/rcl-logging-noop/default.nix b/crystal/rcl-logging-noop/default.nix
index fdc3f79dd2..c768b69b59 100644
--- a/crystal/rcl-logging-noop/default.nix
+++ b/crystal/rcl-logging-noop/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl_logging-release/archive/release/crystal/rcl_logging_noop/0.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl_logging-release/archive/release/crystal/rcl_logging_noop/0.2.0-0.tar.gz";
+    name = "0.2.0-0.tar.gz";
     sha256 = "7820b3b21a0cd3964df0a6a60e6f385d4cd89ecc3dc59e8ae9c28b44f9bc0139";
   };
 
diff --git a/crystal/rcl-yaml-param-parser/default.nix b/crystal/rcl-yaml-param-parser/default.nix
index a5488dbb76..fb3614be7b 100644
--- a/crystal/rcl-yaml-param-parser/default.nix
+++ b/crystal/rcl-yaml-param-parser/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl-release/archive/release/crystal/rcl_yaml_param_parser/0.6.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl-release/archive/release/crystal/rcl_yaml_param_parser/0.6.6-1.tar.gz";
+    name = "0.6.6-1.tar.gz";
     sha256 = "36a57efcbf15db7c2e71af5c82d59017c74b4b80c3ed9a90be023b47fd8efd1b";
   };
 
diff --git a/crystal/rcl/default.nix b/crystal/rcl/default.nix
index 79cd0105ec..cb4045f7bf 100644
--- a/crystal/rcl/default.nix
+++ b/crystal/rcl/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl-release/archive/release/crystal/rcl/0.6.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl-release/archive/release/crystal/rcl/0.6.6-1.tar.gz";
+    name = "0.6.6-1.tar.gz";
     sha256 = "e98f83aac311ace0a9b1d83d7f1a03765410e68f6281f74c080765133f4cb8cd";
   };
 
diff --git a/crystal/rclcpp-action/default.nix b/crystal/rclcpp-action/default.nix
index f05aead8c8..08902c2afc 100644
--- a/crystal/rclcpp-action/default.nix
+++ b/crystal/rclcpp-action/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rclcpp-release/archive/release/crystal/rclcpp_action/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/crystal/rclcpp_action/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "4d76ff4572c3b0e802314b47bfca794d51ccd5ccb2996b8a33b7436656e13f68";
   };
 
diff --git a/crystal/rclcpp-lifecycle/default.nix b/crystal/rclcpp-lifecycle/default.nix
index 71c23a0756..8696502876 100644
--- a/crystal/rclcpp-lifecycle/default.nix
+++ b/crystal/rclcpp-lifecycle/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rclcpp-release/archive/release/crystal/rclcpp_lifecycle/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/crystal/rclcpp_lifecycle/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "d9e05dc10b16031ec559fd12f315139708c458a811bf4133e7863c65f26806cc";
   };
 
diff --git a/crystal/rclcpp/default.nix b/crystal/rclcpp/default.nix
index 74465bf57d..b7dedcb9f8 100644
--- a/crystal/rclcpp/default.nix
+++ b/crystal/rclcpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rclcpp-release/archive/release/crystal/rclcpp/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rclcpp-release/archive/release/crystal/rclcpp/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "0c2a84291e91f1e32e8d355681bb68a812594951f27203a63a8fc86c32126f87";
   };
 
diff --git a/crystal/rclpy/default.nix b/crystal/rclpy/default.nix
index 34fa021c96..bf6c868f22 100644
--- a/crystal/rclpy/default.nix
+++ b/crystal/rclpy/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rclpy-release/archive/release/crystal/rclpy/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rclpy-release/archive/release/crystal/rclpy/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "f038de02819aeeb4c26500888db7ac0b56115fc9036e6c0816e62a75ad604dc7";
   };
 
diff --git a/crystal/rcutils/default.nix b/crystal/rcutils/default.nix
index 7cd221e79c..a622fb7952 100644
--- a/crystal/rcutils/default.nix
+++ b/crystal/rcutils/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcutils-release/archive/release/crystal/rcutils/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcutils-release/archive/release/crystal/rcutils/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "0fdb96bde3e98cd975529a326ffaf7ff763f51d523d5fc98fab8c6af6980b407";
   };
 
diff --git a/crystal/realsense-camera-msgs/default.nix b/crystal/realsense-camera-msgs/default.nix
index 99ff0fa384..2491d3093d 100644
--- a/crystal/realsense-camera-msgs/default.nix
+++ b/crystal/realsense-camera-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2_intel_realsense-release/archive/release/crystal/realsense_camera_msgs/2.0.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2_intel_realsense-release/archive/release/crystal/realsense_camera_msgs/2.0.3-0.tar.gz";
+    name = "2.0.3-0.tar.gz";
     sha256 = "bbf211ae9823bcb1d68f9c1f2d75b506154350a7037f8f578e0ba347ad9412e5";
   };
 
diff --git a/crystal/realsense-ros2-camera/default.nix b/crystal/realsense-ros2-camera/default.nix
index 8002673e0f..17359bead9 100644
--- a/crystal/realsense-ros2-camera/default.nix
+++ b/crystal/realsense-ros2-camera/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2_intel_realsense-release/archive/release/crystal/realsense_ros2_camera/2.0.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2_intel_realsense-release/archive/release/crystal/realsense_ros2_camera/2.0.3-0.tar.gz";
+    name = "2.0.3-0.tar.gz";
     sha256 = "ccd6585ced405d85548f307ccafaffe130bbcdad898c93a6c447205304b8791d";
   };
 
diff --git a/crystal/resource-retriever/default.nix b/crystal/resource-retriever/default.nix
index cfd1cdbcb0..188ac6da33 100644
--- a/crystal/resource-retriever/default.nix
+++ b/crystal/resource-retriever/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/resource_retriever-release/archive/release/crystal/resource_retriever/2.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/resource_retriever-release/archive/release/crystal/resource_retriever/2.1.0-0.tar.gz";
+    name = "2.1.0-0.tar.gz";
     sha256 = "9db42f615c9c1240dcae2f0ef91495e1177ab7c97acd884dfb38507e5d41660b";
   };
 
diff --git a/crystal/rmw-connext-cpp/default.nix b/crystal/rmw-connext-cpp/default.nix
index 73ec3b540f..9872e0032d 100644
--- a/crystal/rmw-connext-cpp/default.nix
+++ b/crystal/rmw-connext-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw_connext-release/archive/release/crystal/rmw_connext_cpp/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw_connext-release/archive/release/crystal/rmw_connext_cpp/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "a4555f1b7959ab4d90e381594f96e4d96c81ff03fdd512cc584f78bd64ef2bab";
   };
 
diff --git a/crystal/rmw-connext-shared-cpp/default.nix b/crystal/rmw-connext-shared-cpp/default.nix
index f4b16e27ca..925471b66c 100644
--- a/crystal/rmw-connext-shared-cpp/default.nix
+++ b/crystal/rmw-connext-shared-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw_connext-release/archive/release/crystal/rmw_connext_shared_cpp/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw_connext-release/archive/release/crystal/rmw_connext_shared_cpp/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "7c45059558c31cf04c5130b14d5df11dedac4f01991d29cec84c4d95784a120b";
   };
 
diff --git a/crystal/rmw-fastrtps-cpp/default.nix b/crystal/rmw-fastrtps-cpp/default.nix
index 47fcb30035..72d5cb2561 100644
--- a/crystal/rmw-fastrtps-cpp/default.nix
+++ b/crystal/rmw-fastrtps-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/crystal/rmw_fastrtps_cpp/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/crystal/rmw_fastrtps_cpp/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "309efba86d62ecbb153d05b71b10b362ab9f89b52f4b324a885c861000cc1f01";
   };
 
diff --git a/crystal/rmw-fastrtps-dynamic-cpp/default.nix b/crystal/rmw-fastrtps-dynamic-cpp/default.nix
index 686fd0e586..001dfe943d 100644
--- a/crystal/rmw-fastrtps-dynamic-cpp/default.nix
+++ b/crystal/rmw-fastrtps-dynamic-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/crystal/rmw_fastrtps_dynamic_cpp/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/crystal/rmw_fastrtps_dynamic_cpp/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "1213ab6b6f2916ca6c8718ceb31aaf58c8434a8525e26af9313b99e1f3ba6e3e";
   };
 
diff --git a/crystal/rmw-fastrtps-shared-cpp/default.nix b/crystal/rmw-fastrtps-shared-cpp/default.nix
index cc1077c5c4..5a9e050258 100644
--- a/crystal/rmw-fastrtps-shared-cpp/default.nix
+++ b/crystal/rmw-fastrtps-shared-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/crystal/rmw_fastrtps_shared_cpp/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw_fastrtps-release/archive/release/crystal/rmw_fastrtps_shared_cpp/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "e1621ea08ed960bcb88359e26b1a805dc3c233c5edebe3964e8a4a263cfc6422";
   };
 
diff --git a/crystal/rmw-implementation-cmake/default.nix b/crystal/rmw-implementation-cmake/default.nix
index 2ff6fea623..121b649ed9 100644
--- a/crystal/rmw-implementation-cmake/default.nix
+++ b/crystal/rmw-implementation-cmake/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw-release/archive/release/crystal/rmw_implementation_cmake/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw-release/archive/release/crystal/rmw_implementation_cmake/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "c6dcb8d1d0f673d63c8c2052c684efc7d91a714e6024ebc1e4805915d16b7d9c";
   };
 
diff --git a/crystal/rmw-implementation/default.nix b/crystal/rmw-implementation/default.nix
index 80ac3db726..0eb90e3c5f 100644
--- a/crystal/rmw-implementation/default.nix
+++ b/crystal/rmw-implementation/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw_implementation-release/archive/release/crystal/rmw_implementation/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw_implementation-release/archive/release/crystal/rmw_implementation/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "fd0cc3de840262b7d7a09f6593a8eb49dd1f2cbde4a0047e77b925a4b009ab91";
   };
 
diff --git a/crystal/rmw-opensplice-cpp/default.nix b/crystal/rmw-opensplice-cpp/default.nix
index 39dbcdd46a..46ee4c98f1 100644
--- a/crystal/rmw-opensplice-cpp/default.nix
+++ b/crystal/rmw-opensplice-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw_opensplice-release/archive/release/crystal/rmw_opensplice_cpp/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw_opensplice-release/archive/release/crystal/rmw_opensplice_cpp/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "6d86a8b9e2e0aab9e2a58fd3eec8c9463dba0a95e21bae0ea5a9aeb9b03737d6";
   };
 
diff --git a/crystal/rmw/default.nix b/crystal/rmw/default.nix
index 66f73b6ca9..f87844bfcd 100644
--- a/crystal/rmw/default.nix
+++ b/crystal/rmw/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rmw-release/archive/release/crystal/rmw/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rmw-release/archive/release/crystal/rmw/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "84db3e5964876c57a44fdd440da1df948bc548516baafee870546d851822990b";
   };
 
diff --git a/crystal/robot-state-publisher/default.nix b/crystal/robot-state-publisher/default.nix
index 6a75c91ab5..e731d55847 100644
--- a/crystal/robot-state-publisher/default.nix
+++ b/crystal/robot-state-publisher/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/robot_state_publisher-release/archive/release/crystal/robot_state_publisher/2.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/robot_state_publisher-release/archive/release/crystal/robot_state_publisher/2.1.0-0.tar.gz";
+    name = "2.1.0-0.tar.gz";
     sha256 = "d849ccbb30a8a45c01a4a67ab1c7fbcfa331902a2786e127739eb63182b539a1";
   };
 
diff --git a/crystal/ros-base/default.nix b/crystal/ros-base/default.nix
index d131e427dc..ed99d4339d 100644
--- a/crystal/ros-base/default.nix
+++ b/crystal/ros-base/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/variants-release/archive/release/crystal/ros_base/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/variants-release/archive/release/crystal/ros_base/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "f4024e4d573f5137a6c5d7865bdd4ea69875a111db2c4938b7995da59c8d4932";
   };
 
diff --git a/crystal/ros-core/default.nix b/crystal/ros-core/default.nix
index 6c26ec216a..5d31f21cff 100644
--- a/crystal/ros-core/default.nix
+++ b/crystal/ros-core/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/variants-release/archive/release/crystal/ros_core/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/variants-release/archive/release/crystal/ros_core/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "9a63fb497e726d067691d7876f32675db43300613a56920c77e1d50bd2b6ab16";
   };
 
diff --git a/crystal/ros-environment/default.nix b/crystal/ros-environment/default.nix
index addf6b5f90..b9b7cb4f67 100644
--- a/crystal/ros-environment/default.nix
+++ b/crystal/ros-environment/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros_environment-release/archive/release/crystal/ros_environment/2.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros_environment-release/archive/release/crystal/ros_environment/2.2.0-0.tar.gz";
+    name = "2.2.0-0.tar.gz";
     sha256 = "8c890650a2d0c0bf70cb93ad109a920272f64cba3ac089503891a356d67262a5";
   };
 
diff --git a/crystal/ros-workspace/default.nix b/crystal/ros-workspace/default.nix
index 0aad673a9b..3c5f0b9ebb 100644
--- a/crystal/ros-workspace/default.nix
+++ b/crystal/ros-workspace/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros_workspace-release/archive/release/crystal/ros_workspace/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros_workspace-release/archive/release/crystal/ros_workspace/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "b5806c6fd73383283d4a4eacb5026d308d9d8e1d0039a4ad115e9fda957062f9";
   };
 
diff --git a/crystal/ros1-bridge/default.nix b/crystal/ros1-bridge/default.nix
index c51f2e484b..34c4944757 100644
--- a/crystal/ros1-bridge/default.nix
+++ b/crystal/ros1-bridge/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2-r2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros1_bridge-release/archive/release/crystal/ros1_bridge/0.6.2-2.tar.gz;
+    url = "https://github.com/ros2-gbp/ros1_bridge-release/archive/release/crystal/ros1_bridge/0.6.2-2.tar.gz";
+    name = "0.6.2-2.tar.gz";
     sha256 = "8dd00267aeb79b2c88892c8b6806f55684450b04fd412f3874309f069f23e9e3";
   };
 
diff --git a/crystal/ros1-rosbag-storage-vendor/default.nix b/crystal/ros1-rosbag-storage-vendor/default.nix
index ef81b452d3..6c175f3db6 100644
--- a/crystal/ros1-rosbag-storage-vendor/default.nix
+++ b/crystal/ros1-rosbag-storage-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/ros1_rosbag_storage_vendor/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/ros1_rosbag_storage_vendor/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "691566ef964303ee76e1ea3231d1132284f69d09d2a1aaca8f2674e985e27825";
   };
 
diff --git a/crystal/ros2bag/default.nix b/crystal/ros2bag/default.nix
index dccff45195..823c706020 100644
--- a/crystal/ros2bag/default.nix
+++ b/crystal/ros2bag/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/ros2bag/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/ros2bag/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "929ca0f58c09e2c71490b80ded4f9d5b6d555ff6b43e7ae3d83ea51e3339ec85";
   };
 
diff --git a/crystal/ros2cli/default.nix b/crystal/ros2cli/default.nix
index 1a8cc8270b..f6ff6bbfde 100644
--- a/crystal/ros2cli/default.nix
+++ b/crystal/ros2cli/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2cli/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2cli/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "b777413fcbd5057055a331e5375bbb562c0cbb62074464298a593170795eb9ee";
   };
 
diff --git a/crystal/ros2launch/default.nix b/crystal/ros2launch/default.nix
index e5c1debe03..de5cf32069 100644
--- a/crystal/ros2launch/default.nix
+++ b/crystal/ros2launch/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.7.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/launch-release/archive/release/crystal/ros2launch/0.7.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/launch-release/archive/release/crystal/ros2launch/0.7.4-0.tar.gz";
+    name = "0.7.4-0.tar.gz";
     sha256 = "3d01086b81c441f2d45bfeeb3860f45d5e74a8b3988029ce280755ccdcc65cb1";
   };
 
diff --git a/crystal/ros2lifecycle/default.nix b/crystal/ros2lifecycle/default.nix
index 219a43ff69..367c2dec82 100644
--- a/crystal/ros2lifecycle/default.nix
+++ b/crystal/ros2lifecycle/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2lifecycle/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2lifecycle/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "f9b4f93f89f33644f48b8e71b38f9a28db19761f3a0233a01648a639ab7d2f06";
   };
 
diff --git a/crystal/ros2msg/default.nix b/crystal/ros2msg/default.nix
index 9cd74b3dd5..15a5249063 100644
--- a/crystal/ros2msg/default.nix
+++ b/crystal/ros2msg/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2msg/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2msg/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "2f916f28321281cdd792cac534f4b4eb6b983c02eb551e58012c7d2a041442ec";
   };
 
diff --git a/crystal/ros2multicast/default.nix b/crystal/ros2multicast/default.nix
index 00a4d52d4b..ca3e111854 100644
--- a/crystal/ros2multicast/default.nix
+++ b/crystal/ros2multicast/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2multicast/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2multicast/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "67d000324c650eb131df4570d3f89287c4f5b5a70d9c52dd62c995c09760a22f";
   };
 
diff --git a/crystal/ros2node/default.nix b/crystal/ros2node/default.nix
index 9168307550..7d51d92725 100644
--- a/crystal/ros2node/default.nix
+++ b/crystal/ros2node/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2node/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2node/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "5a98f8f75ece2380b33e4ba7477ff99b3a5cf6916a5c7f12ff9e68a6a4723d19";
   };
 
diff --git a/crystal/ros2param/default.nix b/crystal/ros2param/default.nix
index 0ea462386d..ae90b771df 100644
--- a/crystal/ros2param/default.nix
+++ b/crystal/ros2param/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2param/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2param/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "4e9e9bf121ab885ecbc1994379ec6722c85a41abca9e6d4bf5454fcce40cd171";
   };
 
diff --git a/crystal/ros2pkg/default.nix b/crystal/ros2pkg/default.nix
index b7fc6ffcb1..7aa426d647 100644
--- a/crystal/ros2pkg/default.nix
+++ b/crystal/ros2pkg/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2pkg/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2pkg/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "60545874df871dbeafd5ed2d39d5f4b7957c5e7e4260cf1cd4775f1f807a7e31";
   };
 
diff --git a/crystal/ros2run/default.nix b/crystal/ros2run/default.nix
index 0866e7d5c5..948b65d16f 100644
--- a/crystal/ros2run/default.nix
+++ b/crystal/ros2run/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2run/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2run/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "f0aad3bd70be47c0d33ca3c00594b3815d896aabe91298e6bc6e5023b184863d";
   };
 
diff --git a/crystal/ros2service/default.nix b/crystal/ros2service/default.nix
index c96ebf7231..2eb418aa58 100644
--- a/crystal/ros2service/default.nix
+++ b/crystal/ros2service/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2service/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2service/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "4034b2face753bc2960ae7ad0d7b0c009e7f51f14639fafd7f6386397c2340c8";
   };
 
diff --git a/crystal/ros2srv/default.nix b/crystal/ros2srv/default.nix
index c44a4f46d8..0ebd11d028 100644
--- a/crystal/ros2srv/default.nix
+++ b/crystal/ros2srv/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2srv/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2srv/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "e6eb8a7b8803ad26d1bc1a4661daf9126bdf9a84bd52a7a16e9fc4ce4ada9cd2";
   };
 
diff --git a/crystal/ros2topic/default.nix b/crystal/ros2topic/default.nix
index 71a4266546..aedc6cd6da 100644
--- a/crystal/ros2topic/default.nix
+++ b/crystal/ros2topic/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2topic/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/ros2cli-release/archive/release/crystal/ros2topic/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "cc449c6bfc2f21af43c622ffa5e00142a6b7f5cbec5a6de6534d8b37b2c51c54";
   };
 
diff --git a/crystal/rosbag2-bag-v2-plugins/default.nix b/crystal/rosbag2-bag-v2-plugins/default.nix
index a05c1267ef..9399c6352b 100644
--- a/crystal/rosbag2-bag-v2-plugins/default.nix
+++ b/crystal/rosbag2-bag-v2-plugins/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_bag_v2_plugins/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_bag_v2_plugins/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "4760361587c5fbc1f4003239f3e2b6ce87c755878be0407bb7af5b689c31942b";
   };
 
diff --git a/crystal/rosbag2-converter-default-plugins/default.nix b/crystal/rosbag2-converter-default-plugins/default.nix
index 5ff5514e14..909a6d46b8 100644
--- a/crystal/rosbag2-converter-default-plugins/default.nix
+++ b/crystal/rosbag2-converter-default-plugins/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_converter_default_plugins/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_converter_default_plugins/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "b35732ce4c7388c40c5038fe73a76a440328b6abe6b1c70be3f4f64e7711336b";
   };
 
diff --git a/crystal/rosbag2-storage-default-plugins/default.nix b/crystal/rosbag2-storage-default-plugins/default.nix
index ae0e795efe..bd21d5f7c7 100644
--- a/crystal/rosbag2-storage-default-plugins/default.nix
+++ b/crystal/rosbag2-storage-default-plugins/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_storage_default_plugins/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_storage_default_plugins/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "d686069fc2136b5053f9e601e2e6f9f69359cf8e2bfc50f3119b06a8261aec74";
   };
 
diff --git a/crystal/rosbag2-storage/default.nix b/crystal/rosbag2-storage/default.nix
index 036ece6700..ab08e5a545 100644
--- a/crystal/rosbag2-storage/default.nix
+++ b/crystal/rosbag2-storage/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_storage/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_storage/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "e80c7e091dc84f99bcf69adad327232cb17f5d6263b6a7062fb0be4b2aadce3f";
   };
 
diff --git a/crystal/rosbag2-test-common/default.nix b/crystal/rosbag2-test-common/default.nix
index ef983cca9f..e8a03a9300 100644
--- a/crystal/rosbag2-test-common/default.nix
+++ b/crystal/rosbag2-test-common/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_test_common/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_test_common/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "21d43e4410570bb103acd19254d87dc584c13a77340f266b393b760568dc2a7e";
   };
 
diff --git a/crystal/rosbag2-tests/default.nix b/crystal/rosbag2-tests/default.nix
index 1fe0101aef..45d6c3cec9 100644
--- a/crystal/rosbag2-tests/default.nix
+++ b/crystal/rosbag2-tests/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_tests/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_tests/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "c29de4e032b989e2d724d9270d9ed4aedd45354b9c989d99c7ff09265cafb577";
   };
 
diff --git a/crystal/rosbag2-transport/default.nix b/crystal/rosbag2-transport/default.nix
index 15967b096f..1338853cc1 100644
--- a/crystal/rosbag2-transport/default.nix
+++ b/crystal/rosbag2-transport/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_transport/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2_transport/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "e32c864241cb17117eae3a7c56b55095ec350968e3e07c96e5baa65c5720df46";
   };
 
diff --git a/crystal/rosbag2/default.nix b/crystal/rosbag2/default.nix
index 776de24f1b..f21bfde637 100644
--- a/crystal/rosbag2/default.nix
+++ b/crystal/rosbag2/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/rosbag2/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "3fd6bf46e3462909038feed3bf7019b83efb38731b9b1d5c136f1ac230cfe002";
   };
 
diff --git a/crystal/rosgraph-msgs/default.nix b/crystal/rosgraph-msgs/default.nix
index bd3c48d84c..e9263239a9 100644
--- a/crystal/rosgraph-msgs/default.nix
+++ b/crystal/rosgraph-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/rosgraph_msgs/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/rosgraph_msgs/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "1f4b3daa77b09d500c47d14372f4e2a830b3a6a834af9d7510028a497c4ada29";
   };
 
diff --git a/crystal/rosidl-actions/default.nix b/crystal/rosidl-actions/default.nix
index 8946daa09b..c8834d2da9 100644
--- a/crystal/rosidl-actions/default.nix
+++ b/crystal/rosidl-actions/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_actions/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_actions/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "f79319429937ec9389ab706816c9e04dbbbb1903073b76317f97be19a61fd4b7";
   };
 
diff --git a/crystal/rosidl-adapter/default.nix b/crystal/rosidl-adapter/default.nix
index 38ad0ad617..dd977cb762 100644
--- a/crystal/rosidl-adapter/default.nix
+++ b/crystal/rosidl-adapter/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_adapter/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_adapter/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "79a9668a51ee594d5e7a3d6d38d25ee20dfefde53e4ce49cd7d7a665e9105801";
   };
 
diff --git a/crystal/rosidl-cmake/default.nix b/crystal/rosidl-cmake/default.nix
index 69caf3714b..0e3824d4d3 100644
--- a/crystal/rosidl-cmake/default.nix
+++ b/crystal/rosidl-cmake/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_cmake/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_cmake/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "511f4f0f1635d02c087d46fdb566d7a176bf94d1be85488a8764a9c93f706368";
   };
 
diff --git a/crystal/rosidl-default-generators/default.nix b/crystal/rosidl-default-generators/default.nix
index c1adaf7bcc..8877b4365e 100644
--- a/crystal/rosidl-default-generators/default.nix
+++ b/crystal/rosidl-default-generators/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/crystal/rosidl_default_generators/0.6.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/crystal/rosidl_default_generators/0.6.0-0.tar.gz";
+    name = "0.6.0-0.tar.gz";
     sha256 = "0d994dd35ba40f84ae30f6ef0d14a5d00acfd24ca660e55b05a3882e811802a3";
   };
 
diff --git a/crystal/rosidl-default-runtime/default.nix b/crystal/rosidl-default-runtime/default.nix
index bb7bce3a29..4a3f3dc0e4 100644
--- a/crystal/rosidl-default-runtime/default.nix
+++ b/crystal/rosidl-default-runtime/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/crystal/rosidl_default_runtime/0.6.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_defaults-release/archive/release/crystal/rosidl_default_runtime/0.6.0-0.tar.gz";
+    name = "0.6.0-0.tar.gz";
     sha256 = "8b856ffb15bc3153f89f51d87b1606568d2702cd87f00c30f39f8b65e24142ad";
   };
 
diff --git a/crystal/rosidl-generator-c/default.nix b/crystal/rosidl-generator-c/default.nix
index 4d89bb0cee..d2d48cadd1 100644
--- a/crystal/rosidl-generator-c/default.nix
+++ b/crystal/rosidl-generator-c/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_generator_c/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_generator_c/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "faf3e8c0b436926f12be1f2ae3190685d52e0fc6856aff7dc159bceb3456319c";
   };
 
diff --git a/crystal/rosidl-generator-cpp/default.nix b/crystal/rosidl-generator-cpp/default.nix
index 9edb91377a..f45e98ca1e 100644
--- a/crystal/rosidl-generator-cpp/default.nix
+++ b/crystal/rosidl-generator-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_generator_cpp/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_generator_cpp/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "49fca695e681fc7bb6dc560aecdce2f7a52a177587f9cf8b820cbc473405fbc1";
   };
 
diff --git a/crystal/rosidl-generator-dds-idl/default.nix b/crystal/rosidl-generator-dds-idl/default.nix
index 1abd71164a..faa4c2ae13 100644
--- a/crystal/rosidl-generator-dds-idl/default.nix
+++ b/crystal/rosidl-generator-dds-idl/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_dds-release/archive/release/crystal/rosidl_generator_dds_idl/0.6.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_dds-release/archive/release/crystal/rosidl_generator_dds_idl/0.6.0-0.tar.gz";
+    name = "0.6.0-0.tar.gz";
     sha256 = "48f52d487269aacba9ec8e4aa8a0d0646a659daea3042708c1b5a9ac1a32596a";
   };
 
diff --git a/crystal/rosidl-generator-py/default.nix b/crystal/rosidl-generator-py/default.nix
index 8f40391642..1d0dd9653f 100644
--- a/crystal/rosidl-generator-py/default.nix
+++ b/crystal/rosidl-generator-py/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_python-release/archive/release/crystal/rosidl_generator_py/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_python-release/archive/release/crystal/rosidl_generator_py/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "6afe8899ecf01ee8636a5afc1f970cc2ac3ceb992349a34f1887b722bb283947";
   };
 
diff --git a/crystal/rosidl-parser/default.nix b/crystal/rosidl-parser/default.nix
index ac1574660d..f7500c2741 100644
--- a/crystal/rosidl-parser/default.nix
+++ b/crystal/rosidl-parser/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_parser/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_parser/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "28496bca14e887afa1c7c178146ab443934723db1088e8b54dfde79d43cc3d9e";
   };
 
diff --git a/crystal/rosidl-typesupport-c/default.nix b/crystal/rosidl-typesupport-c/default.nix
index f88fbe4a3e..568362a08f 100644
--- a/crystal/rosidl-typesupport-c/default.nix
+++ b/crystal/rosidl-typesupport-c/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/crystal/rosidl_typesupport_c/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/crystal/rosidl_typesupport_c/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "be4fdfbf1648deced42c792279d1ed834eba3df058192d0e30c7600255c297e5";
   };
 
diff --git a/crystal/rosidl-typesupport-connext-c/default.nix b/crystal/rosidl-typesupport-connext-c/default.nix
index e85ed8cceb..f70ce9b0c1 100644
--- a/crystal/rosidl-typesupport-connext-c/default.nix
+++ b/crystal/rosidl-typesupport-connext-c/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/crystal/rosidl_typesupport_connext_c/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/crystal/rosidl_typesupport_connext_c/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "203f5177188d336538c2f0443dffcdd7226c418de48806f85f832e2ac416ad2b";
   };
 
diff --git a/crystal/rosidl-typesupport-connext-cpp/default.nix b/crystal/rosidl-typesupport-connext-cpp/default.nix
index 2eef542480..8f42445cf8 100644
--- a/crystal/rosidl-typesupport-connext-cpp/default.nix
+++ b/crystal/rosidl-typesupport-connext-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.4";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/crystal/rosidl_typesupport_connext_cpp/0.6.4-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_connext-release/archive/release/crystal/rosidl_typesupport_connext_cpp/0.6.4-0.tar.gz";
+    name = "0.6.4-0.tar.gz";
     sha256 = "7a65e6e25646ea08557082d0ca4435958a2f09ff8670d6234342c244e1c2b682";
   };
 
diff --git a/crystal/rosidl-typesupport-cpp/default.nix b/crystal/rosidl-typesupport-cpp/default.nix
index 67c422caa1..3993ca0b92 100644
--- a/crystal/rosidl-typesupport-cpp/default.nix
+++ b/crystal/rosidl-typesupport-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/crystal/rosidl_typesupport_cpp/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport-release/archive/release/crystal/rosidl_typesupport_cpp/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "9dc80a33f451a8d8fa776974c0c696130fdd27a23e9a76925c59779d0df4d734";
   };
 
diff --git a/crystal/rosidl-typesupport-fastrtps-c/default.nix b/crystal/rosidl-typesupport-fastrtps-c/default.nix
index 59b06e3866..ceda504e9e 100644
--- a/crystal/rosidl-typesupport-fastrtps-c/default.nix
+++ b/crystal/rosidl-typesupport-fastrtps-c/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/crystal/rosidl_typesupport_fastrtps_c/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/crystal/rosidl_typesupport_fastrtps_c/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "7b6a807031603ef8dd4c18a8a78316fba8a333fca59e6ff65b6be32da4b5534a";
   };
 
diff --git a/crystal/rosidl-typesupport-fastrtps-cpp/default.nix b/crystal/rosidl-typesupport-fastrtps-cpp/default.nix
index d37683f653..956e897c38 100644
--- a/crystal/rosidl-typesupport-fastrtps-cpp/default.nix
+++ b/crystal/rosidl-typesupport-fastrtps-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/crystal/rosidl_typesupport_fastrtps_cpp/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_fastrtps-release/archive/release/crystal/rosidl_typesupport_fastrtps_cpp/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "2daa01538507dddde0fb0cae9725c2a4410ffa22a8939dff2c562c4a6956a93e";
   };
 
diff --git a/crystal/rosidl-typesupport-interface/default.nix b/crystal/rosidl-typesupport-interface/default.nix
index a7769a3f3e..818f90be9a 100644
--- a/crystal/rosidl-typesupport-interface/default.nix
+++ b/crystal/rosidl-typesupport-interface/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_typesupport_interface/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_typesupport_interface/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "c26bc487256f5667128fe176e27cf2295aab3474a41a53286066e0405b36d085";
   };
 
diff --git a/crystal/rosidl-typesupport-introspection-c/default.nix b/crystal/rosidl-typesupport-introspection-c/default.nix
index 725ca6702b..a04fb1fff7 100644
--- a/crystal/rosidl-typesupport-introspection-c/default.nix
+++ b/crystal/rosidl-typesupport-introspection-c/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_typesupport_introspection_c/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_typesupport_introspection_c/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "23fc3046491d1816be15edcd3a210ee401c3efef2b6030efe82dbd2fee1fa783";
   };
 
diff --git a/crystal/rosidl-typesupport-introspection-cpp/default.nix b/crystal/rosidl-typesupport-introspection-cpp/default.nix
index 2d6e44edd9..8223b0dd46 100644
--- a/crystal/rosidl-typesupport-introspection-cpp/default.nix
+++ b/crystal/rosidl-typesupport-introspection-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_typesupport_introspection_cpp/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl-release/archive/release/crystal/rosidl_typesupport_introspection_cpp/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "8c5d625a6f4d27ff0082cbfcfaf4409592d42a01ac99275d604be9bc893b6830";
   };
 
diff --git a/crystal/rosidl-typesupport-opensplice-c/default.nix b/crystal/rosidl-typesupport-opensplice-c/default.nix
index dd03db1047..0e037547df 100644
--- a/crystal/rosidl-typesupport-opensplice-c/default.nix
+++ b/crystal/rosidl-typesupport-opensplice-c/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_opensplice-release/archive/release/crystal/rosidl_typesupport_opensplice_c/0.6.3-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_opensplice-release/archive/release/crystal/rosidl_typesupport_opensplice_c/0.6.3-1.tar.gz";
+    name = "0.6.3-1.tar.gz";
     sha256 = "3eb10890c529a50bc9c098b82bfc8230ca1c4beb285378be7e36631e4a4aa431";
   };
 
diff --git a/crystal/rosidl-typesupport-opensplice-cpp/default.nix b/crystal/rosidl-typesupport-opensplice-cpp/default.nix
index ba2360f535..cc4f8a3b8a 100644
--- a/crystal/rosidl-typesupport-opensplice-cpp/default.nix
+++ b/crystal/rosidl-typesupport-opensplice-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosidl_typesupport_opensplice-release/archive/release/crystal/rosidl_typesupport_opensplice_cpp/0.6.3-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rosidl_typesupport_opensplice-release/archive/release/crystal/rosidl_typesupport_opensplice_cpp/0.6.3-1.tar.gz";
+    name = "0.6.3-1.tar.gz";
     sha256 = "3bd641b06f77153233a8c5eebab313fd4612685cf23bc6afdc31d42ab9473b31";
   };
 
diff --git a/crystal/rqt-action/default.nix b/crystal/rqt-action/default.nix
index e43b2015ef..34ace4fe24 100644
--- a/crystal/rqt-action/default.nix
+++ b/crystal/rqt-action/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_action-release/archive/release/crystal/rqt_action/1.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_action-release/archive/release/crystal/rqt_action/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "7238fa8bf233b4f674088d5229026c07a0e8de91de6183897e92be1786d86b9a";
   };
 
diff --git a/crystal/rqt-console/default.nix b/crystal/rqt-console/default.nix
index 1e1607c5f5..b9a394fa39 100644
--- a/crystal/rqt-console/default.nix
+++ b/crystal/rqt-console/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_console-release/archive/release/crystal/rqt_console/1.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_console-release/archive/release/crystal/rqt_console/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "394aa4341e913abde53c085889f1a314d4dc7f8bf6d0eaf33ab6f9ab582e0979";
   };
 
diff --git a/crystal/rqt-graph/default.nix b/crystal/rqt-graph/default.nix
index 79abca9736..159d555073 100644
--- a/crystal/rqt-graph/default.nix
+++ b/crystal/rqt-graph/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_graph-release/archive/release/crystal/rqt_graph/1.0.1-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_graph-release/archive/release/crystal/rqt_graph/1.0.1-1.tar.gz";
+    name = "1.0.1-1.tar.gz";
     sha256 = "0014405bf2a246e8d995efe233db9b7c28eb4244998f0b4b3218ce199e63fac0";
   };
 
diff --git a/crystal/rqt-gui-cpp/default.nix b/crystal/rqt-gui-cpp/default.nix
index b330660c84..451e56ec1f 100644
--- a/crystal/rqt-gui-cpp/default.nix
+++ b/crystal/rqt-gui-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt_gui_cpp/1.0.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt_gui_cpp/1.0.2-0.tar.gz";
+    name = "1.0.2-0.tar.gz";
     sha256 = "d8138f546878edf1673ed52dc1b4e02ecce8cde383249634a49c4416e0e1a823";
   };
 
diff --git a/crystal/rqt-gui-py/default.nix b/crystal/rqt-gui-py/default.nix
index 5c7aeffd6f..d1a3fa8ac2 100644
--- a/crystal/rqt-gui-py/default.nix
+++ b/crystal/rqt-gui-py/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt_gui_py/1.0.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt_gui_py/1.0.2-0.tar.gz";
+    name = "1.0.2-0.tar.gz";
     sha256 = "88e7fbe247e2a45351e3c8a7e882b302a3c7a7a6766a191be34edf2ef1d639bb";
   };
 
diff --git a/crystal/rqt-gui/default.nix b/crystal/rqt-gui/default.nix
index 4c49d37e31..0cabc4ddf4 100644
--- a/crystal/rqt-gui/default.nix
+++ b/crystal/rqt-gui/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt_gui/1.0.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt_gui/1.0.2-0.tar.gz";
+    name = "1.0.2-0.tar.gz";
     sha256 = "4e256bfa84d8af087d1201e8e2564f34e2ea8642f6c3e35000be52f35d7404ac";
   };
 
diff --git a/crystal/rqt-image-view/default.nix b/crystal/rqt-image-view/default.nix
index 0268fe7354..46f9b4673f 100644
--- a/crystal/rqt-image-view/default.nix
+++ b/crystal/rqt-image-view/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_image_view-release/archive/release/crystal/rqt_image_view/1.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_image_view-release/archive/release/crystal/rqt_image_view/1.0.0-0.tar.gz";
+    name = "1.0.0-0.tar.gz";
     sha256 = "36aaa0d59df2005e1e0b220e15d13e79df9ec027ba28cf1b829e9f05c226c263";
   };
 
diff --git a/crystal/rqt-msg/default.nix b/crystal/rqt-msg/default.nix
index 130362ae8d..31246545b4 100644
--- a/crystal/rqt-msg/default.nix
+++ b/crystal/rqt-msg/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_msg-release/archive/release/crystal/rqt_msg/1.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_msg-release/archive/release/crystal/rqt_msg/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "60afac52d8e0054ba07516357ddf272edea74802ee7b779ed0c89a9d39cd88fd";
   };
 
diff --git a/crystal/rqt-plot/default.nix b/crystal/rqt-plot/default.nix
index cdf471ff91..9b07de0351 100644
--- a/crystal/rqt-plot/default.nix
+++ b/crystal/rqt-plot/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.6-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_plot-release/archive/release/crystal/rqt_plot/1.0.6-1.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_plot-release/archive/release/crystal/rqt_plot/1.0.6-1.tar.gz";
+    name = "1.0.6-1.tar.gz";
     sha256 = "2b849f99ddef657e6711f07cf034016b0b12219010431f81b467649ea2ce2f9f";
   };
 
diff --git a/crystal/rqt-publisher/default.nix b/crystal/rqt-publisher/default.nix
index 0435bcc91c..2418786fde 100644
--- a/crystal/rqt-publisher/default.nix
+++ b/crystal/rqt-publisher/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_publisher-release/archive/release/crystal/rqt_publisher/1.0.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_publisher-release/archive/release/crystal/rqt_publisher/1.0.3-0.tar.gz";
+    name = "1.0.3-0.tar.gz";
     sha256 = "8d6b4cc21b3b3a1a0e1394eba2afd3921d28af0482c12af5e466d0a2080d22f7";
   };
 
diff --git a/crystal/rqt-py-common/default.nix b/crystal/rqt-py-common/default.nix
index d1c68d6131..db13a3764c 100644
--- a/crystal/rqt-py-common/default.nix
+++ b/crystal/rqt-py-common/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt_py_common/1.0.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt_py_common/1.0.2-0.tar.gz";
+    name = "1.0.2-0.tar.gz";
     sha256 = "9aab24d68ce8ddf28c893ad4e015ee82092f937f456cbf904e8eba4bf7db4fcd";
   };
 
diff --git a/crystal/rqt-py-console/default.nix b/crystal/rqt-py-console/default.nix
index 9776982072..c8c4085ca8 100644
--- a/crystal/rqt-py-console/default.nix
+++ b/crystal/rqt-py-console/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.0-r2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_py_console-release/archive/release/crystal/rqt_py_console/1.0.0-2.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_py_console-release/archive/release/crystal/rqt_py_console/1.0.0-2.tar.gz";
+    name = "1.0.0-2.tar.gz";
     sha256 = "2797cbe4f59a613ed53201713ad7a0a3d5f3db5271bca452012500b8ab8130c6";
   };
 
diff --git a/crystal/rqt-service-caller/default.nix b/crystal/rqt-service-caller/default.nix
index 0436c31ebd..b30af4f1b6 100644
--- a/crystal/rqt-service-caller/default.nix
+++ b/crystal/rqt-service-caller/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_service_caller-release/archive/release/crystal/rqt_service_caller/1.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_service_caller-release/archive/release/crystal/rqt_service_caller/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "d8850f2897289e4414da4a2daf77e2f00e81c24e6753668e18c257b32ad53917";
   };
 
diff --git a/crystal/rqt-shell/default.nix b/crystal/rqt-shell/default.nix
index 3df4e7eb98..cdb0ad0613 100644
--- a/crystal/rqt-shell/default.nix
+++ b/crystal/rqt-shell/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_shell-release/archive/release/crystal/rqt_shell/1.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_shell-release/archive/release/crystal/rqt_shell/1.0.0-0.tar.gz";
+    name = "1.0.0-0.tar.gz";
     sha256 = "5a8ea5e58a69cf9d636cf5fb54acc62e8c3d2ad5acea86c0361c2d613c1fb6ab";
   };
 
diff --git a/crystal/rqt-srv/default.nix b/crystal/rqt-srv/default.nix
index f89aec64ca..d045c97289 100644
--- a/crystal/rqt-srv/default.nix
+++ b/crystal/rqt-srv/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_srv-release/archive/release/crystal/rqt_srv/1.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_srv-release/archive/release/crystal/rqt_srv/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "06feb31b523415f057448cbd3190cfb4c60d97ac41a6a5233a2e93d6f03bca40";
   };
 
diff --git a/crystal/rqt-top/default.nix b/crystal/rqt-top/default.nix
index dbc9255269..ab83f600f7 100644
--- a/crystal/rqt-top/default.nix
+++ b/crystal/rqt-top/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_top-release/archive/release/crystal/rqt_top/1.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_top-release/archive/release/crystal/rqt_top/1.0.0-0.tar.gz";
+    name = "1.0.0-0.tar.gz";
     sha256 = "64d8df02dbd0b780950cf5bf408506d0d16c070ea0709ed521369492941342dc";
   };
 
diff --git a/crystal/rqt-topic/default.nix b/crystal/rqt-topic/default.nix
index 15947943ab..41d67727dc 100644
--- a/crystal/rqt-topic/default.nix
+++ b/crystal/rqt-topic/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt_topic-release/archive/release/crystal/rqt_topic/1.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt_topic-release/archive/release/crystal/rqt_topic/1.0.0-0.tar.gz";
+    name = "1.0.0-0.tar.gz";
     sha256 = "fcd05409c692c11682336b35372024844908ac97824eed6b8d98e38ac4af3536";
   };
 
diff --git a/crystal/rqt/default.nix b/crystal/rqt/default.nix
index da8246e0df..69c9c92bc2 100644
--- a/crystal/rqt/default.nix
+++ b/crystal/rqt/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt/1.0.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rqt-release/archive/release/crystal/rqt/1.0.2-0.tar.gz";
+    name = "1.0.2-0.tar.gz";
     sha256 = "852d0ed7d6535653d84dba6db0e482c78959bbd87a9b0aa1f922fe2eb20cad4a";
   };
 
diff --git a/crystal/rttest/default.nix b/crystal/rttest/default.nix
index 324e874469..6cf926daf3 100644
--- a/crystal/rttest/default.nix
+++ b/crystal/rttest/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/realtime_support-release/archive/release/crystal/rttest/0.6.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/realtime_support-release/archive/release/crystal/rttest/0.6.0-0.tar.gz";
+    name = "0.6.0-0.tar.gz";
     sha256 = "16271ef178a15732177f981b5d3e9e15ac1a7d71aea70a1789cd900e5706e5c4";
   };
 
diff --git a/crystal/rviz-assimp-vendor/default.nix b/crystal/rviz-assimp-vendor/default.nix
index 636dfcea01..1d04f31a2b 100644
--- a/crystal/rviz-assimp-vendor/default.nix
+++ b/crystal/rviz-assimp-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "5.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_assimp_vendor/5.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_assimp_vendor/5.1.0-0.tar.gz";
+    name = "5.1.0-0.tar.gz";
     sha256 = "b571fec410ffc054065ebb16be64e2ef2e6b50b62c9a3fe4656ffde67750a8e9";
   };
 
diff --git a/crystal/rviz-common/default.nix b/crystal/rviz-common/default.nix
index 49998435ae..26aa0a72eb 100644
--- a/crystal/rviz-common/default.nix
+++ b/crystal/rviz-common/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "5.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_common/5.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_common/5.1.0-0.tar.gz";
+    name = "5.1.0-0.tar.gz";
     sha256 = "8fde07fc584f5c242e3849c258f00d85452c6507816c6ed6a9b543383b6d8d52";
   };
 
diff --git a/crystal/rviz-default-plugins/default.nix b/crystal/rviz-default-plugins/default.nix
index b58a128b9f..8e6a9186f6 100644
--- a/crystal/rviz-default-plugins/default.nix
+++ b/crystal/rviz-default-plugins/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "5.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_default_plugins/5.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_default_plugins/5.1.0-0.tar.gz";
+    name = "5.1.0-0.tar.gz";
     sha256 = "86db4edda8a8596f4b26e72fb17d9dbe7c48effc1b99a76d46dfd475312c9187";
   };
 
diff --git a/crystal/rviz-ogre-vendor/default.nix b/crystal/rviz-ogre-vendor/default.nix
index aa56a736a3..54383a80d9 100644
--- a/crystal/rviz-ogre-vendor/default.nix
+++ b/crystal/rviz-ogre-vendor/default.nix
@@ -8,13 +8,14 @@ buildRosPackage {
   version = "5.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_ogre_vendor/5.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_ogre_vendor/5.1.0-0.tar.gz";
+    name = "5.1.0-0.tar.gz";
     sha256 = "804f35dd8c1bf6183eb37bae744861da954bce63188ed3c11e1ed2bd135aecdb";
   };
 
   buildType = "ament_cmake";
-  buildInputs = [ xorg.libXaw pkg-config xorg.xrandr xorg.libX11 libGLU libGL freetype ];
-  propagatedBuildInputs = [ xorg.libXaw xorg.xrandr xorg.libX11 libGLU libGL freetype ];
+  buildInputs = [ xorg.libXaw pkg-config xorg.libXrandr xorg.libX11 libGLU libGL freetype ];
+  propagatedBuildInputs = [ xorg.libXaw xorg.libXrandr xorg.libX11 libGLU libGL freetype ];
   nativeBuildInputs = [ ament-cmake ];
 
   meta = {
diff --git a/crystal/rviz-rendering-tests/default.nix b/crystal/rviz-rendering-tests/default.nix
index 2f8e86289c..802244f0c4 100644
--- a/crystal/rviz-rendering-tests/default.nix
+++ b/crystal/rviz-rendering-tests/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "5.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_rendering_tests/5.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_rendering_tests/5.1.0-0.tar.gz";
+    name = "5.1.0-0.tar.gz";
     sha256 = "a66b2482a4c5c7ab5fd51246a799b42855b7d406643a9c28e1eff45fbadeb3e1";
   };
 
diff --git a/crystal/rviz-rendering/default.nix b/crystal/rviz-rendering/default.nix
index f5daeccb67..4d8a7fc077 100644
--- a/crystal/rviz-rendering/default.nix
+++ b/crystal/rviz-rendering/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "5.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_rendering/5.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_rendering/5.1.0-0.tar.gz";
+    name = "5.1.0-0.tar.gz";
     sha256 = "96086e823a93382820f721d1ef80ed07afdef6a433d8d5bff33265ae9407b528";
   };
 
diff --git a/crystal/rviz-visual-testing-framework/default.nix b/crystal/rviz-visual-testing-framework/default.nix
index ae793f11be..63b6ed7c67 100644
--- a/crystal/rviz-visual-testing-framework/default.nix
+++ b/crystal/rviz-visual-testing-framework/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "5.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_visual_testing_framework/5.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz_visual_testing_framework/5.1.0-0.tar.gz";
+    name = "5.1.0-0.tar.gz";
     sha256 = "70d7d6aa110b2f04368e7c7f90d152b6c43f38f704e6188f19352af1e93372c5";
   };
 
diff --git a/crystal/rviz2/default.nix b/crystal/rviz2/default.nix
index aa3124b6d5..dc877813a8 100644
--- a/crystal/rviz2/default.nix
+++ b/crystal/rviz2/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "5.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz2/5.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rviz-release/archive/release/crystal/rviz2/5.1.0-0.tar.gz";
+    name = "5.1.0-0.tar.gz";
     sha256 = "152a838d3f477c960cf567c50e70ba0cec5645c2bbb881a0cda952ccb2ddd4b8";
   };
 
diff --git a/crystal/sensor-msgs/default.nix b/crystal/sensor-msgs/default.nix
index 450c98bf51..810301d6c3 100644
--- a/crystal/sensor-msgs/default.nix
+++ b/crystal/sensor-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/sensor_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/sensor_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "09309c9ac332be8eedaf4c74f6342d60be5c8f729079edd2ee26a42ed3029075";
   };
 
diff --git a/crystal/shape-msgs/default.nix b/crystal/shape-msgs/default.nix
index c157798fe8..0e08119eb9 100644
--- a/crystal/shape-msgs/default.nix
+++ b/crystal/shape-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/shape_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/shape_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "2bd53e9b315efdb349d6e057dd5d95c1ea48a947974cae7cbacb4cccf3bae682";
   };
 
diff --git a/crystal/shared-queues-vendor/default.nix b/crystal/shared-queues-vendor/default.nix
index b866185c8d..7a772ce3cf 100644
--- a/crystal/shared-queues-vendor/default.nix
+++ b/crystal/shared-queues-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/shared_queues_vendor/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/shared_queues_vendor/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "a16b140efff873ddc45af4c6f25e534942e36d408294d04ed33dc4875a6c9a57";
   };
 
diff --git a/crystal/sophus/default.nix b/crystal/sophus/default.nix
index df3b4c4aeb..587c99cffb 100644
--- a/crystal/sophus/default.nix
+++ b/crystal/sophus/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.2";
 
   src = fetchurl {
-    url = https://github.com/yujinrobot-release/sophus-release/archive/release/crystal/sophus/1.0.2-0.tar.gz;
+    url = "https://github.com/yujinrobot-release/sophus-release/archive/release/crystal/sophus/1.0.2-0.tar.gz";
+    name = "1.0.2-0.tar.gz";
     sha256 = "bf2d15f293ed5fc5710b76bf6be309ddee55b910a37f34cc259b69bce11ef6f2";
   };
 
diff --git a/crystal/sqlite3-vendor/default.nix b/crystal/sqlite3-vendor/default.nix
index 0b19186f6b..76b303773a 100644
--- a/crystal/sqlite3-vendor/default.nix
+++ b/crystal/sqlite3-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.7";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/sqlite3_vendor/0.0.7-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rosbag2-release/archive/release/crystal/sqlite3_vendor/0.0.7-0.tar.gz";
+    name = "0.0.7-0.tar.gz";
     sha256 = "243bb62d135e78429dd88a5f21c18293ccf173041cc274b3031c948f0c77c5c6";
   };
 
diff --git a/crystal/sros2-cmake/default.nix b/crystal/sros2-cmake/default.nix
index 85179ab2cd..3e68e43715 100644
--- a/crystal/sros2-cmake/default.nix
+++ b/crystal/sros2-cmake/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/sros2-release/archive/release/crystal/sros2_cmake/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/sros2-release/archive/release/crystal/sros2_cmake/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "80042b41404ecbb8cc07a61aa45b2b93fb2c15adfb8e6043fb1e5ef662d4fd7a";
   };
 
diff --git a/crystal/sros2/default.nix b/crystal/sros2/default.nix
index 62529960f8..e108aa32ae 100644
--- a/crystal/sros2/default.nix
+++ b/crystal/sros2/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/sros2-release/archive/release/crystal/sros2/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/sros2-release/archive/release/crystal/sros2/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "006a7b5eef7f2d33a38be6367659eec3a17a901a35339c1b30fd64b4ab2b4f76";
   };
 
diff --git a/crystal/std-msgs/default.nix b/crystal/std-msgs/default.nix
index e355eb0b7b..732c798e31 100644
--- a/crystal/std-msgs/default.nix
+++ b/crystal/std-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/std_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/std_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "3713d137c312f568c5bb934b6fbf9794090862f5585cf34bdc7f080007d89720";
   };
 
diff --git a/crystal/std-srvs/default.nix b/crystal/std-srvs/default.nix
index cd308dfad0..a74bf57ad4 100644
--- a/crystal/std-srvs/default.nix
+++ b/crystal/std-srvs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/std_srvs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/std_srvs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "cd76b3e0759a1bca1b6963cbe8e8d6926251eaa2553311d6fe256a3e59a893d8";
   };
 
diff --git a/crystal/stereo-msgs/default.nix b/crystal/stereo-msgs/default.nix
index 3443c59a3e..d34b376fcd 100644
--- a/crystal/stereo-msgs/default.nix
+++ b/crystal/stereo-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/stereo_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/stereo_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "02091b01f35da1e96319e42ee309af8aa4d495611b960d775569298133ba3d1b";
   };
 
diff --git a/crystal/system-modes-examples/default.nix b/crystal/system-modes-examples/default.nix
index 721f4e9ac5..650e231f8e 100644
--- a/crystal/system-modes-examples/default.nix
+++ b/crystal/system-modes-examples/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.3-r1";
 
   src = fetchurl {
-    url = https://github.com/microROS/system_modes-release/archive/release/crystal/system_modes_examples/0.1.3-1.tar.gz;
+    url = "https://github.com/microROS/system_modes-release/archive/release/crystal/system_modes_examples/0.1.3-1.tar.gz";
+    name = "0.1.3-1.tar.gz";
     sha256 = "e5a05a80230ade9371ee63541ccdcd0284441debde2c3f987968564187dd3470";
   };
 
diff --git a/crystal/system-modes/default.nix b/crystal/system-modes/default.nix
index ec5fffaa7a..5d7722652d 100644
--- a/crystal/system-modes/default.nix
+++ b/crystal/system-modes/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.1.3-r1";
 
   src = fetchurl {
-    url = https://github.com/microROS/system_modes-release/archive/release/crystal/system_modes/0.1.3-1.tar.gz;
+    url = "https://github.com/microROS/system_modes-release/archive/release/crystal/system_modes/0.1.3-1.tar.gz";
+    name = "0.1.3-1.tar.gz";
     sha256 = "416b5b1c3e63223b949fd1ef38c4ad860204939dae003721c65389f69bf20d71";
   };
 
diff --git a/crystal/teleop-twist-joy/default.nix b/crystal/teleop-twist-joy/default.nix
index fb832eea19..904ba55db6 100644
--- a/crystal/teleop-twist-joy/default.nix
+++ b/crystal/teleop-twist-joy/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/teleop_twist_joy-release/archive/release/crystal/teleop_twist_joy/2.1.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/teleop_twist_joy-release/archive/release/crystal/teleop_twist_joy/2.1.1-0.tar.gz";
+    name = "2.1.1-0.tar.gz";
     sha256 = "a7d77f7bc4efb63a825c9f06c88703e9373dafe9a615473f6a1a7c4866fea635";
   };
 
diff --git a/crystal/teleop-twist-keyboard/default.nix b/crystal/teleop-twist-keyboard/default.nix
index 6462f5d895..a79a10faf1 100644
--- a/crystal/teleop-twist-keyboard/default.nix
+++ b/crystal/teleop-twist-keyboard/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/teleop_twist_keyboard-release/archive/release/crystal/teleop_twist_keyboard/2.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/teleop_twist_keyboard-release/archive/release/crystal/teleop_twist_keyboard/2.2.0-0.tar.gz";
+    name = "2.2.0-0.tar.gz";
     sha256 = "2b900f9b7189e874bb2d13b56426e6d1c2c6d632e92e69890b1aa32bd9d04ddb";
   };
 
diff --git a/crystal/test-msgs/default.nix b/crystal/test-msgs/default.nix
index 520accece4..8279f85fe0 100644
--- a/crystal/test-msgs/default.nix
+++ b/crystal/test-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.3";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/test_msgs/0.6.3-0.tar.gz;
+    url = "https://github.com/ros2-gbp/rcl_interfaces-release/archive/release/crystal/test_msgs/0.6.3-0.tar.gz";
+    name = "0.6.3-0.tar.gz";
     sha256 = "74f8874674cec9d9f6b53a41aa24ab578358a710dec1b0b96ac9090abac0cccb";
   };
 
diff --git a/crystal/test-osrf-testing-tools-cpp/default.nix b/crystal/test-osrf-testing-tools-cpp/default.nix
index 8d6f303f1d..e49244a2da 100644
--- a/crystal/test-osrf-testing-tools-cpp/default.nix
+++ b/crystal/test-osrf-testing-tools-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/osrf_testings_tools_cpp-release/archive/release/crystal/test_osrf_testing_tools_cpp/1.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/osrf_testings_tools_cpp-release/archive/release/crystal/test_osrf_testing_tools_cpp/1.1.0-0.tar.gz";
+    name = "1.1.0-0.tar.gz";
     sha256 = "1067dd7000f2588b491c497ab81fc7ace0c5e8be01ecb1ec000479e0a9842e8f";
   };
 
diff --git a/crystal/tf2-eigen/default.nix b/crystal/tf2-eigen/default.nix
index c45620fa63..ef1f396d25 100644
--- a/crystal/tf2-eigen/default.nix
+++ b/crystal/tf2-eigen/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.10.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_eigen/0.10.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_eigen/0.10.1-0.tar.gz";
+    name = "0.10.1-0.tar.gz";
     sha256 = "cfd1668cfa4bc1daff1156eaa9c84067d7179d5a0b140b749e6872fab29b882c";
   };
 
diff --git a/crystal/tf2-geometry-msgs/default.nix b/crystal/tf2-geometry-msgs/default.nix
index 6b1f6a046f..6d1f9539fb 100644
--- a/crystal/tf2-geometry-msgs/default.nix
+++ b/crystal/tf2-geometry-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.10.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_geometry_msgs/0.10.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_geometry_msgs/0.10.1-0.tar.gz";
+    name = "0.10.1-0.tar.gz";
     sha256 = "7aafc1e2f356900c3a04bafeebdbacb50778dc3ac072aded38af027e0bb031b0";
   };
 
diff --git a/crystal/tf2-msgs/default.nix b/crystal/tf2-msgs/default.nix
index 72878add46..9eb0feac1b 100644
--- a/crystal/tf2-msgs/default.nix
+++ b/crystal/tf2-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.10.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_msgs/0.10.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_msgs/0.10.1-0.tar.gz";
+    name = "0.10.1-0.tar.gz";
     sha256 = "3229d3ac0f9001ee47e1de7be89d370382142ea81501c9ba8a4e27c20c342c9e";
   };
 
diff --git a/crystal/tf2-ros/default.nix b/crystal/tf2-ros/default.nix
index d49f3bbdf7..c1b2195dd7 100644
--- a/crystal/tf2-ros/default.nix
+++ b/crystal/tf2-ros/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.10.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_ros/0.10.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_ros/0.10.1-0.tar.gz";
+    name = "0.10.1-0.tar.gz";
     sha256 = "9ce43d432da28490f5420df35d2adcc2486455dd97dac648d209a85d86ffc34c";
   };
 
diff --git a/crystal/tf2-sensor-msgs/default.nix b/crystal/tf2-sensor-msgs/default.nix
index 0ed43b7492..208dc35e95 100644
--- a/crystal/tf2-sensor-msgs/default.nix
+++ b/crystal/tf2-sensor-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.10.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_sensor_msgs/0.10.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2_sensor_msgs/0.10.1-0.tar.gz";
+    name = "0.10.1-0.tar.gz";
     sha256 = "9dd7df4d7dbc5eb6b757acf55b5d356d22903aefccabe59a1d770813c19c7cd7";
   };
 
diff --git a/crystal/tf2/default.nix b/crystal/tf2/default.nix
index 073aea4c27..db59b1fc7c 100644
--- a/crystal/tf2/default.nix
+++ b/crystal/tf2/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.10.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2/0.10.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/geometry2-release/archive/release/crystal/tf2/0.10.1-0.tar.gz";
+    name = "0.10.1-0.tar.gz";
     sha256 = "33f565f29e58c2675896a0b7dc88df83659a0acd09776f7aa40438ef7713b012";
   };
 
diff --git a/crystal/theora-image-transport/default.nix b/crystal/theora-image-transport/default.nix
index d432704211..0cdf2e8678 100644
--- a/crystal/theora-image-transport/default.nix
+++ b/crystal/theora-image-transport/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/crystal/theora_image_transport/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/image_transport_plugins-release/archive/release/crystal/theora_image_transport/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "748543b146e6a8816a560c6ccf5a48c9648c0b1b6a956cd3e7c67390ee4e2d2c";
   };
 
diff --git a/crystal/tinydir-vendor/default.nix b/crystal/tinydir-vendor/default.nix
index 30fc64083d..7e31419813 100644
--- a/crystal/tinydir-vendor/default.nix
+++ b/crystal/tinydir-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/tinydir_vendor-release/archive/release/crystal/tinydir_vendor/1.0.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/tinydir_vendor-release/archive/release/crystal/tinydir_vendor/1.0.1-0.tar.gz";
+    name = "1.0.1-0.tar.gz";
     sha256 = "993a5b8000c90a3284ca05971c79f13f7e71fa2b92e02f865d8d730b9ceaafd3";
   };
 
diff --git a/crystal/tinyxml-vendor/default.nix b/crystal/tinyxml-vendor/default.nix
index d20e925f46..d8eced0b41 100644
--- a/crystal/tinyxml-vendor/default.nix
+++ b/crystal/tinyxml-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.5.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/tinyxml_vendor-release/archive/release/crystal/tinyxml_vendor/0.5.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/tinyxml_vendor-release/archive/release/crystal/tinyxml_vendor/0.5.0-0.tar.gz";
+    name = "0.5.0-0.tar.gz";
     sha256 = "ad189cbcce4e0a7187d9dc7bc1fea531fb2cfa4e68ffb506556ddfcd65d79c08";
   };
 
diff --git a/crystal/tinyxml2-vendor/default.nix b/crystal/tinyxml2-vendor/default.nix
index 608b599057..0c4d3f2ca5 100644
--- a/crystal/tinyxml2-vendor/default.nix
+++ b/crystal/tinyxml2-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/tinyxml2_vendor-release/archive/release/crystal/tinyxml2_vendor/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/tinyxml2_vendor-release/archive/release/crystal/tinyxml2_vendor/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "68aa18c4cdfc73098b30c5b59de57a85458e88e38f54b790442cf6ab05861514";
   };
 
diff --git a/crystal/tlsf-cpp/default.nix b/crystal/tlsf-cpp/default.nix
index 7e4c74860d..4fe88e5c16 100644
--- a/crystal/tlsf-cpp/default.nix
+++ b/crystal/tlsf-cpp/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/realtime_support-release/archive/release/crystal/tlsf_cpp/0.6.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/realtime_support-release/archive/release/crystal/tlsf_cpp/0.6.0-0.tar.gz";
+    name = "0.6.0-0.tar.gz";
     sha256 = "0226cc7cd7cbe864671d5f5c83d87b483bdb6e7c0a3fb205276aec9e47acd903";
   };
 
diff --git a/crystal/tlsf/default.nix b/crystal/tlsf/default.nix
index 4e456963be..d07806d232 100644
--- a/crystal/tlsf/default.nix
+++ b/crystal/tlsf/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.5.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/tlsf-release/archive/release/crystal/tlsf/0.5.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/tlsf-release/archive/release/crystal/tlsf/0.5.0-0.tar.gz";
+    name = "0.5.0-0.tar.gz";
     sha256 = "fb30080b58ef1610f857ff1ddcf1416325f24a247267e2c49f09a5759ab919a7";
   };
 
diff --git a/crystal/topic-monitor/default.nix b/crystal/topic-monitor/default.nix
index b3611e648f..8f9c2a3946 100644
--- a/crystal/topic-monitor/default.nix
+++ b/crystal/topic-monitor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.2";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/demos-release/archive/release/crystal/topic_monitor/0.6.2-0.tar.gz;
+    url = "https://github.com/ros2-gbp/demos-release/archive/release/crystal/topic_monitor/0.6.2-0.tar.gz";
+    name = "0.6.2-0.tar.gz";
     sha256 = "6cad0a1877a05bd2e7e7888f06f26f4739e442726da85a548f4ddb65783ead6c";
   };
 
diff --git a/crystal/trajectory-msgs/default.nix b/crystal/trajectory-msgs/default.nix
index acc727f0ea..afb85d6bf0 100644
--- a/crystal/trajectory-msgs/default.nix
+++ b/crystal/trajectory-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/trajectory_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/trajectory_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "9080e638daee2e5f3fb97a72dc991f24b28b7833d2d330cba35e1bcf16d171bd";
   };
 
diff --git a/crystal/uncrustify-vendor/default.nix b/crystal/uncrustify-vendor/default.nix
index 0b3d95937a..177c7ced51 100644
--- a/crystal/uncrustify-vendor/default.nix
+++ b/crystal/uncrustify-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/uncrustify_vendor-release/archive/release/crystal/uncrustify_vendor/1.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/uncrustify_vendor-release/archive/release/crystal/uncrustify_vendor/1.1.0-0.tar.gz";
+    name = "1.1.0-0.tar.gz";
     sha256 = "e81702fda146eb9e430cb382a925c852d768aee7f801fe35df14c91cc2efbed5";
   };
 
diff --git a/crystal/unique-identifier-msgs/default.nix b/crystal/unique-identifier-msgs/default.nix
index f20d7eb4f6..cc9d40f6d2 100644
--- a/crystal/unique-identifier-msgs/default.nix
+++ b/crystal/unique-identifier-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/unique_identifier_msgs-release/archive/release/crystal/unique_identifier_msgs/2.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/unique_identifier_msgs-release/archive/release/crystal/unique_identifier_msgs/2.0.0-0.tar.gz";
+    name = "2.0.0-0.tar.gz";
     sha256 = "87eed67a35931d8ae852ed650b8b98049ee7af773fa97ba29ab0f0d42b5f3636";
   };
 
diff --git a/crystal/urdf/default.nix b/crystal/urdf/default.nix
index 3b3be78a0c..aaf33e10bb 100644
--- a/crystal/urdf/default.nix
+++ b/crystal/urdf/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.2.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/urdf-release/archive/release/crystal/urdf/2.2.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/urdf-release/archive/release/crystal/urdf/2.2.0-0.tar.gz";
+    name = "2.2.0-0.tar.gz";
     sha256 = "541212cb509c15483e69146739bb03deae092d7a70173b8eda23c33bd391e307";
   };
 
diff --git a/crystal/urdfdom-headers/default.nix b/crystal/urdfdom-headers/default.nix
index fc8180eb89..a4625718a2 100644
--- a/crystal/urdfdom-headers/default.nix
+++ b/crystal/urdfdom-headers/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "1.0.2-r1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/urdfdom_headers-release/archive/release/crystal/urdfdom_headers/1.0.2-1.tar.gz;
+    url = "https://github.com/ros2-gbp/urdfdom_headers-release/archive/release/crystal/urdfdom_headers/1.0.2-1.tar.gz";
+    name = "1.0.2-1.tar.gz";
     sha256 = "57ca69ecd0c2de926bc758d5f7a32dce4cd2ebc7f902c69b22ee34f9647e62fa";
   };
 
diff --git a/crystal/urdfdom/default.nix b/crystal/urdfdom/default.nix
index 3fb5375be5..f74f0fcbeb 100644
--- a/crystal/urdfdom/default.nix
+++ b/crystal/urdfdom/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/urdfdom-release/archive/release/crystal/urdfdom/2.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/urdfdom-release/archive/release/crystal/urdfdom/2.1.0-0.tar.gz";
+    name = "2.1.0-0.tar.gz";
     sha256 = "27275c8ea3647c50538c85816341e1de41618345e4b54b9d30314886f9525b89";
   };
 
diff --git a/crystal/vision-opencv/default.nix b/crystal/vision-opencv/default.nix
index 5496de82eb..a901b2d641 100644
--- a/crystal/vision-opencv/default.nix
+++ b/crystal/vision-opencv/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "2.1.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/vision_opencv-release/archive/release/crystal/vision_opencv/2.1.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/vision_opencv-release/archive/release/crystal/vision_opencv/2.1.0-0.tar.gz";
+    name = "2.1.0-0.tar.gz";
     sha256 = "c5c3156bb5a3c568428b126aa2f70fc9f811283d834d0a01b74c452dbde8f2e9";
   };
 
diff --git a/crystal/visualization-msgs/default.nix b/crystal/visualization-msgs/default.nix
index bdb4c6f06a..e37a687678 100644
--- a/crystal/visualization-msgs/default.nix
+++ b/crystal/visualization-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.6.1";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/visualization_msgs/0.6.1-0.tar.gz;
+    url = "https://github.com/ros2-gbp/common_interfaces-release/archive/release/crystal/visualization_msgs/0.6.1-0.tar.gz";
+    name = "0.6.1-0.tar.gz";
     sha256 = "77169a17f41ace0b652fcfc75f70e9bb8aa505967d2fdc13c3a95125d99002ad";
   };
 
diff --git a/crystal/webots-ros2-core/default.nix b/crystal/webots-ros2-core/default.nix
index fe96518393..c89b2eb176 100644
--- a/crystal/webots-ros2-core/default.nix
+++ b/crystal/webots-ros2-core/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.2-r1";
 
   src = fetchurl {
-    url = https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_core/0.0.2-1.tar.gz;
+    url = "https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_core/0.0.2-1.tar.gz";
+    name = "0.0.2-1.tar.gz";
     sha256 = "bcf69b4dcabfe0719810d89bc6e3d7133c21728bfd1a050d444bba2859cbb5b4";
   };
 
diff --git a/crystal/webots-ros2-desktop/default.nix b/crystal/webots-ros2-desktop/default.nix
index 1b0a8a7e51..08c1a0e7eb 100644
--- a/crystal/webots-ros2-desktop/default.nix
+++ b/crystal/webots-ros2-desktop/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.2-r1";
 
   src = fetchurl {
-    url = https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_desktop/0.0.2-1.tar.gz;
+    url = "https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_desktop/0.0.2-1.tar.gz";
+    name = "0.0.2-1.tar.gz";
     sha256 = "488c6d49806092cf4ecf8ca019ec93d5112e9ee6ebfd829c0e0b5ab80a213064";
   };
 
diff --git a/crystal/webots-ros2-examples/default.nix b/crystal/webots-ros2-examples/default.nix
index d5c6ccdaaa..e5d11edeb5 100644
--- a/crystal/webots-ros2-examples/default.nix
+++ b/crystal/webots-ros2-examples/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.2-r1";
 
   src = fetchurl {
-    url = https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_examples/0.0.2-1.tar.gz;
+    url = "https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_examples/0.0.2-1.tar.gz";
+    name = "0.0.2-1.tar.gz";
     sha256 = "ccab36e0a04439bf43ec4101380c356d5fa7a6a6419e783ccea93fa20f56a1f2";
   };
 
diff --git a/crystal/webots-ros2-msgs/default.nix b/crystal/webots-ros2-msgs/default.nix
index 5c181f35ab..369399df98 100644
--- a/crystal/webots-ros2-msgs/default.nix
+++ b/crystal/webots-ros2-msgs/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.2-r1";
 
   src = fetchurl {
-    url = https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_msgs/0.0.2-1.tar.gz;
+    url = "https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_msgs/0.0.2-1.tar.gz";
+    name = "0.0.2-1.tar.gz";
     sha256 = "aebc172cb774aaaa12ca507a6bbbddc13326d52b849b64c082b2a3b8b63261a8";
   };
 
diff --git a/crystal/webots-ros2-universal-robot/default.nix b/crystal/webots-ros2-universal-robot/default.nix
index 3a4ed12f51..e4be8d368b 100644
--- a/crystal/webots-ros2-universal-robot/default.nix
+++ b/crystal/webots-ros2-universal-robot/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.2-r1";
 
   src = fetchurl {
-    url = https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_universal_robot/0.0.2-1.tar.gz;
+    url = "https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2_universal_robot/0.0.2-1.tar.gz";
+    name = "0.0.2-1.tar.gz";
     sha256 = "3b7c3d898d90d5f1c04855ba5d0b8a567d66159a0d77f9c0fe84887359a173ff";
   };
 
diff --git a/crystal/webots-ros2/default.nix b/crystal/webots-ros2/default.nix
index d6ad419f63..368bdf0e5b 100644
--- a/crystal/webots-ros2/default.nix
+++ b/crystal/webots-ros2/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "0.0.2-r1";
 
   src = fetchurl {
-    url = https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2/0.0.2-1.tar.gz;
+    url = "https://github.com/cyberbotics/webots_ros2-release/archive/release/crystal/webots_ros2/0.0.2-1.tar.gz";
+    name = "0.0.2-1.tar.gz";
     sha256 = "0725803da2fd33fcdd3a5c0e78bcea930a93b62cd660bc8c6d327158d357dd46";
   };
 
diff --git a/crystal/yaml-cpp-vendor/default.nix b/crystal/yaml-cpp-vendor/default.nix
index 97f4cddad1..aa9f0432c7 100644
--- a/crystal/yaml-cpp-vendor/default.nix
+++ b/crystal/yaml-cpp-vendor/default.nix
@@ -8,7 +8,8 @@ buildRosPackage {
   version = "5.0.0";
 
   src = fetchurl {
-    url = https://github.com/ros2-gbp/yaml_cpp_vendor-release/archive/release/crystal/yaml_cpp_vendor/5.0.0-0.tar.gz;
+    url = "https://github.com/ros2-gbp/yaml_cpp_vendor-release/archive/release/crystal/yaml_cpp_vendor/5.0.0-0.tar.gz";
+    name = "5.0.0-0.tar.gz";
     sha256 = "40ebab2a3298b5c6f44d69b287d305097cc267912e38722e181f1a903e1d0e63";
   };