Skip to content

merge queue: queuing main (cf2373d) and #57 together #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 3 commits into from
+7 −2
Closed

merge queue: queuing main (cf2373d) and #57 together #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33ef8c3
templates: add missing flakoboros template
arntanguy Jun 17, 2026
739131a
fix: mc-udp sha, add to packages
arntanguy Jun 17, 2026
0997247
Merge of #57
mergify[bot] Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@
path = ./templates/controller;
description = "A template with superbuild configuration for use with mc-rtc/nixpkgs";
};
flakoboros = {
path = ./templates/flakoboros;
description = "A flakoboros template for simple projects";
};
ros = {
path = ./templates/ros;
description = "A template for use with mc-rtc/nixpkgs and ROS";
Expand Down
2 changes: 1 addition & 1 deletion module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
inherit (pkgs) mc-rtc-data mc-rtc;

# Main GUIs and applications
inherit (pkgs) mc-rtc-magnum mc-rtc-ticker mc-franka;
inherit (pkgs) mc-rtc-magnum mc-rtc-ticker mc-franka mc-udp;

# Main robots
inherit (pkgs)
Expand Down
3 changes: 2 additions & 1 deletion pkgs/mc-udp/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stdenv.mkDerivation {
src = fetchgit {
url = "https://github.com/jrl-umi3218/mc_udp";
rev = "b6be9c9423b6c68a3b375641e99affed448cf825";
sha256 = "";
sha256 = "sha256-VZxbxerpH4o6bt9dP8JjlEGNNpPijbwHDqC+RdWuw8Y=";
};

nativeBuildInputs = [ cmake ];
Expand All @@ -31,6 +31,7 @@ stdenv.mkDerivation {
doCheck = false;

meta = with lib; {
mainProgram = "MCUDPControl";
description = "UDP interface for mc_rtc";
homepage = "https://github.com/jrl-umi3218/mc_udp";
license = licenses.bsd2;
Expand Down
Loading