Unverified Commit 78f92255 authored by PerchunPak's avatar PerchunPak
Browse files

bat-extras: also test nushell

parent a996e533

pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
  fish,

  getconf,

  makeWrapper,

  nushell,

  zsh,

}:

let
@@ -49,6 +50,7 @@ stdenv.mkDerivation ( 
      bat

      bash

      fish

      nushell

      zsh

    ]

    ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);

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

+7 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  buildBatExtrasPkg,

  less,

  procps,
@@ -9,8 +11,13 @@ buildBatExtrasPkg { 
    less

    procps

  ];



  patches = [

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

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    ../patches/batpipe-skip-detection-tests.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

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
  fish,

  getconf,

  nix-update-script,

  nushell,

  zsh,

}:

stdenv.mkDerivation {
@@ -41,6 +42,7 @@ stdenv.mkDerivation { 
  nativeCheckInputs = [

    bash

    fish

    nushell

    zsh

  ]

  ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);

pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch

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

index e834f6e..da87411 100644

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

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

@@ -12,6 +12,7 @@ test:detected_bash_shell() {

 

 test:detected_fish_shell() {

 	description "Test it can detect a fish shell."

+	skip "This test fails in the Nix sandbox"

 

 	# Note: We don't use bash's `-c` option when testing with a fake fish shell.

 	# Bash `-c` will automatically exec() into the last process, which loses the

@@ -28,6 +29,7 @@ test:detected_fish_shell() {

 

 test:detected_nu_shell() {

 	description "Test it can detect a nushell shell."

+	skip "This test fails in the Nix sandbox"

 

 	# Note: We don't use bash's `-c` option when testing with a fake nu shell.

 	# Bash `-c` will automatically exec() into the last process, which loses the