treefmt v2.5.0traversed 71 files emitted 68 files for processing formatted 68 files (3 changed) in 461ms M clanServices/dvt/flake-module.nix M clanServices/dvt/tests/lib.nix M packages/vero.nix diff --git a/clanServices/dvt/flake-module.nix b/clanServices/dvt/flake-module.nix index cc970b5..519d6cf 100644 --- a/clanServices/dvt/flake-module.nix +++ b/clanServices/dvt/flake-module.nix @@ -18,11 +18,9 @@ let }: { imports = [ - ( - (import ./tests/lib.nix lib).mkDvtTest { inherit self; } { - inherit elPackage clPackage validatorPackage; - } - ) + ((import ./tests/lib.nix lib).mkDvtTest { inherit self; } { + inherit elPackage clPackage validatorPackage; + }) ]; clan.modules."@dvt/dvt" = dvtModule; }; diff --git a/clanServices/dvt/tests/lib.nix b/clanServices/dvt/tests/lib.nix index b75bfee..dd539eb 100644 --- a/clanServices/dvt/tests/lib.nix +++ b/clanServices/dvt/tests/lib.nix @@ -190,40 +190,46 @@ in # Summary phase helpers, parameterised by validatorPackage. # Both are Python code blocks that are interpolated at column 0 in the summary string. summaryValidatorRows = - if validatorPackage == "vero" then '' - for v in validators: - rsi_ok, rsi_st = _svc(v, "remote-signer-dirk-interop.service") - v_ok, v_st = _svc(v, "vero.service") - if not rsi_ok: - _unexpected.append(f"{v.name}: remote-signer-dirk-interop not active") - if not v_ok: - _unexpected.append(f"{v.name}: vero not active") - _validator_rows.append(f" {v.name} rsi={rsi_st} vero={v_st}") - '' else '' - for v in validators: - ok, st = _svc(v, "vouch.service") - if not ok: - _unexpected.append(f"{v.name}: vouch not active") - _validator_rows.append(f" {v.name} vouch={st}") - ''; + if validatorPackage == "vero" then + '' + for v in validators: + rsi_ok, rsi_st = _svc(v, "remote-signer-dirk-interop.service") + v_ok, v_st = _svc(v, "vero.service") + if not rsi_ok: + _unexpected.append(f"{v.name}: remote-signer-dirk-interop not active") + if not v_ok: + _unexpected.append(f"{v.name}: vero not active") + _validator_rows.append(f" {v.name} rsi={rsi_st} vero={v_st}") + '' + else + '' + for v in validators: + ok, st = _svc(v, "vouch.service") + if not ok: + _unexpected.append(f"{v.name}: vouch not active") + _validator_rows.append(f" {v.name} vouch={st}") + ''; summaryValidatorErrors = - if validatorPackage == "vero" then '' - for v in validators: - for svc in ["remote-signer-dirk-interop.service", "vero.service"]: - errs = _journal_errors(v, svc) - if errs: - _err_rows.append(f" {_c(v.name + ' ' + svc, _YEL)}:") - for ln in errs.splitlines(): - _err_rows.append(f" {_c(ln, _YEL)}") - '' else '' - for v in validators: - errs = _journal_errors(v, "vouch.service") - if errs: - _err_rows.append(f" {_c(v.name + ' vouch.service', _YEL)}:") - for ln in errs.splitlines(): - _err_rows.append(f" {_c(ln, _YEL)}") - ''; + if validatorPackage == "vero" then + '' + for v in validators: + for svc in ["remote-signer-dirk-interop.service", "vero.service"]: + errs = _journal_errors(v, svc) + if errs: + _err_rows.append(f" {_c(v.name + ' ' + svc, _YEL)}:") + for ln in errs.splitlines(): + _err_rows.append(f" {_c(ln, _YEL)}") + '' + else + '' + for v in validators: + errs = _journal_errors(v, "vouch.service") + if errs: + _err_rows.append(f" {_c(v.name + ' vouch.service', _YEL)}:") + for ln in errs.splitlines(): + _err_rows.append(f" {_c(ln, _YEL)}") + ''; # Base phase strings — one attribute per phase name, built from el/cl metadata. basePhases = { diff --git a/packages/vero.nix b/packages/vero.nix index 08fc1d0..e6835bb 100644 --- a/packages/vero.nix +++ b/packages/vero.nix @@ -35,10 +35,13 @@ let let rustSupportDir = pkgs.path + "/pkgs/build-support/rust"; - patchedUtilSrc = builtins.replaceStrings - [ " session.mount('https://', HTTPAdapter(max_retries=retries))\n return session\n" ] - [ " session.mount('https://', HTTPAdapter(max_retries=retries))\n session.headers[\"User-Agent\"] = \"nixpkgs-fetchCargoVendor/1 (https://github.com/NixOS/nixpkgs)\"\n return session\n" ] - (builtins.readFile (rustSupportDir + "/fetch-cargo-vendor-util.py")); + patchedUtilSrc = + builtins.replaceStrings + [ " session.mount('https://', HTTPAdapter(max_retries=retries))\n return session\n" ] + [ + " session.mount('https://', HTTPAdapter(max_retries=retries))\n session.headers[\"User-Agent\"] = \"nixpkgs-fetchCargoVendor/1 (https://github.com/NixOS/nixpkgs)\"\n return session\n" + ] + (builtins.readFile (rustSupportDir + "/fetch-cargo-vendor-util.py")); patchedUtil = pkgs.writers.writePython3Bin "fetch-cargo-vendor-util" { libraries = @@ -53,9 +56,12 @@ let in pkgs.callPackage (rustSupportDir + "/fetch-cargo-vendor.nix") { writers = pkgs.writers // { - writePython3Bin = name: args: content: - if name == "fetch-cargo-vendor-util" then patchedUtil - else pkgs.writers.writePython3Bin name args content; + writePython3Bin = + name: args: content: + if name == "fetch-cargo-vendor-util" then + patchedUtil + else + pkgs.writers.writePython3Bin name args content; }; };