gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swiftPackages.{sourcekit-lsp,swift-format}: drop upstreamed patches

Browse Source 
I'm grouping this together because it's the same patch
This commit is contained in:
Sam
2025-09-18 11:40:55 -07:00
parent 6e1a464f82
commit d8754b1b0a
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/swift/sourcekit-lsp/default.nix
View File

@@ -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 # This toggles a section specific to Xcode XCTest, which doesn't work on
# Darwin, where we also use swift-corelibs-xctest. # Darwin, where we also use swift-corelibs-xctest.
substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \ substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \

11
pkgs/development/compilers/swift/swift-format/default.nix
View File

@@ -24,16 +24,7 @@ stdenv.mkDerivation {
]; ];
buildInputs = [ Foundation ]; buildInputs = [ Foundation ];
configurePhase = generated.configure + '' 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" ];
}
}
'';
# We only install the swift-format binary, so don't need the other products. # We only install the swift-format binary, so don't need the other products.
swiftpmFlags = [ "--product swift-format" ]; swiftpmFlags = [ "--product swift-format" ];