cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #88991 from lilyball/bat

Browse source 
bat: 0.15.1 -> 0.15.3
This commit is contained in:
Mario Rodas 2020-05-26 21:34:10 -05:00 committed by GitHub
commit 3d8f69db85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/tools/misc/bat/default.nix
View file

@ -1,32 +1,25 @@
{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, less
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, less
, Security, libiconv, installShellFiles, makeWrapper
}:
rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.15.1";
version = "0.15.3";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "10cs94ja1dmn0f24gqkcy8rf68b3b43k6qpbb5njbg0hcx3x6cyj";
sha256 = "0893xjnrjmhhzccfb57w5s7wlf6z4cwxvrxj8qb5jnmrgkfaw86b";
fetchSubmodules = true;
};
cargoSha256 = "13cphi08bp6lg054acgliir8dx2jajll4m3c4xxy04skmx555zr8";
cargoSha256 = "0mcff6nsd9g39xdhsf06zxs7pmq27nqfxdk0lwh83lqmnzdp01sf";
# Disable test that's broken on macOS.
# This should probably be removed on the next release.
# https://github.com/sharkdp/bat/issues/983
patches = [ ./macos.patch ];
nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ];
nativeBuildInputs = [ pkgconfig installShellFiles makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
postInstall = ''
installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish

13
pkgs/tools/misc/bat/macos.patch
View file

@ -1,13 +0,0 @@
diff --git a/src/assets.rs b/src/assets.rs
index 4f8556f..222abc2 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -336,7 +336,7 @@ mod tests {
assert_eq!(test.syntax_for_file("Makefile"), "Makefile");
}
- #[cfg(unix)]
+ #[cfg(all(unix,not(target_os = "macos")))]
#[test]
fn syntax_detection_invalid_utf8() {
use std::os::unix::ffi::OsStrExt;