From 191359a33a7fb1e726e17390bd9467ecb7146d23 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 11 Nov 2022 13:56:17 -0500 Subject: [PATCH] Fix urdfdom patch. --- distros/foxy/overrides.nix | 2 +- distros/galactic/overrides.nix | 2 +- distros/humble/overrides.nix | 4 ++-- flake.lock | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distros/foxy/overrides.nix b/distros/foxy/overrides.nix index 0edc6bd4d7..148e1e5dde 100644 --- a/distros/foxy/overrides.nix +++ b/distros/foxy/overrides.nix @@ -74,7 +74,7 @@ rosSelf: rosSuper: with rosSelf.lib; { # Fix CMake relative install dir assumptions # https://github.com/ros/urdfdom/pull/142 (backported to 2.3) (self.fetchpatch { - url = "https://github.com/ros/urdfdom/commit/f44a382984269d4a4cc4006673e16dfd74e8b4f8.patch"; + url = "https://github.com/ros/urdfdom/commit/f6d9b2e248ab5c7d08b21a104a2d2d7fa3490790.patch"; hash = "sha256-ykBw9DEBraYHzgrCa1JkDhWTYXBQL1MmfelC5j5ibrs="; }) ]; diff --git a/distros/galactic/overrides.nix b/distros/galactic/overrides.nix index 8a426e2db4..5fb491052b 100644 --- a/distros/galactic/overrides.nix +++ b/distros/galactic/overrides.nix @@ -90,7 +90,7 @@ rosSelf: rosSuper: with rosSelf.lib; { # Fix CMake relative install dir assumptions # https://github.com/ros/urdfdom/pull/142 (backported to 2.3) (self.fetchpatch { - url = "https://github.com/ros/urdfdom/commit/f44a382984269d4a4cc4006673e16dfd74e8b4f8.patch"; + url = "https://github.com/ros/urdfdom/commit/f6d9b2e248ab5c7d08b21a104a2d2d7fa3490790.patch"; hash = "sha256-ykBw9DEBraYHzgrCa1JkDhWTYXBQL1MmfelC5j5ibrs="; }) ]; diff --git a/distros/humble/overrides.nix b/distros/humble/overrides.nix index 643627f52e..4af5f4aa1c 100644 --- a/distros/humble/overrides.nix +++ b/distros/humble/overrides.nix @@ -86,8 +86,8 @@ rosSelf: rosSuper: with rosSelf.lib; { # Fix CMake relative install dir assumptions # https://github.com/ros/urdfdom/pull/142 (self.fetchpatch { - url = "https://github.com/ros/urdfdom/commit/a627bd366e5fcabd814fb5b88ac55986374e46c9.patch"; - hash = "sha256-pUpS9lBgwuFDejvRXrLPe+FRm0Gjh7H2URS/bic9ys0="; + url = "https://github.com/ros/urdfdom/commit/cbe6884d267779463bb444be851f6404e692cc0a.patch"; + hash = "sha256-1gTRKIGqiSRion76bGecSfFJSBskYUJguUIa6ePIiX4="; }) ]; }); diff --git a/flake.lock b/flake.lock index a2f7cff51f..17aa632705 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668190783, - "narHash": "sha256-9E0pMY8DpoPUxjrokfEgeP/vWD4ClofP7TNLedPY780=", + "lastModified": 1668192777, + "narHash": "sha256-C/koqhRmkV2hRCENfDUAK6HP7HTDwLAmhyP5QOy1jtI=", "owner": "lopsided98", "repo": "nixpkgs", - "rev": "019bc5dcee5ec137a6c418c2d606af59b1d6d458", + "rev": "cb892295b6674f6d942ce78df3a27f2f219972e0", "type": "github" }, "original": {