From bc2336898fd4a3a0d53628e7e793212c1e4b0ac1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 9 Feb 2020 04:10:57 -0500 Subject: [PATCH] broot: 0.12.2 -> 0.13.1 (#79565) Changelog: - https://github.com/Canop/broot/releases/tag/v0.13.0 - https://github.com/Canop/broot/releases/tag/v0.13.1 --- pkgs/tools/misc/broot/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index d555d031896..45b26b25055 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -1,21 +1,23 @@ -{ stdenv, rustPlatform, fetchFromGitHub, coreutils, installShellFiles }: +{ stdenv, rustPlatform, fetchFromGitHub, coreutils, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.12.2"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1y2da4xcdsvvss4plbp77pqhi8fqjlnsgpcwq8fkc0vx049ijhcm"; + sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak"; }; - cargoSha256 = "1h9jpyxvk76h06jgy3bwbr3ymhqypsyq05m99clkkrlwp8dnsgqq"; + cargoSha256 = "0vzpyymylzxjm613lf5xr6hd21ijkl3vwq4y6h1q3as41phw2sqb"; verifyCargoDeps = true; nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + postPatch = '' substituteInPlace src/verb_store.rs --replace '"/bin/' '"${coreutils}/bin/' ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feaba9296a1..62ddc0820da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1270,7 +1270,9 @@ in brook = callPackage ../tools/networking/brook { }; - broot = callPackage ../tools/misc/broot { }; + broot = callPackage ../tools/misc/broot { + inherit (darwin.apple_sdk.frameworks) Security; + }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };