support for mesa building

ROAR-QUTRC · Dec 20, 2024 · 33f8ee9 · 33f8ee9
1 parent e398a08
commit 33f8ee9
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 136 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -6,125 +6,7 @@
         "limitSymbolsToIncludedHeaders": false
       },
       "includePath": [
-        "/nix/store/04g4akaa4g88a7f13rn72qjbksbakf4d-ros-env/include/**",
-        "/nix/store/via8f3zlswgld8xs9a26l50bvph9abzc-ros-humble-kdl-parser-2.6.4-r1/include/**",
-        "/nix/store/2ss5pb8gf0kapp8ki7x2s88avpzphjkx-ros-humble-robot-state-publisher-3.0.3-r2/include/**",
-        "/nix/store/ksg7rcd4m0r7x4q57bn8fc54ihc67fnj-ros-humble-tl-expected-1.0.2-r2/include/**",
-        "/nix/store/m2bdmxfg9b7gzagfdcdplz3i09kzhinn-ros-humble-tcb-span-1.0.2-r2/include/**",
-        "/nix/store/ywhrl5gx320caff769ws3v61vk6wkfxa-ros-humble-parameter-traits-0.3.9-r1/include/**",
-        "/nix/store/0z131zhlhkkpy1g8akrymxqkb4ghwg8d-ros-humble-joint-state-broadcaster-2.38.0-r1/include/**",
-        "/nix/store/2pmbmbb4l95217h6amgfqc1sqzx15wrg-ros-humble-diff-drive-controller-2.38.0-r1/include/**",
-        "/nix/store/k2xa4zqjvkxab1lgwdp5zlkbwffx12yj-ros-humble-ros2-control-test-assets-2.44.0-r1/include/**",
-        "/nix/store/b611hdsx14l2b0fnycfyj3yw3bj0xivx-ros-humble-realtime-tools-2.8.1-r1/include/**",
-        "/nix/store/hydw4jwcxb6qsxk02j61c9bi2vs9ba01-ros-humble-controller-manager-msgs-2.44.0-r1/include/**",
-        "/nix/store/1qvjii8yvizsnm4xhrl5wqwmb7sgy7fy-ros-humble-trajectory-msgs-4.2.4-r1/include/**",
-        "/nix/store/a8llx8cxkgjlryyr7hi3if56i4dlid22-ros-humble-control-msgs-4.7.0-r1/include/**",
-        "/nix/store/mfysym7n72z59lszlc7xix3zpd3yvdra-ros-humble-hardware-interface-2.44.0-r1/include/**",
-        "/nix/store/7wyjgmsrcwz1vlp66xxnr87idwilxx4p-ros-humble-controller-interface-2.44.0-r1/include/**",
-        "/nix/store/hfhbcrk5lpgvr5fhv84sagdjx2d679gy-ros-humble-controller-manager-2.44.0-r1/include/**",
-        "/nix/store/lzcnid48bzfjpld120apg0jyxnc04dpx-ros-humble-slam-toolbox-2.6.8-r1/include/**",
-        "/nix/store/xdai7lx7c20hbg63025d4m4gbz519x8n-ros-humble-cv-bridge-3.2.1-r1/include/**",
-        "/nix/store/yfah9kkjjyl41pfhb4j0y7rjm8xd63h4-ros-humble-nav2-waypoint-follower-1.1.17-r1/include/**",
-        "/nix/store/m313z147l7qn8g0h5q5gzinmd9rivxm3-ros-humble-nav2-velocity-smoother-1.1.17-r1/include/**",
-        "/nix/store/rv1y3rsmnn9m6az1v2mm3cjrsasg6qn9-ros-humble-nav2-theta-star-planner-1.1.17-r1/include/**",
-        "/nix/store/22zyyrd7w7h8ig79fj7ivf41h2b7f5qy-ros-humble-nav2-smoother-1.1.17-r1/include/**",
-        "/nix/store/rw2kvk8qwk364nc3dg4zsy9cfb1ni3pq-ros-humble-nav2-smac-planner-1.1.17-r1/include/**",
-        "/nix/store/i72qgv2f5kl8rygnw420x4hswyyxmd7a-ros-humble-interactive-markers-2.3.2-r2/include/**",
-        "/nix/store/1ncj16kcyffrzrnlwfrydr6kl5s3mr00-ros-humble-image-transport-3.1.9-r1/include/**",
-        "/nix/store/8dpsk25dwrlibj0006acw8w4mr9dfr4p-ros-humble-rviz-default-plugins-11.2.13-r1/include/**",
-        "/nix/store/56d3ijff1sk3vim37flwp6j3xmxzyij1-ros-humble-urdf-parser-plugin-2.6.1-r1/include/**",
-        "/nix/store/6mprbhn1jfhin27qhkz1xjy6gx626kzf-ros-humble-urdf-2.6.1-r1/include/**",
-        "/nix/store/z4vd8z0jm9av1335kw32w4ggy98869h8-ros-humble-rviz-rendering-11.2.13-r1/include/**",
-        "/nix/store/zc5ci7091a5ys7nywm84xxiwdcqfnzhq-ros-humble-rviz-common-11.2.13-r1/include/**",
-        "/nix/store/rbvgs4qrjw7m21ky27jjz5l06l7cvq6w-ros-humble-resource-retriever-3.1.2-r1/include/**",
-        "/nix/store/sbmdhwpr6xmr4xpqwxxy30dinkizb4cw-ros-humble-nav2-rviz-plugins-1.1.17-r1/include/**",
-        "/nix/store/3jg3kp61ffqibq0vf01i47bxwism4p6w-ros-humble-nav2-rotation-shim-controller-1.1.17-r1/include/**",
-        "/nix/store/k5n0lm19cp4v0rg00aaddzwdl5826fj0-ros-humble-nav2-regulated-pure-pursuit-controller-1.1.17-r1/include/**",
-        "/nix/store/5lvny3c5g3a2lhqn4ln4vzj0wbbi5mzg-ros-humble-nav2-planner-1.1.17-r1/include/**",
-        "/nix/store/jwq6w1qbxy6njvzmnqh2n27hgrk1bv9q-ros-humble-nav2-navfn-planner-1.1.17-r1/include/**",
-        "/nix/store/25wshzwnc04lvjrv0i7r6a17zpsg34f9-ros-humble-tf2-eigen-0.25.9-r1/include/**",
-        "/nix/store/rfb0af5a22365zn6i6592z731glj5v6n-ros-humble-nav2-mppi-controller-1.1.17-r1/include/**",
-        "/nix/store/qfmzvarhcxf2nmxhf4m3k9433136v376-ros-humble-nav2-map-server-1.1.17-r1/include/**",
-        "/nix/store/iirb0k2mv1sfihirx9j8mqvrqvcyi62c-ros-humble-diagnostic-msgs-4.2.4-r1/include/**",
-        "/nix/store/dlbvfwy90fhvr1yj4zjqx1mdamxkadr2-ros-humble-diagnostic-updater-4.0.0-r1/include/**",
-        "/nix/store/yq8r3fwkw6lncmcv9r56pfqbfba8s8nm-ros-humble-nav2-lifecycle-manager-1.1.17-r1/include/**",
-        "/nix/store/iq0314m2wvg48d16y05aljrbgihjcvxx-ros-humble-dwb-plugins-1.1.17-r1/include/**",
-        "/nix/store/0zrdm6fjcgmpbas0ifijpzk875g4armr-ros-humble-dwb-critics-1.1.17-r1/include/**",
-        "/nix/store/msyjp0wv099a6zb13rdbll632islq73q-ros-humble-dwb-msgs-1.1.17-r1/include/**",
-        "/nix/store/2xf2k9q8wpcfplc3w48hh3qx17qhj4zx-ros-humble-dwb-core-1.1.17-r1/include/**",
-        "/nix/store/m1dy83ppkfxdzd7rgcwy9b8kmgs2mi1v-ros-humble-costmap-queue-1.1.17-r1/include/**",
-        "/nix/store/a8rbdc59w324z2m8qdii7w729dp3k7fi-ros-humble-nav-2d-utils-1.1.17-r1/include/**",
-        "/nix/store/m13lslzjplgm1mzdy1fxgkjlmqnzjfyp-ros-humble-nav-2d-msgs-1.1.17-r1/include/**",
-        "/nix/store/5fixza3m1hcsm1hvm4sx4q2c663nhqqp-ros-humble-nav2-controller-1.1.17-r1/include/**",
-        "/nix/store/yqfppb4qwidf0gys3garmsznx0aq1xjr-ros-humble-nav2-constrained-smoother-1.1.17-r1/include/**",
-        "/nix/store/a961z6k51mq93jmbcrjsr12s8bbr0ny2-ros-humble-nav2-collision-monitor-1.1.17-r1/include/**",
-        "/nix/store/xi9y0ndpb1qh9c36r67f4cz086qnks7m-ros-humble-nav2-bt-navigator-1.1.17-r1/include/**",
-        "/nix/store/lmdvnl6z6vp6lazb307b0dnl1c9s207f-ros-humble-visualization-msgs-4.2.4-r1/include/**",
-        "/nix/store/xppliwh33a5d96zdz1ynikkhi5xbwh40-ros-humble-tf2-sensor-msgs-0.25.9-r1/include/**",
-        "/nix/store/sg0xcp4hlqxrgcdyj5g31ssvrxhq4j96-ros-humble-nav2-voxel-grid-1.1.17-r1/include/**",
-        "/nix/store/37a92y71vyqy20ljsmkg9c93jp039d3q-ros-humble-map-msgs-2.1.0-r3/include/**",
-        "/nix/store/c6xchcr5jd7n1k24a2nk86pfs0n7hp83-ros-humble-laser-geometry-2.4.0-r2/include/**",
-        "/nix/store/akdvckzya1xpdpl3gcmpxhhn04mpbl16-ros-humble-angles-1.15.0-r1/include/**",
-        "/nix/store/wspmk47xyngckvbajjd2gi42qm3jj4mr-ros-humble-nav2-costmap-2d-1.1.17-r1/include/**",
-        "/nix/store/5wf5z52f27fac1i0b4zwhsz9hbzbh1ha-ros-humble-nav2-core-1.1.17-r1/include/**",
-        "/nix/store/djq5drp740jip6hrb1v7q15amj4dy6p2-ros-humble-nav2-behaviors-1.1.17-r1/include/**",
-        "/nix/store/08iinvb4w7bgix475ijccbzzxxlpffwh-ros-humble-behaviortree-cpp-v3-3.8.7-r1/include/**",
-        "/nix/store/nnw2bsvdjj5b66k707f8icgafffwlpxw-ros-humble-nav2-behavior-tree-1.1.17-r1/include/**",
-        "/nix/store/babbvq6b07lvrvfp86vcfv3wks06l5i2-ros-humble-std-srvs-4.2.4-r1/include/**",
-        "/nix/store/qskj22zc7iwkjchy5bin4d2jc3j9m319-ros-humble-pluginlib-5.1.0-r3/include/**",
-        "/nix/store/77dlllg4ai5iydcqbqhml5f2yw5yjfxb-ros-humble-sensor-msgs-4.2.4-r1/include/**",
-        "/nix/store/fldgdqx4hspkznym56z42cp24hljm3cf-ros-humble-tf2-msgs-0.25.9-r1/include/**",
-        "/nix/store/xcwp5r5a4w8h7rmz99nqiwryn6if00qf-ros-humble-class-loader-2.2.0-r3/include/**",
-        "/nix/store/nl3p7lgljq0wg6bdxjlb8z3bch02093f-ros-humble-rclcpp-components-16.0.10-r1/include/**",
-        "/nix/store/yxb5n600a5jz2vy5hvglw9jl6mjrnvbf-ros-humble-tf2-ros-0.25.9-r1/include/**",
-        "/nix/store/hl5zmcigl1kk7dpjfksxj1bbx9awkgbp-ros-humble-tf2-geometry-msgs-0.25.9-r1/include/**",
-        "/nix/store/hbkp9mavg6i9pbms85vki851c0ldxcqk-ros-humble-tf2-0.25.9-r1/include/**",
-        "/nix/store/7i4j496w0q9bv58w3mf4gzpy23lpharn-ros-humble-rclcpp-action-16.0.10-r1/include/**",
-        "/nix/store/ld17ialic4qwlavm0k8di75cyn8fyw38-ros-humble-smclib-3.0.2-r3/include/**",
-        "/nix/store/vsj9b3pzyrpwl7by0kzaprnnb3h278vs-ros-humble-rclcpp-lifecycle-16.0.10-r1/include/**",
-        "/nix/store/frs36wrxpw3clfyq2f5lx5dbz9hlv66s-ros-humble-bondcpp-3.0.2-r3/include/**",
-        "/nix/store/gpl02jcjrn9vnjagawxribzqzy2hnrzn-ros-humble-bond-3.0.2-r3/include/**",
-        "/nix/store/znvz4ddzwdwjh7kjiq2sn6vblfz6jq77-ros-humble-nav2-util-1.1.17-r1/include/**",
-        "/nix/store/pm8bbbqh3pw1zmn6hw7gmw3hjhzi85yc-ros-humble-nav2-msgs-1.1.17-r1/include/**",
-        "/nix/store/7x2mi3r6sbsi8v39f4fyn0d5lliysmvh-ros-humble-nav-msgs-4.2.4-r1/include/**",
-        "/nix/store/hi95innqiz1b399ddnjs06pm574fa6c3-ros-humble-statistics-msgs-1.2.1-r1/include/**",
-        "/nix/store/2a16gd8gvikmjpqcp8jnvrzirkwhh999-ros-humble-libstatistics-collector-1.3.2-r1/include/**",
-        "/nix/store/r9miib63c2gdhbx79mgzhf8dp89bb25l-ros-humble-rclcpp-16.0.10-r1/include/**",
-        "/nix/store/wmrypkk1q0jg98mdq1r7zj3qrjjwwbgz-ros-humble-message-filters-4.3.5-r1/include/**",
-        "/nix/store/zkphs3cypfai8z3r59gf17qm9vycd76h-ros-humble-std-msgs-4.2.4-r1/include/**",
-        "/nix/store/kh7y5sda985ygw7r7fmc81aapx8960dm-ros-humble-geometry-msgs-4.2.4-r1/include/**",
-        "/nix/store/h82qj6zhl6abr84bafm1rm96dl4x5d30-ros-humble-nav2-amcl-1.1.17-r1/include/**",
-        "/nix/store/zh4jiavp7vymnvn41dp7wkyr6986j03l-ros-humble-rosgraph-msgs-1.2.1-r1/include/**",
-        "/nix/store/z2rqn90yg43xmj3p900pj9cvddsrr4pj-ros-humble-rcl-lifecycle-5.3.9-r1/include/**",
-        "/nix/store/7vqlm975021wcy97kv5i2qmljy6g54k6-ros-humble-unique-identifier-msgs-2.2.1-r3/include/**",
-        "/nix/store/0p2a3g5b6bv3s30igs9fqjf6jvyz39ih-ros-humble-action-msgs-1.2.1-r1/include/**",
-        "/nix/store/m44pjhqd5aysckp9a196k1inb0f8b1k7-ros-humble-rcl-action-5.3.9-r1/include/**",
-        "/nix/store/84v28kgfhay9z070x9c3isfp7gdfm7nd-ros-humble-ament-index-cpp-1.4.0-r2/include/**",
-        "/nix/store/hi6y373z0bfxw5clw17srhha3n08fdnz-ros-humble-tracetools-4.1.1-r1/include/**",
-        "/nix/store/g3jjihxvx0wjfva45bhrsdgfdzwvfcdc-ros-humble-rmw-fastrtps-shared-cpp-6.2.7-r1/include/**",
-        "/nix/store/m4srps8q0xwbgc3dfy19kv9ns214nq33-ros-humble-rmw-dds-common-1.6.0-r2/include/**",
-        "/nix/store/ps1s7m4kw1hir0ymnd4k0lmzrys3ngpg-ros-humble-rmw-fastrtps-cpp-6.2.7-r1/include/**",
-        "/nix/store/8y22klc6ghkyb844lvw6w73l1vwbgql8-ros-humble-libyaml-vendor-1.2.2-r2/include/**",
-        "/nix/store/s04w3k14kxah3sl72l66nqjqv04biqjx-ros-humble-rcl-yaml-param-parser-5.3.9-r1/include/**",
-        "/nix/store/0prg6y2c76nw8djbhfgld0js4mbrhb52-ros-humble-rcl-logging-interface-2.3.1-r1/include/**",
-        "/nix/store/c0siv8i9kakg7xvyrhwfgdd270sxq4wb-ros-humble-rcl-5.3.9-r1/include/**",
-        "/nix/store/q195y469qlckb81jvipgm9575f1nhxiy-ros-humble-lifecycle-msgs-1.2.1-r1/include/**",
-        "/nix/store/6ivis0miqy0vawalc9d5c1vxr1afq0qi-ros-humble-rosidl-typesupport-introspection-cpp-3.1.5-r2/include/**",
-        "/nix/store/akr3gzd68q1w36042hzi1hrzrrlh8hkp-ros-humble-rosidl-typesupport-introspection-c-3.1.5-r2/include/**",
-        "/nix/store/5vyhdx8hwbwkpb3divbiy5pn3xjjyms0-ros-humble-rosidl-typesupport-fastrtps-cpp-2.2.2-r2/include/**",
-        "/nix/store/3xn888qvh2vf7b7sri2y8i3sjz56k7pv-ros-humble-rosidl-typesupport-fastrtps-c-2.2.2-r2/include/**",
-        "/nix/store/kf2nw65zi7bgl7yw1hkb3480hj23wis3-ros-humble-rosidl-typesupport-cpp-2.0.1-r1/include/**",
-        "/nix/store/p6d0ddkf1ypfqn83c1azr1iciv23ww08-ros-humble-rosidl-runtime-cpp-3.1.5-r2/include/**",
-        "/nix/store/4sg78wwgzgcjk9550vyfi7iss9c27b2m-ros-humble-rcpputils-2.4.3-r1/include/**",
-        "/nix/store/8rcy2qyhlkl0zpfj841fj8wzzbnn73sw-ros-humble-rosidl-typesupport-c-2.0.1-r1/include/**",
-        "/nix/store/diqlvm8ryws7m51njmskmmj9qb2vcma1-ros-humble-rosidl-typesupport-interface-3.1.5-r2/include/**",
-        "/nix/store/fbq01bjlpamr9721kgpm5ds3dvmshihq-ros-humble-rosidl-runtime-c-3.1.5-r2/include/**",
-        "/nix/store/rffqiz76ir01ihxfarzm0i5xrqrqfwiv-ros-humble-rcutils-5.1.6-r1/include/**",
-        "/nix/store/n0nxi38vlf4wpai9qqp1xjzkv8jb00yc-ros-humble-rmw-6.1.2-r1/include/**",
-        "/nix/store/n65jqjjmcqw34pymq4r5fmkghqm0gvi2-ros-humble-builtin-interfaces-1.2.1-r1/include/**",
-        "/nix/store/klspqy9gvbnxfly2xnmjx9vw22m0808i-ros-humble-rcl-interfaces-1.2.1-r1/include/**",
-        "/nix/store/56anmqljfz4ddajriakh0qbhsv7rvqwk-ros-humble-composition-interfaces-1.2.1-r1/include/**",
-        "/nix/store/04g4akaa4g88a7f13rn72qjbksbakf4d-ros-env/include/**",
+        "${env:ROS_WORKSPACE_ENV_PATH}/include/**",
         "/usr/include/**",
         "${workspaceFolder}/**"
       ],
