diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index bd4452263a92..b6a17a38b5bf 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-+YcHiW4kR4JeIY6zv1WJ97dCIakvtbn8+b9tLFH+aLE="; + sha256 = "sha256-g1i003nBbTYIuKG4ZCQSoI8gINTVc8BKRoO3UOeHOGE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,12 +16,19 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-yKj9CBoEC6UJf4L+XO2qi69//45lSqblMe8ofnLctEw="; + cargoHash = "sha256-jtQ/nkD5XMD2rsq550XsRK416wOCR3OuhgGPeuC3jzc="; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; doCheck = false; + postInstall = '' + installManPage man-page/dust.1 + installShellCompletion completions/dust.{bash,fish} --zsh completions/_dust + ''; + meta = with lib; { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07b67f820ca0..213e32277dc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28858,7 +28858,7 @@ with pkgs; dunst = callPackage ../applications/misc/dunst { }; du-dust = callPackage ../tools/misc/dust { - inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; dutree = callPackage ../tools/misc/dutree { };