···

       
1
       
1
       
 
       
{ lib

     

       
2
       
2
       
 
       
, stdenv

     

       
3
       
3
       
 
       
, callPackage

     

       
4
       
4
       
+
       
, fetchpatch

     

       
4
       
5
       
 
       
, pkg-config

     

       
5
       
6
       
 
       
, swift

     

       
6
       
7
       
 
       
, swiftpm

     
···

       
41
       
42
       
 
       
    patch -p1 -d .build/checkouts/indexstore-db -i ${./patches/indexstore-db-macos-target.patch}

     

       
42
       
43
       
 
       


     

       
43
       
44
       
 
       
    swiftpmMakeMutable swift-tools-support-core

     

       
44
       
44
       
-
       
    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch}

     

       
45
       
45
       
+
       
    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${fetchpatch {

     

       
46
       
46
       
+
       
      url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";

     

       
47
       
47
       
+
       
      hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";

     

       
48
       
48
       
+
       
      includes = [ "Sources/TSCBasic/FileSystem.swift" ];

     

       
49
       
49
       
+
       
    }}

     

       
45
       
50
       
 
       


     

       
46
       
51
       
 
       
    # This toggles a section specific to Xcode XCTest, which doesn't work on

     

       
47
       
52
       
 
       
    # Darwin, where we also use swift-corelibs-xctest.

     

···

       
54
       
54
       
 
       


     

       
55
       
55
       
 
       
  configurePhase = generated.configure + ''

     

       
56
       
56
       
 
       
    swiftpmMakeMutable swift-tools-support-core

     

       
57
       
57
       
-
       
    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch}

     

       
57
       
57
       
+
       
    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${fetchpatch {

     

       
58
       
58
       
+
       
      url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";

     

       
59
       
59
       
+
       
      hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";

     

       
60
       
60
       
+
       
      includes = [ "Sources/TSCBasic/FileSystem.swift" ];

     

       
61
       
61
       
+
       
    }}

     

       
58
       
62
       
 
       
  '';

     

       
59
       
63
       
 
       


     

       
60
       
64
       
 
       
  # TODO: Tests depend on indexstore-db being provided by an existing Swift

     

···

       
1
       
1
       
-
       
From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: Pavel Sobolev <paveloom@riseup.net>

     

       
3
       
3
       
-
       
Date: Tue, 21 Nov 2023 20:53:33 +0300

     

       
4
       
4
       
-
       
Subject: [PATCH] Force-unwrap file handles.

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
---

     

       
7
       
7
       
-
       
 Sources/TSCBasic/FileSystem.swift | 4 ++--

     

       
8
       
8
       
-
       
 1 file changed, 2 insertions(+), 2 deletions(-)

     

       
9
       
9
       
-
       


     

       
10
       
10
       
-
       
diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift

     

       
11
       
11
       
-
       
index 3a63bdf..a1f3d9d 100644

     

       
12
       
12
       
-
       
--- a/Sources/TSCBasic/FileSystem.swift

     

       
13
       
13
       
-
       
+++ b/Sources/TSCBasic/FileSystem.swift

     

       
14
       
14
       
-
       
