From ef240933985f39428a3c538c6d4f55c1ad41637b Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Tue, 16 Dec 2025 14:26:48 +0200 Subject: [PATCH 1/3] darwin.xcode: fix link generation for universal versions of 26.0.1 and 26.1 --- pkgs/os-specific/darwin/xcode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 039a6879369b..15c8e881fd62 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -109,9 +109,9 @@ lib.makeExtensible (self: { xcode_16_4 = requireXcode "16.4" "sha256-voCEZlKrp9NYGmXAsf1FHxO69EgWZHDIWtQZ2qEzElA="; xcode_26 = requireXcode "26_Universal" "sha256-p4INqf85CSIzd7xHRCS9tCigQkOQPKnS/+D5nue3PsY="; xcode_26_Apple_silicon = requireXcode "26_Apple_silicon" "sha256-dlfZ2sM6a9pUPdukoMoqvQAj7EEUyj0a/VkXKwkkFT8="; - xcode_26_0_1 = requireXcode "26.0.1" "sha256-PsEIjrzxgXFqCWeHs/bsvrlxy8aN899jMhesczMbPfE="; + xcode_26_0_1 = requireXcode "26.0.1_Universal" "sha256-PsEIjrzxgXFqCWeHs/bsvrlxy8aN899jMhesczMbPfE="; xcode_26_0_1_Apple_silicon = requireXcode "26.0.1_Apple_silicon" "sha256-UBDey19uBljjRw84bY4rzxetFEkHiXLEj39Q578jYL8="; - xcode_26_1 = requireXcode "26.1" "sha256-SLIn1xAjaYhKGN6EEKslzmVZv+Zoq7QNGdtNreWJ5L8="; + xcode_26_1 = requireXcode "26.1_Universal" "sha256-SLIn1xAjaYhKGN6EEKslzmVZv+Zoq7QNGdtNreWJ5L8="; xcode_26_1_Apple_silicon = requireXcode "26.1_Apple_silicon" "sha256-xFMknk3RxxJi/5IOb2mmw7vyC1xOaY5ZwCZ09AARtJU="; xcode = self."xcode_${ From 3f3b271a2ad135558ed3a302d9cff4d1ae32174a Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Tue, 16 Dec 2025 14:26:49 +0200 Subject: [PATCH 2/3] darwin.xcode: add 26.1.1 --- pkgs/os-specific/darwin/xcode/default.nix | 2 ++ pkgs/top-level/darwin-packages.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 15c8e881fd62..2eaa4162bb6b 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -113,6 +113,8 @@ lib.makeExtensible (self: { xcode_26_0_1_Apple_silicon = requireXcode "26.0.1_Apple_silicon" "sha256-UBDey19uBljjRw84bY4rzxetFEkHiXLEj39Q578jYL8="; xcode_26_1 = requireXcode "26.1_Universal" "sha256-SLIn1xAjaYhKGN6EEKslzmVZv+Zoq7QNGdtNreWJ5L8="; xcode_26_1_Apple_silicon = requireXcode "26.1_Apple_silicon" "sha256-xFMknk3RxxJi/5IOb2mmw7vyC1xOaY5ZwCZ09AARtJU="; + xcode_26_1_1 = requireXcode "26.1.1_Universal" "sha256-IkmrerBysM4eqMf/wCQHCBcEL0go/ivFlMpJ4SYQmOU="; + xcode_26_1_1_Apple_silicon = requireXcode "26.1.1_Apple_silicon" "sha256-5dZ1O7iD2CF8R4TBeBLkaKLe/WOi8CMJJ1/Bg+uitCw="; xcode = self."xcode_${ lib.replaceStrings [ "." ] [ "_" ] ( diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 9a87aa6555ba..f64f93dffcaa 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -177,6 +177,8 @@ makeScopeWithSplicing' { xcode_26_0_1_Apple_silicon xcode_26_1 xcode_26_1_Apple_silicon + xcode_26_1_1 + xcode_26_1_1_Apple_silicon xcode requireXcode ; From b9002e996ec1e913d66acc3b5341d1e6853d9277 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Tue, 16 Dec 2025 14:26:49 +0200 Subject: [PATCH 3/3] darwin.xcode: add 26.2 --- pkgs/os-specific/darwin/xcode/default.nix | 2 ++ pkgs/top-level/darwin-packages.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 2eaa4162bb6b..873d0d4c97a6 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -115,6 +115,8 @@ lib.makeExtensible (self: { xcode_26_1_Apple_silicon = requireXcode "26.1_Apple_silicon" "sha256-xFMknk3RxxJi/5IOb2mmw7vyC1xOaY5ZwCZ09AARtJU="; xcode_26_1_1 = requireXcode "26.1.1_Universal" "sha256-IkmrerBysM4eqMf/wCQHCBcEL0go/ivFlMpJ4SYQmOU="; xcode_26_1_1_Apple_silicon = requireXcode "26.1.1_Apple_silicon" "sha256-5dZ1O7iD2CF8R4TBeBLkaKLe/WOi8CMJJ1/Bg+uitCw="; + xcode_26_2 = requireXcode "26.2_Universal" "sha256-uCw71PjAuvtKTIpcYsiFSjUZQnIBIpIoOm1QaaYHD7k="; + xcode_26_2_Apple_silicon = requireXcode "26.2_Apple_silicon" "sha256-YxMVppJwRzTA6xWOILxVjLdl0bNmtZSifG/KQx6inRE="; xcode = self."xcode_${ lib.replaceStrings [ "." ] [ "_" ] ( diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index f64f93dffcaa..b8328fe2a482 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -179,6 +179,8 @@ makeScopeWithSplicing' { xcode_26_1_Apple_silicon xcode_26_1_1 xcode_26_1_1_Apple_silicon + xcode_26_2 + xcode_26_2_Apple_silicon xcode requireXcode ;