Unverified Commit 0efaf283 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #309947 from GaetanLepage/mujoco 

mujoco: 3.1.4 -> 3.1.5
parents 10167311 ce7837a4

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

+7 −7
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ 
let

  pin = {



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

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

    abseil-cpp = fetchFromGitHub {

      owner = "abseil";

      repo = "abseil-cpp";

      rev = "2f9e432cce407ce0ae50676696666f33a77d42ac";

      hash = "sha256-D4E11bICKr3Z5RRah7QkfXVsXtuUg32FMmKpiOGjZDM=";

      rev = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a";

      hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg=";

    };

    benchmark = fetchFromGitHub {

      owner = "google";
@@ -70,8 +70,8 @@ let 
    marchingcubecpp = fetchFromGitHub {

      owner = "aparis69";

      repo = "MarchingCubeCpp";

      rev = "5b79e5d6bded086a0abe276a4b5a69fc17ae9bf1";

      hash = "sha256-L0DH1GJZ/3vatQAU/KZj/2xTKE6Fwcw9eQYzLdqX2N4=";

      rev = "f03a1b3ec29b1d7d865691ca8aea4f1eb2c2873d";

      hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw=";

    };



    tmd = stdenv.mkDerivation rec {
@@ -129,7 +129,7 @@ let 


in stdenv.mkDerivation rec {

  pname = "mujoco";

  version = "3.1.4";

  version = "3.1.5";



  # 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-VgD6ditMDpHki7l23Gjip2roA8Oi4MGpxl+4gSLTEFs=";

    hash = "sha256-XKN489oexHf2/Gv0MVxXUzqyeJJTJXV99+fNi8shdsg=";

  };



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

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

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


buildPythonPackage rec {

  pname = "mujoco";

  version = "3.1.4";

  version = "3.1.5";



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

  src = fetchPypi {

    inherit pname version;

    hash = "sha256-GdeL1zMri/ArjXyjXTgan48WVPTHDA1/SZxtTYB8QFk=";

    hash = "sha256-kJm6YAE0HMnji3uUuO96ZzRsdjj6PpT1IHQ6NXiR8pY=";

  };



  nativeBuildInputs = [ cmake setuptools ];