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

Merge pull request #46601 from dywedir/bat

Browse Source 
bat: 0.6.1 -> 0.7.0
This commit is contained in:
Jörg Thalheim 2018-09-13 11:54:58 +01:00 committed by GitHub
commit 75177ab7e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/misc/bat/default.nix
View File

@ -1,24 +1,24 @@
{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, libiconv, darwin }:
{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib
, Security, libiconv
}:
rustPlatform.buildRustPackage rec {
name = "bat-${version}";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "bat";
rev = "v${version}";
sha256 = "19xmj3a3npx4v1mlvd31r3icml73mxjq6la5qifb2i35ciqnx9bd";
sha256 = "1dhn88asf08dvl4827v4mkxafcr01m1h5jmicvzda9ywmr82g1cs";
fetchSubmodules = true;
};
cargoSha256 = "062vvpj514h85h9gm3jipp6z256cnnbxbjy7ja6bm7i6bpglyvvi";
cargoSha256 = "10s8ig08prs1wcsisrllvsixqkrkwjx769y1w5fypldn9kfk2lka";
nativeBuildInputs = [ cmake pkgconfig zlib ];
buildInputs = [ libiconv ] ++ stdenv.lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
meta = with stdenv.lib; {
description = "A cat(1) clone with syntax highlighting and Git integration";

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

@ -844,7 +844,9 @@ with pkgs;
bashmount = callPackage ../tools/filesystems/bashmount {};
bat = callPackage ../tools/misc/bat { };
bat = callPackage ../tools/misc/bat {
inherit (darwin.apple_sdk.frameworks) Security;
};
bc = callPackage ../tools/misc/bc { };