@@ -135,4 +17,4 @@
     }
   ],
   "version": 4
-}
+}
diff --git a/docs/default.nix b/docs/default.nix
@@ -48,7 +48,7 @@ let
     name = "roar-docs-env";
     paths = [
       pyEnv
-      unstable.doxygen
+      unstable.doxygen12
       graphviz
     ];
   };

diff --git a/docs/nix/overlay.nix b/docs/nix/overlay.nix
@@ -1,6 +1,6 @@
 final: prev:
 let
-  doxygen = prev.doxygen.overrideAttrs (
+  doxygen12 = prev.doxygen.overrideAttrs (
     { ... }:
     rec {
       version = "1.12.0";
@@ -16,5 +16,5 @@ let
   );
 in
 {
-  inherit doxygen;
+  inherit doxygen12;
 }
diff --git a/docs/source/architecture/ci-cd.md b/docs/source/architecture/ci-cd.md
@@ -11,6 +11,9 @@ This keeps code merges small (reducing the chances and sizes of merge conflicts)
 However, that's only one part of code _integration_ - the other is continuous and _automated_ testing.
 CI/CD is only made possible by continuous and automated builds and tests which run every time there is code pushed to the main repository.
 
+#### CI testing frameworks
+As this is a ROS2 project with C++ and Python nodes, the GoogleTest (gtest) and pytest frameworks are used respectively to create tests that are automatically run.
+
 ### Continuous Delivery
 
 Continuous Delivery refers to the project always being _delivered_ in a functional, ready-to-go state, and handles any final stages needed to package the project and get it into a _deployment_ ready state.

diff --git a/docs/source/intersphinx/python.inv b/docs/source/intersphinx/python.inv
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,11 +1,13 @@
 {
   inputs = {
     # ros inputs
+    # TODO: Currently can't be updated till after issue #540 is resolved
     nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay";
     nixpkgs.follows = "nix-ros-overlay/nixpkgs"; # IMPORTANT!!!
     nix-ros-workspace = {
       url = "github:RandomSpaceship/nix-ros-workspace";
-      flake = false;
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nix-ros-overlay.follows = "nix-ros-overlay";
     };
     # docs inputs
     nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
@@ -63,7 +65,7 @@
             # fix colcon (silence warnings, add extensions)
             (import ./software/ros_ws/colcon/overlay.nix)
             # add ros workspace functionality
-            (import nix-ros-workspace { }).overlay
+            nix-ros-workspace.overlays.default
             # import ros workspace packages + fixes
             (import ./software/overlay.nix rosDistro)
 
@@ -129,6 +131,11 @@
           # Freeimage is blocked by default since it has a whole bunch of CVEs.
           # This means we have to explicitly permit Freeimage to allow Gazebo to run.
           config.permittedInsecurePackages = [ "freeimage-unstable-2021-11-01" ];
+          config.allowUnfreePredicate =
+            pkg:
+            builtins.elem (pkgs.lib.getName pkg) [
+              "drawio"
+            ];
         };
         # we don't need to apply overlays here since pkgs-unstable is only for pure python stuff
         pkgs-unstable = import nixpkgs-unstable {
@@ -204,7 +211,11 @@
               inherit devPackages name;
               prebuiltPackages = standardPkgs // additionalPkgs;
               prebuiltShellPackages = devShellPkgs // formatters;
+              releaseDomainId = productionDomainId;
+              environmentDomainId = devDomainId;
+              forceReleaseDomainId = true;
             };
+<<<<<<< HEAD
             env = workspace.env.overrideAttrs (
               {
                 shellHook ? "",
@@ -230,9 +241,11 @@
                   '';
               }
             );
+=======
+>>>>>>> main
           in
           # override the env attribute (cli environment) with our modifications
-          workspace // { inherit env; };
+          workspace;
 
         # Actually build the workspaces
         default = mkWorkspace {
@@ -283,7 +296,7 @@
         packages = {
           inherit default simulation docs;
 
-          # Output the entire package set to make certain debugging easier 
+          # Output the entire package set to make certain debugging easier
           # Note that it needs to be a derivation though to make nix flake commands happy, so we just touch the output file
           # so that it can "build" successfully
           pkgs = pkgs.runCommand "roar-all-pkgs" { passthru = pkgs; } ''
@@ -333,18 +346,18 @@
       }
     );
   nixConfig = {
-    # note from James Nichol - I set up a custom cache at https://qutrc-roar.cachix.org 
+    # note from James Nichol - I set up a custom cache at https://qutrc-roar.cachix.org
     # Currently I'm compiling for x86-64 and aarch64 on my machine and pushing to it whenever I make changes
     # to the Nix config - contact me if you want an auth token to push your own builds
     extra-substituters = [
-      "https://qutrc-roar.cachix.org"
       "https://roar-qutrc.cachix.org"
       "https://ros.cachix.org"
+      "https://qutrc-roar.cachix.org"
     ];
     extra-trusted-public-keys = [
-      "qutrc-roar.cachix.org-1:lARPhJL+PLuGd021HeN8CQOGGiYVEVGws5za+39M1Z0="
       "roar-qutrc.cachix.org-1:ZKgHZSSHH2hOAN7+83gv1gkraXze5LSEzdocPAEBNnA="
       "ros.cachix.org-1:dSyZxI8geDCJrwgvCOHDoAfOm5sV1wCPjBkKL+38Rvo="
+      "qutrc-roar.cachix.org-1:lARPhJL+PLuGd021HeN8CQOGGiYVEVGws5za+39M1Z0="
     ];
     # note that this is normally a VERY BAD IDEA but it may be needed so the docs can have internet access,
     # with certain configurations. Currently, everything is configured to work offline with cached files in the git repo.

diff --git a/treefmt.toml b/treefmt.toml
@@ -11,7 +11,7 @@ includes = ["*.c", "*.cc", "*.cpp", "*.h", "*.hh", "*.hpp"]
 options = ["-i"]
 
 [formatter.cmake-format]
-command = "/nix/store/9ijpfiihb5hnwy5s6fag0c196z71ycfb-cmake-format-0.6.13/bin/cmake-format"
+command = "/nix/store/br5n4f9z6ybfln4k6044rgdrkmdm94bb-cmake-format-0.6.13/bin/cmake-format"
 excludes = []
 includes = ["CMakeLists.txt", "**/CMakeLists.txt", "**/*.cmake", "*.cmake", "CMakeLists.txt"]
 options = ["--in-place"]
@@ -35,7 +35,7 @@ includes = ["*.nix"]
 options = []
 
 [formatter.prettier]
-command = "/nix/store/9hwlvnn35g296w83m1088sf1lng0cv9d-prettier-3.3.3/bin/prettier"
+command = "/nix/store/1bi5k3m7n4wldvgfzbfiqw1mzpb6jy0l-prettier-3.3.3/bin/prettier"
 excludes = []
 includes = ["*.cjs", "*.css", "*.html", "*.js", "*.json", "*.json5", "*.jsx", "*.md", "*.mdx", "*.mjs", "*.scss", "*.ts", "*.tsx", "*.vue", "*.yaml", "*.yml"]
 options = ["--write"]