Merge pull request #200768 from lopsided98/urdfdom-update
urdfdom: 1.0.4 -> 3.1.0
This commit is contained in:
commit
f891f624ae
1 changed files with 4 additions and 9 deletions
|
@ -3,25 +3,20 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "urdfdom";
|
pname = "urdfdom";
|
||||||
version = "1.0.4";
|
version = "3.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ros";
|
owner = "ros";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0wambq06d7dvja25zcv4agc055q9rmf3xkrnxy8lsf4nic7ra2rr";
|
hash = "sha256-9MJnify4zcDBSZVJZCN/XupN5xax+U4PLee54gVVw3Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fix CMake saying console-bridge 1.0 is incompatible
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/ros/urdfdom/commit/6faba176d41cf39114785a3e029013f941ed5a0e.patch";
|
|
||||||
sha256 = "1pn9hcg5wkkc7y28sbkxvffqxgvazzsp3g1xmz6h055v4f9ikjbs";
|
|
||||||
})
|
|
||||||
# Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom/pull/142)
|
# Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom/pull/142)
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/ros/urdfdom/commit/707c97c3d1f739ba0ab6e93e1bf7cd01d68a8c07.patch";
|
url = "https://github.com/ros/urdfdom/commit/cbe6884d267779463bb444be851f6404e692cc0a.patch";
|
||||||
sha256 = "10bv7sv7gfy6lj8z5bkw7v291y12fbrrxsiqxqjxg4i65rfg92ng";
|
hash = "sha256-1gTRKIGqiSRion76bGecSfFJSBskYUJguUIa6ePIiX4=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue