commit bfa10832140d291585d99efdbf415abae65b0773 · pyrox.dev/nixpkgs

-25

pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch

···

       1
       1
       -
       From 77ca537cfc61765f2109c626757f2da8de602ce0 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Randy Eckenrode <randy@largeandhighquality.com>

     

       3
       3
       -
       Date: Fri, 5 Apr 2024 23:20:32 -0400

     

       4
       4
       -
       Subject: [PATCH 2/3] Pass fileType to writeToStream

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        lib/Core/JSONReaderWriter.cpp | 2 +-

     

       8
       8
       -
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/tapi/lib/Core/JSONReaderWriter.cpp b/tapi/lib/Core/JSONReaderWriter.cpp

     

       11
       11
       -
       index c040670..c1be85f 100644

     

       12
       12
       -
       --- a/tapi/lib/Core/JSONReaderWriter.cpp

     

       13
       13
       -
       +++ b/tapi/lib/Core/JSONReaderWriter.cpp

     

       14
       14
       -
       @@ -57,7 +57,7 @@ Error JSONWriter::writeFile(raw_ostream &os, const InterfaceFile *file,

     

       15
       15
       -
          if (file == nullptr)

     

       16
       16
       -
            return errorCodeToError(std::make_error_code(std::errc::invalid_argument));

     

       17
       17
       -
        

     

       18
       18
       -
       -  return TextAPIWriter::writeToStream(os, *file, /*Compact=*/false);

     

       19
       19
       -
       +  return TextAPIWriter::writeToStream(os, *file, fileType, /*Compact=*/false);

     

       20
       20
       -
        }

     

       21
       21
       -
        

     

       22
       22
       -
        TAPI_NAMESPACE_INTERNAL_END

     

       23
       23
       -
       -- 

     

       24
       24
       -
       2.42.0

     

       25
       25
       -

+6 -17

pkgs/by-name/li/libtapi/package.nix

···

       18
       18
        
         # See: https://en.wikipedia.org/wiki/Xcode#Toolchain_versions

     

       19
       19
        
         # Note: Can’t use a sparse checkout because the Darwin stdenv bootstrap can’t depend on fetchgit.

     

       20
       20
        
         appleLlvm = {

     

       21
       21
       -
           version = "15.0.0"; # As reported by upstream’s `tapi --version`.

     

       22
       22
       -
           rev = "2b5ff47e44b059c03de5779479d01a133ab4d581"; # Per the TAPI repo.

     

       23
       23
       -
           hash = "sha256-X37zBbpSEWmqtdTXsd1t++gp+0ggA8YtB73fGKNaiR0=";

     

       21
       21
       +
           version = "16.0.0"; # As reported by upstream’s `tapi --version`.

     

       22
       22
       +
           rev = "3602748d4ec9947f0d1493511a8c34410909506e"; # Per the TAPI repo.

     

       23
       23
       +
           hash = "sha256-7o/JY/tcu4AeXCa7xhfjbuuV3/Cbf89AdoZOKrciJk0=";

     

       24
       24
        
         };

     

       25
       25
        
       in

     

       26
       26
        
       stdenv.mkDerivation (finalAttrs: {

     

       27
       27
        
         pname = "libtapi";

     

       28
       28
       -
         version = "1500.0.12.3";

     

       28
       28
       +
         version = "1600.0.11.8";

     

       29
       29
        
       

     

       30
       30
        
         outputs = [

     

       31
       31
        
           "out"

     
···

       38
       38
        
             name = "tapi-src";

     

       39
       39
        
             owner = "apple-oss-distributions";

     

       40
       40
        
             repo = "tapi";

     

       41
       41
       -
             rev = "tapi-${finalAttrs.version}";

     

       42
       42
       -
             hash = "sha256-YeaA2OeSY1fXYJHPJJ0TrVC1brspSvutBtPMPGX6Y1o=";

     

       41
       41
       +
             tag = "tapi-${finalAttrs.version}";

     

       42
       42
       +
             hash = "sha256-87AQZrCmZHv3lbfUnw0j17H4cP+GN5g0D6zhdT4P56Y=";

     

       43
       43
        
           })

     

       44
       44
        
           # libtapi can’t avoid pulling the whole repo even though it needs only a couple of folders because

     

       45
       45
        
           # `fetchgit` can’t be used in the Darwin bootstrap.

     
···

       56
       56
        
           # when the linker supports it.

     

       57
       57
        
           # Note: This can be dropped once the bootstrap tools are updated after the ld64 update.

     

       58
       58
        
           ./0001-Check-for-no_exported_symbols-linker-support.patch

     

       59
       59
       -
           # The recommended upstream revision of Apple’s LLVM fork needs this patch, or

     

       60
       60
       -
           # `tapi stubify` will crash when generating stubs.

     

       61
       61
       -
           (fetchpatch {

     

       62
       62
       -
             url = "https://github.com/apple/llvm-project/commit/455bf3d1ccd6a52df5e38103532c1b8f49924edc.patch";

     

       63
       63
       -
             hash = "sha256-ujZcfdAls20JPIvjvO2Xv8st8cNTY/XTEQusICKBKSA";

     

       64
       64
       -
           })

     

       65
       65
       -
           # Updates `JSONReaderWriter` to work with the API change in the above patch.

     

       66
       66
       -
           ./0002-Pass-fileType-to-writeToStream.patch

     

       67
       59
        
           # Fix build on Linux. GCC is more picky than clang about the field order.

     

       68
       60
        
           ./0003-Match-designator-order-with-declaration-order.patch

     

       69
       61
        
         ];

     
···

       93
       85
        
                   --replace-fail "DESTINATION $dir" "DESTINATION \''${$cmakevar}"

     

       94
       86
        
               done

     

       95
       87
        
             done

     

       96
       96
       -
             # Doesn’t seem to exist publically.

     

       97
       97
       -
             substituteInPlace tapi/test/CMakeLists.txt \

     

       98
       98
       -
               --replace-fail tapi-configs ""

     

       99
       88
        
           ''

     

       100
       89
        
           + lib.optionalString stdenv.hostPlatform.isLinux ''

     

       101
       90
        
             # Remove Darwin-specific versioning flags.