From 8f171925b3a0edbdc6611eef50eb07ef991fc7a6 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 1 Jan 2023 22:27:28 +0200 Subject: [PATCH] makeSetupHook: deprecate deps argument --- pkgs/build-support/trivial-builders.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index db3207bf2250..c7cc61262a0a 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -639,8 +639,9 @@ rec { inherit depsTargetTargetPropagated; propagatedBuildInputs = # remove list conditionals before 23.11 - lib.warnIf (!lib.isList deps) "deps argument to makeSetupHook must be a list. content: ${toString deps}" - propagatedBuildInputs ++ (if lib.isList deps then deps else [ deps ] ); + 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 ])); strictDeps = true; # TODO 2023-01, no backport: simplify to inherit passthru; passthru = passthru