From 67400e37eaa8e88bb3931d8aecfbd647e17fc508 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 28 Oct 2025 22:51:58 +0100 Subject: [PATCH 1/3] dua: use finalAttrs pattern --- pkgs/by-name/du/dua/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 4043d4267153..f85381031b43 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dua"; version = "2.32.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-u8g7X/70ZsZF6vUiVnisItwSMiNXgiAdOXqGUT34EaY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. @@ -32,9 +32,7 @@ rustPlatform.buildRustPackage rec { "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_without_reaching_the_top" ]; - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; @@ -43,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Tool to conveniently learn about the disk usage of directories"; homepage = "https://github.com/Byron/dua-cli"; - changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ figsoda @@ -51,4 +49,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "dua"; }; -} +}) From fb190ad3f3b890990799ad9987a18f58989290e1 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 22 May 2025 22:34:37 +0200 Subject: [PATCH 2/3] dua: add defelo as maintainer --- pkgs/by-name/du/dua/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index f85381031b43..02a7c9e65dd5 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ figsoda killercup + defelo ]; mainProgram = "dua"; }; From 67d6a2f6a02e5db78e8092cd424719ca671431f9 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 28 Oct 2025 20:12:29 +0000 Subject: [PATCH 3/3] dua: 2.32.0 -> 2.32.2 Changelog: https://github.com/Byron/dua-cli/blob/v2.32.2/CHANGELOG.md Diff: https://github.com/Byron/dua-cli/compare/v2.32.0...v2.32.2 --- pkgs/by-name/du/dua/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 02a7c9e65dd5..6ec17352a3b2 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dua"; - version = "2.32.0"; + version = "2.32.2"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-u8g7X/70ZsZF6vUiVnisItwSMiNXgiAdOXqGUT34EaY="; + hash = "sha256-MB5uePy32jTvOtkQKcP9peFPqwR68E+NZ7UGMuLx8Eo="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -22,10 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-6WjaKGCnEoHCIDqMHtp/dpdHbrUe2XOxCtstQCuXPyc="; + cargoHash = "sha256-6H0x6I3nkCezu4/Hguv0XTdl+3QiyPL8Ue1rqTQU7VA="; checkFlags = [ # Skip interactive tests + "--skip=interactive::app::tests::journeys_readonly::quit_instantly_when_nothing_marked" + "--skip=interactive::app::tests::journeys_readonly::quit_requires_two_presses_when_items_marked" "--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only" "--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion" "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels"