From 235415cacf3c3caa75ee902ea0e738a827854372 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 2 Apr 2025 14:10:51 +0200 Subject: [PATCH 1/2] example-robot-data: submodule is no longer required ref. https://github.com/Gepetto/example-robot-data/pull/277 --- pkgs/by-name/ex/example-robot-data/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix index 35483310bff3..c7523509fa62 100644 --- a/pkgs/by-name/ex/example-robot-data/package.nix +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -3,6 +3,7 @@ doxygen, fetchFromGitHub, lib, + jrl-cmakemodules, pkg-config, pythonSupport ? false, python3Packages, @@ -17,8 +18,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Gepetto"; repo = "example-robot-data"; rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-702+hR8YzxfHBZYF2Q//4gRF/cx4kdQ1oNHtnYL5xp0="; + hash = "sha256-i5YU5lcbB3gm8/YrRRiE2NDcLEq7+eF7GtIrJ1DF1cU="; }; outputs = [ @@ -39,7 +39,9 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.pythonImportsCheckHook ]; - propagatedBuildInputs = lib.optionals pythonSupport [ python3Packages.pinocchio ]; + propagatedBuildInputs = [ + jrl-cmakemodules + ] ++ lib.optionals pythonSupport [ python3Packages.pinocchio ]; cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ]; From bb4ad61b5100e052848000386d0cbe2589cf5211 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 4 May 2025 11:47:30 +0200 Subject: [PATCH 2/2] example-robot-data: rev -> tag --- pkgs/by-name/ex/example-robot-data/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix index c7523509fa62..29cee31c54b2 100644 --- a/pkgs/by-name/ex/example-robot-data/package.nix +++ b/pkgs/by-name/ex/example-robot-data/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Gepetto"; repo = "example-robot-data"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i5YU5lcbB3gm8/YrRRiE2NDcLEq7+eF7GtIrJ1DF1cU="; };