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

Commits on Jun 12, 2020

  1. broot: 0.13.6 -> 0.15.1

    @bbigras
    bbigras committed Jun 12, 2020
    Copy the full SHA
    619f7d8 View commit details

Commits on Jun 13, 2020

  1. Merge pull request #90194 from bbigras/broot 

    broot: 0.13.6 -> 0.15.1
    @marsam
    marsam authored Jun 13, 2020
    Copy the full SHA
    6be09e2 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/tools/misc/broot/default.nix
8 changes: 4 additions & 4 deletions pkgs/tools/misc/broot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,23 +2,23 @@

rustPlatform.buildRustPackage rec {
pname = "broot";
version = "0.13.6";
version = "0.15.1";

src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "08d0zddqqymxj1qcp8c78r7mpii1piy6awaf135jxhzwi775sqqv";
sha256 = "1ggzx4w69fmvaxm5gfqhh8ncr2mdx528zm6vwrrwz165lga2fvw6";
};

cargoSha256 = "1cxvx51zkmhszmgwsi0aj469xz98v5nk79zvqfyma27gsnh8jczr";
cargoSha256 = "0gcq0fww9hl3avh3qcnpnwmpwda4cymr7x3kd3frdizrs8i643mr";

nativeBuildInputs = [ installShellFiles ];

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];

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

postInstall = ''