movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-07-14 14:10:37 +03:00
Code Activity

Update gazebo and dependencies.

Browse source
This commit is contained in:
Ben Wolsieffer 2022-08-16 19:34:13 -04:00
parent ac07c183e7
commit 36f37f731c
17 changed files with 58 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkgs/default.nix
View file

@ -82,8 +82,8 @@ in {
fuel-tools1 = self.callPackage ./ignition/fuel-tools/1.nix { };
fuel-tools4 = self.callPackage ./ignition/fuel-tools/4.nix { };
fuel-tools6 = self.callPackage ./ignition/fuel-tools { };
fuel-tools = self.ignition.fuel-tools6;
fuel-tools7 = self.callPackage ./ignition/fuel-tools { };
fuel-tools = self.ignition.fuel-tools7;
math4 = self.callPackage ./ignition/math/4.nix { };
math6 = self.callPackage ./ignition/math { };
@ -91,15 +91,15 @@ in {
msgs1 = self.callPackage ./ignition/msgs/1.nix { };
msgs5 = self.callPackage ./ignition/msgs/5.nix { };
msgs7 = self.callPackage ./ignition/msgs { };
msgs = self.ignition.msgs7;
msgs8 = self.callPackage ./ignition/msgs { };
msgs = self.ignition.msgs8;
tools = self.callPackage ./ignition/tools { };
transport4 = self.callPackage ./ignition/transport/4.nix { };
transport8 = self.callPackage ./ignition/transport/8.nix { };
transport10 = self.callPackage ./ignition/transport { };
transport = self.ignition.transport10;
transport11 = self.callPackage ./ignition/transport { };
transport = self.ignition.transport11;
utils1 = self.callPackage ./ignition/utils { };
utils = self.ignition.utils1;

4
pkgs/gazebo/9.nix
View file

@ -1,8 +1,8 @@
{ callPackage, sdformat_6, ignition, ... } @ args:
callPackage ./. (args // {
version = "9.18.0";
srcSha256 = "0j9458bzm7a3pl4nsialypw2s3p1fk3sjpji8kw8aqkrdrpdw03d";
version = "9.19.0";
srcSha256 = "sha256-HzykMIJLEgrgx8TAA3oaVue2v2xQcxsUi1x1v8Rtf+c=";
sdformat = sdformat_6;
ignition-common = ignition.common1;
ignition-transport = ignition.transport4;

12
pkgs/gazebo/default.nix
View file

@ -3,12 +3,12 @@
, libuuid, graphviz, libsForQt5, freeimage, boost, protobuf, sdformat, tbb
, ogre1_9, ffmpeg, ignition, ignition-cmake ? ignition.cmake0
, ignition-common ? ignition.common, ignition-math ? ignition.math4
, ignition-transport ? ignition.transport8, ignition-msgs ? ignition.msgs
, ignition-transport ? ignition.transport8, ignition-msgs ? ignition.msgs5
, ignition-fuel-tools ? ignition.fuel-tools4
, bullet, withBulletEngineSupport ? false
, version ? "11.9.0"
, srcSha256 ? "0bhzp28kcif5qhbx8wdhvj7rdkcmiy4b8l50p8ss8858g3kwbpsp"
, version ? "11.11.0"
, srcSha256 ? "sha256-DCY3qHPtFOhI550+3IZyyPs5ABBzKHzpTpmRqudt2Vg="
, ... }: with lib;
mkDerivation rec {
@ -31,12 +31,6 @@ mkDerivation rec {
lib.optional (lib.versionOlder version "11.3.0") (fetchpatch {
url = "https://github.com/osrf/gazebo/commit/25d3381c083a9eeafcee34ef648339a83e192676.patch";
sha256 = "1qixrz2jiqdc37mgcsnv562m7mzr6w0rd67fmkr5710n6dnky4y7";
}) ++
# Fix CMake relative install path assumptions
# https://github.com/osrf/gazebo/pull/3138
lib.optional (lib.versionAtLeast version "11.8.0") (fetchpatch {
url = "https://github.com/osrf/gazebo/commit/9bf5dac1546f3982d9da783a6ac5d7e674ddbe24.patch";
sha256 = "0h9fmch8rgnsi3gnxvwfp0g9jgzy0z9p7nah005qw9lzmkvdrvs7";
});
enableParallelBuilding = true;

7
pkgs/ignition/cmake/default.nix
View file

@ -1,14 +1,15 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, majorVersion ? "2"
, version ? "2.9.0"
, srcSha256 ? "0yg5prhkgysp2wqrsh71mv582ry154sm14ps20rsq138zhnf9751"
, version ? "2.14.0"
, srcSha256 ? "sha256-23QwqdBBKNB/Q/6e2aitWZ433FFfhpIfbm9jvEiKNG8="
, ... }:
stdenv.mkDerivation rec {
pname = "ignition-cmake${majorVersion}";
inherit version;
src = fetchFromGitHub {
src = fetchFromGitHub rec {
name = "${rev}-source";
owner = "ignitionrobotics";
repo = "ign-cmake";
rev = "${pname}_${version}";

4
pkgs/ignition/common/3.nix
View file

@ -2,6 +2,6 @@
callPackage ./. ({
majorVersion = "3";
version = "3.13.2";
srcSha256 = "0kh2x8lmyxwms1s1fqyf331463j191337jcvhc77ga9x5igspfb5";
version = "3.14.1";
srcSha256 = "sha256-UcXNt42CiqN//nfMSTjbGH8Imeey2HojojOw2t8csHw=";
} // args)

7
pkgs/ignition/common/default.nix
View file

@ -2,15 +2,16 @@
, ignition-cmake ? ignition.cmake, ignition-math ? ignition.math
, ignition-utils ? ignition.utils, libuuid, tinyxml-2, freeimage, gts, ffmpeg
, majorVersion ? "4"
, version ? "4.0.0"
, srcSha256 ? "1vfgjd527z3jypdvnz6w2yfm8n6brrxxh4mcb9srf4bn9apawzwp"
, version ? "4.5.1"
, srcSha256 ? "sha256-Ut5/pvcpCbZH2QGleXW2bfiVcWm5zBdt7r1Hx+4F924="
, ... }:
stdenv.mkDerivation rec {
pname = "ignition-common${majorVersion}";
inherit version;
src = fetchFromGitHub {
src = fetchFromGitHub rec {
name = "${rev}-source";
owner = "ignitionrobotics";
repo = "ign-common";
rev = "${pname}_${version}";

4
pkgs/ignition/fuel-tools/4.nix
View file

@ -2,8 +2,8 @@
callPackage ./. ({
majorVersion = "4";
version = "4.4.0";
srcSha256 = "1366nxy518amxs618h97jqzsl9755ig78w04s1ci3w5nir5silmq";
version = "4.5.0";
srcSha256 = "sha256-//udxWLXP2CTY3i3mEN9u9manlbwu9lBjhPJD4nd+R8=";
ignition-common = ignition.common3;
ignition-msgs = ignition.msgs5;
} // args)

9
pkgs/ignition/fuel-tools/default.nix
View file

@ -1,16 +1,17 @@
{ lib, stdenv, fetchFromGitHub, cmake, ignition
, ignition-cmake ? ignition.cmake, ignition-common ? ignition.common
, ignition-msgs ? ignition.msgs, tinyxml-2, curl, jsoncpp, libyaml, libzip
, majorVersion ? "6"
, version ? "6.0.0"
, srcSha256 ? "07c489yc0n7gry0czp85siaqy9ar03ggaj70lcphwq6zp98gzz4h"
, majorVersion ? "7"
, version ? "7.0.0"
, srcSha256 ? "sha256-yHiHfYjZuLOzly30nAE//r65ibzZ6DGoZSCQiWRXIHg="
, ... }:
stdenv.mkDerivation rec {
pname = "ignition-fuel-tools${majorVersion}";
inherit version;
src = fetchFromGitHub {
src = fetchFromGitHub rec {
name = "${rev}-source";
owner = "ignitionrobotics";
repo = "ign-fuel-tools";
rev = "${pname}_${version}";

7
pkgs/ignition/math/default.nix
View file

@ -1,14 +1,15 @@
{ lib, stdenv, fetchFromGitHub, cmake, ignition, ignition-cmake ? ignition.cmake
, majorVersion ? "6"
, version ? "6.7.0"
, srcSha256 ? "0hyhlqgjx3yrmk1fgp1brgq2lk8l26sihn8yfmm0garbxi70zspb"
, version ? "6.12.0"
, srcSha256 ? "sha256-tKVaRzxLzMfAyL6+xRmmTgFKxFXAjoNyf8pgwOkWb/Q="
, ... }:
stdenv.mkDerivation rec {
pname = "ignition-math${majorVersion}";
inherit version;
src = fetchFromGitHub {
src = fetchFromGitHub rec {
name = "${rev}-source";
owner = "ignitionrobotics";
repo = "ign-math";
rev = "${pname}_${version}";

4
pkgs/ignition/msgs/5.nix
View file

@ -2,6 +2,6 @@
callPackage ./. ({
majorVersion = "5";
version = "5.7.0";
srcSha256 = "0qky3bapa5r396wfl2fhrjljzya3k845dp6pzld4pkk588w9q3mj";
version = "5.10.0";
srcSha256 = "sha256-yXAvIi/8Eea7szAAgVEKFXfWznxPIp9R3bTIWxpm7hw=";
} // args)

9
pkgs/ignition/msgs/default.nix
View file

@ -1,15 +1,16 @@
{ lib, stdenv, fetchFromGitHub, cmake, tinyxml-2, ignition
, ignition-cmake ? ignition.cmake, protobuf, ignition-math ? ignition.math
, majorVersion ? "7"
, version ? "7.1.0"
, srcSha256 ? "0sc6mgjxdyx973ziq9svkna35pz9f5cikcf7980vc69vlfaiv9k7"
, majorVersion ? "8"
, version ? "8.6.0"
, srcSha256 ? "sha256-Rk9as7eQ6gmY2bYCHv4TnwBX5B+He+0SEEAQhCpfUaM="
, ... }:
stdenv.mkDerivation rec {
pname = "ignition-msgs${majorVersion}";
inherit version;
src = fetchFromGitHub {
src = fetchFromGitHub rec {
name = "${rev}-source";
owner = "ignitionrobotics";
repo = "ign-msgs";
rev = "${pname}_${version}";

7
pkgs/ignition/tools/default.nix
View file

@ -2,13 +2,14 @@
stdenv.mkDerivation rec {
pname = "ignition-tools";
version = "1.2.0";
version = "1.5.0";
src = fetchFromGitHub {
src = fetchFromGitHub rec {
name = "${rev}-source";
owner = "ignitionrobotics";
repo = "ign-tools";
rev = "${pname}_${version}";
sha256 = "1zf5hrwkfp7cilfqsk8spdi7dsygj2bff5w3d56cd97ym7r4d1zi";
sha256 = "sha256-HgYT7MARRnOdUuUllxRn9pl7tsWO5RDIFDObzJQgZpc=";
};
nativeBuildInputs = [ cmake ruby ];

4
pkgs/ignition/transport/8.nix
View file

@ -2,7 +2,7 @@
callPackage ./. ({
majorVersion = "8";
version = "8.2.0";
srcSha256 = "0s1xcvnynfq8dr2j41xxcczl6jc2rfqwhlh26jhwbh1338fqxgnr";
version = "8.3.0";
srcSha256 = "sha256-Yh1DtedwY+rxYdkud9A+fGgA0b5MVUJHa7LDY3OPtMw=";
ignition-msgs = ignition.msgs5;
} // args)

9
pkgs/ignition/transport/default.nix
View file

@ -1,16 +1,17 @@
{ lib, stdenv, fetchFromGitHub, cmake, ignition, ignition-cmake ? ignition.cmake
, ignition-math ? ignition.math, ignition-msgs ? ignition.msgs
, ignition-utils ? ignition.utils, protobuf, libuuid, sqlite, cppzmq, zeromq
, majorVersion ? "10"
, version ? "10.0.0"
, srcSha256 ? "0jhqn1hai25mg1807ixhp903jg8gqwl8kqrm4na50q8gl6jnv7hi"
, majorVersion ? "11"
, version ? "11.1.0"
, srcSha256 ? "sha256-bOsulr8O5sRJ3XAQOP9xWCgoXqEH6M+IEFa0Sx6vze0="
, ... }:
stdenv.mkDerivation rec {
pname = "ignition-transport${majorVersion}";
inherit version;
src = fetchFromGitHub {
src = fetchFromGitHub rec {
name = "${rev}-source";
owner = "ignitionrobotics";
repo = "ign-transport";
rev = "${pname}_${version}";

7
pkgs/ignition/utils/default.nix
View file

@ -1,15 +1,16 @@
{ lib, stdenv, fetchFromGitHub, cmake, ignition
, ignition-cmake ? ignition.cmake
, majorVersion ? "1"
, version ? "1.0.0"
, srcSha256 ? "1y7x1gpwm2ws7sljxgk7yqsngjcgya4vi3xlasfl7hzh9lfps8zg"
, version ? "1.4.0"
, srcSha256 ? "sha256-+kV/iYA1XmMpgK6G4Q69uT1ZZexVAphX6mD5SRQGI7k="
, ... }:
stdenv.mkDerivation rec {
pname = "ignition-utils${majorVersion}";
inherit version;
src = fetchFromGitHub {
src = fetchFromGitHub rec {
name = "${rev}-source";
owner = "ignitionrobotics";
repo = "ign-utils";
rev = "${pname}_${version}";

4
pkgs/sdformat/6.nix
View file

@ -1,8 +1,8 @@
{ callPackage, ignition, ... } @ args:
callPackage ./. (args // {
version = "6.2.0";
srcSha256 = "1ylqb22p0w3mikpl6vjqi4jkq15sqzl765i3232a0fd6y148d0dy";
version = "6.3.1";
srcSha256 = "sha256-JPjDFLFP0+mZ7q1am3iPmDlcyGG/i1Yti8zKdY7d7ME=";
ignition-math = ignition.math4;
})

4
pkgs/sdformat/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, ruby, boost, ignition
, ignition-math ? ignition.math, tinyxml, urdfdom, urdfdom-headers
, console-bridge
, version ? "9.3.0"
, srcSha256 ? "01jikzpv073dz0k4s3wabcm5frndjzkhbjbb3nzw6qbfb1d45arh"
, version ? "9.8.0"
, srcSha256 ? "sha256-kJz6qlxbmIrWOwvhLbb12ZCLbajMJ0p9Opzj6lzDtPs="
, ...
}: