Unverified Commit 6b98647f authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #317365 from GaetanLepage/mujoco 

mujoco: 3.1.5 -> 3.1.6
parents 23ed9cb9 92555723

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

+10 −6
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


let

  pin = {



    # TODO: Check the following file and ensure the dependencies are up-to-date

    # See https://github.com/google-deepmind/mujoco/blob/<VERSION>/cmake/MujocoDependencies.cmake#L17-L64

    abseil-cpp = fetchFromGitHub {

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


in stdenv.mkDerivation rec {

  pname = "mujoco";

  version = "3.1.5";

  version = "3.1.6";



  # 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-XKN489oexHf2/Gv0MVxXUzqyeJJTJXV99+fNi8shdsg=";

    hash = "sha256-64zUplr1E5WSb5RpTW9La1zKVT67a1VrftiUqc2SHlU=";

  };



  patches = [ ./mujoco-system-deps-dont-fetch.patch ];
@@ -177,12 +177,16 @@ in stdenv.mkDerivation rec { 


  passthru.pin = { inherit (pin) lodepng eigen3 abseil-cpp; };



  meta = with lib; {

  meta = {

    description = "Multi-Joint dynamics with Contact. A general purpose physics simulator.";

    homepage = "https://mujoco.org/";

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

    license = licenses.asl20;

    maintainers = with maintainers; [ samuela tmplt ];

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [

      GaetanLepage

      samuela

      tmplt

    ];

    broken = stdenv.isDarwin;

  };

}

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

+8 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


buildPythonPackage rec {

  pname = "mujoco";

  version = "3.1.5";

  inherit (mujoco) version;



  pyproject = true;
@@ -28,7 +28,7 @@ buildPythonPackage rec { 
  # in the project's CI.

  src = fetchPypi {

    inherit pname version;

    hash = "sha256-kJm6YAE0HMnji3uUuO96ZzRsdjj6PpT1IHQ6NXiR8pY=";

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

  };



  nativeBuildInputs = [
@@ -82,11 +82,14 @@ buildPythonPackage rec { 
      ''

    );



  meta = with lib; {

  meta = {

    description = "Python bindings for MuJoCo: a general purpose physics simulator.";

    homepage = "https://mujoco.org/";

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

    license = licenses.asl20;

    maintainers = with maintainers; [ tmplt ];

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [

      GaetanLepage

      tmplt

    ];

  };

}