flake upd

This commit is contained in:
Игорь Брылёв 2025-06-17 21:17:06 +03:00
parent d8285f0661
commit 7c80847754
3 changed files with 191 additions and 21 deletions

160
flake.lock generated
View file

@ -1,5 +1,19 @@
{ {
"nodes": { "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": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -18,6 +32,42 @@
"type": "github" "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": { "nix-ros-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -38,6 +88,29 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744849697, "lastModified": 1744849697,
@ -54,13 +127,68 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"nix-ros-overlay": "nix-ros-overlay", "nix-ros-overlay": "nix-ros-overlay",
"nixpkgs": [ "nixpkgs": [
"nix-ros-overlay", "nix-ros-overlay",
"nixpkgs" "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": { "systems": {
@ -77,6 +205,36 @@
"repo": "default", "repo": "default",
"type": "github" "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", "root": "root",

View file

@ -2,11 +2,13 @@
inputs = { inputs = {
nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/develop"; nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/develop";
nixpkgs.follows = "nix-ros-overlay/nixpkgs"; # IMPORTANT!!! nixpkgs.follows = "nix-ros-overlay/nixpkgs"; # IMPORTANT!!!
ros2nix.url = "github:wentasah/ros2nix";
}; };
outputs = { outputs = {
self, self,
nix-ros-overlay, nix-ros-overlay,
nixpkgs, nixpkgs,
ros2nix
}: }:
nix-ros-overlay.inputs.flake-utils.lib.eachDefaultSystem (system: let nix-ros-overlay.inputs.flake-utils.lib.eachDefaultSystem (system: let
applyDistroOverlay = rosOverlay: rosPackages: applyDistroOverlay = rosOverlay: rosPackages:
@ -61,7 +63,10 @@
packages = packages =
[ [
pkgs.colcon pkgs.colcon
pkgs.vcstool
pkgs.gdb
# ... other non-ROS packages # ... other non-ROS packages
(with pkgs.rosPackages.${rosDistro}; (with pkgs.rosPackages.${rosDistro};
buildEnv { buildEnv {
paths = [ paths = [
@ -72,25 +77,32 @@
# robot package # robot package
rbs-arm rbs-arm
# dynamixel gz-sim-vendor
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 # dynamixel
ffw-bringup # dynamixel-hardware
ffw-description # dynamixel-hardware-interface
ffw-joint-trajectory-command-broadcaster # dynamixel-interfaces
ffw-joystick-controller # dynamixel-sdk
ffw-moveit-config # dynamixel-sdk-custom-interfaces
ffw-spring-actuator-controller # dynamixel-sdk-examples
ffw-teleop # 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
]; ];
}) })
] ]

View file

@ -21,5 +21,5 @@ repositories:
version: gazebo-simulation version: gazebo-simulation
ai_worker: ai_worker:
type: git type: git
url: https://github.com/ROBOTIS-GIT/ai_worker url: https://github.com/movefasta/ai_worker
version: jazzy version: jazzy