diff options
author | Pamplemousse <xav.maso@gmail.com> | 2021-05-07 17:14:16 -0700 |
---|---|---|
committer | Pamplemousse <xav.maso@gmail.com> | 2021-05-10 14:47:11 -0700 |
commit | aac9ebc45f2dd348102f5fd100de1fa5d13f8ee5 (patch) | |
tree | 9bcf85b5faa76a2e75ba3df860953194c4214a2c /pkgs/development/tools/tapview | |
parent | 3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde (diff) | |
download | nixpkgs-aac9ebc45f2dd348102f5fd100de1fa5d13f8ee5.tar nixpkgs-aac9ebc45f2dd348102f5fd100de1fa5d13f8ee5.tar.gz nixpkgs-aac9ebc45f2dd348102f5fd100de1fa5d13f8ee5.tar.bz2 nixpkgs-aac9ebc45f2dd348102f5fd100de1fa5d13f8ee5.tar.lz nixpkgs-aac9ebc45f2dd348102f5fd100de1fa5d13f8ee5.tar.xz nixpkgs-aac9ebc45f2dd348102f5fd100de1fa5d13f8ee5.tar.zst nixpkgs-aac9ebc45f2dd348102f5fd100de1fa5d13f8ee5.zip |
tapview: init at 1.1
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
Diffstat (limited to 'pkgs/development/tools/tapview')
-rw-r--r-- | pkgs/development/tools/tapview/default.nix | 32 | ||||
-rw-r--r-- | pkgs/development/tools/tapview/dont_check_echo.patch | 44 |
2 files changed, 76 insertions, 0 deletions
diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/development/tools/tapview/default.nix new file mode 100644 index 00000000000..966df4bed65 --- /dev/null +++ b/pkgs/development/tools/tapview/default.nix @@ -0,0 +1,32 @@ +{ asciidoctor +, fetchFromGitLab +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "tapview"; + version = "1.1"; + + nativeBuildInputs = [ asciidoctor ]; + + src = fetchFromGitLab { + owner = "esr"; + repo = pname; + rev = version; + sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; + }; + + # Remove unecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. + patches = [ ./dont_check_echo.patch ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "A minimalist pure consumer for TAP (Test Anything Protocol)"; + homepage = "https://gitlab.com/esr/tapview"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/development/tools/tapview/dont_check_echo.patch b/pkgs/development/tools/tapview/dont_check_echo.patch new file mode 100644 index 00000000000..3b12adb84c5 --- /dev/null +++ b/pkgs/development/tools/tapview/dont_check_echo.patch @@ -0,0 +1,44 @@ +diff --git a/tapview b/tapview +index ad6a33a66d1..4cf9545d42f 100644 +--- a/tapview ++++ b/tapview +@@ -13,21 +13,6 @@ + # + # This is version 1.1 + # A newer version may be available at https://gitlab.com/esr/tapview +-# +-# POSIX allows but does not mandate that -n suppresses emission of a +-# trailing newline in echo. Thus, some shell builtin echos don't do +-# that. Cope gracefully. +-# shellcheck disable=SC2039 +-if [ "$(echo -n "a"; echo "b")" != "ab" ] +-then +- ECHO="echo" +-elif [ "$(/bin/echo -n "a"; /bin/echo "b")" = "ab" ] +-then +- ECHO="/bin/echo" +-else +- echo "tapview: bailing out, your echo lacks -n support." +- exit 3 +-fi + + OK="." + FAIL="F" +@@ -37,7 +22,7 @@ TODO_OK="u" + + ship_char() { + # shellcheck disable=SC2039 +- "${ECHO}" -n "$1" ++ echo -n "$1" + } + + ship_line() { +@@ -155,7 +140,7 @@ do + fi + done + +-/bin/echo "" ++echo "" + + if [ -z "$expect" ] + then |