Merge branch 'main' into fix-windows-tests

completions/bash/eza

@@ -38,13 +38,13 @@ _eza()
         # _parse_help doesn’t pick up short options when they are on the same line than long options
         --*)
             # colo[u]r isn’t parsed correctly so we filter these options out and add them by hand
-            parse_help=$( eza --help | grep -oE ' (\-\-[[:alnum:]@-]+)' | tr -d ' ' | grep -v '\-\-colo' )
+            parse_help=$( eza --help | grep -oE ' (--[[:alnum:]@-]+)' | tr -d ' ' | grep -v '\--colo' )
             completions=$( echo '--color --colour --color-scale --colour-scale' $parse_help )
             COMPREPLY=( $( compgen -W "$completions" -- "$cur" ) )
             ;;
 
         -*)
-            completions=$( eza --help | grep -oE ' (\-[[:alnum:]@])' | tr -d ' ' )
+            completions=$( eza --help | grep -oE ' (-[[:alnum:]@])' | tr -d ' ' )
             COMPREPLY=( $( compgen -W "$completions" -- "$cur" ) )
             ;;
 

flake.nix

@@ -120,7 +120,7 @@
             singleStep = true;
             # set itests files creation date to unix epoch
             buildPhase = ''touch --date=@0 tests/itest/*'';
-            cargoTestOptions = opts: opts ++ [ "--features nix" ];
+            cargoTestOptions = opts: opts ++ ["--features nix"];
             inherit buildInputs;
           };
 
@@ -135,8 +135,8 @@
             singleStep = true;
             # set itests files creation date to unix epoch
             buildPhase = ''touch --date=@0 tests/itest/*; rm tests/cmd/*.stdout || echo; rm tests/cmd/*.stderr || echo;'';
-            cargoTestOptions = opts: opts ++ [ "--features nix" ];
-            TRYCMD="dump";
+            cargoTestOptions = opts: opts ++ ["--features nix"];
+            TRYCMD = "dump";
             postInstall = ''
               cp dump $out -r
             '';
@@ -155,6 +155,7 @@
           build = packages.check;
           test = packages.test;
           lint = packages.clippy;
+          trycmd = packages.trycmd;
         };
       }
     );