Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 57b7b019812f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d85e435b7bde
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 15, 2019

  1. exa: apply patch to not panic on broken symlinks 

    Currently, exa fails when being executed in a git repository with
symlinks pointing to a non-existing location.

This can happen quite often with garbage-collected result links, or in
bazel repositories.

A fix was PR'ed in September at ogham/exa#584,
but upstream seems to be not responding.

Let's apply this patch until there's a release containing the fixes.

(cherry picked from commit d41dca2)
    @flokli
    flokli committed Dec 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d85e435 View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/tools/misc/exa/default.nix
11 changes: 10 additions & 1 deletion pkgs/tools/misc/exa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkgconfig, zlib
, darwin, libiconv, installShellFiles
}:

@@ -17,6 +17,15 @@ buildRustPackage rec {
sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw";
};

patches = [
(fetchpatch {
# https://github.com/ogham/exa/pull/584
name = "fix-panic-on-broken-symlink-in-git-repository.patch";
url = "https://github.com/ogham/exa/pull/584/commits/a7a8e99cf3a15992afb2383435da0231917ffb54.patch";
sha256 = "0n5q483sz300jkp0sbb350hdinmkw7s6bmigdyr6ypz3fvygd9hx";
})
];

nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ];
buildInputs = [ zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [