From f644ca5a95e9ec6b04b165347a00631ea736eae2 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 17:23:36 +0200 Subject: [PATCH 1/7] dust: use finalAttrs pattern --- pkgs/by-name/du/dust/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 720bfee00efd..d3ab6b7d0acd 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -5,7 +5,7 @@ installShellFiles, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { # Originally, this package was under the attribute `du-dust`, since `dust` was taken. # Since then, `dust` has been freed up, allowing this package to take that attribute. # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname. @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-MmlCTF7tZBBOCnyhUjTatDjajFMGd+Nk2kYyxjzZc04="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. @@ -43,4 +43,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "dust"; }; -} +}) From 7c3ad7e0414e52299657eed9866389f968996c07 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 17:24:15 +0200 Subject: [PATCH 2/7] dust: use tag in fetchFromGitHub --- pkgs/by-name/du/dust/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index d3ab6b7d0acd..60a2b9b47dac 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MmlCTF7tZBBOCnyhUjTatDjajFMGd+Nk2kYyxjzZc04="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. From f10d01c45a2df6662d460d36e82183a634becb67 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 17:27:54 +0200 Subject: [PATCH 3/7] dust: add versionCheckHook --- pkgs/by-name/du/dust/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 60a2b9b47dac..824561c36c4b 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, rustPlatform, installShellFiles, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -36,6 +37,11 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellCompletion completions/dust.{bash,fish} --zsh completions/_dust ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/dust"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; From b8f6858e45ea7b4ce568fa305918fd3f060b2625 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 17:31:28 +0200 Subject: [PATCH 4/7] dust: add updateScript --- pkgs/by-name/du/dust/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 824561c36c4b..fbb8e932daa8 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -4,6 +4,7 @@ rustPlatform, installShellFiles, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -42,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; From e94e42557b1c256e09fa3e2617ff2e6fe0976567 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 17:46:50 +0200 Subject: [PATCH 5/7] dust: add meta.changelog --- pkgs/by-name/du/dust/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index fbb8e932daa8..5d5a33ce0db5 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -48,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; + changelog = "https://github.com/bootandy/dust/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "dust"; From 813693e40cb544e0678533e55cda2a0ce2f01560 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 17:47:10 +0200 Subject: [PATCH 6/7] dust: enable tests --- pkgs/by-name/du/dust/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 5d5a33ce0db5..a0eb8ecc462d 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -31,7 +31,16 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - doCheck = false; + checkFlags = [ + # disable tests that depend on the unicode files we removed above + "--skip=test_show_files_by_type" + ]; + + preCheck = '' + # These tests depend on the disk format of the build host. + rm tests/test_exact_output.rs + rm tests/tests_symlinks.rs + ''; postInstall = '' installManPage man-page/dust.1 From 680dda8cf1f6efce2affeb2aeeb3f9d089c90e48 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 17:22:55 +0200 Subject: [PATCH 7/7] dust: add defelo as maintainer --- pkgs/by-name/du/dust/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index a0eb8ecc462d..bbcfa8fd96be 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -59,7 +59,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/bootandy/dust"; changelog = "https://github.com/bootandy/dust/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ + aaronjheng + defelo + ]; mainProgram = "dust"; }; })