Unverified Commit 4fec52fb authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

proxsuite: 0.6.7 -> 0.7.2, aligator: 0.12.0 -> 0.13.0, jrl-cmakemodules:...

proxsuite: 0.6.7 -> 0.7.2, aligator: 0.12.0 -> 0.13.0, jrl-cmakemodules: 0-unstable-2025-01-29 -> 0-unstable-2025-05-21 (#403612)
parents ca9f8e02 c930de82
Loading
Loading
Loading
Loading
+23 −14
Original line number Diff line number Diff line
{
  cmake,
  crocoddyl,
  doxygen,
  lib,
  fetchFromGitHub,
  fmt,
  fontconfig,
  gbenchmark,
  graphviz,
  lib,
  llvmPackages,
  pinocchio,
  pkg-config,
  proxsuite-nlp,
  nix-update-script,
  python3Packages,
  pythonSupport ? false,
  stdenv,

  # nativeBuildInputs
  doxygen,
  cmake,
  graphviz,
  pkg-config,

  # buildInputs
  fmt,

  # propagatedBuildInputs
  suitesparse,
  crocoddyl,
  pinocchio,

  # checkInputs
  gbenchmark,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "aligator";
  version = "0.12.0";
  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "Simple-Robotics";
    repo = "aligator";
    tag = "v${finalAttrs.version}";
    hash = "sha256-oy2qcJbIGr5pe+XYWKntfsc6Ie7oEU1qqrPXjuqULmY=";
    hash = "sha256-SkhFV/a3A6BqzoicQa7MUgsEuDzd+JfgYvL4ztHg/K0=";
  };

  outputs = [
@@ -44,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
      pkg-config
    ]
    ++ lib.optionals pythonSupport [
      python3Packages.python
      python3Packages.pythonImportsCheckHook
    ];
  buildInputs =
@@ -57,12 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
      python3Packages.crocoddyl
      python3Packages.matplotlib
      python3Packages.pinocchio
      python3Packages.proxsuite-nlp
    ]
    ++ lib.optionals (!pythonSupport) [
      crocoddyl
      pinocchio
      proxsuite-nlp
    ];
  checkInputs =
    [ gbenchmark ]
@@ -99,6 +106,8 @@ stdenv.mkDerivation (finalAttrs: {
  doCheck = true;
  pythonImportsCheck = [ "aligator" ];

  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Versatile and efficient framework for constrained trajectory optimization";
    homepage = "https://github.com/Simple-Robotics/aligator";
+3 −3
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@

stdenv.mkDerivation {
  pname = "jrl-cmakemodules";
  version = "0-unstable-2025-01-29";
  version = "0-unstable-2025-05-04";

  src = fetchFromGitHub {
    owner = "jrl-umi3218";
    repo = "jrl-cmakemodules";
    rev = "2ede15d1cb9d66401ba96788444ad64c44ffccd8";
    hash = "sha256-0o5DKt9BxZlAYTHp/BjzF6eJRP/d6lVlaV5P4xlzKnA=";
    rev = "2dd858f5a71d8224f178fb3dc0bcd95256ba10e7";
    hash = "sha256-Iq9IuhEJBmDd14FhQ3wb94AoJDUjJ1h1D3qCdQYCnUc=";
  };

  nativeBuildInputs = [ cmake ];
+31 −24
Original line number Diff line number Diff line
@@ -2,39 +2,37 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  cereal_1_3_2,
  fontconfig,
  nix-update-script,
  pythonSupport ? false,
  python3Packages,

  # nativeBuildInputs
  cmake,
  doxygen,
  eigen,
  fontconfig,
  graphviz,

  # propagatedBuildInputs
  cereal_1_3_2,
  eigen,
  jrl-cmakemodules,
  simde,

  # checkInputs
  matio,
  pythonSupport ? false,
  python3Packages,

}:
stdenv.mkDerivation (finalAttrs: {
  pname = "proxsuite";
  version = "0.6.7";
  version = "0.7.2";

  src = fetchFromGitHub {
    owner = "simple-robotics";
    repo = "proxsuite";
    rev = "v${finalAttrs.version}";
    hash = "sha256-iKc55WDHArmmIM//Wir6FHrNV84HnEDcBUlwnsbtMME=";
    hash = "sha256-1+a5tFOlEwzhGZtll35EMFceD0iUOOQCbwJd9NcFDlk=";
  };

  patches = [
    # Fix use of system cereal
    # This was merged upstream and can be removed on next release
    (fetchpatch {
      url = "https://github.com/Simple-Robotics/proxsuite/pull/352/commits/8305864f13ca7dff7210f89004a56652b71f8891.patch";
      hash = "sha256-XMS/zHFVrEp1P6aDlGrLbrcmuKq42+GdZRH9ObewNCY=";
    })
  ];

  outputs = [
    "doc"
    "out"
@@ -52,17 +50,24 @@ stdenv.mkDerivation (finalAttrs: {

  strictDeps = true;

  nativeBuildInputs = [
  nativeBuildInputs =
    [
      cmake
      doxygen
      graphviz
  ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
    ]
    ++ lib.optionals pythonSupport [
      python3Packages.python
      python3Packages.pythonImportsCheckHook
    ];

  propagatedBuildInputs = [
    cereal_1_3_2
    eigen
    jrl-cmakemodules
    simde
  ] ++ lib.optionals pythonSupport [ python3Packages.pybind11 ];
  ] ++ lib.optionals pythonSupport [ python3Packages.nanobind ];

  checkInputs =
    [ matio ]
    ++ lib.optionals pythonSupport [
@@ -85,11 +90,13 @@ stdenv.mkDerivation (finalAttrs: {
  doCheck = true;
  pythonImportsCheck = [ "proxsuite" ];

  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Advanced Proximal Optimization Toolbox";
    homepage = "https://github.com/Simple-Robotics/proxsuite";
    license = lib.licenses.bsd2;
    maintainers = with lib.maintainers; [ nim65s ];
    platforms = lib.platforms.unix;
    platforms = lib.platforms.unix ++ lib.platforms.windows;
  };
})