From 7c80847754482a46af7e5630c812e40d3618cdb9 Mon Sep 17 00:00:00 2001 From: Igor Brylev Date: Tue, 17 Jun 2025 21:17:06 +0300 Subject: [PATCH] flake upd --- flake.lock | 160 ++++++++++++++++++++++++++++++++++++++++++- flake.nix | 48 ++++++++----- repos/all-deps.repos | 4 +- 3 files changed, 191 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index c0748ae..cca2f85 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,19 @@ { "nodes": { + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -18,6 +32,42 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nix-ros-overlay": { "inputs": { "flake-utils": "flake-utils", @@ -38,6 +88,29 @@ "type": "github" } }, + "nix-ros-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "ros2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727450207, + "narHash": "sha256-IYfuTysAvph03Iyc/XwuM04yd0qJhm/OtziZglwYys0=", + "owner": "lopsided98", + "repo": "nix-ros-overlay", + "rev": "31e1e361f41a0e4116d4c34eb608931dfd101492", + "type": "github" + }, + "original": { + "owner": "lopsided98", + "ref": "develop", + "repo": "nix-ros-overlay", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1744849697, @@ -54,13 +127,68 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "nix-ros-overlay": "nix-ros-overlay", "nixpkgs": [ "nix-ros-overlay", "nixpkgs" - ] + ], + "ros2nix": "ros2nix" + } + }, + "ros2nix": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nix-ros-overlay": "nix-ros-overlay_2", + "nixpkgs": "nixpkgs_2", + "rosdistro": "rosdistro" + }, + "locked": { + "lastModified": 1748758516, + "narHash": "sha256-uIuV8XxekjaucsAHvlVIAOEKD8IGo0WpZjUt1Dt0iqA=", + "owner": "wentasah", + "repo": "ros2nix", + "rev": "ea952692634f664b578c07fcdbc481fc105f302a", + "type": "github" + }, + "original": { + "owner": "wentasah", + "repo": "ros2nix", + "type": "github" + } + }, + "rosdistro": { + "flake": false, + "locked": { + "lastModified": 1748630238, + "narHash": "sha256-qTCxQ8Rvrmrz0s1J0e6AZKtxC7fu+uwridNEscj7yZI=", + "owner": "ros", + "repo": "rosdistro", + "rev": "0c431c180b0773ba7e60f0378e5d88fdeab6b4ef", + "type": "github" + }, + "original": { + "owner": "ros", + "repo": "rosdistro", + "type": "github" } }, "systems": { @@ -77,6 +205,36 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9be5c16..304b9e1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,13 @@ inputs = { nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/develop"; nixpkgs.follows = "nix-ros-overlay/nixpkgs"; # IMPORTANT!!! + ros2nix.url = "github:wentasah/ros2nix"; }; outputs = { self, nix-ros-overlay, nixpkgs, + ros2nix }: nix-ros-overlay.inputs.flake-utils.lib.eachDefaultSystem (system: let applyDistroOverlay = rosOverlay: rosPackages: @@ -61,7 +63,10 @@ packages = [ pkgs.colcon + pkgs.vcstool + pkgs.gdb # ... other non-ROS packages + (with pkgs.rosPackages.${rosDistro}; buildEnv { paths = [ @@ -72,25 +77,32 @@ # robot package rbs-arm - # dynamixel - dynamixel-hardware - dynamixel-hardware-interface - dynamixel-interfaces - dynamixel-sdk - dynamixel-sdk-custom-interfaces - dynamixel-sdk-examples - dynamixel-workbench - dynamixel-workbench-msgs - dynamixel-workbench-toolbox + gz-sim-vendor - ffw - ffw-bringup - ffw-description - ffw-joint-trajectory-command-broadcaster - ffw-joystick-controller - ffw-moveit-config - ffw-spring-actuator-controller - ffw-teleop + # dynamixel + # dynamixel-hardware + # dynamixel-hardware-interface + # dynamixel-interfaces + # dynamixel-sdk + # dynamixel-sdk-custom-interfaces + # dynamixel-sdk-examples + # dynamixel-workbench + # dynamixel-workbench-msgs + # dynamixel-workbench-toolbox + + # ffw + # ffw-bringup + # ffw-description + # ffw-joint-trajectory-command-broadcaster + # ffw-joystick-controller + # ffw-moveit-config + # ffw-spring-actuator-controller + # ffw-teleop + + #open-manipulator + ur + + #franka-gello-state-publisher ]; }) ] diff --git a/repos/all-deps.repos b/repos/all-deps.repos index 9e378b4..d4a9728 100644 --- a/repos/all-deps.repos +++ b/repos/all-deps.repos @@ -21,5 +21,5 @@ repositories: version: gazebo-simulation ai_worker: type: git - url: https://github.com/ROBOTIS-GIT/ai_worker - version: jazzy \ No newline at end of file + url: https://github.com/movefasta/ai_worker + version: jazzy