Unverified Commit 02990218 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

[python3Packages.]mujoco: 3.3.2 -> 3.3.3 (#415961)

parents 10bcaa30 a19c61b6

pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch

+15 −25
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index aaac4e38..fe4e9932 100644

index 3cab120d..abc526b1 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -120,7 +120,7 @@ target_link_libraries(

@@ -128,7 +128,7 @@ target_link_libraries(

           lodepng

           qhullstatic_r

           tinyobjloader
@@ -12,7 +12,7 @@ index aaac4e38..fe4e9932 100644 
 

 set_target_properties(

diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake

index 23e4e71e..33081e00 100644

index 78522705..7c64e22a 100644

--- a/cmake/MujocoDependencies.cmake

+++ b/cmake/MujocoDependencies.cmake

@@ -93,28 +93,36 @@ set(BUILD_SHARED_LIBS
@@ -292,17 +292,7 @@ index 23e4e71e..33081e00 100644 
     TARGETS

     absl::core_headers

     EXCLUDE_FROM_ALL

@@ -268,6 +310,9 @@ if(MUJOCO_BUILD_TESTS)

       CACHE BOOL "Build tests." FORCE

   )

 

+  option(MUJOCO_USE_SYSTEM_gtest "Use installed gtest version." OFF)

+  mark_as_advanced(MUJOCO_USE_SYSTEM_gtest)

+

   # Avoid linking errors on Windows by dynamically linking to the C runtime.

   set(gtest_force_shared_crt

       ON

@@ -276,22 +321,20 @@ if(MUJOCO_BUILD_TESTS)

@@ -276,22 +318,20 @@ if(MUJOCO_BUILD_TESTS)

 

   findorfetch(

     USE_SYSTEM_PACKAGE
@@ -331,7 +321,7 @@ index 23e4e71e..33081e00 100644 
   set(BENCHMARK_EXTRA_FETCH_ARGS "")

   if(WIN32 AND NOT MSVC)

     set(BENCHMARK_EXTRA_FETCH_ARGS

@@ -310,15 +353,11 @@ if(MUJOCO_BUILD_TESTS)

@@ -310,15 +350,11 @@ if(MUJOCO_BUILD_TESTS)

 

   findorfetch(

     USE_SYSTEM_PACKAGE
@@ -348,7 +338,7 @@ index 23e4e71e..33081e00 100644 
     TARGETS

     benchmark::benchmark

     benchmark::benchmark_main

@@ -328,15 +367,18 @@ if(MUJOCO_BUILD_TESTS)

@@ -328,15 +364,18 @@ if(MUJOCO_BUILD_TESTS)

 endif()

 

 if(MUJOCO_TEST_PYTHON_UTIL)
@@ -372,7 +362,7 @@ index 23e4e71e..33081e00 100644 
     )

 

     FetchContent_GetProperties(Eigen3)

@@ -348,6 +390,19 @@ if(MUJOCO_TEST_PYTHON_UTIL)

@@ -348,6 +387,19 @@ if(MUJOCO_TEST_PYTHON_UTIL)

       set_target_properties(

         Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}"

       )
@@ -393,17 +383,17 @@ index 23e4e71e..33081e00 100644 
   endif()

 endif()

diff --git a/plugin/sdf/CMakeLists.txt b/plugin/sdf/CMakeLists.txt

index 3e216fc4..e7e3a1eb 100644

index 8b834971..25021fa1 100644

--- a/plugin/sdf/CMakeLists.txt

+++ b/plugin/sdf/CMakeLists.txt

@@ -37,7 +37,7 @@ set(MUJOCO_SDF_SRCS

 add_library(sdf SHARED)

 target_sources(sdf PRIVATE ${MUJOCO_SDF_SRCS})

 target_include_directories(sdf PRIVATE ${MUJOCO_SDF_INCLUDE})

-target_link_libraries(sdf PRIVATE mujoco SdfLib)

+target_link_libraries(sdf PRIVATE mujoco SdfLib::SdfLib)

 add_library(sdf_plugin SHARED)

 target_sources(sdf_plugin PRIVATE ${MUJOCO_SDF_SRCS})

 target_include_directories(sdf_plugin PRIVATE ${MUJOCO_SDF_INCLUDE})

-target_link_libraries(sdf_plugin PRIVATE mujoco SdfLib)

+target_link_libraries(sdf_plugin PRIVATE mujoco SdfLib::SdfLib)

 target_compile_options(

   sdf

   sdf_plugin

   PRIVATE ${AVX_COMPILE_OPTIONS}

diff --git a/python/mujoco/util/CMakeLists.txt b/python/mujoco/util/CMakeLists.txt

index 666a3725..d89bb499 100644
@@ -469,7 +459,7 @@ index 5141406c..75ff7884 100644 
   glfw

   EXCLUDE_FROM_ALL

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt

index 0f92803d..da9dce4c 100644

index a286a1c6..982f2e68 100644

--- a/test/CMakeLists.txt

+++ b/test/CMakeLists.txt

@@ -81,8 +81,8 @@ target_link_libraries(

pkgs/by-name/mu/mujoco/package.nix

+12 −12
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ let 
    abseil-cpp = fetchFromGitHub {

      owner = "abseil";

      repo = "abseil-cpp";

      rev = "d9e4955c65cd4367dd6bf46f4ccb8cd3d100540b";

      hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ=";

      rev = "bc257a88f7c1939f24e0379f14a3589e926c950c";

      hash = "sha256-Tuw1Py+LQdXS+bizXsduPjjEU5YIAVFvL+iJ+w8JoSU=";

    };

    benchmark = fetchFromGitHub {

      owner = "google";
@@ -36,26 +36,26 @@ let 
    eigen3 = fetchFromGitLab {

      owner = "libeigen";

      repo = "eigen";

      rev = "464c1d097891a1462ab28bf8bb763c1683883892";

      hash = "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk=";

      rev = "d0b490ee091629068e0c11953419eb089f9e6bb2";

      hash = "sha256-EmpuOQxshAFa0d6Ddzz6dy21nxHhSn+6Aiz18/o8VUU=";

    };

    googletest = fetchFromGitHub {

      owner = "google";

      repo = "googletest";

      rev = "6910c9d9165801d8827d628cb72eb7ea9dd538c5";

      hash = "sha256-01PK9LxqHno89gypd7ze5gDP4V3en2J5g6JZRqohDB0=";

      rev = "52eb8108c5bdec04579160ae17225d66034bd723";

      hash = "sha256-HIHMxAUR4bjmFLoltJeIAVSulVQ6kVuIT2Ku+lwAx/4=";

    };

    lodepng = fetchFromGitHub {

      owner = "lvandeve";

      repo = "lodepng";

      rev = "b4ed2cd7ecf61d29076169b49199371456d4f90b";

      hash = "sha256-5cCkdj/izP4e99BKfs/Mnwu9aatYXjlyxzzYiMD/y1M=";

      rev = "17d08dd26cac4d63f43af217ebd70318bfb8189c";

      hash = "sha256-vnw52G0lY68471dzH7NXc++bTbLRsITSxGYXOTicA5w=";

    };

    qhull = fetchFromGitHub {

      owner = "qhull";

      repo = "qhull";

      rev = "0c8fc90d2037588024d9964515c1e684f6007ecc";

      hash = "sha256-Ptzxad3ewmKJbbcmrBT+os4b4SR976zlCG9F0nq0x94=";

      rev = "c7bee59d068a69f427b1273e71cdc5bc455a5bdd";

      hash = "sha256-RnuaRrWMQ1rFfb/nxE0ukIoBf2AMG5pRyFmKmvsJ/U8=";

    };

    tinyobjloader = fetchFromGitHub {

      owner = "tinyobjloader";
@@ -132,7 +132,7 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "mujoco";

  version = "3.3.2";

  version = "3.3.3";



  # Bumping version? Make sure to look though the MuJoCo's commit

  # history for bumped dependency pins!
@@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "google-deepmind";

    repo = "mujoco";

    tag = finalAttrs.version;

    hash = "sha256-ftohDFsQv6/N82QjPONiQV/Hr7Eb1h2pFDwHaOOhJE0=";

    hash = "sha256-yU3ckVtgGqLPyu7Jd3L6ZiHELKbGe9AUdCcmXLAxtpo=";

  };



  patches = [ ./mujoco-system-deps-dont-fetch.patch ];

pkgs/development/python-modules/brax/default.nix

+14 −5
Original line number Diff line number Diff line
@@ -86,7 +86,16 @@ buildPythonPackage rec { 
    transforms3d

  ];



  disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [

  disabledTests =

    [

      # Broken after mujoco was updated to 3.3.3:

      # TypeError: Data.init() got an unexpected keyword argument 'contact'

      # Reported upstream: https://github.com/google/brax/issues/618

      "test_pendulum"

      "test_pipeline_ant"

      "test_pipeline_init_with_ctrl"

    ]

    ++ lib.optionals stdenv.hostPlatform.isAarch64 [

      # Flaky:

      # AssertionError: Array(-0.00135638, dtype=float32) != 0.0 within 0.001 delta (Array(0.00135638, dtype=float32) difference)

      "test_pendulum_period2"

pkgs/development/python-modules/mujoco/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ buildPythonPackage rec { 
  # in the project's CI.

  src = fetchPypi {

    inherit pname version;

    hash = "sha256-d3c8cU9XL25xqTe8OH96NsEp0JMv0kaWLD5qSP32u6w=";

    hash = "sha256-XbeipHKzk9MuQhHVkB8rxJB4L0KoaDe8q1iMNhJrQlY=";

  };



  nativeBuildInputs = [ cmake ];