From c45e09039b412fe81ad9828af59431f5dfa20bc9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 19 Jun 2020 04:20:00 -0500 Subject: [PATCH 1/2] tab: use python3 --- pkgs/tools/text/tab/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index f7796c8a3291..cd3bfbe85d8a 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, python2 }: +{ stdenv, fetchFromBitbucket, python3 }: stdenv.mkDerivation rec { version = "7.2"; @@ -11,10 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1bm15lw0vp901dj2vsqx6yixmn7ls3brrzh1w6zgd1ksjzlm5aax"; }; - nativeBuildInputs = [ python2 ]; + checkInputs = [ python3 ]; doCheck = true; + preCheck = '' + substituteInPlace Makefile --replace "python2 go2.py" "python go.py" + ''; + checkTarget = "test"; installPhase = '' From c193d3b494b669c7c0c0833f242c42650ecbbcf0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 19 Jun 2020 04:21:00 -0500 Subject: [PATCH 2/2] tab: enable on darwin --- pkgs/tools/text/tab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index cd3bfbe85d8a..8a80c7ad10e9 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { checkInputs = [ python3 ]; - doCheck = true; + doCheck = !stdenv.isDarwin; preCheck = '' substituteInPlace Makefile --replace "python2 go2.py" "python go.py" @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://tkatchev.bitbucket.io/tab/"; license = licenses.boost; maintainers = with maintainers; [ mstarzyk ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; }