Unverified Commit 76a87d52 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #315303 from nim65s/pin3 

pinocchio: 2.7.1 -> 3.0.0
parents 9731173b d849229e

pkgs/by-name/jr/jrl-cmakemodules/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


stdenv.mkDerivation {

  pname = "jrl-cmakemodules";

  version = "0-unstable-2024-04-12";

  version = "0-unstable-2024-05-22";



  src = fetchFromGitHub {

    owner = "jrl-umi3218";

    repo = "jrl-cmakemodules";

    rev = "a914fa836ab4d2f01c191c93a763cfa322820dc7";

    hash = "sha256-/VedtcRqy4SUTZfrtg01Z1lSPFRg/858hgve+nKTqPo=";

    rev = "dd3e4127f2b223496859fe05be02726e9d1a071b";

    hash = "sha256-ySMfops0Py1U+50LEGwgIwlzPUq/miusTxK7TIpQQXs=";

  };



  nativeBuildInputs = [ cmake ];

pkgs/development/libraries/crocoddyl/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -10,14 +10,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "crocoddyl";

  version = "2.0.2";

  version = "2.1.0";



  src = fetchFromGitHub {

    owner = "loco-3d";

    repo = finalAttrs.pname;

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-MsAXHfxLNlIK/PbtVTjvBN1Jk3dyGEkfpj3/98nExj4=";

    hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w=";

  };



  strictDeps = true;
@@ -50,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { 
  pythonImportsCheck = [

    "crocoddyl"

  ];

  checkInputs = lib.optionals (pythonSupport) [

  checkInputs = lib.optionals pythonSupport [

    python3Packages.scipy

  ];

pkgs/development/libraries/example-robot-data/default.nix

+11 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, cmake

, pythonSupport ? false

, python3Packages
@@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { 


  strictDeps = true;



  patches = [

    # Temporary patch for pinocchio v3.0.0 compatibility.

    # Should be removed on next example-robot-data release

    (fetchpatch {

      name = "pin3.patch";

      url = "https://github.com/Gepetto/example-robot-data/pull/217/commits/a605ceec857005cde153ec5895e227205eb7a5c3.patch";

      hash = "sha256-cvAWFytrU2XVggo/nCg8cuLcaZBTACXg6LxjL/6YMPs=";

    })

  ];



  nativeBuildInputs = [

    cmake

  ];

pkgs/development/libraries/pinocchio/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "pinocchio";

  version = "2.7.1";

  version = "3.0.0";



  src = fetchFromGitHub {

    owner = "stack-of-tasks";

    repo = finalAttrs.pname;

    rev = "v${finalAttrs.version}";

    hash = "sha256-Ks5dvKi5iutjM+iovDOYGx3vsr45JWRqGOXV8+Ko4gg=";

    hash = "sha256-h4NzfS27+jWyHbegxF+pgN6JzJdVAoM16J6G/9uNJc4=";

  };



  # example-robot-data models are used in checks.