Unverified Commit a996e533 authored by PerchunPak's avatar PerchunPak
Browse files

bat-extras: 2024.08.24 -> 2024.08.24-unstable-2025-02-22

parent 428deb18

pkgs/tools/misc/bat-extras/modules/batpipe.nix

+8 −1
Original line number Diff line number Diff line 
{

  buildBatExtrasPkg,

  less,

  procps,

}:

buildBatExtrasPkg {

  name = "batpipe";

  dependencies = [ less ];

  dependencies = [

    less

    procps

  ];

  patches = [

    ../patches/batpipe-skip-outdated-test.patch

  ];

  meta.description = "Less (and soon bat) preprocessor for viewing more types of files in the terminal";

}

pkgs/tools/misc/bat-extras/modules/core.nix

+5 −7
Original line number Diff line number Diff line
@@ -9,15 +9,15 @@ 
  nix-update-script,

  zsh,

}:

stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "bat-extras";

  version = "2024.08.24";

  version = "2024.08.24-unstable-2025-02-22";



  src = fetchFromGitHub {

    owner = "eth-p";

    repo = "bat-extras";

    tag = "v${version}";

    hash = "sha256-xkND/w6UNC58dC8WrsifwjqU9ZI4yUUq+ZljkhhUNT8=";

    rev = "3860f0f1481f1d0e117392030f55ef19cc018ee4";

    hash = "sha256-9TEq/LzE1Pty1Z3WFWR/TaNNKPp2LGBr0jzGBkOEGQo=";

    fetchSubmodules = true;

  };
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec { 


  dontConfigure = true;



  patches = [ ../patches/disable-theme-tests.patch ];



  postPatch = ''

    patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh

  '';
@@ -72,7 +70,7 @@ stdenv.mkDerivation rec { 
  # The per-script derivations will go ahead and patch the files they actually install.

  dontPatchShebangs = true;



  passthru.updateScript = nix-update-script { };

  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };



  meta = {

    description = "Bash scripts that integrate bat with various command line tools";

pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh

index e834f6e..2d9354d 100644

--- a/test/suite/batpipe.sh

+++ b/test/suite/batpipe.sh

@@ -51,6 +51,7 @@ test:viewer_gzip() {

 

 test:batpipe_term_width() {

 	description "Test support for BATPIPE_TERM_WIDTH"

+	skip "Fails on a newer version of bat"

 	snapshot STDOUT

 

 	export BATPIPE=color

pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
Subject: [PATCH] skip tests depending on color theme

===================================================================

diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh

--- a/test/suite/batpipe.sh	(revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1)

+++ b/test/suite/batpipe.sh	(date 1736621098865)

@@ -29,6 +29,7 @@

 test:batpipe_term_width() {

 	description "Test support for BATPIPE_TERM_WIDTH"

 	snapshot STDOUT

+	skip "bat-extras does not support '--theme' flag"



 	export BATPIPE=color

 	export BATPIPE_DEBUG_PARENT_EXECUTABLE=less

Index: test/suite/batgrep.sh

===================================================================

diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh

--- a/test/suite/batgrep.sh	(revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1)

+++ b/test/suite/batgrep.sh	(date 1736621086239)

@@ -58,6 +58,7 @@

 	description "Snapshot test for colored output."

 	snapshot stdout

 	snapshot stderr

+	skip "bat-extras does not support '--theme' flag"



 	require_rg



@@ -118,6 +119,7 @@

 	description "Should respect the BAT_STYLE variable."

 	snapshot stdout

 	snapshot stderr

+	skip "bat-extras does not support '--theme' flag"



 	require_rg



@@ -128,6 +130,7 @@

 	description "Snapshot test for output without separator"

 	snapshot stdout

 	snapshot stderr

+	skip "bat-extras does not support '--theme' flag"



 	require_rg