@@ -1,27 +1,39 @@
1−{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, less
2−, Security, libiconv, installShellFiles, makeWrapper
1+{ stdenv
2+, rustPlatform
3+, fetchFromGitHub
4+, pkg-config
5+, less
6+, Security
7+, libiconv
8+, installShellFiles
9+, makeWrapper
310}:
411
512rustPlatform.buildRustPackage rec {
6− pname = "bat";
7− version = "0.15.4";
13+ pname = "bat";
14+ version = "0.16.0";
815
916 src = fetchFromGitHub {
10− owner = "sharkdp";
11− repo = pname;
12− rev = "v${version}";
13− sha256 = "0pjdba2c6p7ldgx2yfffxqlpasrcfrlkw63m1ma34zdq0f287w3p";
17+ owner = "sharkdp";
18+ repo = pname;
19+ rev = "v${version}";
20+ sha256 = "161pfix42j767ziyp4mslffdd20v9i0ncplvjw2pmpccwdm106kg";
1421 };
1522
16− cargoSha256 = "0myz06hjv4hwzmyqa9l36i9j9d213a0mnq8rvx6wyff7mr9zk99i";
23+ cargoSha256 = "19vhhxfyx3nrngcs6dvwldnk9h4lvs7xjkb31aj1y0pyawz882h9";
1724
18− nativeBuildInputs = [ pkgconfig installShellFiles makeWrapper ];
25+ nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
1926
2027 buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
2128
29+ # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master
30+ preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
31+ unset SDKROOT
32+ '';
33+
2234 postInstall = ''
2335 installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
24− installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish
36+ installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{fish,zsh}
2537 '';
2638
2739 # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as
@@ -33,8 +45,8 @@ rustPlatform.buildRustPackage rec {
3345
3446 meta = with stdenv.lib; {
3547 description = "A cat(1) clone with syntax highlighting and Git integration";
36− homepage = "https://github.com/sharkdp/bat";
37− license = with licenses; [ asl20 /* or */ mit ];
48+ homepage = "https://github.com/sharkdp/bat";
49+ license = with licenses; [ asl20 /* or */ mit ];
3850 maintainers = with maintainers; [ dywedir lilyball zowoq ];
3951 };
4052}