From 57123ce8c8f4a507fac865e3b9c30b23f09ea7c7 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Wed, 8 Oct 2025 20:08:17 +0100
Subject: [PATCH] buildstream: 2.5.0 -> 2.6.0

- Remove patches that are now in Buildstream 2.6.0.
- Re-enable hard links tested now we're on Buildstream 2.6.0.
---
 pkgs/by-name/bu/buildstream/package.nix | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix
index 47c84a04cdc3..5fe35925edde 100644
--- a/pkgs/by-name/bu/buildstream/package.nix
+++ b/pkgs/by-name/bu/buildstream/package.nix
@@ -21,28 +21,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "buildstream";
-  version = "2.5.0";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "buildstream";
     tag = version;
-    hash = "sha256-/kGmAHx10//iVeqLXwcIWNI9FGIi0LlNJW+s6v0yU3Q=";
+    hash = "sha256-2Z+s0dQB85MBO06llhIEO3jwWfL53n74S28ENHcbe/Q=";
   };
 
-  # FIXME: To be removed in v2.6.0 of Buildstream.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/apache/buildstream/commit/9c4378ab2ec71b6b79ef90ee4bd950dd709a0310.patch?full_index=1";
-      hash = "sha256-po3Dn7gCv7o7h3k8qhmoH/b6Vv6ikKO/pkA20RvdU1g=";
-    })
-    (fetchpatch {
-      url = "https://github.com/apache/buildstream/commit/456a464b2581c52cad2b0b48596f5c19ad1db23f.patch?full_index=1";
-      hash = "sha256-0oFENx4AUhd1uJxRzbKzO5acGDosCc4vFJaSJ6urvhk=";
-    })
-  ];
-
   build-system = with python3Packages; [
     cython
     pdm-pep517
@@ -115,10 +103,6 @@ python3Packages.buildPythonApplication rec {
 
     # Blob not found in the local CAS
     "test_source_pull_partial_fallback_fetch"
-
-    # FAILED tests/sources/tar.py::test_out_of_basedir_hardlinks - AssertionError
-    # FIXME: To be removed in v2.6.0 of Buildstream.
-    "test_out_of_basedir_hardlinks"
   ];
 
   disabledTestPaths = [