colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #309947 from GaetanLepage/mujoco

Browse Source 
mujoco: 3.1.4 -> 3.1.5
This commit is contained in:
Pol Dellaiera 2024-05-08 06:28:47 +02:00 committed by GitHub
commit 0efaf283bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/science/robotics/mujoco/default.nix
View File

@ -12,12 +12,12 @@
let let
pin = { 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 { abseil-cpp = fetchFromGitHub {
owner = "abseil"; owner = "abseil";
repo = "abseil-cpp"; repo = "abseil-cpp";
rev = "2f9e432cce407ce0ae50676696666f33a77d42ac"; rev = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a";
hash = "sha256-D4E11bICKr3Z5RRah7QkfXVsXtuUg32FMmKpiOGjZDM="; hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg=";
}; };
benchmark = fetchFromGitHub { benchmark = fetchFromGitHub {
owner = "google"; owner = "google";
@ -70,8 +70,8 @@ let
marchingcubecpp = fetchFromGitHub { marchingcubecpp = fetchFromGitHub {
owner = "aparis69"; owner = "aparis69";
repo = "MarchingCubeCpp"; repo = "MarchingCubeCpp";
rev = "5b79e5d6bded086a0abe276a4b5a69fc17ae9bf1"; rev = "f03a1b3ec29b1d7d865691ca8aea4f1eb2c2873d";
hash = "sha256-L0DH1GJZ/3vatQAU/KZj/2xTKE6Fwcw9eQYzLdqX2N4="; hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw=";
}; };
tmd = stdenv.mkDerivation rec { tmd = stdenv.mkDerivation rec {
@ -129,7 +129,7 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "mujoco"; pname = "mujoco";
version = "3.1.4"; version = "3.1.5";
# Bumping version? Make sure to look though the MuJoCo's commit # Bumping version? Make sure to look though the MuJoCo's commit
# history for bumped dependency pins! # history for bumped dependency pins!
@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
owner = "google-deepmind"; owner = "google-deepmind";
repo = "mujoco"; repo = "mujoco";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-VgD6ditMDpHki7l23Gjip2roA8Oi4MGpxl+4gSLTEFs="; hash = "sha256-XKN489oexHf2/Gv0MVxXUzqyeJJTJXV99+fNi8shdsg=";
}; };
patches = [ ./mujoco-system-deps-dont-fetch.patch ]; patches = [ ./mujoco-system-deps-dont-fetch.patch ];

4
pkgs/development/python-modules/mujoco/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mujoco"; pname = "mujoco";
version = "3.1.4"; version = "3.1.5";
pyproject = true; pyproject = true;
@ -27,7 +27,7 @@ buildPythonPackage rec {
# in the project's CI. # in the project's CI.
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-GdeL1zMri/ArjXyjXTgan48WVPTHDA1/SZxtTYB8QFk="; hash = "sha256-kJm6YAE0HMnji3uUuO96ZzRsdjj6PpT1IHQ6NXiR8pY=";
}; };
nativeBuildInputs = [ cmake setuptools ]; nativeBuildInputs = [ cmake setuptools ];