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

Commits on Apr 9, 2020

  1. lsd: 0.16.0 -> 0.17.0

    Br1ght0ne committed Apr 9, 2020
    Copy the full SHA
    75223b6 View commit details
  2. Copy the full SHA
    f5ceacc View commit details
  3. Copy the full SHA
    41bcd86 View commit details
  4. Merge pull request #84794 from filalex77/lsd-0.17.0

    lsd: 0.16.0 -> 0.17.0
    marsam authored Apr 9, 2020
    Copy the full SHA
    a8cf8a3 View commit details
Showing with 12 additions and 12 deletions.
  1. +12 −12 pkgs/tools/misc/lsd/default.nix
24 changes: 12 additions & 12 deletions pkgs/tools/misc/lsd/default.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv
, fetchFromGitHub
, rustPlatform
, installShellFiles
}:

rustPlatform.buildRustPackage rec {
pname = "lsd";
version = "0.16.0";
version = "0.17.0";

src = fetchFromGitHub {
owner = "Peltoche";
repo = pname;
rev = version;
sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym";
sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai";
};

cargoSha256 = "1z7sg9b7qsjw1hhc7dkvxz8xgf4k8jddr7gbnjr4d2569g97jf3f";
cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr";

preFixup = ''
install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd
install -Dm644 -t $out/share/fish/vendor_completions.d/ target/release/build/lsd-*/out/lsd.fish
install -Dm644 -t $out/share/bash-completion/completions/ target/release/build/lsd-*/out/lsd.bash
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}}
'';

# Some tests fail, but Travis ensures a proper build
doCheck = false;

meta = with stdenv.lib; {
homepage = https://github.com/Peltoche/lsd;
description = "The next gen ls command";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ filalex77 marsam ];
};
}