Merge pull request #185500 from sielicki/master

authored by Sandro and committed by GitHub ed63dc36 a362cc95

+9 -4
+9 -4
pkgs/tools/misc/bat-extras/default.nix
··· 3 3 , coreutils 4 4 , getconf 5 5 , less 6 + # tests 7 + , bash 8 + , zsh 9 + , fish 6 10 # batgrep 7 11 , ripgrep 8 12 # prettybat ··· 51 55 52 56 # Run the library tests as they don't have external dependencies 53 57 doCheck = true; 54 - checkInputs = lib.optionals stdenv.isDarwin [ getconf ]; 58 + checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); 55 59 checkPhase = '' 56 60 runHook preCheck 57 61 # test list repeats suites. Unique them ··· 59 63 while read -r action arg _; do 60 64 [[ "$action" == "test_suite" && "$arg" == lib_* ]] && 61 65 test_suites+=(["$arg"]=1) 62 - done <<<"$(bash ./test.sh --compiled --list --porcelain)" 66 + done <<<"$(./test.sh --compiled --list --porcelain)" 63 67 (( ''${#test_suites[@]} != 0 )) || { 64 68 echo "Couldn't find any library test suites" 65 69 exit 1 66 70 } 67 - bash ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}") 71 + ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}") 68 72 runHook postCheck 69 73 ''; 70 74 ··· 108 112 dontBuild = true; # we've already built 109 113 110 114 doCheck = true; 111 - checkInputs = lib.optionals stdenv.isDarwin [ getconf ]; 115 + checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); 112 116 checkPhase = '' 113 117 runHook preCheck 114 118 bash ./test.sh --compiled --suite ${name} ··· 139 143 batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta); 140 144 batgrep = script "batgrep" [ less coreutils ripgrep ]; 141 145 batman = script "batman" [ util-linux ]; 146 + batpipe = script "batpipe" [ less ]; 142 147 batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); 143 148 prettybat = script "prettybat" ([] 144 149 ++ optionalDep withShFmt shfmt