tea-create-pr: get rid of runtime nix eval

...instead use our treefmt wrapper derivation which is exactly the same
but doesn't require an eval at runtime
This commit is contained in:
DavHau
2024-09-06 15:44:29 +02:00
parent c94bec68f0
commit b13081a84c
3 changed files with 7 additions and 2 deletions

View File

@@ -24,7 +24,7 @@
{ {
packages = packages =
{ {
tea-create-pr = pkgs.callPackage ./tea-create-pr { }; tea-create-pr = pkgs.callPackage ./tea-create-pr { formatter = config.treefmt.build.wrapper; };
zerotier-members = pkgs.callPackage ./zerotier-members { }; zerotier-members = pkgs.callPackage ./zerotier-members { };
zt-tcp-relay = pkgs.callPackage ./zt-tcp-relay { }; zt-tcp-relay = pkgs.callPackage ./zt-tcp-relay { };
moonlight-sunshine-accept = pkgs.callPackage ./moonlight-sunshine-accept { }; moonlight-sunshine-accept = pkgs.callPackage ./moonlight-sunshine-accept { };

View File

@@ -5,6 +5,8 @@
git, git,
tea, tea,
openssh, openssh,
# our formatter
formatter,
}: }:
writeShellApplication { writeShellApplication {
name = "tea-create-pr"; name = "tea-create-pr";
@@ -14,6 +16,9 @@ writeShellApplication {
git git
tea tea
openssh openssh
# our treefmt formatter wrapped with correct config
formatter
]; ];
text = builtins.readFile ./script.sh; text = builtins.readFile ./script.sh;
} }

View File

@@ -29,7 +29,7 @@ if ! check_remote "$remoteUpstream"; then
exit 1 exit 1
fi fi
nix fmt -- --fail-on-change --no-cache treefmt --fail-on-change --no-cache
upstream_url=$(git remote get-url "$remoteUpstream") upstream_url=$(git remote get-url "$remoteUpstream")
set -x set -x