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

Commits on Jan 12, 2020

  1. broot: fix hardlinks during postPatch phase 

    - add coreutils dependency
    @evanjs
    evanjs committed Jan 12, 2020
    Copy the full SHA
    22674e9 View commit details

  2. broot: install newly-added shell completions 

    - add installShellFiles dependency
    @evanjs
    evanjs committed Jan 12, 2020
    Copy the full SHA
    68a5f9f View commit details

  3. broot: 0.10.2 -> 0.11.8

    @evanjs
    evanjs committed Jan 12, 2020
    Copy the full SHA
    ba820a4 View commit details

Commits on Jan 13, 2020

  1. Merge pull request #77415 from evanjs/feature/broot-0.11.4 

    broot: 0.10.2 -> 0.11.8
    @marsam
    marsam authored Jan 13, 2020
    Copy the full SHA
    118da86 View commit details
Showing with 19 additions and 4 deletions.
  1. +19 −4 pkgs/tools/misc/broot/default.nix
23 changes: 19 additions & 4 deletions pkgs/tools/misc/broot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
{ stdenv, rustPlatform, fetchFromGitHub, coreutils, installShellFiles }:

rustPlatform.buildRustPackage rec {
pname = "broot";
version = "0.10.2";
version = "0.11.8";

src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "1wisqb4cqdgsnjvmpgxbzs9zcw6npqw1kqxxs8mn33sxlikhbf2l";
sha256 = "1pbjlfwv4s50s731ryrcc54200g2i04acdxrxk4kpcvi6b19kbky";
};

cargoSha256 = "09gnyj97akychin1axp9kcww3c04xx7x1qnplhs2yxfki62r4y2b";
cargoSha256 = "07ncclp4yqqr2lncw4bbcmknm09qzmdcq8iwkhyyfiy3fpyw9hqc";

nativeBuildInputs = [ installShellFiles ];

postPatch = ''
substituteInPlace src/verb_store.rs --replace '"/bin/' '"${coreutils}/bin/'
'';

postInstall = ''
# install shell completion files
OUT_DIR=target/release/build/broot-*/out
installShellCompletion --bash $OUT_DIR/{br,broot}.bash
installShellCompletion --fish $OUT_DIR/{br,broot}.fish
installShellCompletion --zsh $OUT_DIR/{_br,_broot}
'';

meta = with stdenv.lib; {
description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands";