treewide: remove usage of deprecated apple_sdk framework stubs

They are not doing anything right now. This is in preparation for their complete removal from the tree. Note: several changes that affect the derivation inputs (e.g. removal of references to stub paths in build instructions) were left out. They will be cleaned up the next iteration and will require special care. Note: this PR is a result of a mix of ugly regex (not AST) based automation and some manual labor. For reference, the regex automation part was hacked in: https://github.com/booxter/nix-clean-apple_sdk Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2026-01-11 18:32:23 +08:00 · 2025-04-14 09:29:14 -04:00
parent 5ec4cb1365
commit dd0f03a56c
1173 changed files with 2734 additions and 10513 deletions
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -9,9 +9,6 @@
  pkg-config,
  python3,
  xorg,
-  Libsystem,
-  AppKit,
-  Security,
  nghttp2,
  libgit2,
  withDefaultFeatures ? true,
@@ -51,12 +48,9 @@ rustPlatform.buildRustPackage {
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      zlib
-      Libsystem
-      Security
    ]
    ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ]
    ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [
-      AppKit
      nghttp2
      libgit2
    ];
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@@ -3,28 +3,24 @@
  config,
  newScope,
  dbus,
-  IOKit,
-  CoreFoundation,
-  Foundation,
-  Security,
 }:

 lib.makeScope newScope (
  self:
  with self;
  {
-    gstat = callPackage ./gstat.nix { inherit Security; };
-    formats = callPackage ./formats.nix { inherit IOKit Foundation; };
-    polars = callPackage ./polars.nix { inherit IOKit Foundation; };
-    query = callPackage ./query.nix { inherit IOKit CoreFoundation; };
-    net = callPackage ./net.nix { inherit IOKit CoreFoundation; };
-    units = callPackage ./units.nix { inherit IOKit Foundation; };
-    highlight = callPackage ./highlight.nix { inherit IOKit Foundation; };
+    gstat = callPackage ./gstat.nix { };
+    formats = callPackage ./formats.nix { };
+    polars = callPackage ./polars.nix { };
+    query = callPackage ./query.nix { };
+    net = callPackage ./net.nix { };
+    units = callPackage ./units.nix { };
+    highlight = callPackage ./highlight.nix { };
    dbus = callPackage ./dbus.nix {
      inherit dbus;
      nushell_plugin_dbus = self.dbus;
    };
-    skim = callPackage ./skim.nix { inherit IOKit CoreFoundation; };
+    skim = callPackage ./skim.nix { };
  }
  // lib.optionalAttrs config.allowAliases {
    regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
--- a/pkgs/shells/nushell/plugins/formats.nix
+++ b/pkgs/shells/nushell/plugins/formats.nix
@@ -4,8 +4,6 @@
  rustPlatform,
  nushell,
  pkg-config,
-  IOKit,
-  Foundation,
  nix-update-script,
 }:

@@ -16,10 +14,6 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    IOKit
-    Foundation
-  ];
  cargoBuildFlags = [ "--package nu_plugin_formats" ];

  checkPhase = ''
--- a/pkgs/shells/nushell/plugins/gstat.nix
+++ b/pkgs/shells/nushell/plugins/gstat.nix
@@ -5,7 +5,6 @@
  openssl,
  nushell,
  pkg-config,
-  Security,
  nix-update-script,
 }:

@@ -16,7 +15,7 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
+  buildInputs = [ openssl ];
  cargoBuildFlags = [ "--package nu_plugin_gstat" ];

  checkPhase = ''
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -5,8 +5,6 @@
  pkg-config,
  nix-update-script,
  fetchFromGitHub,
-  IOKit,
-  Foundation,
 }:

 rustPlatform.buildRustPackage rec {
@@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-y0SCpDU1GM5JrixOffP1DRGtaXZsBjr7fYgYxhn4NDg=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    IOKit
-    Foundation
-  ];
  cargoBuildFlags = [ "--package nu_plugin_highlight" ];

  checkPhase = ''
--- a/pkgs/shells/nushell/plugins/net.nix
+++ b/pkgs/shells/nushell/plugins/net.nix
@@ -2,9 +2,6 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
-  stdenv,
-  IOKit,
-  CoreFoundation,
  nix-update-script,
 }:

@@ -24,11 +21,6 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [ rustPlatform.bindgenHook ];

-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreFoundation
-    IOKit
-  ];
-
  passthru.updateScript = nix-update-script { };

  meta = with lib; {
--- a/pkgs/shells/nushell/plugins/polars.nix
+++ b/pkgs/shells/nushell/plugins/polars.nix
@@ -5,8 +5,6 @@
  openssl,
  nushell,
  pkg-config,
-  IOKit,
-  Foundation,
  nix-update-script,
 }:

@@ -18,12 +16,7 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      IOKit
-      Foundation
-    ];
+  buildInputs = [ openssl ];
  cargoBuildFlags = [ "--package nu_plugin_polars" ];

  checkPhase = ''
--- a/pkgs/shells/nushell/plugins/query.nix
+++ b/pkgs/shells/nushell/plugins/query.nix
@@ -3,8 +3,6 @@
  lib,
  rustPlatform,
  nushell,
-  IOKit,
-  CoreFoundation,
  nix-update-script,
  pkg-config,
  openssl,
@@ -18,15 +16,10 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs =
-    [
-      openssl
-      curl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      IOKit
-      CoreFoundation
-    ];
+  buildInputs = [
+    openssl
+    curl
+  ];
  cargoBuildFlags = [ "--package nu_plugin_query" ];

  checkPhase = ''
--- a/pkgs/shells/nushell/plugins/skim.nix
+++ b/pkgs/shells/nushell/plugins/skim.nix
@@ -5,8 +5,6 @@
  rustPlatform,
  nix-update-script,
  fetchFromGitHub,
-  IOKit,
-  CoreFoundation,
  nushell,
  skim,
 }:
@@ -26,10 +24,6 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-CvBBBDi8AkSfCIcUyUH4e5DX5tija1KqE9z05lndNE4=";

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    IOKit
-    CoreFoundation
-  ];

  passthru = {
    updateScript = nix-update-script { };
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@@ -5,8 +5,6 @@
  pkg-config,
  nix-update-script,
  fetchFromGitHub,
-  IOKit,
-  Foundation,
 }:

 rustPlatform.buildRustPackage rec {
@@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-3v9jP8nL0JqtC76igsCytkQAVTgWqzHH0KQX3o6bi0c=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    IOKit
-    Foundation
-  ];
  cargoBuildFlags = [ "--package nu_plugin_units" ];

  passthru.updateScript = nix-update-script { };