From 9f55dcc8dce04a6c1bf98f95c3737f178b479e57 Mon Sep 17 00:00:00 2001 From: Arnaud TANGUY Date: Mon, 15 Jun 2026 19:05:23 +0200 Subject: [PATCH 1/2] treewide(jrl-cmakemodules): is a buildInputs --- pkgs/3rd-party/imguizmo.nix | 4 +++- .../polytopeController/mc-dynamic-polytopes.nix | 4 +++- pkgs/mc-rtc/mc-mujoco/default.nix | 6 ++++-- pkgs/mc-rtc/mc-rtc.nix | 4 +++- pkgs/mesh-sampling/default.nix | 13 ++++++++++--- pkgs/spacevecalg/default.nix | 4 +++- pkgs/tasks/default.nix | 4 +++- pkgs/tvm/default.nix | 4 +++- 8 files changed, 32 insertions(+), 11 deletions(-) diff --git a/pkgs/3rd-party/imguizmo.nix b/pkgs/3rd-party/imguizmo.nix index 51faa46..b1bc397 100644 --- a/pkgs/3rd-party/imguizmo.nix +++ b/pkgs/3rd-party/imguizmo.nix @@ -27,9 +27,11 @@ stdenv.mkDerivation (_finalAttrs: { hash = "sha256-JLwciNGo90vR5tsFB4z5JPvhCz38FhN9Ja/5+Ct6YPo="; }; + buildInputs = [ + jrl-cmakemodules + ]; nativeBuildInputs = [ cmake - jrl-cmakemodules ]; propagatedBuildInputs = [ imgui diff --git a/pkgs/mc-rtc/controllers/polytopeController/mc-dynamic-polytopes.nix b/pkgs/mc-rtc/controllers/polytopeController/mc-dynamic-polytopes.nix index 1d4d165..dc2481c 100644 --- a/pkgs/mc-rtc/controllers/polytopeController/mc-dynamic-polytopes.nix +++ b/pkgs/mc-rtc/controllers/polytopeController/mc-dynamic-polytopes.nix @@ -34,9 +34,11 @@ stdenv.mkDerivation (_finalAttrs: { hash = ""; }; + buildInputs = [ + jrl-cmakemodules + ]; nativeBuildInputs = [ cmake - jrl-cmakemodules ]; propagatedBuildInputs = [ mc-rtc diff --git a/pkgs/mc-rtc/mc-mujoco/default.nix b/pkgs/mc-rtc/mc-mujoco/default.nix index 514cf4d..4f5cfdb 100644 --- a/pkgs/mc-rtc/mc-mujoco/default.nix +++ b/pkgs/mc-rtc/mc-mujoco/default.nix @@ -40,10 +40,12 @@ stdenv.mkDerivation (_finalAttrs: { hash = "sha256-GDJKEOyRjPF5eTpXA7x82K86fjLyx3N3eTt2ZSmcYv4="; }; - buildInputs = [ cli11 ]; + buildInputs = [ + cli11 + jrl-cmakemodules + ]; nativeBuildInputs = [ cmake - jrl-cmakemodules makeWrapper ]; propagatedBuildInputs = [ diff --git a/pkgs/mc-rtc/mc-rtc.nix b/pkgs/mc-rtc/mc-rtc.nix index 544ab49..efb1b71 100644 --- a/pkgs/mc-rtc/mc-rtc.nix +++ b/pkgs/mc-rtc/mc-rtc.nix @@ -56,10 +56,12 @@ in else ""; + buildInputs = [ + jrl-cmakemodules + ]; nativeBuildInputs = [ cmake pkg-config - jrl-cmakemodules qt5.wrapQtAppsHook python3Packages.distutils python3Packages.pytest diff --git a/pkgs/mesh-sampling/default.nix b/pkgs/mesh-sampling/default.nix index 11809e2..20fad41 100644 --- a/pkgs/mesh-sampling/default.nix +++ b/pkgs/mesh-sampling/default.nix @@ -3,9 +3,11 @@ lib, fetchgit, cmake, + jrl-cmakemodules, + gtest, + cli11, qhull, assimp, - cli11, eigen, libz, }: @@ -23,9 +25,13 @@ stdenv.mkDerivation { sha256 = "sha256-2e1Ctq/2lj2BNyxPH3VD+owYlURyIUq82D74y4nKPeg="; }; + buildInputs = [ + cli11 + jrl-cmakemodules + ]; nativeBuildInputs = [ cmake - cli11 + gtest ]; # XXX why is libz dependency manually required here? Either qhull or assimp should bring it propagatedBuildInputs = [ @@ -39,9 +45,10 @@ stdenv.mkDerivation { "-DINSTALL_DOCUMENTATION=OFF" ]; - doCheck = false; + doCheck = true; meta = with lib; { + mainProgram = "mesh_sampling"; description = "Samplers to obtain pointclouds from CAD meshes "; homepage = "https://github.com/jrl-umi3218/mesh_sampling"; license = licenses.bsd2; diff --git a/pkgs/spacevecalg/default.nix b/pkgs/spacevecalg/default.nix index c7319d0..fcb3e33 100644 --- a/pkgs/spacevecalg/default.nix +++ b/pkgs/spacevecalg/default.nix @@ -22,9 +22,11 @@ stdenv.mkDerivation { hash = "sha256-fTKKj3m8cO4F46LlO7r8JeuWLhlyRcX7EblHroDYFkQ="; }; + buildInputs = [ + jrl-cmakemodules + ]; nativeBuildInputs = [ cmake - jrl-cmakemodules pkg-config doxygen python3Packages.cython diff --git a/pkgs/tasks/default.nix b/pkgs/tasks/default.nix index 11c8eb2..58cfc04 100644 --- a/pkgs/tasks/default.nix +++ b/pkgs/tasks/default.nix @@ -23,9 +23,11 @@ stdenv.mkDerivation { hash = "sha256-1XrRagwiMJwukbqPmlJCzp/Y11POdUdDIFjeZTCg3Ik="; }; + buildInputs = [ + jrl-cmakemodules + ]; nativeBuildInputs = [ cmake - jrl-cmakemodules python3Packages.distutils python3Packages.pytest python3Packages.cython diff --git a/pkgs/tvm/default.nix b/pkgs/tvm/default.nix index 69d309c..c9fadaf 100644 --- a/pkgs/tvm/default.nix +++ b/pkgs/tvm/default.nix @@ -20,9 +20,11 @@ stdenv.mkDerivation { sha256 = "sha256-qse7emorGWqoWlmzaHNdbDiHFXrVOo3oz8Fah4AYmL8="; }; + buildInputs = [ + jrl-cmakemodules + ]; nativeBuildInputs = [ cmake - jrl-cmakemodules ]; propagatedBuildInputs = [ eigen-qld From f02180eb8f25ab5c2d0798fb4ab61615bd6df494 Mon Sep 17 00:00:00 2001 From: Arnaud TANGUY Date: Mon, 15 Jun 2026 19:24:59 +0200 Subject: [PATCH 2/2] mesh-sampling: release v1.1.0 --- pkgs/mesh-sampling/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/mesh-sampling/default.nix b/pkgs/mesh-sampling/default.nix index 20fad41..f1e14af 100644 --- a/pkgs/mesh-sampling/default.nix +++ b/pkgs/mesh-sampling/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchgit, + fetchFromGitHub, cmake, jrl-cmakemodules, gtest, @@ -14,16 +14,14 @@ stdenv.mkDerivation { pname = "mesh-sampling"; - version = "1.0.0"; + version = "1.1.0"; - src = - # TODO: release mesh-sampling - fetchgit { - url = "https://github.com/jrl-umi3218/mesh_sampling"; - # master - rev = "466064a4e9b7718b0b90922122c6aedd4867724a"; - sha256 = "sha256-2e1Ctq/2lj2BNyxPH3VD+owYlURyIUq82D74y4nKPeg="; - }; + src = fetchFromGitHub { + owner = "jrl-umi3218"; + repo = "mesh_sampling"; + tag = "v1.1.0"; + hash = "sha256-hZ8v42g0+Kw0aQtOa9id8WQ/pwDMpn8QxxBXVXpPpJU="; + }; buildInputs = [ cli11