From 033d41e2e542a1449f933113a601e77220755897 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 01/23] darwin.sourceRelease: 26.3 -> 26.4 IOAudioFamily: 700.2 -> 740.1 IOHIDFamily: 2222.80.22 -> 2238.100.59 IOKitUser: 100222.80.4 -> 100231.100.18.0.1 IONetworkingFamily: 186 -> 188 IOStorageFamily: 333.40.1 -> 337.100.1 Libc: 1725.40.4 -> 1752.100.10 Libnotify: 344.0.1 -> 48.100.7 Security: 61901.80.25 -> 61901.101.4 configd: 1385.80.4 -> 1405.100.8 eap8021x: 368.60.2 -> 368.101.1 hfs: 704.60.4 -> 715.100.10 libdispatch: 1542.0.4 -> 1542.100.32 libmalloc: 792.80.2 -> 812.100.31 libplatform: 359.80.2 -> 375.100.10 libpthread: 539.80.3 -> 539.100.4 mDNSResponder: 2881.80.4.0.1 -> 2881.100.56.0.1 objc4: 951.1 -> 951.7 ppp: 1023 -> 1025 xnu: 12377.81.4 -> 12377.101.15 --- .../darwin/sourceRelease/versions.json | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 352df185452c..d51fffa33a75 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -21,7 +21,7 @@ }, "IOAudioFamily": { "hash": "sha256-A3iiAjjP29VdjMj40tLS5Q/ni4qeh9bBpnmNzeG2pIY=", - "version": "700.2" + "version": "740.1" }, "IOBDStorageFamily": { "hash": "sha256-OcQUJ3nEfrpvWX/npnedJ4PECIGWFSLiM0PKoiH911w=", @@ -56,40 +56,40 @@ "version": "262" }, "IOGraphics": { - "hash": "sha256-iysZE42mOKZbFxSZBNspaBTCRKEKK38DFGBxZWQxZxI=", - "version": "599" + "hash": "sha256-+9DtN1aRQQXLl+OaMZNXdD7ae+NZw3eSWpVhRY5qvhw=", + "version": "600" }, "IOHIDFamily": { - "hash": "sha256-EJg5lL5uuFCzeOjKDeNZCRYlinwt4WDci0Lr8rJ4Q9k=", - "version": "2222.80.22" + "hash": "sha256-BORZA8jiVFq/HHY6AnSotKyERkWAN1jK555ZNPW4G1M=", + "version": "2238.100.59" }, "IOKitTools": { "hash": "sha256-Oknsvzn4nv77WU7f0WPS446iwR2BM2q4iw46r/qctAE=", "version": "125" }, "IOKitUser": { - "hash": "sha256-bT6CIKd4/Ea17jWd74FWvz5dsmdyDRGU+D5/VydAjrA=", - "version": "100222.80.4" + "hash": "sha256-PPsD3JGEJlwe9qJdlduQP4q13DtUT3Eak7W1WhlUdn4=", + "version": "100231.100.18.0.1" }, "IONetworkingFamily": { - "hash": "sha256-ZF5ML41Y1l1liQn32qTkcl4mMvx9Xdizb9VgvTzVTL4=", - "version": "186" + "hash": "sha256-zSmOsiCh+W1k9d6G2+/FD0KPrrtjQTkZscyKgKIa3UU=", + "version": "188" }, "IOSerialFamily": { "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", "version": "93" }, "IOStorageFamily": { - "hash": "sha256-5oUSyzMxniNHG7rPkuxb31v4QcOmXNCriI3Jku2VOTY=", - "version": "333.40.1" + "hash": "sha256-whybjI8XIaihvo16oLq6xP5pNRPZeG7Jdy5jbyWqG1k=", + "version": "337.100.1" }, "IOUSBFamily": { "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", "version": "630.4.5" }, "Libc": { - "hash": "sha256-3r3IFwONIg+4Oe99IRJ4jvyevZRmIuFmjVL+JMrfw/M=", - "version": "1725.40.4" + "hash": "sha256-+40LeOU1ViMKBXCSvJXQi1N8NSAhL/rlucR32KZ+Chw=", + "version": "1752.100.10" }, "Libinfo": { "hash": "sha256-4InBEPi0n2EMo/8mIBib1Im4iTKRcRJ4IlAcLCigVGk=", @@ -100,8 +100,8 @@ "version": "2026" }, "Libnotify": { - "hash": "sha256-p8cJZlBYOFmI1NDHXGYjgcv8z9Ldc1amZuYlxxJfeVY=", - "version": "344.0.1" + "hash": "sha256-5ZpFParMjqf3nwsjx3Y1SCTXmTUtHX9eDkVJTW59Ppg=", + "version": "348.100.7" }, "Librpcsvc": { "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", @@ -120,8 +120,8 @@ "version": "1846.81.1" }, "Security": { - "hash": "sha256-+Rt3+bwj7++u8Pm5V6QgIQUpugwcY2gjqkCWZ2xqGqw=", - "version": "61901.80.25" + "hash": "sha256-1ka7ws6POwm+WKwB/VYZX/uQTQccJe5r9tYDHgoqHp0=", + "version": "61901.101.4" }, "adv_cmds": { "hash": "sha256-QSqEchXCBSUo6kpGb1FyCcrZx1RFfUP/9hoNbQK2lF8=", @@ -140,8 +140,8 @@ "version": "138" }, "configd": { - "hash": "sha256-OJhJocVQvIaulSK65z2URATB+NTnFdOXyunjcBGr08k=", - "version": "1385.80.4" + "hash": "sha256-3GiQlhfYhemK37ue0KY8Q3CDQK2TMFRDFnoxFeJzO+k=", + "version": "1405.100.8" }, "copyfile": { "hash": "sha256-I9uDi5BDQKa7mO3XpHxv0d6PiROW2ueZ3vGfrsG0OJo=", @@ -168,16 +168,16 @@ "version": "1340" }, "eap8021x": { - "hash": "sha256-To9CIsN0oXRmtUjPojXYfUmaoOOdrNbq3AYwghxzoQs=", - "version": "368.60.2" + "hash": "sha256-nwCp5QgtXC2X3y5eR3DnXkdpECNkLmejM2iGQ6nuPaQ=", + "version": "368.101.1" }, "file_cmds": { "hash": "sha256-1hdTjg1Nf31gAhwjQEhRZQhaqayC8x7PGHAwZ1aEIm8=", "version": "475" }, "hfs": { - "hash": "sha256-WqXzEVvveaOvTbVN/HzKdDxeHYmxEfLhV3WjO/S+u1E=", - "version": "704.60.4" + "hash": "sha256-GOI7U2J4vy5GQRubSWqx0xZFtE4e/hq7SsUuqptrYR0=", + "version": "715.100.10" }, "launchd": { "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", @@ -188,8 +188,8 @@ "version": "96" }, "libdispatch": { - "hash": "sha256-L0+Ho9dAlMXVpqFEGIcIMsJc0gULckRulUImNEZe5MU=", - "version": "1542.0.4" + "hash": "sha256-1PHHUzPipwUdzk9uMHweG64J4EU4lixPApV7qwPBpWY=", + "version": "1542.100.32" }, "libffi": { "hash": "sha256-xHefZVsZg9kUXV0t/HLdjPkkD/hn/4bvdRVJ4PsQLeM=", @@ -200,20 +200,20 @@ "version": "113" }, "libmalloc": { - "hash": "sha256-FYWPf6UwDfmWtde2xW1EuBfygv43bvzGncKEMUHY3Qc=", - "version": "792.80.2" + "hash": "sha256-kwJ6vfk1PzDdE0n3Ba+3hXLSf63YmMgPluxrEuvOpF0=", + "version": "812.100.31" }, "libpcap": { "hash": "sha256-G7CL3pCCmxOoZ+ouA+xfOeDgvLcT9AN9zyrx+cL2Ge4=", "version": "144" }, "libplatform": { - "hash": "sha256-m1g1suIbEA4g7vWEKYR9x+g0aaXSjvR0IRy4jCU+y0w=", - "version": "359.80.2" + "hash": "sha256-bghS+sClE2nygZMahh1udoMZmGvRSCKn+W4ywTi51Zw=", + "version": "375.100.10" }, "libpthread": { "hash": "sha256-3Xoe0gYZ6RbMZqzsAG8ynnFb3cqypFYImPNYA5H6P9s=", - "version": "539.80.3" + "version": "539.100.4" }, "libresolv": { "hash": "sha256-SDdF7foz8DFUXmXEznwusNMkXFHrPkdLWQM8xfxb0gc=", @@ -224,8 +224,8 @@ "version": "73" }, "mDNSResponder": { - "hash": "sha256-Wa6IM6qz/gjO1GwER7KkPEiknEJbkntA2Q92Bc/YMoY=", - "version": "2881.80.4.0.1" + "hash": "sha256-0u2c3b0rmOFock4wIWg6n16XZWEr+bsj2r5JwgUOr7o=", + "version": "2881.100.56.0.1" }, "mail_cmds": { "hash": "sha256-peoaHopJaYDqyE4TGfLx7W1K2KsFZmHLWr8Er/HpA90=", @@ -240,16 +240,16 @@ "version": "730.80.3" }, "objc4": { - "hash": "sha256-imgOe9mr5HnvTAupIEj1UwS7tbmk3coqNf5BQgI32lE=", - "version": "951.1" + "hash": "sha256-vonl+pqJurD7ozdZ8AQokvtlgKXCk+BP/vFfoyGJiUQ=", + "version": "951.7" }, "patch_cmds": { "hash": "sha256-fDY2NOT3DnU5pm06cHSs+JJcA/EFP8Lxjg7sErUerJ0=", "version": "72" }, "ppp": { - "hash": "sha256-N8e3BvyxTvb+mAhNHuCWVGqEyEE89G2zNQDL/mro+X0=", - "version": "1023" + "hash": "sha256-syc0tbDPACswBNNrTaOsC6Lyix6d7O9634PBCjnuqOs=", + "version": "1025" }, "remote_cmds": { "hash": "sha256-8c/NgQZ+K6jJ3aoYK78/BsEkM1gmRS+9z0437+SvcCw=", @@ -276,7 +276,7 @@ "version": "144" }, "xnu": { - "hash": "sha256-ci4Rsa1nRpS9qYBUxnaQokrtBzApGF/kQXugGusb9ok=", - "version": "12377.81.4" + "hash": "sha256-TpT7j7jgcibaHd7cqGbyfDRO0XkjKJNf/tPrdnVVpUw=", + "version": "12377.101.15" } } From 5663b16973445e8f1c58057f55599b3c9882cbc7 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 02/23] darwin.adv_cmds: fix build after 26.4 source release update --- pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix b/pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix index 3ded625c156b..3f0e13b38f2a 100644 --- a/pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix @@ -14,7 +14,7 @@ let Libc = sourceRelease "Libc"; libplatform = sourceRelease "libplatform"; - xnu = sourceRelease "xnu"; + xnu = sourceRelease "xnu"; # Can’t use xnuHeaders because adv_cmds is a transitive dependency of xnuHeaders. privateHeaders = stdenvNoCC.mkDerivation { name = "adv_cmds-deps-private-headers"; @@ -27,6 +27,9 @@ let install -D -m644 -t "$out/include/System/sys" \ '${xnu}/bsd/sys/persona.h' \ '${xnu}/bsd/sys/proc.h' + + install -D -m644 -t "$out/include/sys" \ + '${xnu}/bsd/sys/proc_private.h' ''; }; in From 63d7cdac01939aa8fd7dd5561a63b152dc2d63aa Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 03/23] darwin.AvailabilityVersions: 155 -> 157.2 https://github.com/apple-oss-distributions/AvailabilityVersions/compare/AvailabilityVersions-155...AvailabilityVersions-157.2 --- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index d51fffa33a75..0f3e475e2d53 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -1,7 +1,7 @@ { "AvailabilityVersions": { - "hash": "sha256-WcRJx/dt4DdEZ+lQBGgLwRYv1zlSwyNeKUTtuKH1fzE=", - "version": "155" + "hash": "sha256-v+ikUET6ByNEBRbPbl7ivqTJKJkZQDGG7Q20tIMt8pU=", + "version": "157.2" }, "CarbonHeaders": { "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", From 10bb94fb92560bd6a169b4b106098ddc0f17bfed Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 04/23] darwin.copyfile: 230.0.1.0.1 -> 240 https://github.com/apple-oss-distributions/copyfile/compare/copyfile-230.0.1.0.1...copyfile-240 --- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 0f3e475e2d53..786fc6a5c49e 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -144,8 +144,8 @@ "version": "1405.100.8" }, "copyfile": { - "hash": "sha256-I9uDi5BDQKa7mO3XpHxv0d6PiROW2ueZ3vGfrsG0OJo=", - "version": "230.0.1.0.1" + "hash": "sha256-IPwDBOtzdUiS1M4ZlhJ44z8Rv7Ot21QnKGxwUW8UZ8c=", + "version": "240" }, "developer_cmds": { "hash": "sha256-4DDyWuRbxpwDLkbfJIwYp6DKcEDByDiGUmsdOmwq5fI=", From 89251e8199cd1bf5740e8088e85d6afe24aa093e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 05/23] darwin.developer_cmds: 87 -> 89 https://github.com/apple-oss-distributions/developer_cmds/compare/developer_cmds-87...developer_cmds-89 --- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 786fc6a5c49e..0ee3deb8ca03 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -148,8 +148,8 @@ "version": "240" }, "developer_cmds": { - "hash": "sha256-4DDyWuRbxpwDLkbfJIwYp6DKcEDByDiGUmsdOmwq5fI=", - "version": "87" + "hash": "sha256-MX7PIvmWvu/QTUqgzjMu0NntcZuFTL35faec3IkWHBE=", + "version": "89" }, "diskdev_cmds": { "hash": "sha256-WDedl0pv/AReA96Gh+v2MwoX+QGrekK7YXEGw3aWB5Q=", From 3ea2eff071bad9cb03b3582c2e02309125be3011 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 06/23] darwin.diskdev_cmds: 751.80.2 -> 757 https://github.com/apple-oss-distributions/diskdev_cmds/compare/diskdev_cmds-751.80.2...diskdev_cmds-757 --- pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix | 2 +- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix index a9e5571a8954..7a16dbe68484 100644 --- a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix @@ -48,7 +48,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-qyQM+48PKKWUmdoBprpDf4DXIVAtd3EKCU+ZD/EhNXQ="; + xcodeHash = "sha256-mlTUd9eTBQhJa1hzAKzBpw6+702C4dwUjwZvJs/EKyw="; postPatch = # Fix incompatible pointer to integer conversion. The last parameter is size_t not a pointer. diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 0ee3deb8ca03..a60760db5da6 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -152,8 +152,8 @@ "version": "89" }, "diskdev_cmds": { - "hash": "sha256-WDedl0pv/AReA96Gh+v2MwoX+QGrekK7YXEGw3aWB5Q=", - "version": "751.80.2" + "hash": "sha256-SciJme+LNmkKkxEO77P0kRGMhtw2ZXSKKMSp55YbdIo=", + "version": "757" }, "doc_cmds": { "hash": "sha256-nnwKXKKjgJXcLCArD38Dme2L1WyR1U0rwn7zI+NCftw=", From ad15de5dbd17c591bc755ead6f2981d0d8d28f61 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 07/23] darwin.dyld: 1340 -> 1376.6 https://github.com/apple-oss-distributions/dyld/compare/dyld-1340...dyld-1376.6 --- .../darwin/by-name/dy/dyld/meson.build.in | 178 ++++++++++++++++-- .../darwin/by-name/dy/dyld/package.nix | 22 ++- .../darwin/sourceRelease/versions.json | 4 +- 3 files changed, 175 insertions(+), 29 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/meson.build.in b/pkgs/os-specific/darwin/by-name/dy/dyld/meson.build.in index 5bbef54de647..467f425e1cc0 100644 --- a/pkgs/os-specific/darwin/by-name/dy/dyld/meson.build.in +++ b/pkgs/os-specific/darwin/by-name/dy/dyld/meson.build.in @@ -9,6 +9,7 @@ project( version : '@version@' ) add_project_arguments( + '-DLD_VERSION=@version@', # Prevent build failures due to these targets not being defined '-DTARGET_OS_BRIDGE=0', '-DTARGET_OS_EXCLAVEKIT=0', @@ -63,6 +64,32 @@ corecrypto_dep = declare_dependency( link_with : corecrypto, ) +common = static_library( + 'common', + dependencies : [ corecrypto_dep ], + include_directories : [ + common_inc, + 'cache_builder', + 'lsl', + 'other-tools', + ], + sources : [ + 'common/CRC32c.cpp', + 'common/CachePatching.cpp', + 'common/Diagnostics.cpp', + 'common/DyldSharedCache.cpp', + 'common/MachOFile.cpp', + 'common/MachOLayout.cpp', + 'common/MachOLoaded.cpp', + 'common/TargetPolicy.cpp', + 'common/Utilities.cpp', + ], +) +common_dep = declare_dependency( + include_directories : [ 'common' ], + link_with : common, +) + lsl = static_library( 'lsl', cpp_args : [ @@ -77,7 +104,6 @@ lsl = static_library( ], sources : [ 'lsl/Allocator.cpp', - 'lsl/CRC32c.cpp', 'lsl/PVLEInt64.cpp', ], ) @@ -107,7 +133,7 @@ libmach_o = static_library( 'mach_o/FunctionStarts.cpp', 'mach_o/FunctionVariants.cpp', 'mach_o/GradedArchitectures.cpp', - 'mach_o/Header.cpp', + 'mach_o/LazyLoadDylib.cpp', 'mach_o/Image.cpp', 'mach_o/Instructions.cpp', # 'mach_o/LinkerOptimizationHints.cpp', @@ -121,6 +147,7 @@ libmach_o = static_library( 'mach_o/SplitSeg.cpp', 'mach_o/Symbol.cpp', 'mach_o/Universal.cpp', + 'mach_o/UnsafeHeader.cpp', 'mach_o/Version32.cpp', 'mach_o/Version64.cpp', ], @@ -147,12 +174,12 @@ libmach_o_writer = static_library( 'mach_o_writer/ExportsTrieWriter.cpp', 'mach_o_writer/FunctionStartsWriter.cpp', 'mach_o_writer/FunctionVariantsWriter.cpp', - 'mach_o_writer/HeaderWriter.cpp', 'mach_o_writer/LinkerOptimizationHintsWriter.cpp', 'mach_o_writer/NListSymbolTableWriter.cpp', 'mach_o_writer/RebaseOpcodesWriter.cpp', 'mach_o_writer/SplitSegWriter.cpp', 'mach_o_writer/UniversalWriter.cpp', + 'mach_o_writer/UnsafeHeaderWriter.cpp', ], ) libmach_o_writer_dep = declare_dependency( @@ -170,7 +197,11 @@ libminidyld = static_library( '-DPRIVATE', '-DBUILDING_LIBDYLD=1', ], - dependencies : [ corecrypto_dep, lsl_dep ], + dependencies : [ + common_dep, + corecrypto_dep, + lsl_dep + ], include_directories : [ common_inc, 'cache_builder', @@ -178,9 +209,6 @@ libminidyld = static_library( 'libdyld_introspection', ], sources : [ - 'common/CachePatching.cpp', - 'common/MachOLayout.cpp', - 'common/MachOLoaded.cpp', 'libdyld/CrashReporterAnnotations.c', ], ) @@ -189,6 +217,7 @@ libdsc_extractor = shared_library( 'dsc_extractor', cpp_args : [ '-DBUILDING_SHARED_CACHE_EXTRACTOR=1' ], dependencies : [ + common_dep, corecrypto_dep, libmach_o_dep, lsl_dep @@ -204,13 +233,8 @@ libdsc_extractor = shared_library( name_prefix : '', name_suffix : 'bundle', sources : [ - 'common/DyldSharedCache.cpp', - 'common/MachOFile.cpp', - 'common/TargetPolicy.cpp', 'other-tools/dsc_extractor.cpp', 'other-tools/dsc_iterator.cpp', - 'common/MachOLayout.cpp', - 'common/Diagnostics.cpp', ], ) @@ -223,6 +247,30 @@ executable( sources : [ 'other-tools/dsc_extractor_bin.cpp' ], ) + +executable( + 'dyld_analyzer', + cpp_args : [ '-DBUILDING_LEGACY_TOOL' ], + dependencies : [ + common_dep, + libmach_o_dep, + lsl_dep, + ], + include_directories : [ + common_inc, + 'cache_builder', + 'other-tools', + ], + install : true, + link_with : [ libminidyld ], + sources : [ + 'other-tools/dyld_analyzer.cpp', + 'other-tools/FileUtils.cpp', + 'other-tools/MiscFileUtils.cpp', + 'other-tools/Tool.cpp', + ], +) + executable( 'dyld_info', cpp_args : [ @@ -230,6 +278,7 @@ executable( '-DBUILDING_FOR_TOOLCHAIN=1', ], dependencies : [ + common_dep, corecrypto_dep, libmach_o_dep, llvm_dep, @@ -244,13 +293,6 @@ executable( link_args : [ '-Wl,-weak-lLTO' ], link_with : [ libminidyld ], sources : [ - 'common/Diagnostics.cpp', - 'common/DyldSharedCache.cpp', - 'common/MachOAnalyzer.cpp', - 'common/MachOFile.cpp', - 'common/MetadataVisitor.cpp', - 'common/SwiftVisitor.cpp', - 'common/TargetPolicy.cpp', 'other-tools/dyld_info.cpp', 'other-tools/FileUtils.cpp', 'other-tools/MiscFileUtils.cpp', @@ -258,3 +300,101 @@ executable( ], ) install_man('doc/man/man1/dyld_info.1') + +# Requires headers from unpublished ld-prime sources +# executable( +# 'libtool', +# dependencies : [ lsl_dep ], +# include_directories : [ +# common_inc, +# 'cache_builder', +# 'mach_o_writer', +# ], +# install : true, +# sources : [ +# 'other-tools/libtool.cpp', +# 'other-tools/Tool.cpp', +# ], +# ) +# install_man('doc/man/man1/libtool.1') +# +# # ranlib is a symlink to libtool +# install_man('doc/man/man1/ranlib.1') + +# Requires headers from unpublished ld-prime sources +# executable( +# 'lipo', +# dependencies : [ lsl_dep ], +# include_directories : [ common_inc ], +# install : true, +# sources : [ +# 'other-tools/lipo.cpp', +# 'other-tools/Tool.cpp', +# ], +# ) + +executable( + 'nm', + cpp_args : [ '-DBUILDING_LEGACY_TOOL' ], + dependencies : [ + common_dep, + libmach_o_dep, + lsl_dep, + ], + include_directories : [ + common_inc, + 'cache_builder', + 'other-tools', + ], + install : true, + link_with : [ libminidyld ], + sources : [ + 'other-tools/MiscFileUtils.cpp', + 'other-tools/nm.cpp', + 'other-tools/Tool.cpp', + ], +) + +executable( + 'strings', + cpp_args : [ '-DBUILDING_LEGACY_TOOL' ], + dependencies : [ + common_dep, + libmach_o_dep, + lsl_dep, + ], + include_directories : [ + common_inc, + 'cache_builder', + 'other-tools', + ], + install : true, + link_with : [ libminidyld ], + sources : [ + 'other-tools/MiscFileUtils.cpp', + 'other-tools/strings.cpp', + 'other-tools/Tool.cpp', + ], +) + +executable( + 'size', + cpp_args : [ '-DBUILDING_LEGACY_TOOL' ], + dependencies : [ + common_dep, + libmach_o_dep, + lsl_dep, + ], + include_directories : [ + common_inc, + 'cache_builder', + 'other-tools', + ], + install : true, + link_with : [ libminidyld ], + sources : [ + 'other-tools/MiscFileUtils.cpp', + 'other-tools/size.cpp', + 'other-tools/Tool.cpp', + ], +) diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix b/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix index a92bdb13e3ad..27ae0af42ab1 100644 --- a/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix +++ b/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix @@ -10,6 +10,7 @@ pkgsBuildHost, sourceRelease, stdenvNoCC, + xnuHeaders, }: let @@ -70,18 +71,19 @@ let install -D -m644 -t "$out/include/os" \ '${xnu}/libsyscall/os/tsd.h' \ - '${xnu}/libkern/os/atomic_private.h' \ - '${xnu}/libkern/os/atomic_private_arch.h' \ - '${xnu}/libkern/os/atomic_private_impl.h' \ - '${xnu}/libkern/os/base_private.h' \ + '${xnuHeaders}/Library/Frameworks/Kernel.framework/Versions/A/PrivateHeaders/os/atomic_private.h' \ + '${xnuHeaders}/Library/Frameworks/Kernel.framework/Versions/A/PrivateHeaders/os/atomic_private_arch.h' \ + '${xnuHeaders}/Library/Frameworks/Kernel.framework/Versions/A/PrivateHeaders/os/atomic_private_impl.h' \ + '${xnuHeaders}/Library/Frameworks/Kernel.framework/Versions/A/PrivateHeaders/os/base_private.h' \ '${libplatform}/private/os/lock_private.h' substituteInPlace "$out/include/os/lock_private.h" \ --replace-fail ', bridgeos(4.0)' "" install -D -m644 -t "$out/include/sys" \ - '${xnu}/bsd/sys/kern_memorystatus.h' \ - '${xnu}/bsd/sys/reason.h' + '${xnuHeaders}/include/sys/commpage_private.h' \ + '${xnuHeaders}/include/sys/kern_memorystatus.h' \ + '${xnuHeaders}/include/sys/reason.h' # This file is part of ld-prime, which is unhelpfully not included in the dyld source release. # Fortunately, nothing in it is actually needed to build `dyld_info` and `dsc_extractor`. @@ -100,7 +102,7 @@ mkAppleDerivation { propagatedBuildOutputs = [ ]; - xcodeHash = "sha256-F/V1XzBP1qEDpUDTz+jyp5dbcfqdQp8s9NW2OBoU5x0="; + xcodeHash = "sha256-eECKavCwz8NDqPOgW1YZ4ldQQHSUdBvAGRtYcVgEX/w="; patches = [ # Disable use of private kdebug API @@ -134,7 +136,8 @@ mkAppleDerivation { --replace-fail '__API_UNAVAILABLE(ios, tvos, watchos) __API_UNAVAILABLE(bridgeos)' "" substituteInPlace include/mach-o/utils_priv.h \ - --replace-fail 'SPI_AVAILABLE(macos(15.0), ios(18.0), tvos(18.0), watchos(11.0))' "" + --replace-fail 'SPI_AVAILABLE' "__SPI_AVAILABLE" \ + --replace-fail '____SPI_AVAILABLE' "__SPI_AVAILABLE" substituteInPlace libdyld/utils.cpp \ --replace-fail 'DYLD_EXCLAVEKIT_UNAVAILABLE' "" @@ -146,6 +149,9 @@ mkAppleDerivation { = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0 }; EOF + substituteInPlace other-tools/Tool.cpp \ + --replace-fail 'bridgeOS 6,' "" + # Fix header includes substituteInPlace libdyld_introspection/dyld_introspection.cpp \ --replace-fail 'dyld_introspection.h' 'mach-o/dyld_introspection.h' diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index a60760db5da6..7a8bc75624eb 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -164,8 +164,8 @@ "version": "413" }, "dyld": { - "hash": "sha256-rvWFiQVLJKqL0hOL2nRqwRkyPc/OvGnL0GEBymq7Fio=", - "version": "1340" + "hash": "sha256-uXFAHIgSrAR2duFhSvOXdaa0x8GTj4Qjq9TNGOZRGhU=", + "version": "1376.6" }, "eap8021x": { "hash": "sha256-nwCp5QgtXC2X3y5eR3DnXkdpECNkLmejM2iGQ6nuPaQ=", From ca6d6d5817edb91338ff221a63f30fb38bd33589 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 08/23] darwin.file_cmds: 475 -> 479 https://github.com/apple-oss-distributions/file_cmds/compare/file_cmds-475...file_cmds-479 --- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 7a8bc75624eb..933aa066417e 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -172,8 +172,8 @@ "version": "368.101.1" }, "file_cmds": { - "hash": "sha256-1hdTjg1Nf31gAhwjQEhRZQhaqayC8x7PGHAwZ1aEIm8=", - "version": "475" + "hash": "sha256-4Ii7dbijMCYq0IyAYXt1wm+9igSqUCtS60hsAm8+dM8=", + "version": "479" }, "hfs": { "hash": "sha256-GOI7U2J4vy5GQRubSWqx0xZFtE4e/hq7SsUuqptrYR0=", From 4c124e96a89c72f71026522204a1c6b8bb13600a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 09/23] darwin.ICU: 76142.3.1.1 -> 76142.4.7 https://github.com/apple-oss-distributions/ICU/compare/ICU-76142.3.1.1...ICU-76142.4.7 Contrary to the version convention, this ICU is based on ICU 78. One can confirm by checking `$dev/include/unicode/uvernum.h`, which shows 78. --- .../darwin/by-name/ic/ICU/package.nix | 8 +++--- .../0001-suppress-icu-check-crash.patch | 25 +++++++++++++++++++ .../patches/suppress-icu-check-crash.patch | 13 ---------- .../darwin/sourceRelease/versions.json | 4 +-- 4 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 pkgs/os-specific/darwin/by-name/ic/ICU/patches/0001-suppress-icu-check-crash.patch delete mode 100644 pkgs/os-specific/darwin/by-name/ic/ICU/patches/suppress-icu-check-crash.patch diff --git a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix index f742f4743807..d2678d47b0bc 100644 --- a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix +++ b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix @@ -3,7 +3,7 @@ bootstrapStdenv, buildPackages, fetchpatch2, - icu76, # The ICU version should correspond to the same one used by Apple’s ICU package + icu78, # The ICU version should correspond to the same one used by Apple’s ICU package mkAppleDerivation, python3, stdenvNoCC, @@ -40,9 +40,11 @@ let patches = [ # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does. - ./patches/suppress-icu-check-crash.patch + ./patches/0001-suppress-icu-check-crash.patch ]; + patchFlags = [ "-p4" ]; + preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure patchShebangs --build . @@ -118,7 +120,7 @@ let # Add missing test data. It’s not included in the source release. chmod u+w "$NIX_BUILD_TOP/source/icu" - tar -C "$NIX_BUILD_TOP/source" -axf ${lib.escapeShellArg icu76.src} icu/testdata + tar -C "$NIX_BUILD_TOP/source" -axf ${lib.escapeShellArg icu78.src} icu/testdata '' + lib.optionalString stdenv.hostPlatform.isx86_64 '' # These tests fail under Rosetta 2 with a floating-point exception. diff --git a/pkgs/os-specific/darwin/by-name/ic/ICU/patches/0001-suppress-icu-check-crash.patch b/pkgs/os-specific/darwin/by-name/ic/ICU/patches/0001-suppress-icu-check-crash.patch new file mode 100644 index 000000000000..b9018766b838 --- /dev/null +++ b/pkgs/os-specific/darwin/by-name/ic/ICU/patches/0001-suppress-icu-check-crash.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Fri, 8 May 2026 21:00:49 -0400 +Subject: [PATCH] suppress-icu-check-crash + +--- + icu/icu4c/source/test/cintltst/cmsgtst.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/icu/icu4c/source/test/cintltst/cmsgtst.c b/icu/icu4c/source/test/cintltst/cmsgtst.c +index 16263b5c7..fccc2753d 100644 +--- a/icu/icu4c/source/test/cintltst/cmsgtst.c ++++ b/icu/icu4c/source/test/cintltst/cmsgtst.c +@@ -231,7 +231,7 @@ static void MessageFormatTest( void ) + austrdup(result), austrdup(testResultStrings[i]) ); + } + +-#if (U_PLATFORM == U_PF_LINUX || U_PLATFORM == U_PF_QNX) /* add platforms here .. */ ++#if (U_PLATFORM == U_PF_LINUX || U_PLATFORM == U_PF_DARWIN || U_PLATFORM == U_PF_QNX) /* add platforms here .. */ + log_verbose("Skipping potentially crashing test for mismatched varargs.\n"); + #else + log_verbose("Note: the next is a platform dependent test. If it crashes, add an exclusion for your platform near %s:%d\n", __FILE__, __LINE__); +-- +2.51.2 + diff --git a/pkgs/os-specific/darwin/by-name/ic/ICU/patches/suppress-icu-check-crash.patch b/pkgs/os-specific/darwin/by-name/ic/ICU/patches/suppress-icu-check-crash.patch deleted file mode 100644 index 23a5ac307c80..000000000000 --- a/pkgs/os-specific/darwin/by-name/ic/ICU/patches/suppress-icu-check-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/cintltst/cmsgtst.c b/test/cintltst/cmsgtst.c -index cb328707..1073e6c1 100644 ---- a/test/cintltst/cmsgtst.c -+++ b/test/cintltst/cmsgtst.c -@@ -231,7 +231,7 @@ static void MessageFormatTest( void ) - austrdup(result), austrdup(testResultStrings[i]) ); - } - --#if (U_PLATFORM == U_PF_LINUX) /* add platforms here .. */ -+#if (U_PLATFORM == U_PF_LINUX || U_PLATFORM == U_PF_DARWIN) /* add platforms here .. */ - log_verbose("Skipping potentially crashing test for mismatched varargs.\n"); - #else - log_verbose("Note: the next is a platform dependent test. If it crashes, add an exclusion for your platform near %s:%d\n", __FILE__, __LINE__); diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 933aa066417e..de9dff82d2cb 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -16,8 +16,8 @@ "version": "88" }, "ICU": { - "hash": "sha256-qtv+IUEjdY5I87wDEIO9cWFAh1WmnIDVIzIyyL9NTd8=", - "version": "76142.3.1.1" + "hash": "sha256-NnTaNtYDDSNe7wLr9U/raaCXGBDWHMt91HJcumY0qTQ=", + "version": "76142.4.7" }, "IOAudioFamily": { "hash": "sha256-A3iiAjjP29VdjMj40tLS5Q/ni4qeh9bBpnmNzeG2pIY=", From 6575bc0242017976bd3924c72d6d498f79f014bf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 10/23] darwin.libiconv: 113 -> 115.100.1 https://github.com/apple-oss-distributions/libiconv/compare/libiconv-113...libiconv-115.100.1 --- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index de9dff82d2cb..b2cc513862a5 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -196,8 +196,8 @@ "version": "40" }, "libiconv": { - "hash": "sha256-MboAwJvpO0ix7XsAuKUUxipv8ecxD2OjDgD5bQbygr8=", - "version": "113" + "hash": "sha256-iPPdwts6kALf2lGnYnXfMTuBa2lYrDt7rySiUmraJqs=", + "version": "115.100.1" }, "libmalloc": { "hash": "sha256-kwJ6vfk1PzDdE0n3Ba+3hXLSf63YmMgPluxrEuvOpF0=", From 0d5d9a512954686344ed5e5346bab660983c5cfc Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 11/23] darwin.libpcap: 144 -> 146 https://github.com/apple-oss-distributions/libpcap/compare/libpcap-144...libpcap-146 --- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index b2cc513862a5..63ca1def35c4 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -204,8 +204,8 @@ "version": "812.100.31" }, "libpcap": { - "hash": "sha256-G7CL3pCCmxOoZ+ouA+xfOeDgvLcT9AN9zyrx+cL2Ge4=", - "version": "144" + "hash": "sha256-imKN9h6AfSyjjOjp9AX68LNXybh/pitXDM35N/3/Tls=", + "version": "146" }, "libplatform": { "hash": "sha256-bghS+sClE2nygZMahh1udoMZmGvRSCKn+W4ywTi51Zw=", From 11e16349972656869ac34c91b73ea50fecb82f17 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 12/23] darwin.libresolv: 93 -> 96 https://github.com/apple-oss-distributions/libresolv/compare/libresolv-93...libresolv-96 --- pkgs/os-specific/darwin/by-name/li/libresolv/package.nix | 9 ++++++--- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/li/libresolv/package.nix b/pkgs/os-specific/darwin/by-name/li/libresolv/package.nix index 6e8cf1f8e394..f38797fd2ce9 100644 --- a/pkgs/os-specific/darwin/by-name/li/libresolv/package.nix +++ b/pkgs/os-specific/darwin/by-name/li/libresolv/package.nix @@ -1,6 +1,5 @@ { lib, - fetchFromGitHub, mkAppleDerivation, sourceRelease, stdenvNoCC, @@ -23,8 +22,12 @@ let '${dyld}/include/mach-o/dyld_priv.h' substituteInPlace "$out/include/mach-o/dyld_priv.h" \ - --replace-fail ', bridgeos(3.0)' "" \ - --replace-fail '//@VERSION_DEFS@' 'const dyld_build_version_t dyld_2024_SU_E_os_versions = { 1 /* macOS */, 150400 };' + --replace-fail ', bridgeos(3.0)' "" + + cat < "$out/include/mach-o/dyld_version_defines.h" + #pragma once + const dyld_build_version_t dyld_2024_SU_E_os_versions = { 1 /* macOS */, 150400 }; + EOF ''; }; in diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 63ca1def35c4..e77862dd91a3 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -216,8 +216,8 @@ "version": "539.100.4" }, "libresolv": { - "hash": "sha256-SDdF7foz8DFUXmXEznwusNMkXFHrPkdLWQM8xfxb0gc=", - "version": "93" + "hash": "sha256-MAfzoyww1UK0o5TJ7XI4A9vi1T09Nz6Yb9iMrS/wX78=", + "version": "96" }, "libutil": { "hash": "sha256-64+1CIRpYBon7skJRKdaXcxucPh9GrhAbUERhL2PLXA=", From a90fc6279376633863e9f9bd52d1a9719630a9fe Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 13/23] darwin.mail_cmds: 41 -> 43 https://github.com/apple-oss-distributions/mail_cmds/compare/mail_cmds-41...mail_cmds-43 --- pkgs/os-specific/darwin/by-name/ma/mail_cmds/package.nix | 2 +- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/ma/mail_cmds/package.nix b/pkgs/os-specific/darwin/by-name/ma/mail_cmds/package.nix index b29e711251d6..01eb728f2eb6 100644 --- a/pkgs/os-specific/darwin/by-name/ma/mail_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/ma/mail_cmds/package.nix @@ -14,7 +14,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-6rBflDgQkqWDc8XPLgKIO703bMamg2QlhUnP71hBX3I="; + xcodeHash = "sha256-X9WKaCXm7gJI04iOJ3upmqTwZ6Lw+JjH0xSs+ng/9J0="; meta.description = "Traditional mail command for Darwin"; } diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index e77862dd91a3..6e4f2b81be0d 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -228,8 +228,8 @@ "version": "2881.100.56.0.1" }, "mail_cmds": { - "hash": "sha256-peoaHopJaYDqyE4TGfLx7W1K2KsFZmHLWr8Er/HpA90=", - "version": "41" + "hash": "sha256-xAU0HNDC2jmzYqnWWIzUjV0Kldl3SHMvM66Pl6kK8/0=", + "version": "43" }, "misc_cmds": { "hash": "sha256-04uBS16nNrg73Fqh4Obev7nQDjTTlY4f5+pEv3i0FIU=", From 362d374daf44df736ebbbd86288f66669476cd4f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 14/23] darwin.network_cmds: 730.80.3 -> 741.100.2 https://github.com/apple-oss-distributions/network_cmds/compare/network_cmds-730.80.3...network_cmds-741.100.2 --- pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix | 3 +++ pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix b/pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix index 1504ebf59590..51455f86897f 100644 --- a/pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix @@ -119,6 +119,9 @@ let #include <${xnuHeaders}/include/netinet6/nd6.h> EOF + install -D -t "$out/include/netkey" \ + '${xnuHeaders}/include/netkey/keysock_private.h' + install -D -t "$out/include/os" \ '${xnuHeaders}/Library/Frameworks/Kernel.framework/PrivateHeaders/os/atomic_private.h' \ '${xnuHeaders}/Library/Frameworks/Kernel.framework/PrivateHeaders/os/atomic_private_arch.h' \ diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 6e4f2b81be0d..39acfc776ad4 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -236,8 +236,8 @@ "version": "45" }, "network_cmds": { - "hash": "sha256-WlO668xfWOJk9QkTDJBqBVfXK52yg2Ofdjcdk6pQvIo=", - "version": "730.80.3" + "hash": "sha256-GXtGhkmTrpYHZj5ufpx2aOMRTMjCe8/H425OWBluKeU=", + "version": "741.100.2" }, "objc4": { "hash": "sha256-vonl+pqJurD7ozdZ8AQokvtlgKXCk+BP/vFfoyGJiUQ=", From 857fccfb375188654f8947495860739c4e898dd9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 15/23] darwin.patch_cmds: 72 -> 75 https://github.com/apple-oss-distributions/patch_cmds/compare/patch_cmds-72...patch_cmds-75 --- .../darwin/by-name/pa/patch_cmds/package.nix | 12 +++++-- .../patches/0001-Fall-back-to-scandir.patch | 32 +++++++++++++++++++ .../darwin/sourceRelease/versions.json | 4 +-- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/darwin/by-name/pa/patch_cmds/patches/0001-Fall-back-to-scandir.patch diff --git a/pkgs/os-specific/darwin/by-name/pa/patch_cmds/package.nix b/pkgs/os-specific/darwin/by-name/pa/patch_cmds/package.nix index 30f1eef87c27..5be1753d589a 100644 --- a/pkgs/os-specific/darwin/by-name/pa/patch_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/pa/patch_cmds/package.nix @@ -1,6 +1,6 @@ { lib, - apple-sdk, + apple-sdk_26, libutil, mkAppleDerivation, pkg-config, @@ -14,11 +14,19 @@ mkAppleDerivation { "man" ]; + patches = [ + # Use `scandir` on versions of macOS older than 26.4. + ./patches/0001-Fall-back-to-scandir.patch + ]; + xcodeHash = "sha256-Ox8Ii2sUuledUttZ64DaHC0iFlUybs3lNZ23IDeziPM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libutil ]; + buildInputs = [ + apple-sdk_26 + libutil + ]; meta = { description = "BSD patch commands for Darwin"; diff --git a/pkgs/os-specific/darwin/by-name/pa/patch_cmds/patches/0001-Fall-back-to-scandir.patch b/pkgs/os-specific/darwin/by-name/pa/patch_cmds/patches/0001-Fall-back-to-scandir.patch new file mode 100644 index 000000000000..bcc6279d081e --- /dev/null +++ b/pkgs/os-specific/darwin/by-name/pa/patch_cmds/patches/0001-Fall-back-to-scandir.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Fri, 8 May 2026 19:34:31 -0400 +Subject: [PATCH] Fall-back-to-scandir + +--- + diff/diffdir.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/diff/diffdir.c b/diff/diffdir.c +index 7583f98..cc476bc 100644 +--- a/diff/diffdir.c ++++ b/diff/diffdir.c +@@ -92,8 +92,13 @@ vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp, + *dirp = NULL; + return (0); + } +- if ((ret = fdscandir(fd, dirp, select, compar)) < 0) +- goto fail; ++ if (__builtin_available(macOS 26.4, *)) { ++ if ((ret = fdscandir(fd, dirp, select, compar)) < 0) ++ goto fail; ++ } else { ++ if ((ret = scandir(path, dirp, select, compar)) < 0) ++ goto fail; ++ } + RB_INSERT(inodetree, tree, ino); + close(fd); + return (ret); +-- +2.51.2 + diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 39acfc776ad4..e475e820ec8f 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -244,8 +244,8 @@ "version": "951.7" }, "patch_cmds": { - "hash": "sha256-fDY2NOT3DnU5pm06cHSs+JJcA/EFP8Lxjg7sErUerJ0=", - "version": "72" + "hash": "sha256-XoLEVrvu9pfHPalkBQDH0IfzcX8FLkcEBmW03cq2jQY=", + "version": "75" }, "ppp": { "hash": "sha256-syc0tbDPACswBNNrTaOsC6Lyix6d7O9634PBCjnuqOs=", From 68030807a152264bfedb00dafacdc71a3ded0874 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 16/23] darwin.PowerManagement: 1846.81.1 -> 1846.101.2 https://github.com/apple-oss-distributions/PowerManagement/compare/PowerManagement-1846.81.1...PowerManagement-1846.101.2 --- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index e475e820ec8f..088a6f64dc15 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -116,8 +116,8 @@ "version": "146" }, "PowerManagement": { - "hash": "sha256-KqpAUjwqENbx3qPxhkK6OFARjBGSMEpaGz5ozo9vtSY=", - "version": "1846.81.1" + "hash": "sha256-2vtld72nBFzgqh3vAh8L0PR3RORaXRojQZDc4OH4MVQ=", + "version": "1846.101.2" }, "Security": { "hash": "sha256-1ka7ws6POwm+WKwB/VYZX/uQTQccJe5r9tYDHgoqHp0=", From b850d4728a31bb7922d3e912a95712dbe18bef2a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 17/23] darwin.remote_cmds: 306 -> 308 https://github.com/apple-oss-distributions/remote_cmds/compare/remote_cmds-306...remote_cmds-308 --- pkgs/os-specific/darwin/by-name/re/remote_cmds/meson.build.in | 1 + pkgs/os-specific/darwin/by-name/re/remote_cmds/package.nix | 2 +- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/re/remote_cmds/meson.build.in b/pkgs/os-specific/darwin/by-name/re/remote_cmds/meson.build.in index 137397b3abbc..646143084e2c 100644 --- a/pkgs/os-specific/darwin/by-name/re/remote_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/by-name/re/remote_cmds/meson.build.in @@ -53,6 +53,7 @@ executable( '-DCOLLATE_DEBUG', '-DYY_NO_UNPUT', ], + include_directories: [ 'wall' ], install : true, sources : [ 'talkd/announce.c', diff --git a/pkgs/os-specific/darwin/by-name/re/remote_cmds/package.nix b/pkgs/os-specific/darwin/by-name/re/remote_cmds/package.nix index 8029d2982acd..523c67f88645 100644 --- a/pkgs/os-specific/darwin/by-name/re/remote_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/re/remote_cmds/package.nix @@ -14,7 +14,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-+hC3yJwwwXr01Aa47K5dv4gL0+IlTQZU9YYgygXkTSI="; + xcodeHash = "sha256-SdeF6Jp+KuVTUawJdvpw53qr3gIPEhVzqgQxAau19C0="; postPatch = '' # Avoid a conflict with the definition in SDK’s headers. diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 088a6f64dc15..ad26933183ea 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -252,8 +252,8 @@ "version": "1025" }, "remote_cmds": { - "hash": "sha256-8c/NgQZ+K6jJ3aoYK78/BsEkM1gmRS+9z0437+SvcCw=", - "version": "306" + "hash": "sha256-aTcoaFbKhVrhGQyVRvqb/Iwm0sqUn5HMO19sBpdt428=", + "version": "308" }, "removefile": { "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=", From 03761fb93a51622cc14c1f20aa17dfaf8a121341 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 18/23] darwin.removefile: 84 -> 85.100.6 https://github.com/apple-oss-distributions/removefile/compare/removefile-84...removefile-85.100.6 --- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index ad26933183ea..0739d0bf2b9f 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -256,8 +256,8 @@ "version": "308" }, "removefile": { - "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=", - "version": "84" + "hash": "sha256-4E0LsE6b83AqP90tpIhnRdtSekToY7JUWa7lQ3+y3WI=", + "version": "85.100.6" }, "shell_cmds": { "hash": "sha256-hoMssbZCrmzyJTgEAzOS4L7DhY9z/yXIcvHRhL6W5qc=", From 4c232cc2669e1e272771a095719af84748c15f57 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 19/23] darwin.shell_cmds: 326 -> 329 https://github.com/apple-oss-distributions/shell_cmds/compare/shell_cmds-326...shell_cmds-329 --- pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix | 2 +- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix index 88f7885ce814..955a2bc84542 100644 --- a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix @@ -24,7 +24,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-fY8k7qzqqiv/KvGIB4a82qbNsm23QPnGOadrZmNoi54="; + xcodeHash = "sha256-sbgPFMMXgUp+F1IRLiaFto+PsfMHBd23KQ1sQK7tP7A="; postPatch = '' # Fix `mktemp` templates diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index 0739d0bf2b9f..bc50c75fe4e1 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -260,8 +260,8 @@ "version": "85.100.6" }, "shell_cmds": { - "hash": "sha256-hoMssbZCrmzyJTgEAzOS4L7DhY9z/yXIcvHRhL6W5qc=", - "version": "326" + "hash": "sha256-mZ8DuxAMrv96gDnIG3nNXY906wNVDmjymOv/t3wDr2Q=", + "version": "329" }, "system_cmds": { "hash": "sha256-OYLCu2pPe10apZEK5kgINcEvxRFFPYquPzcRNkvtJKI=", From 7a1aca160150d04be12b8b00ba56aa1b21914888 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 20/23] darwin.system_cmds: 1039 -> 1042.100.6.0.1 https://github.com/apple-oss-distributions/system_cmds/compare/system_cmds-1039...system_cmds-1042.100.6.0.1 --- pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix | 5 +++-- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix b/pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix index 1fdb00d9a735..8a780069d52d 100644 --- a/pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix @@ -18,7 +18,7 @@ let libplatform = sourceRelease "libplatform"; - xnu = sourceRelease "xnu"; + xnu = sourceRelease "xnu"; # Can’t use xnuHeaders because adv_cmds is a transitive dependency of xnuHeaders. privateHeaders = stdenvNoCC.mkDerivation { name = "system_cmds-deps-private-headers"; @@ -71,10 +71,11 @@ let install -D -t "$out/include/sys" \ '${xnu}/bsd/sys/csr.h' \ '${xnu}/bsd/sys/event_private.h' \ - '${xnu}/bsd/sys/pgo.h' \ '${xnu}/bsd/sys/kdebug_private.h' \ '${xnu}/bsd/sys/kern_memorystatus.h' \ + '${xnu}/bsd/sys/pgo.h' \ '${xnu}/bsd/sys/proc_info_private.h' \ + '${xnu}/bsd/sys/proc_private.h' \ '${xnu}/bsd/sys/reason.h' \ '${xnu}/bsd/sys/resource.h' \ '${xnu}/bsd/sys/resource_private.h' \ diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index bc50c75fe4e1..dca0e584e990 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -264,8 +264,8 @@ "version": "329" }, "system_cmds": { - "hash": "sha256-OYLCu2pPe10apZEK5kgINcEvxRFFPYquPzcRNkvtJKI=", - "version": "1039" + "hash": "sha256-zG5N06b1/X6bCPWFME10w8XoLqwGKvrAmNihLy0cxl4=", + "version": "1042.100.6.0.1" }, "text_cmds": { "hash": "sha256-SDH74Pwy/kPiApisuUFBrDVQ7swCsinMK7zkpm82rnw=", From 976af9cac6bf77cea6594526473cdf68df3fc5bf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 21/23] darwin.text_cmds: 197 -> 199 https://github.com/apple-oss-distributions/text_cmds/compare/text_cmds-197...text_cmds-199 --- pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix | 2 +- pkgs/os-specific/darwin/sourceRelease/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix index 8a757030dd9b..d91a37359c32 100644 --- a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix @@ -45,7 +45,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-4nwDGUBSx5jjeLQ3EGQFdPZE2MfNGcBvlTU/Sye6OIk="; + xcodeHash = "sha256-8Z6Goz94xP3HqAaSnFUurhZE8l3G1mK5KviXtxSPQhI="; postPatch = '' # Improve compatiblity with libmd in nixpkgs. diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json index dca0e584e990..78e9ad87a6bf 100644 --- a/pkgs/os-specific/darwin/sourceRelease/versions.json +++ b/pkgs/os-specific/darwin/sourceRelease/versions.json @@ -268,8 +268,8 @@ "version": "1042.100.6.0.1" }, "text_cmds": { - "hash": "sha256-SDH74Pwy/kPiApisuUFBrDVQ7swCsinMK7zkpm82rnw=", - "version": "197" + "hash": "sha256-Z2SKmsmCRX/CnRC9kkgCb8ozK+nit4GYsv1rrEWL3qs=", + "version": "199" }, "top": { "hash": "sha256-F+P7yRQw4qa73JmQrMVgy3lVQRDBrFDy9kkOUJ135ys=", From 127450a4fc9134531b214aa72d467232fc7e4e0f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 22/23] ld64: 956.6 -> 957.1 https://github.com/apple-oss-distributions/ld64/compare/ld64-956.6...ld64-957.1 --- pkgs/by-name/ld/ld64/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 8699a4132d4a..f21f90a37929 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ld64"; - version = "956.6"; + version = "957.1"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apple-oss-distributions"; repo = "ld64"; tag = "ld64-${finalAttrs.version}"; - hash = "sha256-2VlBjlCZ+ZPKGZ0f5UuG3jJTLZIBXf8IZOiD6snheh4="; + hash = "sha256-KUkEKz2jQq815ls25u0JMYmad4cN9PS/nC3E5eV19co="; }; patches = [ From 516deee1c136242d983d0f510ecb7ca42d885aff Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 7 May 2026 18:16:31 -0400 Subject: [PATCH 23/23] xar: 501 -> 503 https://github.com/apple-oss-distributions/xar/compare/xar-501...xar-503 --- pkgs/by-name/xa/xar/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index 53583b24caf3..b9e477ca6194 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -31,13 +31,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xar${lib.optionalString (e2fsprogs == null) "-minimal"}"; - version = "501"; + version = "503"; src = fetchFromGitHub { owner = "apple-oss-distributions"; repo = "xar"; rev = "xar-${finalAttrs.version}"; - hash = "sha256-Fq+Re0LCBIGhW2FR+pgV8SWtaDOEFgTh+rQ8JFWK/k0="; + hash = "sha256-QdK7NTN3A/EWr+vdfT5ZLTdX+wOmfnqvL5yJeiiPwtM="; }; # Update patch set with @@ -48,11 +48,7 @@ stdenv.mkDerivation (finalAttrs: { # # … # rm -r ../pkgs/by-name/xa/xar/patches # git format-patch --zero-commit --output-directory ../pkgs/by-name/xa/xar/patches main - patches = - # Avoid Darwin rebuilds on staging-next - lib.filter ( - p: stdenv.hostPlatform.isDarwin -> baseNameOf p != "0020-Fall-back-to-readlink-on-Linux.patch" - ) (lib.filesystem.listFilesRecursive ./patches); + patches = lib.filesystem.listFilesRecursive ./patches; # We do not use or modify files outside of the xar subdirectory. patchFlags = [ "-p2" ];