Merge pull request #306943 from nim65s/pin271

pinocchio: 2.7.0 -> 2.7.1

authored by Pol Dellaiera and committed by GitHub 109da46a fe6b10e2

+20 -13
+20 -13
pkgs/development/libraries/pinocchio/default.nix
··· 4 4 , cmake 5 5 , boost 6 6 , eigen 7 + , example-robot-data 7 8 , collisionSupport ? !stdenv.isDarwin 9 + , jrl-cmakemodules 8 10 , hpp-fcl 9 11 , urdfdom 10 12 , pythonSupport ? false ··· 13 15 14 16 stdenv.mkDerivation (finalAttrs: { 15 17 pname = "pinocchio"; 16 - version = "2.7.0"; 18 + version = "2.7.1"; 17 19 18 20 src = fetchFromGitHub { 19 21 owner = "stack-of-tasks"; 20 22 repo = finalAttrs.pname; 21 23 rev = "v${finalAttrs.version}"; 22 - fetchSubmodules = true; 23 - hash = "sha256-yhrG+MilGJkvwLUNTAgNhDqUWGjPswjrbg38yOLsmHc="; 24 + hash = "sha256-Ks5dvKi5iutjM+iovDOYGx3vsr45JWRqGOXV8+Ko4gg="; 24 25 }; 25 26 27 + # example-robot-data models are used in checks. 28 + # Upstream provide them as git submodule, but we can use our own version instead. 29 + postPatch = '' 30 + rmdir models/example-robot-data 31 + ln -s ${example-robot-data.src} models/example-robot-data 32 + ''; 33 + 26 34 strictDeps = true; 27 35 28 36 nativeBuildInputs = [ ··· 30 38 ]; 31 39 32 40 propagatedBuildInputs = [ 41 + jrl-cmakemodules 33 42 urdfdom 34 43 ] ++ lib.optionals (!pythonSupport) [ 35 44 boost ··· 43 52 python3Packages.hpp-fcl 44 53 ]; 45 54 46 - cmakeFlags = lib.optionals collisionSupport [ 47 - "-DBUILD_WITH_COLLISION_SUPPORT=ON" 48 - ] ++ lib.optionals pythonSupport [ 49 - "-DBUILD_WITH_LIBPYTHON=ON" 55 + cmakeFlags = [ 56 + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) 57 + (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport) 58 + (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport) 50 59 ] ++ lib.optionals (pythonSupport && stdenv.isDarwin) [ 51 60 # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.7.0.drv/sou[84 chars].dae' 52 61 "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;test-py-bindings_geometry_model_urdf'" 53 - ] ++ lib.optionals (!pythonSupport) [ 54 - "-DBUILD_PYTHON_INTERFACE=OFF" 55 62 ]; 56 63 57 64 doCheck = true; ··· 60 67 "pinocchio" 61 68 ]; 62 69 63 - meta = with lib; { 70 + meta = { 64 71 description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; 65 72 homepage = "https://github.com/stack-of-tasks/pinocchio"; 66 - license = licenses.bsd2; 67 - maintainers = with maintainers; [ nim65s wegank ]; 68 - platforms = platforms.unix; 73 + license = lib.licenses.bsd2; 74 + maintainers = with lib.maintainers; [ nim65s wegank ]; 75 + platforms = lib.platforms.unix; 69 76 }; 70 77 })