Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d64d6c520e30
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 46bbe1320756
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 1, 2019

  1. bat: 0.11.0 -> 0.12.0

    @dywedir
    dywedir committed Sep 1, 2019
    Copy the full SHA
    19387a0 View commit details

  2. Merge pull request #67868 from dywedir/bat 

    bat: 0.11.0 -> 0.12.0
    @Ma27
    Ma27 authored Sep 1, 2019
    Copy the full SHA
    46bbe13 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/tools/misc/bat/default.nix
12 changes: 7 additions & 5 deletions pkgs/tools/misc/bat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib
{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, zlib
, Security, libiconv
}:

rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.11.0";
version = "0.12.0";

src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "0yyvlplskjvxb2cspqsvfsnahd5m0s83psrp777ng0wc0kr1adbw";
sha256 = "07qxghplqq8km4kp9zas2acw302a77y72x3ix1272kb1zxhw4as6";
fetchSubmodules = true;
};

cargoSha256 = "078n31c0isvxvna0s1m12xv4bkh15rb2nixfyg4c501mlkalb517";
cargoSha256 = "0j9wxv21a91yfvbbvgn5ms5zi1aipj1k2g42mfdvvw2vsdzqagxz";

nativeBuildInputs = [ cmake pkgconfig zlib ];
nativeBuildInputs = [ pkgconfig llvmPackages.libclang zlib ];

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];

LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

postInstall = ''
install -m 444 -Dt $out/share/man/man1 doc/bat.1
install -m 444 -Dt $out/share/fish/vendor_completions.d assets/completions/bat.fish