From d8754b1b0a03be42a5e7936e19c08a1a73acab7c Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Thu, 18 Sep 2025 11:40:55 -0700
Subject: [PATCH] swiftPackages.{sourcekit-lsp,swift-format}: drop upstreamed
 patches

I'm grouping this together because it's the same patch
---
 .../compilers/swift/sourcekit-lsp/default.nix         |  9 ---------
 .../compilers/swift/swift-format/default.nix          | 11 +----------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix
index 1af79dfef9c9..5e4a3b664c85 100644
--- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix
+++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix
@@ -51,15 +51,6 @@ stdenv.mkDerivation {
       }
     }
 
-    swiftpmMakeMutable swift-tools-support-core
-    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${
-      fetchpatch {
-        url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";
-        hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";
-        includes = [ "Sources/TSCBasic/FileSystem.swift" ];
-      }
-    }
-
     # This toggles a section specific to Xcode XCTest, which doesn't work on
     # Darwin, where we also use swift-corelibs-xctest.
     substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \
diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix
index a4b060f7829d..fbdd4efa08e3 100644
--- a/pkgs/development/compilers/swift/swift-format/default.nix
+++ b/pkgs/development/compilers/swift/swift-format/default.nix
@@ -24,16 +24,7 @@ stdenv.mkDerivation {
   ];
   buildInputs = [ Foundation ];
 
-  configurePhase = generated.configure + ''
-    swiftpmMakeMutable swift-tools-support-core
-    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${
-      fetchpatch {
-        url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";
-        hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";
-        includes = [ "Sources/TSCBasic/FileSystem.swift" ];
-      }
-    }
-  '';
+  configurePhase = generated.configure;
 
   # We only install the swift-format binary, so don't need the other products.
   swiftpmFlags = [ "--product swift-format" ];