From af1286f0e9a97747abf4d5b6c11a729bccd44a1f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:23:13 +0100 Subject: [PATCH 1/3] ios-deploy: rename from darwin.ios-deploy --- .../default.nix => by-name/io/ios-deploy/package.nix} | 0 pkgs/top-level/darwin-aliases.nix | 1 + pkgs/top-level/darwin-packages.nix | 2 -- 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{os-specific/darwin/ios-deploy/default.nix => by-name/io/ios-deploy/package.nix} (100%) diff --git a/pkgs/os-specific/darwin/ios-deploy/default.nix b/pkgs/by-name/io/ios-deploy/package.nix similarity index 100% rename from pkgs/os-specific/darwin/ios-deploy/default.nix rename to pkgs/by-name/io/ios-deploy/package.nix diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 768e908a361c..3bd8248805d2 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -66,6 +66,7 @@ mapAliases ({ ### I ### insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 + ios-deploy = throw "'darwin.ios-deploy' has been renamed to 'ios-deploy'"; # added 2024-11-28 ### L ### diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 9c9cb9043591..89e10d8b0ab0 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -237,8 +237,6 @@ impure-cmds // apple-source-packages // apple-source-headers // stubs // { # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; - ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; - # See doc/packages/darwin-builder.section.md linux-builder = lib.makeOverridable ({ modules }: let From 6c59ecc7699bbcc5c9cb1ae6d3cb066e75c4f32f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:25:19 +0100 Subject: [PATCH 2/3] ios-deploy: reformat --- pkgs/by-name/io/ios-deploy/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/io/ios-deploy/package.nix b/pkgs/by-name/io/ios-deploy/package.nix index c405ac8e1c8b..f25b119a1218 100644 --- a/pkgs/by-name/io/ios-deploy/package.nix +++ b/pkgs/by-name/io/ios-deploy/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, fetchFromGitHub -, darwin -, testers +{ + lib, + stdenv, + fetchFromGitHub, + darwin, + testers, }: let From 5c2988371e99f84e34e8cfd4525e68fc7f6e0759 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:26:59 +0100 Subject: [PATCH 3/3] ios-deploy: migrate to new apple-sdk pattern --- pkgs/by-name/io/ios-deploy/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/io/ios-deploy/package.nix b/pkgs/by-name/io/ios-deploy/package.nix index f25b119a1218..21b6fc5b4f9c 100644 --- a/pkgs/by-name/io/ios-deploy/package.nix +++ b/pkgs/by-name/io/ios-deploy/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - darwin, testers, }: @@ -20,10 +19,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TVGC+f+1ow3b93CK3PhIL70le5SZxxb2ug5OkIg8XCA="; }; - buildInputs = [ - darwin.apple_sdk.frameworks.Foundation - ]; - buildPhase = '' runHook preBuild