@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem {

     

       
15
       
15
       
-
       
         if fp == nil {

     

       
16
       
16
       
-
       
             throw FileSystemError(errno: errno, path)

     

       
17
       
17
       
-
       
         }

     

       
18
       
18
       
-
       
-        defer { fclose(fp) }

     

       
19
       
19
       
-
       
+        defer { fclose(fp!) }

     

       
20
       
20
       
-
       


     

       
21
       
21
       
-
       
         // Read the data one block at a time.

     

       
22
       
22
       
-
       
         let data = BufferedOutputByteStream()

     

       
23
       
23
       
-
       
@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem {

     

       
24
       
24
       
-
       
         if fp == nil {

     

       
25
       
25
       
-
       
             throw FileSystemError(errno: errno, path)

     

       
26
       
26
       
-
       
         }

     

       
27
       
27
       
-
       
-        defer { fclose(fp) }

     

       
28
       
28
       
-
       
+        defer { fclose(fp!) }

     

       
29
       
29
       
-
       


     

       
30
       
30
       
-
       
         // Write the data in one chunk.

     

       
31
       
31
       
-
       
         var contents = bytes.contents

     

       
32
       
32
       
-
       
--

     

       
33
       
33
       
-
       
2.42.0

     

···

       
1
       
1
       
 
       
{ lib

     

       
2
       
2
       
 
       
, stdenv

     

       
3
       
3
       
+
       
, fetchpatch

     

       
3
       
4
       
 
       
, callPackage

     

       
4
       
5
       
 
       
, swift

     

       
5
       
6
       
 
       
, swiftpm

     
···

       
21
       
22
       
 
       


     

       
22
       
23
       
 
       
  configurePhase = generated.configure + ''

     

       
23
       
24
       
 
       
    swiftpmMakeMutable swift-tools-support-core

     

       
24
       
24
       
-
       
    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch}

     

       
25
       
25
       
+
       
    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${fetchpatch {

     

       
26
       
26
       
+
       
      url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";

     

       
27
       
27
       
+
       
      hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";

     

       
28
       
28
       
+
       
      includes = [ "Sources/TSCBasic/FileSystem.swift" ];

     

       
29
       
29
       
+
       
    }}

     

       
25
       
30
       
 
       
  '';

     

       
26
       
31
       
 
       


     

       
27
       
32
       
 
       
  # We only install the swift-format binary, so don't need the other products.

     

···

       
1
       
1
       
-
       
From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: Pavel Sobolev <paveloom@riseup.net>

     

       
3
       
3
       
-
       
Date: Tue, 21 Nov 2023 20:53:33 +0300

     

       
4
       
4
       
-
       
Subject: [PATCH] Force-unwrap file handles.

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
---

     

       
7
       
7
       
-
       
 Sources/TSCBasic/FileSystem.swift | 4 ++--

     

       
8
       
8
       
-
       
 1 file changed, 2 insertions(+), 2 deletions(-)

     

       
9
       
9
       
-
       


     

       
10
       
10
       
-
       
diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift

     

       
11
       
11
       
-
       
index 3a63bdf..a1f3d9d 100644

     

       
12
       
12
       
-
       
--- a/Sources/TSCBasic/FileSystem.swift

     

       
13
       
13
       
-
       
+++ b/Sources/TSCBasic/FileSystem.swift

     

       
14
       
14
       
-
       
@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem {

     

       
15
       
15
       
-
       
         if fp == nil {

     

       
16
       
16
       
-
       
             throw FileSystemError(errno: errno, path)

     

       
17
       
17
       
-
       
         }

     

       
18
       
18
       
-
       
-        defer { fclose(fp) }

     

       
19
       
19
       
-
       
+        defer { fclose(fp!) }

     

       
20
       
20
       
-
       


     

       
21
       
21
       
-
       
         // Read the data one block at a time.

     

       
22
       
22
       
-
       
         let data = BufferedOutputByteStream()

     

       
23
       
23
       
-
       
@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem {

     

       
24
       
24
       
-
       
         if fp == nil {

     

       
25
       
25
       
-
       
             throw FileSystemError(errno: errno, path)

     

       
26
       
26
       
-
       
         }

     

       
27
       
27
       
-
       
-        defer { fclose(fp) }

     

       
28
       
28
       
-
       
+        defer { fclose(fp!) }

     

       
29
       
29
       
-
       


     

       
30
       
30
       
-
       
         // Write the data in one chunk.

     

       
31
       
31
       
-
       
         var contents = bytes.contents

     

       
32
       
32
       
-
       
--

     

       
33
       
33
       
-
       
2.42.0

     

···

       
1
       
1
       
 
       
{ lib

     

       
2
       
2
       
 
       
, stdenv

     

       
3
       
3
       
 
       
, callPackage

     

       
4
       
4
       
+
       
, fetchpatch

     

       
4
       
5
       
 
       
, cmake

     

       
5
       
6
       
 
       
, ninja

     

       
6
       
7
       
 
       
, git

     
···

       
195
       
196
       
 
       
      '';

     

       
196
       
197
       
 
       
  };

     

       
197
       
198
       
 
       


     

       
199
       
199
       
+
       
  # Part of this patch fixes for glibc 2.39: glibc patch 64b1a44183a3094672ed304532bedb9acc707554

     

       
200
       
200
       
+
       
  # marks the `FILE*` argument to a few functions including `ferror` & `fread` as non-null. However

     

       
201
       
201
       
+
       
  # the code passes an `Optional<T>` to these functions.

     

       
202
       
202
       
+
       
  # This patch uses a `guard` which effectively unwraps the type (or throws an exception).

     

       
203
       
203
       
+
       
  swift-tools-support-core-glibc-fix = fetchpatch {

     

       
204
       
204
       
+
       
    url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch";

     

       
205
       
205
       
+
       
    hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE=";

     

       
206
       
206
       
+
       
    includes = [ "Sources/TSCBasic/FileSystem.swift" ];

     

       
207
       
207
       
+
       
  };

     

       
208
       
208
       
+
       


     

       
198
       
209
       
 
       
  swift-tools-support-core = mkBootstrapDerivation {

     

       
199
       
210
       
 
       
    name = "swift-tools-support-core";

     

       
200
       
211
       
 
       
    src = generated.sources.swift-tools-support-core;

     

       
201
       
212
       
 
       


     

       
202
       
213
       
 
       
    patches = [

     

       
203
       
203
       
-
       
      ./patches/force-unwrap-file-handles.patch

     

       
214
       
214
       
+
       
      swift-tools-support-core-glibc-fix

     

       
204
       
215
       
 
       
    ];

     

       
205
       
216
       
 
       


     

       
206
       
217
       
 
       
    buildInputs = [

     
···

       
389
       
400
       
 
       
    swiftpmMakeMutable swift-tools-support-core

     

       
390
       
401
       
 
       
    substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \

     

       
391
       
402
       
 
       
      --replace 'canImport(Darwin)' 'false'

     

       
392
       
392
       
-
       
    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch}

     

       
403
       
403
       
+
       
    patch -p1 -d .build/checkouts/swift-tools-support-core -i ${swift-tools-support-core-glibc-fix}

     

       
393
       
404
       
 
       


     

       
394
       
405
       
 
       
    # Prevent a warning about SDK directories we don't have.

     

       
395
       
406
       
 
       
    swiftpmMakeMutable swift-driver

     

···

       
1
       
1
       
-
       
From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: Pavel Sobolev <paveloom@riseup.net>

     

       
3
       
3
       
-
       
Date: Tue, 21 Nov 2023 20:53:33 +0300

     

       
4
       
4
       
-
       
Subject: [PATCH] Force-unwrap file handles.

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
---

     

       
7
       
7
       
-
       
 Sources/TSCBasic/FileSystem.swift | 4 ++--

     

       
8
       
8
       
-
       
 1 file changed, 2 insertions(+), 2 deletions(-)

     

       
9
       
9
       
-
       


     

       
10
       
10
       
-
       
diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift

     

       
11
       
11
       
-
       
index 3a63bdf..a1f3d9d 100644

     

       
12
       
12
       
-
       
--- a/Sources/TSCBasic/FileSystem.swift

     

       
13
       
13
       
-
       
+++ b/Sources/TSCBasic/FileSystem.swift

     

       
14
       
14
       
-
       
@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem {

     

       
15
       
15
       
-
       
         if fp == nil {

     

       
16
       
16
       
-
       
             throw FileSystemError(errno: errno, path)

     

       
17
       
17
       
-
       
         }

     

       
18
       
18
       
-
       
-        defer { fclose(fp) }

     

       
19
       
19
       
-
       
+        defer { fclose(fp!) }

     

       
20
       
20
       
-
       


     

       
21
       
21
       
-
       
         // Read the data one block at a time.

     

       
22
       
22
       
-
       
         let data = BufferedOutputByteStream()

     

       
23
       
23
       
-
       
@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem {

     

       
24
       
24
       
-
       
         if fp == nil {

     

       
25
       
25
       
-
       
             throw FileSystemError(errno: errno, path)

     

       
26
       
26
       
-
       
         }

     

       
27
       
27
       
-
       
-        defer { fclose(fp) }

     

       
28
       
28
       
-
       
+        defer { fclose(fp!) }

     

       
29
       
29
       
-
       


     

       
30
       
30
       
-
       
         // Write the data in one chunk.

     

       
31
       
31
       
-
       
         var contents = bytes.contents

     

       
32
       
32
       
-
       
--

     

       
33
       
33
       
-
       
2.42.0