From 693deec8307b9a14b2972431f82f8f9fa2f59018 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Fri, 11 Apr 2025 19:48:13 +0200
Subject: [PATCH] noetic: Remove patches applied upstream

Now, they no longer apply.
---
 distros/noetic/overrides.nix | 43 ------------------------------------
 distros/ros1-overlay.nix     | 13 -----------
 2 files changed, 56 deletions(-)

diff --git a/distros/noetic/overrides.nix b/distros/noetic/overrides.nix
index 41ae23811f..d89b3d643d 100644
--- a/distros/noetic/overrides.nix
+++ b/distros/noetic/overrides.nix
@@ -5,17 +5,6 @@ self.lib.composeManyExtensions [
 (rosSelf: rosSuper: let
   lib = rosSelf.lib;
 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 ({
     patches ? [], ...
   }: {
@@ -66,16 +55,6 @@ in {
     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 ({
     cmakeFlags ? [], ...
   }: {
@@ -218,17 +197,6 @@ in {
     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 ({
     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 ({
     propagatedBuildInputs ? [], ...
   } : {
diff --git a/distros/ros1-overlay.nix b/distros/ros1-overlay.nix
index f6f11a1155..d4e3189bd3 100644
--- a/distros/ros1-overlay.nix
+++ b/distros/ros1-overlay.nix
@@ -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 ({
     patches ? [], ...
   }: {