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: 53eb2155e76e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d8f69db85a1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 26, 2020

  1. bat: 0.15.1 -> 0.15.3

    @lilyball
    lilyball committed May 26, 2020
    Copy the full SHA
    e3f1712 View commit details

Commits on May 27, 2020

  1. Merge pull request #88991 from lilyball/bat 

    bat: 0.15.1 -> 0.15.3
    @marsam
    marsam authored May 27, 2020
    Copy the full SHA
    3d8f69d View commit details
Showing with 5 additions and 25 deletions.
  1. +5 −12 pkgs/tools/misc/bat/default.nix
  2. +0 −13 pkgs/tools/misc/bat/macos.patch
17 changes: 5 additions & 12 deletions pkgs/tools/misc/bat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 13 deletions pkgs/tools/misc/bat/macos.patch
View file

This file was deleted.