From c18e0380973687edb92ebaf75cd55bb1d15ccdb9 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 20 Jun 2024 14:28:54 +0200 Subject: [PATCH 1/3] writeTextFile: add support for passthru --- pkgs/build-support/trivial-builders/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index b0c9f93649c9..3b202881a85b 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -82,6 +82,7 @@ rec { , destination ? "" , checkPhase ? "" , meta ? { } + , passthru ? { } , allowSubstitutes ? false , preferLocalBuild ? true , derivationArgs ? { } @@ -105,7 +106,8 @@ rec { { mainProgram = lib.head matches; } // meta // derivationArgs.meta or {}; - } // removeAttrs derivationArgs [ "passAsFile" "meta" ]) + passthru = passthru // derivationArgs.passthru or {}; + } // removeAttrs derivationArgs [ "passAsFile" "meta" "passthru" ]) '' target=$out${lib.escapeShellArg destination} mkdir -p "$(dirname "$target")" From f4789133b8e654eab873582b35b91b5f3cd6e0be Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 20 Jun 2024 15:38:01 +0200 Subject: [PATCH 2/3] concatTextFile: add passthru argument --- pkgs/build-support/trivial-builders/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 3b202881a85b..84b945d7647c 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -368,9 +368,10 @@ rec { , destination ? "" # relative path appended to $out eg "/bin/foo" , checkPhase ? "" # syntax checks, e.g. for scripts , meta ? { } + , passthru ? { } }: runCommandLocal name - { inherit files executable checkPhase meta destination; } + { inherit files executable checkPhase meta passthru destination; } '' file=$out$destination mkdir -p "$(dirname "$file")" From d04d2858c928ae57bec19d32b43ab5e3c91b9823 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 20 Jun 2024 15:38:17 +0200 Subject: [PATCH 3/3] writeShellApplication: add passthru argument --- pkgs/build-support/trivial-builders/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 84b945d7647c..c5b27e85e5bb 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -222,6 +222,12 @@ rec { Type: AttrSet */ meta ? { }, + /* + `stdenv.mkDerivation`'s `passthru` argument. + + Type: AttrSet + */ + passthru ? { }, /* The `checkPhase` to run. Defaults to `shellcheck` on supported platforms and `bash -n`. @@ -265,7 +271,7 @@ rec { derivationArgs ? { }, }: writeTextFile { - inherit name meta derivationArgs; + inherit name meta passthru derivationArgs; executable = true; destination = "/bin/${name}"; allowSubstitutes = true;