nav2-costmap-2d: remove upstreamed patch

lopsided98 · Aug 8, 2023 · bf6c9ec · bf6c9ec
1 parent 5384a9b
commit bf6c9ec
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 26 deletions.
diff --git a/distros/humble/overrides.nix b/distros/humble/overrides.nix
@@ -72,19 +72,6 @@ rosSelf: rosSuper: with rosSelf.lib; {
     };
   };
 
-  nav2-costmap-2d = rosSuper.nav2-costmap-2d.overrideAttrs ({
-    patches ? [], ...
-  }: {
-    patches = patches ++ [
-      # Fix uninitialized variable warning
-      (self.fetchpatch {
-        url = "https://github.com/ros-planning/navigation2/commit/4d060c3dbeb63f63c93d41260608b78b9a151bae.patch";
-        hash = "sha256-cFoiiyINc6Q0ecT5ioShdFIfcs/XjPlmgzdVRO5GOHM=";
-        stripLen = 1;
-      })
-    ];
-  });
-
   rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
     url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
     sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";

diff --git a/distros/iron/overrides.nix b/distros/iron/overrides.nix
@@ -72,19 +72,6 @@ rosSelf: rosSuper: with rosSelf.lib; {
     };
   };
 
-  nav2-costmap-2d = rosSuper.nav2-costmap-2d.overrideAttrs ({
-    patches ? [], ...
-  }: {
-    patches = patches ++ [
-      # Fix uninitialized variable warning
-      (self.fetchpatch {
-        url = "https://github.com/ros-planning/navigation2/commit/4d060c3dbeb63f63c93d41260608b78b9a151bae.patch";
-        hash = "sha256-cFoiiyINc6Q0ecT5ioShdFIfcs/XjPlmgzdVRO5GOHM=";
-        stripLen = 1;
-      })
-    ];
-  });
-
   rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
     url = "https://github.com/OGRECave/ogre/archive/v1.12.10.zip";
     sha256 = "sha256-lZDLywgShlWeWah7oTnyKBTqzN505LJKbQbgXRfJXlk=";