jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #260560 from xrelkd/update/bat

Browse Source 
bat: 0.23.0 -> 0.24.0
This commit is contained in:
Mario Rodas 2023-10-12 03:13:49 -05:00 committed by GitHub
commit b59e642e3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/tools/misc/bat/default.nix → pkgs/by-name/ba/bat/package.nix
View File

@ -4,27 +4,27 @@
, fetchFromGitHub
, pkg-config
, less
, Security
, libiconv
, installShellFiles
, makeWrapper
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.23.0";
version = "0.24.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "bat";
rev = "v${version}";
hash = "sha256-cGHxB3Wp8yEcJBMtSOec6l7iBsMLhUtJ7nh5fijnWZs=";
hash = "sha256-1RjlJEmY/jMf0IYQbrWrT1CHFyiqgarOl72u9xjjQiQ=";
};
cargoHash = "sha256-wZNdYGCLKD80gV1QUTgKsFSNYkbDubknPB3e6dsyEgs=";
cargoHash = "sha256-b7wNWdKQ4QLeCf7bNZRfzT9hD/D/oDglU7Xyb65IrGY=";
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
postInstall = ''
installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
@ -38,7 +38,21 @@ rustPlatform.buildRustPackage rec {
--prefix PATH : "${lib.makeBinPath [ less ]}"
'';
checkFlags = [ "--skip=pager_more" "--skip=pager_most" ];
# Skip test cases which depends on `more`
checkFlags = [
"--skip=alias_pager_disable_long_overrides_short"
"--skip=config_read_arguments_from_file"
"--skip=env_var_bat_paging"
"--skip=pager_arg_override_env_noconfig"
"--skip=pager_arg_override_env_withconfig"
"--skip=pager_basic"
"--skip=pager_basic_arg"
"--skip=pager_env_bat_pager_override_config"
"--skip=pager_env_pager_nooverride_config"
"--skip=pager_more"
"--skip=pager_most"
"--skip=pager_overwrite"
];
doInstallCheck = true;
installCheckPhase = ''

4
pkgs/top-level/all-packages.nix
View File

@ -4279,10 +4279,6 @@ with pkgs;
bashmount = callPackage ../tools/filesystems/bashmount { };
bat = callPackage ../tools/misc/bat {
inherit (darwin.apple_sdk.frameworks) Security;
};
bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
beats = callPackage ../tools/misc/beats { };