From bf295de42d433fa2a73481dfc7c06ac5949c7b80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Jan 2023 18:37:04 +0000 Subject: [PATCH 1/3] du-dust: 0.8.3 -> 0.8.4 --- pkgs/tools/misc/dust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index bd4452263a92..a6aff6f63cc0 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ 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,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-yKj9CBoEC6UJf4L+XO2qi69//45lSqblMe8ofnLctEw="; + cargoHash = "sha256-jtQ/nkD5XMD2rsq550XsRK416wOCR3OuhgGPeuC3jzc="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; From 6913943ebe6a703e06512261a944d41e75b72ea8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 31 Jan 2023 18:38:00 +0000 Subject: [PATCH 2/3] du-dust: fix build on darwin --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e49545db3510..f57ed5ab6e64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28835,7 +28835,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 { }; From af1c72c7a4e934b4ec6501e0303dd5c9e59f2f50 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 31 Jan 2023 18:38:00 +0000 Subject: [PATCH 3/3] du-dust: install man page and completions --- pkgs/tools/misc/dust/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index a6aff6f63cc0..b6a17a38b5bf 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "du-dust"; @@ -18,10 +18,17 @@ rustPlatform.buildRustPackage rec { 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";