From a7a9cbc74bacc0b8c240db978623de24d930f172 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 1 Nov 2025 14:52:43 +0100 Subject: [PATCH 1/3] broot: remove `with lib;` --- pkgs/by-name/br/broot/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 8c102074681b..c58878489e5a 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -33,12 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config ]; - buildInputs = [ - libgit2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - zlib - ]; + buildInputs = [ libgit2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; buildFeatures = lib.optionals withTrash [ "trash" ] ++ lib.optionals withClipboard [ "clipboard" ]; @@ -86,12 +81,12 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - meta = with lib; { + meta = { description = "Interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; changelog = "https://github.com/Canop/broot/releases/tag/v${finalAttrs.version}"; - maintainers = with maintainers; [ dywedir ]; - license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ dywedir ]; + license = with lib.licenses; [ mit ]; mainProgram = "broot"; }; }) From 07ed8b53437adc42b701d21efe794d576f6b0258 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 1 Nov 2025 14:53:16 +0100 Subject: [PATCH 2/3] broot: add updateScript --- pkgs/by-name/br/broot/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index c58878489e5a..99de7dcd6da9 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -10,6 +10,7 @@ zlib, buildPackages, versionCheckHook, + nix-update-script, withClipboard ? true, withTrash ? !stdenv.hostPlatform.isDarwin, }: @@ -81,6 +82,8 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; + meta = { description = "Interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; From 5b7d135173f0002749a9ad178d42fe7e6eed5615 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 1 Nov 2025 13:54:24 +0000 Subject: [PATCH 3/3] broot: 1.49.1 -> 1.53.0 Changelog: https://github.com/Canop/broot/releases/tag/v1.53.0 Diff: https://github.com/Canop/broot/compare/v1.49.1...v1.53.0 --- pkgs/by-name/br/broot/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 99de7dcd6da9..4a8a6839e94c 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -12,21 +12,20 @@ versionCheckHook, nix-update-script, withClipboard ? true, - withTrash ? !stdenv.hostPlatform.isDarwin, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; - version = "1.49.1"; + version = "1.53.0"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; tag = "v${finalAttrs.version}"; - hash = "sha256-zDy494qIoo4r+oCnrMvYSetmqsWCWfS5PAVlp8sU8Zk="; + hash = "sha256-iiKfS1r62G9cBKa/KEW/SPwhZ/Pebw0mUvHy40DFCqA="; }; - cargoHash = "sha256-zHvfZAsEoCtdxtFP7yqrC9t49UIMji2qTm+I1bhu63A="; + cargoHash = "sha256-Hp+Fx1b0bQptNJKQeThZ3W7lSGdo6YsVAHAu69/YTX4="; nativeBuildInputs = [ installShellFiles @@ -36,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ libgit2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; - buildFeatures = lib.optionals withTrash [ "trash" ] ++ lib.optionals withClipboard [ "clipboard" ]; + buildFeatures = lib.optionals withClipboard [ "clipboard" ]; env.RUSTONIG_SYSTEM_LIBONIG = true;