From a1f516820b8f5c2b6b2d415391ccaa51ccf115b7 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 20 Apr 2025 15:10:49 +0100 Subject: [PATCH] darwin.stubs.*: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are no longer used, and it doesn’t seem worth keeping inert stubs for deprecated commands around. --- pkgs/os-specific/darwin/stubs/default.nix | 25 ----------------------- pkgs/top-level/darwin-aliases.nix | 4 ++++ pkgs/top-level/darwin-packages.nix | 2 -- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 pkgs/os-specific/darwin/stubs/default.nix diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix deleted file mode 100644 index 832fdc557b5b..000000000000 --- a/pkgs/os-specific/darwin/stubs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - writeScriptBin, - runtimeShell, -}: - -let - fake = - name: - lib.overrideDerivation - (writeScriptBin name '' - #!${runtimeShell} - echo >&2 "Faking call to ${name} with arguments:" - echo >&2 "$@" - '') - (drv: { - name = "${name}-stub"; - }); -in - -{ - setfile = fake "SetFile"; - rez = fake "Rez"; - derez = fake "DeRez"; -} diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index b5517f216eec..2004fb743a96 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -90,4 +90,8 @@ mapAliases ({ ### P ### postLinkSignHook = throw "'darwin.postLinkSignHook' has been removed because it is obsolete"; # added 2025-02-23 + + ### S ### + + stubs = throw "'darwin.stubs.*' have been removed as they were unused"; # added 2025-04-20 }) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 212ba54e57c4..7a5a5ed7cd99 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -204,8 +204,6 @@ makeScopeWithSplicing' { openwith = callPackage ../os-specific/darwin/openwith { }; - stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; - trash = callPackage ../os-specific/darwin/trash { }; inherit (self.file_cmds) xattr;