Unverified Commit 3898b7d5 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

crocoddyl: 3.0.0 -> 3.0.1 + clean, aligator: 0.8.0 -> 0.12.0 + clean (#390922)

parents fa02f448 b7569d37

pkgs/by-name/al/aligator/package.nix

+27 −14
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  gbenchmark,

  graphviz,

  lib,

  llvmPackages, # llvm/Support/Host.h required by casadi 3.6.5 and not available in llvm 18

  llvmPackages,

  pinocchio,

  pkg-config,

  proxsuite-nlp,
@@ -20,13 +20,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "aligator";

  version = "0.8.0";

  version = "0.12.0";



  src = fetchFromGitHub {

    owner = "Simple-Robotics";

    repo = "aligator";

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

    hash = "sha256-o4QjxTaZUa17hZsCv4hCI2cedaHoojBtLe8SVUkl0bo=";

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

    hash = "sha256-oy2qcJbIGr5pe+XYWKntfsc6Ie7oEU1qqrPXjuqULmY=";

  };



  outputs = [
@@ -36,13 +36,21 @@ stdenv.mkDerivation (finalAttrs: { 


  strictDeps = true;



  nativeBuildInputs = [

  nativeBuildInputs =

    [

      doxygen

      cmake

      graphviz

      pkg-config

  ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;

  buildInputs = [ fmt ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;

    ]

    ++ lib.optionals pythonSupport [

      python3Packages.pythonImportsCheckHook

    ];

  buildInputs =

    [ fmt ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      llvmPackages.openmp

    ];

  propagatedBuildInputs =

    [ suitesparse ]

    ++ lib.optionals pythonSupport [
@@ -74,14 +82,19 @@ stdenv.mkDerivation (finalAttrs: { 
    ]

    ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [

      # ignore one failing test for now

      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-integrators")

      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-rollout")

    ];



  # Fontconfig error: Cannot load default config file: No such file: (null)

  env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";



  preBuild = ''

    # silence matplotlib warning

    export MPLCONFIGDIR=$(mktemp -d)



    # Fontconfig error: No writable cache directories

  preBuild = "export XDG_CACHE_HOME=$(mktemp -d)";

    export XDG_CACHE_HOME=$(mktemp -d)

  '';



  doCheck = true;

  pythonImportsCheck = [ "aligator" ];

pkgs/by-name/cr/crocoddyl/package.nix

+8 −14
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "crocoddyl";

  version = "3.0.0";

  version = "3.0.1";



  src = fetchFromGitHub {

    owner = "loco-3d";

    repo = "crocoddyl";

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

    hash = "sha256-oWcclzzuswiR1SaQJd6GnMltJ2vgt7AgJPT0FJzD1Gs=";

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

    hash = "sha256-eUH9fMhuIUp5kuDKNo4B8iJ3JlMIqv7wX6meOpyPTJk=";

  };



  outputs = [
@@ -59,16 +59,10 @@ stdenv.mkDerivation (finalAttrs: { 
      python3Packages.scipy

    ];



  cmakeFlags =

    [

  cmakeFlags = [

    (lib.cmakeBool "INSTALL_DOCUMENTATION" true)

    (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport)

    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      # ref. https://github.com/stack-of-tasks/pinocchio/issues/2563

      # remove this for crocoddyl >= 3.0.0

      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;test_pybinds_*")

  ];



  prePatch = ''