From 8f6d2b14efe41b6bbed6be180d4487ace1c84bb5 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 00:37:39 +0000 Subject: [PATCH 01/14] apple-sdk_{11,12,13,14}: use Wayback Machine URLs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple like to remove old minor releases of the SDK when bumping to a new one. Our current 15.0 SDK is already gone. Since these are all the last minor version of their major version, they’re probably not at risk of imminent deletion, but given their general practices it makes sense to guard against, especially as we can’t be sure ahead of time what the last minor version will be. --- pkgs/by-name/ap/apple-sdk/metadata/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 5a444c2c4eaa0..153b31d39afad 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -1,21 +1,21 @@ { "11": { - "url": "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235110/https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", "version": "11.3", "hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg=" }, "12": { - "url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235341/https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", "version": "12.3", "hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8=" }, "13": { - "url": "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235949/https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", "version": "13.3", "hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4=" }, "14": { - "url": "https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250211001355/https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", "version": "14.4", "hash": "sha256-QozDiwY0Czc0g45vPD7G4v4Ra+3DujCJbSads3fJjjM=" }, From e8ad14c5a2c745eadfa5add729d11846ec96f3a3 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 00:51:10 +0000 Subject: [PATCH 02/14] apple-sdk_15: 15.0 -> 15.2 --- .../metadata/apple-oss-lockfile.json | 78 +++++++++---------- .../ap/apple-sdk/metadata/versions.json | 6 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json index e68c2643ab7c6..5157b58ce3df4 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json @@ -711,14 +711,14 @@ "version": "10063.101.15" } }, - "15.0": { + "15.2": { "CarbonHeaders": { "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", "version": "18.1" }, "CommonCrypto": { - "hash": "sha256-qwQEFoycAw+YLwqpZgJB1Ppg8mrWFnRPDj4I5f2Ggns=", - "version": "600032" + "hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=", + "version": "600033.60.1" }, "IOAudioFamily": { "hash": "sha256-VSk3jvsITJugtL67Qt0m4qJ879i7Fj6B/NGBFVCwpiU=", @@ -761,12 +761,12 @@ "version": "598" }, "IOHIDFamily": { - "hash": "sha256-4hIztdbKpoC0VrRVwZkoCZuByyTGw02lrrcFDBAXyko=", - "version": "2102.0.6" + "hash": "sha256-utWAwmn9jss/6fc4flDHXeJR5ZBymO0ZFbDFIFVBnt4=", + "version": "2104.61.1" }, "IOKitUser": { - "hash": "sha256-ytMma1ft1fKjCvP0SKdwnVonPEixzthoCR7ML94/pLE=", - "version": "100140.0.6" + "hash": "sha256-vfz/kLZlVyoHKOlrNdNrf2HcUOB6bY+mpbCvEEg2sus=", + "version": "100140.60.14" }, "IONetworkingFamily": { "hash": "sha256-gZ7Dkk4Iu7AV9K2ioqSeJ1W7bTNxv77bmT18iv3ljLg=", @@ -777,16 +777,16 @@ "version": "93" }, "IOStorageFamily": { - "hash": "sha256-W9H3jzaXLvAb0cziHBpNo5Iom7c7H5bg4MxQIhIsefc=", - "version": "317" + "hash": "sha256-tjzvlJYVjSTG7oF3AhHgCASKax1fYjOBAxcsrKh/urY=", + "version": "317.40.2" }, "IOUSBFamily": { "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", "version": "630.4.5" }, "Libc": { - "hash": "sha256-1t+e8DQUmsrmr1f6QUU4uUm/el3G7EOL+vUO28srPAM=", - "version": "1669.0.4" + "hash": "sha256-/J1Oawa+cMbcAlMlpr6ce32KQQp2lMGnfbRi/2Oc1cY=", + "version": "1669.60.4" }, "Libinfo": { "hash": "sha256-D7JMCakQVCQ9j2zUHQSGB8zZcHD6azwYY3bsJU0JfEE=", @@ -797,8 +797,8 @@ "version": "2026" }, "Libnotify": { - "hash": "sha256-qYox9iQUnU0AGVfPK2p61/2zlNAJmixCE5K7WojMQ3I=", - "version": "327.0.5" + "hash": "sha256-XwVB4sYXPLAHDuLv8mxAWlC1ia17V4cf73DEJDDm4ck=", + "version": "327.60.1" }, "Librpcsvc": { "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", @@ -813,68 +813,68 @@ "version": "146" }, "Security": { - "hash": "sha256-ptS/IESkJmbcO3H+v6mmN2jvH2mfLXi+fMQfGCLSt7M=", - "version": "61439.1.1" + "hash": "sha256-sRpFQyMk3x4kRthXpqeAnfQ9dE5RMxiSFUiUKRCneck=", + "version": "61439.60.117" }, "architecture": { "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", "version": "282" }, "configd": { - "hash": "sha256-Wks7d0Kere6YYPJar593ZSC5bbkyKcaTxrHK6Ah6u0c=", - "version": "1345" + "hash": "sha256-xRaEzq/OOMBi7lvi2bV2/ObN5JJJ5vcFy8DGHLItUWM=", + "version": "1351" }, "copyfile": { - "hash": "sha256-lIhl5sr1gewIHkh10hD+H/I7MVPzlHlONGRMOO7OZuA=", - "version": "213" + "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", + "version": "213.40.2" }, "dtrace": { - "hash": "sha256-S0gI+9eTcuZkh0FWmTmZ+AhZ4qoSdnUb5GTp1melk9A=", - "version": "409" + "hash": "sha256-iNEZyxK3DmEwO3gzrfvCaVZSEuuOMQm5IG/6FodPNdI=", + "version": "411" }, "dyld": { - "hash": "sha256-q0GN5+4mW8Yxer0XxhlLK7JRM4JDoxeSFDRzbZ738lw=", - "version": "1231.3" + "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=", + "version": "1241.17" }, "eap8021x": { "hash": "sha256-2FdEb76KBbCAl2iwly4c1Xstar53O8qgGdN/3WXO23U=", "version": "364" }, "hfs": { - "hash": "sha256-utmIFAW7Gdbbj71oZnHSaTUse9cIN3ZSfXyFTmuxnc4=", - "version": "672" + "hash": "sha256-isTLSBDxh12W10I5KY6O6SsygqnOvqJ0TfdWIKSK3pM=", + "version": "677.60.1" }, "launchd": { "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", "version": "842.1.4" }, "libclosure": { - "hash": "sha256-21OuQearKTN75OgHN+RPLR1VGdf3ZffPYpV51Kj6LYE=", - "version": "94" + "hash": "sha256-I0PKQFnoJVRMA7H3yT+inHS0454/FXHhQB6nwmHFvFs=", + "version": "95" }, "libdispatch": { - "hash": "sha256-q2oyaEdt8clVLjLwBjAAvLKodpuYThscK3VcQotCmIM=", - "version": "1502.0.1" + "hash": "sha256-f2ex/53OFeSR5A0nMapxC6AocqBSweecNtEhp4bWjhE=", + "version": "1504.60.7" }, "libmalloc": { - "hash": "sha256-tFaYSvebk4uIIPu/46eMp6QnwiO/SmShjUoFnJjnmsc=", - "version": "646.0.13" + "hash": "sha256-Rw/9s7yY3qPtKfDhP+p+0z+aaCsxgwvdUyRG2V1N6D8=", + "version": "657.60.21" }, "libplatform": { - "hash": "sha256-U3TRUGBxuspEPfzdsd+53Kh8E9GmceMhsxxXuQbcdcc=", - "version": "340" + "hash": "sha256-o/W1pQ9yGTE8HQlGcggM+XiJbEyqgc/s0uiY3+yBtnA=", + "version": "340.60.2" }, "libpthread": { "hash": "sha256-eYHDAt2wNk7hJZJxsC7Y9w4ASKdexidu613kPo7TAKs=", "version": "535" }, "mDNSResponder": { - "hash": "sha256-w+Pw/VsHl8hkDiS7EEEYKp9P2NVwu8NSVPSn2U15vHM=", - "version": "2559.1.1" + "hash": "sha256-mDyY/2S4EHbGh02J6VWZVxhNXXZmWGX+NjUjPfMZgZA=", + "version": "2559.60.39.0.1" }, "objc4": { - "hash": "sha256-Z9UAm/hjjO2K0c7ag/ws4e/Y2nKOWnObPgp4HUZe+W4=", - "version": "928.2" + "hash": "sha256-uBFS5extMQkXAXJfPtPlBYAQpz+zsRHQnEaLpDOcYGM=", + "version": "928.3" }, "ppp": { "hash": "sha256-8+QUA79sHf85yvGSPE9qCmGsrZDT3NZnbgZVroJw/Hg=", @@ -885,8 +885,8 @@ "version": "75" }, "xnu": { - "hash": "sha256-9cFPrWtTpCb02YrvKX1KWoExoH2VjPdOBU4dscmKL4A=", - "version": "11215.1.10" + "hash": "sha256-o8CxHvM2OXiAWJmnFe5ERQYnrNyJ+Bpdb9H0sjd6L10=", + "version": "11215.61.5" } } } diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 153b31d39afad..b5f2dc7f5a19b 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -20,8 +20,8 @@ "hash": "sha256-QozDiwY0Czc0g45vPD7G4v4Ra+3DujCJbSads3fJjjM=" }, "15": { - "url": "https://swcdn.apple.com/content/downloads/33/46/042-32691-A_3MH7S3118O/3dblccqo9ws17dc5lk3hojfbt3s74q0ql6/CLTools_macOSNMOS_SDK.pkg", - "version": "15.0", - "hash": "sha256-JhaAPyfX46D+9sematdAYAORw40JP3xvleWRz7Hj/1s=" + "url": "https://web.archive.org/web/20250210234739/https://swcdn.apple.com/content/downloads/36/33/072-44426-A_G1AII30AST/ddbss9h6gse6a32rg6luosbrm6vgniu033/CLTools_macOSNMOS_SDK.pkg", + "version": "15.2", + "hash": "sha256-OP5Ah/JnSZ6sD42BD5vGDmikgFzjsfFBmz1hvQD1dOI=" } } From d5a73874afb7378343d7d1bf82af542d826518c2 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 03/14] darwin.AvailabilityVersions: 143.3 -> 143.6 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 8a4a26ba956e6..fc8bbdb16aa61 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -1,7 +1,7 @@ { "AvailabilityVersions": { - "hash": "sha256-CmFrmbk3XJXhGStc+prNoFTDJiFu4n2wVP3OvMfQwOU=", - "version": "143.3" + "hash": "sha256-PT54BPSRkQiIHrpxZCdjo6XvNuWxESabLndCBYjulfs=", + "version": "143.6" }, "Csu": { "hash": "sha256-l8RI8aiin7ovZuoDh54thDmd/b502w+dtjN5ZoISZBg=", From 072f8e0c4d366343ae3baf7eba9bedd2b90b2731 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 04/14] darwin.ICU: 74221 -> 74222.203 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index fc8bbdb16aa61..3c0fe6ea508f6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -8,8 +8,8 @@ "version": "88" }, "ICU": { - "hash": "sha256-CvpMLFNCEQ05t3nkzDyA9nsm3cmRgXG/QxbyiLpSpIs=", - "version": "74221" + "hash": "sha256-7ImBX4SlrFaLnHdQ4bm4F8q9IpHhQMaeVOO6pnnhyzQ=", + "version": "74222.203" }, "IOKitTools": { "hash": "sha256-Oknsvzn4nv77WU7f0WPS446iwR2BM2q4iw46r/qctAE=", From bea823e65c4b98254963933b51115a0035e94385 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 05/14] darwin.PowerManagement: 1740.0.7 -> 1740.60.27 --- .../darwin/apple-source-releases/PowerManagement/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix index 91319a49644de..231d0ffb562fb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix @@ -20,7 +20,7 @@ in mkAppleDerivation { releaseName = "PowerManagement"; - xcodeHash = "sha256-yonvCPa4lJZ9VOO5BIcd0fLsnr0n2v/SHrLTlAJq+q0="; + xcodeHash = "sha256-l6lm8aaiJg4H2BQVCjlFldpfhnmPAlsiMK7Cghzuh1E="; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 3c0fe6ea508f6..c8fdfff14d202 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -16,8 +16,8 @@ "version": "125" }, "PowerManagement": { - "hash": "sha256-BBEh2+ldmT+8tFvKcTp+4A253hxbUrmY3j7omBXRYf0=", - "version": "1740.0.7" + "hash": "sha256-APkvbp0FhNrypQcDUuREUYOnNLOZGOKhsj5JLcDgvAU=", + "version": "1740.60.27" }, "adv_cmds": { "hash": "sha256-alJOcKeHmIh67ZmN7/YdIouCP/qzakkhimsuZaOkr+c=", From c7377d3a15c000f81e96ba9d109ebbe5077e922a Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 06/14] darwin.copyfile: 213 -> 213.40.2 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index c8fdfff14d202..aba76661f6a2f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -32,8 +32,8 @@ "version": "136" }, "copyfile": { - "hash": "sha256-lIhl5sr1gewIHkh10hD+H/I7MVPzlHlONGRMOO7OZuA=", - "version": "213" + "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", + "version": "213.40.2" }, "developer_cmds": { "hash": "sha256-rgmmPHxlKPb84BHVs8oY99E8iGWbqEjS4B8H7+JK7NY=", From 51e7288bd3ac6c1969e4c6760f89ed9ffdb12c8c Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 07/14] darwin.developer_cmds: 79 -> 83 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems like `unifdefall(1)` was omitted from this package previously; I’m not sure why. --- .../developer_cmds/meson.build.in | 12 ++++++++++++ .../apple-source-releases/developer_cmds/package.nix | 2 +- .../darwin/apple-source-releases/versions.json | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in index 2c6b9ca720a04..ad9c49cd6d3c2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in @@ -78,3 +78,15 @@ executable( sources : [ 'unifdef/unifdef.c' ], ) install_man('unifdef/unifdef.1') + +install_data( + 'unifdef/unifdefall.sh', + install_dir : get_option('bindir'), + install_mode : 'r-xr-xr-x', + rename : 'unifdefall', +) +install_symlink( + 'unifdefall.1', + install_dir : get_option('mandir') / 'man1', + pointing_to : 'unifdef.1', +) diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix index adb16f58652ca..4de6fb9938e6e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix @@ -14,7 +14,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-oE1GJF/M4vXLTM7BBjezKqrMu9iTUlEKDBKgwyFqu3k="; + xcodeHash = "sha256-NurkF9AnPuaQ7Ev36PCknuTNV6z622yFi2bXZsow+xA="; postPatch = '' substituteInPlace rpcgen/rpc_main.c \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index aba76661f6a2f..df358bc6e9d2c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -36,8 +36,8 @@ "version": "213.40.2" }, "developer_cmds": { - "hash": "sha256-rgmmPHxlKPb84BHVs8oY99E8iGWbqEjS4B8H7+JK7NY=", - "version": "79" + "hash": "sha256-jgQUjN9zmqi0/7XpqzbRsJjZIYeMrxXT1Zf3qi7+o+8=", + "version": "83" }, "diskdev_cmds": { "hash": "sha256-TebggzBS/HwEP3W2w2p+XvPDxsQtdTbtKEn9wik653Q=", From 5e0bf4044651ac8d3ebf663667651e4a761a7ada Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 08/14] darwin.diskdev_cmds: 735 -> 737.60.1 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index df358bc6e9d2c..121355d719125 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -40,8 +40,8 @@ "version": "83" }, "diskdev_cmds": { - "hash": "sha256-TebggzBS/HwEP3W2w2p+XvPDxsQtdTbtKEn9wik653Q=", - "version": "735" + "hash": "sha256-v3TFHLUlumt/sHxkOTyxDA4iG8ci5ZmMn7HCb4+9Uo0=", + "version": "737.60.1" }, "doc_cmds": { "hash": "sha256-/Mf+RhaTU9O5i95gddZ2h9eDjLezwj3nP6FvryMF54E=", From f51133dded7ff55a3bf30dabe63531ae8f37d10d Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 09/14] darwin.libffi: 35 -> 39 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 121355d719125..871588a4d4772 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -52,8 +52,8 @@ "version": "448.0.3" }, "libffi": { - "hash": "sha256-tQJdKCz2OIwVtorHQapq9Xs2e1Ac96lGEzIWUXmsasY=", - "version": "35" + "hash": "sha256-YjRMS3H3hIEfQm5MVSxGNTBtFc/9al7iQGDeZy6m/0U=", + "version": "39" }, "libiconv": { "hash": "sha256-4I70hci8SUQ5QERbImP3htjYCGXdZZ0a6RM7ggUnVa4=", From 1db08b9f1e751417352baf3a559d039aca7298cd Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 10/14] darwin.libiconv: 107 -> 109 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 871588a4d4772..fed5025dc2486 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -56,8 +56,8 @@ "version": "39" }, "libiconv": { - "hash": "sha256-4I70hci8SUQ5QERbImP3htjYCGXdZZ0a6RM7ggUnVa4=", - "version": "107" + "hash": "sha256-eaUp0z7HqX0AW2C90gDVFeiJnmGRxPDuzyb1Jlm1pNc=", + "version": "109" }, "libpcap": { "hash": "sha256-x5mKK6LXGS3LBRUVNZwxA750a0NoRScTpoDUsumlg+s=", From dab00cce78f9f4d5a8d5b497b301d5169f455a72 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 11/14] darwin.libpcap: 135 -> 137 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was unhappy about missing BPF `struct` stuff. I’m not sure why the private header thing was like that previously but it builds fine like this. --- .../apple-source-releases/libpcap/package.nix | 21 +------------------ .../apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix index 4ad2619face85..aba3fc53a4f7d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix @@ -26,26 +26,7 @@ let unifdef -x 1 -DPRIVATE -o "$out/include/net/droptap.h" '${xnu}/bsd/net/droptap.h' unifdef -x 1 -DPRIVATE -o "$out/include/net/iptap.h" '${xnu}/bsd/net/iptap.h' unifdef -x 1 -DPRIVATE -o "$out/include/net/pktap.h" '${xnu}/bsd/net/pktap.h' - - cat < "$out/include/net/bpf.h" - #pragma once - #include_next - $(sed -n \ - -e '/^struct bpf_comp_stats\s*{/,/};/p' \ - -e '/^struct bpf_hdr_ext\s*{/,/};/p' \ - -e '/^#define BIOCGBATCHWRITE\s/p' \ - -e '/^#define BIOCGHDRCOMPSTATS\s/p' \ - -e '/^#define BIOCGIFATTACHCOUNT\s/p' \ - -e '/^#define BIOCGWRITEMAX\s/p' \ - -e '/^#define BIOCSBATCHWRITE\s/p' \ - -e '/^#define BIOCSEXTHDR\s/p' \ - -e '/^#define BIOCSHEADDROP\s/p' \ - -e '/^#define BIOCSPKTHDRV2\s/p' \ - -e '/^#define BIOCSTRUNCATE\s/p' \ - -e '/^#define BIOCSWANTPKTAP\s/p' \ - -e '/^#define BIOCSWRITEMAX\s/p' \ - '${xnu}/bsd/net/bpf.h') - EOF + unifdef -x 1 -DPRIVATE -o "$out/include/net/bpf.h" '${xnu}/bsd/net/bpf.h' cat < "$out/include/net/if.h" #pragma once diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index fed5025dc2486..907c5797a9290 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -60,8 +60,8 @@ "version": "109" }, "libpcap": { - "hash": "sha256-x5mKK6LXGS3LBRUVNZwxA750a0NoRScTpoDUsumlg+s=", - "version": "135" + "hash": "sha256-RViIXv5zP2Bcive5qrcfb9vNWwhSe6fGCaToSgDYNxU=", + "version": "137" }, "libresolv": { "hash": "sha256-ndGcicbHizPazTCB0P3aioDOv7IJPmTOgLnioFHH2+o=", From b9dd1e6d908ec4b2882e06430201ae78aa7ac159 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 12/14] darwin.network_cmds: 696 -> 698.60.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple removed the `spray.x` source and replaced it with vendored `rpcgen(1)` output for some reason. Not sure it’s worth trying to undo that. --- .../network_cmds/meson.build.in | 18 +----------------- .../network_cmds/package.nix | 4 +--- .../darwin/apple-source-releases/versions.json | 4 ++-- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in index 9e15c7c5c1544..d0d0d08e559e4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in @@ -19,21 +19,6 @@ add_global_arguments( ) -# Generators -rpcgen_bin = find_program('rpcgen') -rpcgen = generator( - rpcgen_bin, - arguments : [ '-c', '-o', '@OUTPUT@', '@INPUT@' ], - output : '@BASENAME@_xdr.c', -) - -rpcgen_header = generator( - rpcgen_bin, - arguments : [ '-h', '-o', '@OUTPUT@', '@INPUT@' ], - output : '@BASENAME@.h', -) - - # Dependencies cc = meson.get_compiler('c') @@ -340,8 +325,7 @@ executable( install : true, sources : [ 'spray.tproj/spray.c', - rpcgen_header.process('spray.tproj/spray.x'), - rpcgen.process('spray.tproj/spray.x'), + 'spray.tproj/spray_xdr.c', ], ) install_man('spray.tproj/spray.8') diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix index 58defd296f18a..f6bb8f551c9bc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix @@ -1,7 +1,6 @@ { lib, apple-sdk, - developer_cmds, fetchurl, libpcap, libresolv, @@ -405,7 +404,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-L5upfoE6uHsdFOzylTTH+UPftA96qdpnvgFcK5dmhgY="; + xcodeHash = "sha256-HkcIvKB4ektuk+3J/Sque8Pr5dMeNFZRlENuiu3KdsA="; patches = [ # Some private headers depend on corecrypto, which we can’t use. @@ -444,7 +443,6 @@ mkAppleDerivation { env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; nativeBuildInputs = [ - developer_cmds pkg-config ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 907c5797a9290..4d8b142d29b0e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -80,8 +80,8 @@ "version": "44" }, "network_cmds": { - "hash": "sha256-8aW3dAA/dfZTayGLHqzRqnVLmwJzRpvVmXL4eJGz5OQ=", - "version": "696" + "hash": "sha256-aGBsxdYW21QjTILxcR8tHufQKvkvmai9MKOCxBNZvmI=", + "version": "698.60.4" }, "patch_cmds": { "hash": "sha256-foIoIMe+zgPISFmE10q4cwEUBhiah4nbD7UtjBumZYU=", From 100b5483295cf093358186b43080c4b0dc380591 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 13/14] darwin.system_cmds: 1012 -> 1012.60.2 --- .../darwin/apple-source-releases/system_cmds/package.nix | 4 ++++ pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix index f4d1b83f8c298..5e2b5ea0f834f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix @@ -62,7 +62,11 @@ let install -D -t "$out/include/os" \ '${Libc}/os/assumes.h' \ + '${Libc}/os/variant_private.h' \ '${xnu}/libkern/os/base_private.h' + substituteInPlace "$out/include/os/variant_private.h" \ + --replace-fail ', bridgeos(4.0)' "" \ + --replace-fail ', bridgeos' "" touch "$out/include/os/feature_private.h" install -D -t "$out/include/sys" \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 4d8b142d29b0e..9488fce386ed8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -100,8 +100,8 @@ "version": "319.0.1" }, "system_cmds": { - "hash": "sha256-SZfgMX0znyESzRNNzqyq/FAa9NQeI+5yiBS2xIvsP5g=", - "version": "1012" + "hash": "sha256-9nNJeVJo4XwGSHh+SJydhVt+I8+Rb5hCsPiFYKQ8/28=", + "version": "1012.60.2" }, "text_cmds": { "hash": "sha256-76dagwRcAf5fpoyH5FDR5kdCldv6Mgre6aFBzxaCRkg=", From a736ddeaec75f4a3f26d4d7b79bdb64f878d4074 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 14/14] darwin.top: 139 -> 139.40.2 --- pkgs/os-specific/darwin/apple-source-releases/top/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/package.nix b/pkgs/os-specific/darwin/apple-source-releases/top/package.nix index 35737d5f748be..ee48e7c444a96 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/top/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/top/package.nix @@ -13,7 +13,7 @@ in mkAppleDerivation { releaseName = "top"; - xcodeHash = "sha256-b7Qv9ks9JmilY9GaEU3/iXoHBNyHRYr4IB0jVf0fYdo="; + xcodeHash = "sha256-YeBhEstvPh8IX8ArVc7U8IRU6vqPoOE6kBTqcqZonGc="; patches = [ # Upstream removed aarch64 support from the 137 source release, but the removal can be reverted. diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 9488fce386ed8..2ffec99f7fb63 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -108,7 +108,7 @@ "version": "190.0.1" }, "top": { - "hash": "sha256-jz7udjXO5INtMHTDDdTUYAc4Tpy8v9nW0401LAHiPpA=", - "version": "139" + "hash": "sha256-e+k/jE49BMZZ24ge9JCa2ct5f1og6ewWb6U5ZMWdIEc=", + "version": "139.40.2" } }