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: 668a8aa81158
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 072edcbe3795
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 7, 2019

  1. bat: update dependencies 

    Remove zlib, this is no longer a dependency as of at least 0.12.0.

While we're at it, switch to using installShellFiles to install the
manpage/completion.
    @lilyball
    lilyball committed Oct 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd61ba0 View commit details

Commits on Oct 10, 2019

  1. Merge pull request #70585 from lilyball/bat-updates 

    bat: update dependencies
    @nlewo
    nlewo authored Oct 10, 2019
    Copy the full SHA
    072edcb View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/tools/misc/bat/default.nix
10 changes: 5 additions & 5 deletions pkgs/tools/misc/bat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, zlib
, Security, libiconv
{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig
, Security, libiconv, installShellFiles
}:

rustPlatform.buildRustPackage rec {
@@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2";

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

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
installManPage doc/bat.1
installShellCompletion assets/completions/bat.fish
'';

meta = with stdenv.lib; {