From 0adf78de2c74f4c7204e8393e4b139baf6d67c98 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2023 16:48:13 +0200 Subject: [PATCH] merge-after-ci, tea-create-pr: use writeShellApplication --- flake-parts/merge-after-ci/default.nix | 15 +++++++-------- flake-parts/tea-create-pr/default.nix | 14 +++++++------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/flake-parts/merge-after-ci/default.nix b/flake-parts/merge-after-ci/default.nix index 0c8d8a5e8..96fa5666c 100644 --- a/flake-parts/merge-after-ci/default.nix +++ b/flake-parts/merge-after-ci/default.nix @@ -1,26 +1,25 @@ { perSystem = - { config - , pkgs + { pkgs , self' , ... }: let name = builtins.baseNameOf ./.; - script = config.writers.writePureShellScriptBin - name - [ + script = pkgs.writeShellApplication { + inherit name; + runtimeInputs = [ pkgs.bash pkgs.coreutils pkgs.git pkgs.tea pkgs.openssh self'.packages.tea-create-pr - ] - '' - export EDITOR=${pkgs.vim}/bin/vim + ]; + text = '' bash ${./script.sh} "$@" ''; + }; in { packages.${name} = script; diff --git a/flake-parts/tea-create-pr/default.nix b/flake-parts/tea-create-pr/default.nix index c2c7df2e3..e4160cd70 100644 --- a/flake-parts/tea-create-pr/default.nix +++ b/flake-parts/tea-create-pr/default.nix @@ -1,24 +1,24 @@ { perSystem = - { config - , pkgs + { pkgs , ... }: let name = builtins.baseNameOf ./.; - script = config.writers.writePureShellScriptBin - name - [ + script = pkgs.writeShellApplication { + inherit name; + runtimeInputs = [ pkgs.bash pkgs.coreutils pkgs.git pkgs.tea pkgs.openssh - ] - '' + ]; + text = '' export EDITOR=${pkgs.vim}/bin/vim bash ${./script.sh} "$@" ''; + }; in { packages.${name} = script;