diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 847c9b7e5672..906b652e1b8e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -34,7 +34,6 @@ in avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; awscli = handleTest ./awscli.nix { }; babeld = handleTest ./babeld.nix {}; - bat = handleTest ./bat.nix {}; bazarr = handleTest ./bazarr.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 beanstalkd = handleTest ./beanstalkd.nix {}; diff --git a/nixos/tests/bat.nix b/nixos/tests/bat.nix deleted file mode 100644 index 0f548a590fb0..000000000000 --- a/nixos/tests/bat.nix +++ /dev/null @@ -1,12 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "bat"; - meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; - - machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; }; - - testScript = '' - machine.succeed("echo 'Foobar\n\n\n42' > /tmp/foo") - assert "Foobar" in machine.succeed("bat -p /tmp/foo") - assert "42" in machine.succeed("bat -p /tmp/foo -r 4:4") - ''; -}) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index de0f13c77fd0..a46a32d6a88b 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, nixosTests , rustPlatform , fetchFromGitHub , pkg-config @@ -41,7 +40,18 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=pager_more" "--skip=pager_most" ]; - passthru.tests = { inherit (nixosTests) bat; }; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + testFile=$(mktemp /tmp/bat-test.XXXX) + echo -ne 'Foobar\n\n\n42' > $testFile + $out/bin/bat -p $testFile | grep "Foobar" + $out/bin/bat -p $testFile -r 4:4 | grep 42 + rm $testFile + + runHook postInstallCheck + ''; meta = with lib; { description = "A cat(1) clone with syntax highlighting and Git integration";