Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eace2d8a1a74
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d6fd8b00817
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 19, 2020

  1. tab: use python3

    @marsam
    marsam committed Jun 19, 2020
    Copy the full SHA
    c45e090 View commit details

  2. tab: enable on darwin

    @marsam
    marsam committed Jun 19, 2020
    Copy the full SHA
    c193d3b View commit details

Commits on Sep 11, 2020

  1. Merge pull request #97731 from marsam/tab-python3 

    tab: use python3
    @marsam
    marsam authored Sep 11, 2020
    Copy the full SHA
    7d6fd8b View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/tools/text/tab/default.nix
12 changes: 8 additions & 4 deletions pkgs/tools/text/tab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, python2 }:
{ stdenv, fetchFromBitbucket, python3 }:

stdenv.mkDerivation rec {
version = "7.2";
@@ -11,9 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "1bm15lw0vp901dj2vsqx6yixmn7ls3brrzh1w6zgd1ksjzlm5aax";
};

nativeBuildInputs = [ python2 ];
checkInputs = [ python3 ];

doCheck = true;
doCheck = !stdenv.isDarwin;

preCheck = ''
substituteInPlace Makefile --replace "python2 go2.py" "python go.py"
'';

checkTarget = "test";

@@ -31,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;
};
}