diff options
| author | Steven Pease <peasteven@gmail.com> | 2021-01-19 20:41:39 -0800 |
|---|---|---|
| committer | Steven Pease <peasteven@gmail.com> | 2021-01-19 20:41:39 -0800 |
| commit | d8c1c0dc501855658ef3f4bf6a896c82730fe806 (patch) | |
| tree | 1f3f4998f690673cfde11ac50af17cbd28df0329 | |
| parent | 6217cc92b513b5c66f1dbe38d9b8d2d6835ecbe6 (diff) | |
| download | nixpkgs-d8c1c0dc501855658ef3f4bf6a896c82730fe806.tar nixpkgs-d8c1c0dc501855658ef3f4bf6a896c82730fe806.tar.gz nixpkgs-d8c1c0dc501855658ef3f4bf6a896c82730fe806.tar.bz2 nixpkgs-d8c1c0dc501855658ef3f4bf6a896c82730fe806.tar.lz nixpkgs-d8c1c0dc501855658ef3f4bf6a896c82730fe806.tar.xz nixpkgs-d8c1c0dc501855658ef3f4bf6a896c82730fe806.tar.zst nixpkgs-d8c1c0dc501855658ef3f4bf6a896c82730fe806.zip | |
Update to XCode 12.3
| -rw-r--r-- | lib/systems/examples.nix | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/xcode/default.nix | 12 |
2 files changed, 16 insertions, 12 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 5a31b8d91e4..9f090655747 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -179,8 +179,8 @@ rec { iphone64 = { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; - sdkVer = "14.0"; - xcodeVer = "12.0.1"; + sdkVer = "14.3"; + xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; @@ -189,8 +189,8 @@ rec { iphone32 = { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; - sdkVer = "14.0"; - xcodeVer = "12.0.1"; + sdkVer = "14.3"; + xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; @@ -199,8 +199,8 @@ rec { iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; - sdkVer = "14.0"; - xcodeVer = "12.0.1"; + sdkVer = "14.3"; + xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; platform = {}; @@ -209,8 +209,8 @@ rec { iphone32-simulator = { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; - sdkVer = "14.0"; - xcodeVer = "12.0.1"; + sdkVer = "14.3"; + xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; platform = {}; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 7bb004958d5..a96d7256968 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,10 +1,10 @@ -{ stdenv, requireFile, lib }: +{ requireFile, targetPlatform, lib }: let requireXcode = version: sha256: let xip = "Xcode_" + version + ".xip"; # TODO(alexfmpe): Find out how to validate the .xip signature in Linux - unxip = if stdenv.isDarwin + unxip = if targetPlatform.isDarwin then '' open -W ${xip} rm -rf ${xip} @@ -31,7 +31,7 @@ let requireXcode = version: sha256: rm -rf Xcode.app ''; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://developer.apple.com/downloads/"; description = "Apple's XCode SDK"; license = licenses.unfree; @@ -63,5 +63,9 @@ in lib.makeExtensible (self: { xcode_11_7 = requireXcode "11.7" "0422rdc4j5qwyk59anbybxyfv0p26x0xryszm0wd8i44g66smlmj"; xcode_12 = requireXcode "12" "1w3xm268pyn5m04wv22invd5kr2k4jqllgrzapv6n1sxxynxrh8z"; xcode_12_0_1 = requireXcode "12.0.1" "1p6vd5ai0hh3cq6aflh4h21ar0shxnz8wlkaxwq7liwsdmkwzbl0"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.0.1")}"; + xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; + xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; + xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (targetPlatform ? xcodeVer) then targetPlatform.xcodeVer else "12.3")}"; }) + |