+2 -6

modules/flake/checks/lib.nix

reviewed

··· 74 74 # modified from 75 75 # https://github.com/antifuchs/nix-flake-tests/blob/bbd9216bd0f6495bb961a8eb8392b7ef55c67afb/default.nix 76 76 formatValue = 77 77 - val: 78 78 - if (builtins.isList val || builtins.isAttrs val) then 79 79 - builtins.toJSON val 80 80 - else 81 81 - builtins.toString val; 77 77 + val: if (builtins.isList val || builtins.isAttrs val) then builtins.toJSON val else toString val; 82 78 83 79 resultToString = 84 80 { ··· 107 103 { 108 104 checks.lib = 109 105 if res != [ ] then 110 110 - builtins.throw (lib.strings.concatStringsSep "\n" (map resultToString (lib.debug.traceValSeq res))) 106 106 + throw (lib.strings.concatStringsSep "\n" (map resultToString (lib.debug.traceValSeq res))) 111 107 else 112 108 pkgs.runCommandLocal "nix-flake-tests-success" { } "echo > $out"; 113 109 };

+2 -2

modules/flake/lib/helpers.nix

reviewed

··· 217 217 { 218 218 "https://${domain}/".insteadOf = "${alias}:"; 219 219 "ssh://${user}@${domain}${ 220 220 - if (builtins.isNull port) then 220 220 + if (port == null) then 221 221 "" 222 222 else if (builtins.isInt port) then 223 223 - ":" + (builtins.toString port) 223 223 + ":" + (toString port) 224 224 else 225 225 ":" + port 226 226 }/".pushInsteadOf =

+1 -1

modules/flake/lib/secrets.nix

reviewed

··· 39 39 ... 40 40 }@args: 41 41 let 42 42 - args' = builtins.removeAttrs args [ 42 42 + args' = removeAttrs args [ 43 43 "file" 44 44 "owner" 45 45 "group"