treefmt-check
x86_64-linux.treefmt
· build #43
· raw
1treefmt v2.5.0traversed 71 files2emitted 68 files for processing3formatted 68 files (3 changed) in 461ms4 M clanServices/dvt/flake-module.nix5 M clanServices/dvt/tests/lib.nix6 M packages/vero.nix7diff --git a/clanServices/dvt/flake-module.nix b/clanServices/dvt/flake-module.nix8index cc970b5..519d6cf 1006449--- a/clanServices/dvt/flake-module.nix10+++ b/clanServices/dvt/flake-module.nix11@@ -18,11 +18,9 @@ let12 }:13 {14 imports = [15- (16- (import ./tests/lib.nix lib).mkDvtTest { inherit self; } {17- inherit elPackage clPackage validatorPackage;18- }19- )20+ ((import ./tests/lib.nix lib).mkDvtTest { inherit self; } {21+ inherit elPackage clPackage validatorPackage;22+ })23 ];24 clan.modules."@dvt/dvt" = dvtModule;25 };26diff --git a/clanServices/dvt/tests/lib.nix b/clanServices/dvt/tests/lib.nix27index b75bfee..dd539eb 10064428--- a/clanServices/dvt/tests/lib.nix29+++ b/clanServices/dvt/tests/lib.nix30@@ -190,40 +190,46 @@ in31 # Summary phase helpers, parameterised by validatorPackage.32 # Both are Python code blocks that are interpolated at column 0 in the summary string.33 summaryValidatorRows =34- if validatorPackage == "vero" then ''35- for v in validators:36- rsi_ok, rsi_st = _svc(v, "remote-signer-dirk-interop.service")37- v_ok, v_st = _svc(v, "vero.service")38- if not rsi_ok:39- _unexpected.append(f"{v.name}: remote-signer-dirk-interop not active")40- if not v_ok:41- _unexpected.append(f"{v.name}: vero not active")42- _validator_rows.append(f" {v.name} rsi={rsi_st} vero={v_st}")43- '' else ''44- for v in validators:45- ok, st = _svc(v, "vouch.service")46- if not ok:47- _unexpected.append(f"{v.name}: vouch not active")48- _validator_rows.append(f" {v.name} vouch={st}")49- '';50+ if validatorPackage == "vero" then51+ ''52+ for v in validators:53+ rsi_ok, rsi_st = _svc(v, "remote-signer-dirk-interop.service")54+ v_ok, v_st = _svc(v, "vero.service")55+ if not rsi_ok:56+ _unexpected.append(f"{v.name}: remote-signer-dirk-interop not active")57+ if not v_ok:58+ _unexpected.append(f"{v.name}: vero not active")59+ _validator_rows.append(f" {v.name} rsi={rsi_st} vero={v_st}")60+ ''61+ else62+ ''63+ for v in validators:64+ ok, st = _svc(v, "vouch.service")65+ if not ok:66+ _unexpected.append(f"{v.name}: vouch not active")67+ _validator_rows.append(f" {v.name} vouch={st}")68+ '';69 70 summaryValidatorErrors =71- if validatorPackage == "vero" then ''72- for v in validators:73- for svc in ["remote-signer-dirk-interop.service", "vero.service"]:74- errs = _journal_errors(v, svc)75- if errs:76- _err_rows.append(f" {_c(v.name + ' ' + svc, _YEL)}:")77- for ln in errs.splitlines():78- _err_rows.append(f" {_c(ln, _YEL)}")79- '' else ''80- for v in validators:81- errs = _journal_errors(v, "vouch.service")82- if errs:83- _err_rows.append(f" {_c(v.name + ' vouch.service', _YEL)}:")84- for ln in errs.splitlines():85- _err_rows.append(f" {_c(ln, _YEL)}")86- '';87+ if validatorPackage == "vero" then88+ ''89+ for v in validators:90+ for svc in ["remote-signer-dirk-interop.service", "vero.service"]:91+ errs = _journal_errors(v, svc)92+ if errs:93+ _err_rows.append(f" {_c(v.name + ' ' + svc, _YEL)}:")94+ for ln in errs.splitlines():95+ _err_rows.append(f" {_c(ln, _YEL)}")96+ ''97+ else98+ ''99+ for v in validators:100+ errs = _journal_errors(v, "vouch.service")101+ if errs:102+ _err_rows.append(f" {_c(v.name + ' vouch.service', _YEL)}:")103+ for ln in errs.splitlines():104+ _err_rows.append(f" {_c(ln, _YEL)}")105+ '';106 107 # Base phase strings — one attribute per phase name, built from el/cl metadata.108 basePhases = {109diff --git a/packages/vero.nix b/packages/vero.nix110index 08fc1d0..e6835bb 100644111--- a/packages/vero.nix112+++ b/packages/vero.nix113@@ -35,10 +35,13 @@ let114 let115 rustSupportDir = pkgs.path + "/pkgs/build-support/rust";116 117- patchedUtilSrc = builtins.replaceStrings118- [ " session.mount('https://', HTTPAdapter(max_retries=retries))\n return session\n" ]119- [ " session.mount('https://', HTTPAdapter(max_retries=retries))\n session.headers[\"User-Agent\"] = \"nixpkgs-fetchCargoVendor/1 (https://github.com/NixOS/nixpkgs)\"\n return session\n" ]120- (builtins.readFile (rustSupportDir + "/fetch-cargo-vendor-util.py"));121+ patchedUtilSrc =122+ builtins.replaceStrings123+ [ " session.mount('https://', HTTPAdapter(max_retries=retries))\n return session\n" ]124+ [125+ " session.mount('https://', HTTPAdapter(max_retries=retries))\n session.headers[\"User-Agent\"] = \"nixpkgs-fetchCargoVendor/1 (https://github.com/NixOS/nixpkgs)\"\n return session\n"126+ ]127+ (builtins.readFile (rustSupportDir + "/fetch-cargo-vendor-util.py"));128 129 patchedUtil = pkgs.writers.writePython3Bin "fetch-cargo-vendor-util" {130 libraries =131@@ -53,9 +56,12 @@ let132 in133 pkgs.callPackage (rustSupportDir + "/fetch-cargo-vendor.nix") {134 writers = pkgs.writers // {135- writePython3Bin = name: args: content:136- if name == "fetch-cargo-vendor-util" then patchedUtil137- else pkgs.writers.writePython3Bin name args content;138+ writePython3Bin =139+ name: args: content:140+ if name == "fetch-cargo-vendor-util" then141+ patchedUtil142+ else143+ pkgs.writers.writePython3Bin name args content;144 };145 };146