Unverified Commit d8754b1b authored by Sam's avatar Sam
Browse files

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

I'm grouping this together because it's the same patch
parent 6e1a464f

pkgs/development/compilers/swift/sourcekit-lsp/default.nix

+0 −9
Original line number Diff line number Diff line
@@ -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 \

pkgs/development/compilers/swift/swift-format/default.nix

+1 −10
Original line number Diff line number Diff line
@@ -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" ];