diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix new file mode 100644 index 000000000000..01ef5d8f9203 --- /dev/null +++ b/pkgs/by-name/du/dua/package.nix @@ -0,0 +1,54 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "dua"; + version = "2.29.4"; + + src = fetchFromGitHub { + owner = "Byron"; + repo = "dua-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-TVwRz5bAdJMtmhhzfZZ/NuV+YrLcnuK6d86Oj/JmgW4="; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + postFetch = '' + rm -r $out/tests/fixtures + ''; + }; + + cargoHash = "sha256-h4Z0Gb4lf/KXrBxU6gEGcRvuhqjUABsggcv/A+AFclo="; + + checkFlags = [ + # Skip interactive tests + "--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" + "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_without_reaching_the_top" + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + 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"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ + figsoda + killercup + ]; + mainProgram = "dua"; + }; +} diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix deleted file mode 100644 index 67a897403bd7..000000000000 --- a/pkgs/tools/misc/dua/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "dua"; - version = "2.29.3"; - - src = fetchFromGitHub { - owner = "Byron"; - repo = "dua-cli"; - rev = "v${version}"; - hash = "sha256-cxMims1b4zOmpRZSn9rovUCnUT66omgNYjDJWuIDnSk="; - # Remove unicode file names which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalisation. - postFetch = '' - rm -r $out/tests/fixtures - ''; - }; - - cargoHash = "sha256-/7A1XW6EbOQpXeAlsOe1YoY6MdBQ3kC98TTBMs3Zfy8="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - - doCheck = false; - - meta = with lib; { - 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"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ figsoda killercup ]; - mainProgram = "dua"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2e73171af9f..cdf056feef01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4698,8 +4698,6 @@ with pkgs; dtrx = callPackage ../tools/compression/dtrx { }; - dua = callPackage ../tools/misc/dua { }; - duf = callPackage ../tools/misc/duf { }; dum = callPackage ../development/tools/dum { };