Fixes

RoboStack · Jan 5, 2025 · 94c7431 · 94c7431
1 parent d2282a2
commit 94c7431
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/additional_recipes/ros-distro-mutex/recipe.yaml b/additional_recipes/ros-distro-mutex/recipe.yaml
@@ -37,6 +37,7 @@ requirements:
     - libprotobuf 5.28.2.*
     - ogre 1.10.12.*
     - libpqxx 7.8.*
+    - sip ==6.8.6
 
   run_exports:
     weak:

diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml
@@ -5,6 +5,7 @@ rviz:
   add_host: ["${{ 'setuptools 69.*' if win }}", "sip ==6.8.6"]
 python_qt_binding:
   add_run: ["adwaita-icon-theme"]
+  add_host: ["${{ 'setuptools 69.*' if win }}", "sip ==6.8.6"]
 ompl:
   add_host: ["ompl"]
   add_run: ["ompl"]

diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
@@ -27,7 +27,7 @@ git = "*"
 
 [feature.beta.pypi-dependencies]
 # This is tipically the latest commit on rattler-build-humble branch
-vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "8295f8f9b0fade22fff8683f491f203d145d639c" }
+vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "37b38745c4ef3792e17824ce54892ebdeecc17cb" }
 # Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
 # (and regenerate the pixi.lock) once you push the modified commit to the repo
 #vinca = { path = "../vinca", editable = true }