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:
@@ -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 { };
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user