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

Merge pull request #327508 from GaetanLepage/mujoco 

mujoco: 3.1.6 -> 3.2.0
parents 70c83468 627a9c72

pkgs/applications/science/robotics/mujoco/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ let 
    eigen3 = fetchFromGitLab {

      owner = "libeigen";

      repo = "eigen";

      rev = "2a9055b50ed22101da7d77e999b90ed50956fe0b";

      hash = "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=";

      rev = "33d0937c6bdf5ec999939fb17f2a553183d14a74";

      hash = "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY=";

    };

    googletest = fetchFromGitHub {

      owner = "google";
@@ -129,7 +129,7 @@ let 


in stdenv.mkDerivation rec {

  pname = "mujoco";

  version = "3.1.6";

  version = "3.2.0";



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

  # history for bumped dependency pins!
@@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { 
    owner = "google-deepmind";

    repo = "mujoco";

    rev = "refs/tags/${version}";

    hash = "sha256-64zUplr1E5WSb5RpTW9La1zKVT67a1VrftiUqc2SHlU=";

    hash = "sha256-BCvWVOpViEhwvlBzXuj0hoN6W4z5vC8MeO91SsdQ+x4=";

  };



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

pkgs/development/python-modules/dm-control/default.nix

+6 −4
Original line number Diff line number Diff line
@@ -3,11 +3,14 @@ 
  buildPythonPackage,

  pythonOlder,

  fetchFromGitHub,



  # build-system

  absl-py,

  mujoco,

  pyparsing,

  setuptools,

  wheel,



  # dependencies

  dm-env,

  dm-tree,

  fsspec,
@@ -27,7 +30,7 @@ 


buildPythonPackage rec {

  pname = "dm-control";

  version = "1.0.20";

  version = "1.0.21";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -36,7 +39,7 @@ buildPythonPackage rec { 
    owner = "google-deepmind";

    repo = "dm_control";

    rev = "refs/tags/${version}";

    hash = "sha256-huXvfQz7E+OCqRrhLC5dUaG/A2PQXrPBzseIFx7ZIeE=";

    hash = "sha256-yY75QpvZ0fAW2W0GVM7fzmXKmTdDyukCVC/1cyU5IjQ=";

  };



  build-system = [
@@ -44,7 +47,6 @@ buildPythonPackage rec { 
    mujoco

    pyparsing

    setuptools

    wheel

  ];



  pythonRemoveDeps = [

pkgs/development/python-modules/dm-tree/default.nix

+24 −12
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchpatch,

  fetchFromGitHub,

  stdenv,



  # nativeBuildInputs

  cmake,

  pybind11,



  # buildInputs

  abseil-cpp,



  # build-system

  setuptools,



  # checks

  absl-py,

  attrs,

  buildPythonPackage,

  cmake,

  fetchpatch,

  fetchFromGitHub,

  lib,

  numpy,

  pybind11,

  wrapt,

}:

let

  patchCMakeAbseil = fetchpatch {

    name = "0001-don-t-rebuild-abseil.patch";

    url = "https://raw.githubusercontent.com/conda-forge/dm-tree-feedstock/93a91aa2c13240cecf88133e2885ade9121b464a/recipe/patches/0001-don-t-rebuild-abseil.patch";

    hash = "sha256-mCnyAaHBCZJBogGfl0Hx+hocmtFg13RAIUbEy93z2CE=";

    hash = "sha256-bho7lXAV5xHkPmWy94THJtx+6i+px5w6xKKfThvBO/M=";

  };

  patchCMakePybind = fetchpatch {

    name = "0002-don-t-fetch-pybind11.patch";

    url = "https://raw.githubusercontent.com/conda-forge/dm-tree-feedstock/93a91aa2c13240cecf88133e2885ade9121b464a/recipe/patches/0002-don-t-fetch-pybind11.patch";

    hash = "sha256-zGgeAhIMHA238vESWb+44s9p0QjQxnpgMAGv88uYGMU=";

    hash = "sha256-41XIouQ4Fm1yewaxK9erfcnkGBS6vgdvMm/DyF0rsKg=";

  };

in

buildPythonPackage rec {

  pname = "dm-tree";

  version = "0.1.8";

  format = "setuptools";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "deepmind";
@@ -53,6 +62,8 @@ buildPythonPackage rec { 
    pybind11

  ];



  build-system = [ setuptools ];



  nativeCheckInputs = [

    absl-py

    attrs
@@ -62,11 +73,12 @@ buildPythonPackage rec { 


  pythonImportsCheck = [ "tree" ];



  meta = with lib; {

  meta = {

    description = "Tree is a library for working with nested data structures";

    homepage = "https://github.com/deepmind/tree";

    license = licenses.asl20;

    maintainers = with maintainers; [

    changelog = "https://github.com/google-deepmind/tree/releases/tag/${version}";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [

      samuela

      ndl

    ];

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

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

  src = fetchPypi {

    inherit pname version;

    hash = "sha256-fPiIdSbwcedBHcAs4c1mXjm0tgg/3/Sf4TSKgtIxRlE=";

    hash = "sha256-R388jEIbzd60en1SRC8mKSSlvdW/xWl1xDnUET7QvKc=";

  };



  nativeBuildInputs = [