From 6646eeb500eeb27b8bcd56b9910fa967bf8ba410 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Nov 2024 14:34:36 +0100
Subject: [PATCH] makeSetupHook: remove deprecated deps argument

This had been scheduled for removal in 23.11.
---
 pkgs/build-support/trivial-builders/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 107c40c87856..12a40a2d9602 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -607,7 +607,6 @@ rec {
   # See https://nixos.org/manual/nixpkgs/unstable/#sec-pkgs.makeSetupHook
   makeSetupHook =
     { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook"
-    , deps ? [ ]
       # hooks go in nativeBuildInputs so these will be nativeBuildInputs
     , propagatedBuildInputs ? [ ]
       # these will be buildInputs
@@ -625,11 +624,7 @@ rec {
         __structuredAttrs = false;
         inherit meta;
         inherit depsTargetTargetPropagated;
-        propagatedBuildInputs =
-          # remove list conditionals before 23.11
-          lib.warnIf (!lib.isList deps) "'deps' argument to makeSetupHook must be a list. content of deps: ${toString deps}"
-            (lib.warnIf (deps != [ ]) "'deps' argument to makeSetupHook is deprecated and will be removed in release 23.11., Please use propagatedBuildInputs instead. content of deps: ${toString deps}"
-              propagatedBuildInputs ++ (if lib.isList deps then deps else [ deps ]));
+        inherit propagatedBuildInputs;
         strictDeps = true;
         # TODO 2023-01, no backport: simplify to inherit passthru;
         passthru = passthru