From a3a32f3b92bc301ec7f1ea1c664c5616470b98e2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 15 Oct 2024 06:57:46 +0100 Subject: [PATCH] ncdu: 2.5 -> 2.6 Changes: https://dev.yorhel.nl/ncdu/changes2 --- pkgs/tools/misc/ncdu/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index abde0b0d79e1..d3b5ad2e4a43 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,7 +2,9 @@ , stdenv , fetchurl , ncurses +, pkg-config , zig +, zstd , installShellFiles , testers , pie ? stdenv.hostPlatform.isDarwin @@ -10,20 +12,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncdu"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz"; - hash = "sha256-f0neJQJKurGvH/IrO4VCwNFY4Bj+DpYHT9lLDh5tMaU="; + hash = "sha256-P0cevTi1bmDauAwn468dgmZmlX8C2ehBmxSdqvet5QU="; }; nativeBuildInputs = [ zig.hook installShellFiles + pkg-config ]; buildInputs = [ ncurses + zstd ]; zigBuildFlags = lib.optional pie "-Dpie=true"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d325c2dfeadb..61d994fb1748 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31496,9 +31496,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { - zig = buildPackages.zig_0_12; - }; + ncdu = callPackage ../tools/misc/ncdu { }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };