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