commit a291d04a1578b7dcd020ba475f0fa3552914dc46 · pyrox.dev/nixpkgs

+3

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

···

       40
       40
        
           swiftpmMakeMutable indexstore-db

     

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

     

       42
       42
        
       

     

       43
       43
       +
           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
       +
       

     

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

     

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

     

       45
       48
        
           substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \

+33

pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch

···

       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

+4 -1

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

···

       52
       52
        
           })

     

       53
       53
        
         ];

     

       54
       54
        
       

     

       55
       55
       -
         configurePhase = generated.configure;

     

       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}

     

       58
       58
       +
         '';

     

       56
       59
        
       

     

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

     

       58
       61
        
         # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc.

+33

pkgs/development/compilers/swift/swift-driver/patches/force-unwrap-file-handles.patch

···

       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

+4 -1

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

···

       19
       19
        
         nativeBuildInputs = [ swift swiftpm ];

     

       20
       20
        
         buildInputs = [ Foundation ];

     

       21
       21
        
       

     

       22
       22
       -
         configurePhase = generated.configure;

     

       22
       22
       +
         configurePhase = generated.configure + ''

     

       23
       23
       +
           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
       +
         '';

     

       23
       26
        
       

     

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

     

       25
       28
        
         swiftpmFlags = [ "--product swift-format" ];

+33

pkgs/development/compilers/swift/swift-format/patches/force-unwrap-file-handles.patch

···

       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

+5

pkgs/development/compilers/swift/swiftpm/default.nix

···

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

     

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

     

       201
       201
        
       

     

       202
       202
       +
           patches = [

     

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

     

       204
       204
       +
           ];

     

       205
       205
       +
       

     

       202
       206
        
           buildInputs = [

     

       203
       207
        
             swift-system

     

       204
       208
        
             sqlite

     
···

       385
       389
        
           swiftpmMakeMutable swift-tools-support-core

     

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

     

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

     

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

     

       388
       393
        
       

     

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

     

       390
       395
        
           swiftpmMakeMutable swift-driver

+33

pkgs/development/compilers/swift/swiftpm/patches/force-unwrap-file-handles.patch

···

       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