mirror of
https://github.com/lopsided98/nix-ros-overlay.git
synced 2025-06-10 01:42:24 +03:00
noetic: Remove patches applied upstream
Some checks failed
Build / build (humble, aarch64-linux) (push) Has been cancelled
Build / build (humble, x86_64-linux) (push) Has been cancelled
Build / build (jazzy, aarch64-linux) (push) Has been cancelled
Build / build (jazzy, x86_64-linux) (push) Has been cancelled
Build / build (noetic, aarch64-linux) (push) Has been cancelled
Build / build (noetic, x86_64-linux) (push) Has been cancelled
Build / build (rolling, aarch64-linux) (push) Has been cancelled
Build / build (rolling, x86_64-linux) (push) Has been cancelled
Some checks failed
Build / build (humble, aarch64-linux) (push) Has been cancelled
Build / build (humble, x86_64-linux) (push) Has been cancelled
Build / build (jazzy, aarch64-linux) (push) Has been cancelled
Build / build (jazzy, x86_64-linux) (push) Has been cancelled
Build / build (noetic, aarch64-linux) (push) Has been cancelled
Build / build (noetic, x86_64-linux) (push) Has been cancelled
Build / build (rolling, aarch64-linux) (push) Has been cancelled
Build / build (rolling, x86_64-linux) (push) Has been cancelled
Now, they no longer apply.
This commit is contained in:
parent
95300d766a
commit
693deec830
2 changed files with 0 additions and 56 deletions
|
@ -5,17 +5,6 @@ self.lib.composeManyExtensions [
|
||||||
(rosSelf: rosSuper: let
|
(rosSelf: rosSuper: let
|
||||||
lib = rosSelf.lib;
|
lib = rosSelf.lib;
|
||||||
in {
|
in {
|
||||||
angles = rosSuper.angles.overrideAttrs ({
|
|
||||||
patches ? [], ...
|
|
||||||
}: {
|
|
||||||
# Remove distutils dependency
|
|
||||||
patches = patches ++ [ (self.fetchpatch {
|
|
||||||
url = "https://github.com/ros/angles/commit/fe974f2d84b719d3aa0593a4bf633183d75ba213.patch";
|
|
||||||
hash = "sha256-96i+ZmISZzjYedoqIYt/2eMoDUK/RcKhj2BZrUkAgW8=";
|
|
||||||
stripLen = 1;
|
|
||||||
}) ];
|
|
||||||
});
|
|
||||||
|
|
||||||
base-local-planner = rosSuper.base-local-planner.overrideAttrs ({
|
base-local-planner = rosSuper.base-local-planner.overrideAttrs ({
|
||||||
patches ? [], ...
|
patches ? [], ...
|
||||||
}: {
|
}: {
|
||||||
|
@ -66,16 +55,6 @@ in {
|
||||||
NIX_CFLAGS_COMPILE = ["-std=c++14"];
|
NIX_CFLAGS_COMPILE = ["-std=c++14"];
|
||||||
});
|
});
|
||||||
|
|
||||||
laser-geometry = rosSuper.laser-geometry.overrideAttrs ({
|
|
||||||
postPatch ? "", ...
|
|
||||||
}: {
|
|
||||||
# Boost.Math 1.87 requires C++14
|
|
||||||
postPatch = postPatch + ''
|
|
||||||
substituteInPlace CMakeLists.txt \
|
|
||||||
--replace-fail 'set(CMAKE_CXX_STANDARD 11)' 'set(CMAKE_CXX_STANDARD 14)'
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
|
|
||||||
libfranka = rosSuper.libfranka.overrideAttrs ({
|
libfranka = rosSuper.libfranka.overrideAttrs ({
|
||||||
cmakeFlags ? [], ...
|
cmakeFlags ? [], ...
|
||||||
}: {
|
}: {
|
||||||
|
@ -218,17 +197,6 @@ in {
|
||||||
sha256 = "sha256-IBlmph3IJvGxh5okozF6HskhSpGMjrA1vi8ww+nPvcs=";
|
sha256 = "sha256-IBlmph3IJvGxh5okozF6HskhSpGMjrA1vi8ww+nPvcs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
robot-state-publisher = rosSuper.robot-state-publisher.overrideAttrs ({
|
|
||||||
patches ? [], ...
|
|
||||||
}: {
|
|
||||||
# Use C++14 for Boost.Math compatibility
|
|
||||||
# https://github.com/ros/robot_state_publisher/pull/190
|
|
||||||
patches = patches ++ [ (self.fetchpatch {
|
|
||||||
url = "https://github.com/ros/robot_state_publisher/commit/8478b2aface9e4349f8a0bce61eb74dbfd9bfb63.patch";
|
|
||||||
hash = "sha256-BQt6HoOBMM5bJCADve19uH1RSLLNQlG9aR6g1p58WPw=";
|
|
||||||
}) ];
|
|
||||||
});
|
|
||||||
|
|
||||||
rosconsole = rosSuper.rosconsole.overrideAttrs ({
|
rosconsole = rosSuper.rosconsole.overrideAttrs ({
|
||||||
patches ? [], ...
|
patches ? [], ...
|
||||||
}: {
|
}: {
|
||||||
|
@ -299,17 +267,6 @@ in {
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
tf2 = rosSuper.tf2.overrideAttrs ({
|
|
||||||
patches ? [], ...
|
|
||||||
}: {
|
|
||||||
patches = patches ++ [ (self.fetchpatch {
|
|
||||||
# Add missing #include for boost::tuple
|
|
||||||
url = "https://github.com/ros/geometry2/commit/08b4cc720bf95428a30a54d9e9a8257849a93c61.patch";
|
|
||||||
hash = "sha256-pxeJ1gE3kMaN3I4DH9E65dBrhQonuw7WKStEBfLWzY4=";
|
|
||||||
stripLen = 1;
|
|
||||||
}) ];
|
|
||||||
});
|
|
||||||
|
|
||||||
xacro = rosSuper.xacro.overrideAttrs ({
|
xacro = rosSuper.xacro.overrideAttrs ({
|
||||||
propagatedBuildInputs ? [], ...
|
propagatedBuildInputs ? [], ...
|
||||||
} : {
|
} : {
|
||||||
|
|
|
@ -15,19 +15,6 @@ rosSelf: rosSuper: with rosSelf.lib; {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
# Fix usages of global Boost placeholders
|
|
||||||
# https://github.com/ros/actionlib/pull/197
|
|
||||||
actionlib = rosSuper.actionlib.overrideAttrs ({
|
|
||||||
patches ? [], ...
|
|
||||||
}: {
|
|
||||||
patches = patches ++ [ (self.fetchpatch {
|
|
||||||
url = "https://github.com/ros/actionlib/commit/d675dd75d9080d2832591e0220d19e0f0d981446.patch";
|
|
||||||
stripLen = 1;
|
|
||||||
includes = [ "include/*" ];
|
|
||||||
hash = "sha256-bB8PkiDisgBgZoDyieiT1dSQK/xSfG8ZZOJyigX0SYY=";
|
|
||||||
}) ];
|
|
||||||
});
|
|
||||||
|
|
||||||
canopen-master = rosSuper.canopen-master.overrideAttrs ({
|
canopen-master = rosSuper.canopen-master.overrideAttrs ({
|
||||||
patches ? [], ...
|
patches ? [], ...
|
||||||
}: {
|
}: {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue