robossembler/nix-overlay
7
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity Actions

Обновление inputs + исправлен ros2-gz-control

Browse source
This commit is contained in:
movefasta 2023-04-11 16:42:51 +03:00
parent a7c6431257
commit 246eb1cbbe
No known key found for this signature in database
GPG key ID: 74C6469794E996AD
2 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

48
flake.lock generated
View file

@ -1,12 +1,15 @@
{ {
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1678901627, "lastModified": 1681037374,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "rev": "033b9f258ca96a10e543d4442071f614dc3f8412",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +20,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1680946745,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "rev": "946da791763db1c306b86a8bd3828bf5814a1247",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -32,11 +35,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679943299, "lastModified": 1681042531,
"narHash": "sha256-RsGh4KrY4rnhTI7vTv0eVS6P5/MbakSKkGFXOnuN3q4=", "narHash": "sha256-QkCUIENdtxH3sGdmA2Nu8X2jINtQTd4BHO6YptY8QlQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2749074b2e2960fc97aaeca251f3152d6e6effb7", "rev": "a3d8b7f691c4f1b1e3c62faae9885a356eab3920",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +51,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1678244258, "lastModified": 1680987285,
"narHash": "sha256-iecrLqFb1QDgBKmC0h065ZBV6CZsigcz+1aHCv6rvfg=", "narHash": "sha256-H89D9Y0LconKgzW2G9bbeIsbCaDAf15blX1j91oU9tU=",
"owner": "lopsided98", "owner": "lopsided98",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "61852b7faa8b47aad422adca0fea90fe007e9ead", "rev": "dc92b7ed4a9e006ac7dcf94fe699ff5ad865941b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +78,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1679883731, "lastModified": 1680987729,
"narHash": "sha256-s+JOzKRcAOSCkMdjwKNXRX3cCJS99IrzXMb17PRHahU=", "narHash": "sha256-vXhyOMqBx0VxhjQz+JuGrI98xEvTA/AZgY6Sj5aKfUU=",
"owner": "lopsided98", "owner": "lopsided98",
"repo": "nix-ros-overlay", "repo": "nix-ros-overlay",
"rev": "3ae8887f8c0344d6d926a261c958993887487971", "rev": "09db77c14c1a9bb50ae1cbd7f30ebee4d8aa843a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,6 +91,21 @@
"repo": "nix-ros-overlay", "repo": "nix-ros-overlay",
"type": "github" "type": "github"
} }
},
"systems": {
"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",

17
flake.nix
View file

@ -15,25 +15,12 @@
# overrided packages and attributes for nix-ros-overlay # overrided packages and attributes for nix-ros-overlay
humble-overrided = ros.humble.overrideScope (final: prev: { humble-overrided = ros.humble.overrideScope (final: prev: {
# remove after update github:lopsided98/nixpkgs/nix-ros for https://github.com/NixOS/nixpkgs/pull/224099
behaviortree-cpp-v3 = prev.behaviortree-cpp-v3.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
});
moveit-core = prev.moveit-core.overrideAttrs (old: { moveit-core = prev.moveit-core.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ prev.tf2-kdl ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ prev.tf2-kdl ];
}); });
moveit-kinematics = prev.moveit-kinematics.overrideAttrs (old: { moveit-kinematics = prev.moveit-kinematics.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ final.moveit-ros-planning ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ final.moveit-ros-planning ];
}); });
# remove after merging https://github.com/lopsided98/nix-ros-overlay/pull/258
popf = prev.popf.overrideAttrs ({
nativeBuildInputs ? [], ...
}: {
nativeBuildInputs = nativeBuildInputs ++ [ pkgs.perl ];
postPatch = ''
patchShebangs --build src/VALfiles/parsing/fixyywrap
'';
});
}); });
# robossembler custom packages; defined here for share between devShells and packages # robossembler custom packages; defined here for share between devShells and packages
@ -93,9 +80,7 @@
moveit-msgs moveit-msgs
moveit-ros-planning moveit-ros-planning
moveit-ros-planning-interface moveit-ros-planning-interface
# gazebo gazebo-ros2-control
# gazebo-ros2-control
# rbs-skill-interfaces
plansys2-bringup plansys2-bringup
]) ++ (with pkgs; [ nlohmann_json ]); ]) ++ (with pkgs; [ nlohmann_json ]);
RMW_IMPLEMENTATION = "rmw_fastrtps_dynamic_cpp"; RMW_IMPLEMENTATION = "rmw_fastrtps_dynamic_cpp";