diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:28 +0200 |
| commit | 362d88c2b19e3857576b2571722dc66c381c185a (patch) | |
| tree | 7dc706e1918e7dc1e9762573831c851be4343559 /pkgs/tools/misc/bat/default.nix | |
| parent | 0367fa630d59673624d6742e2758b87eb12fff4c (diff) | |
| parent | 1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e (diff) | |
| download | nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.gz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.bz2 nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.lz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.xz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.zst nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/misc/bat/default.nix')
| -rw-r--r-- | pkgs/tools/misc/bat/default.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 95bc44dcce0..9c750171991 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -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 |