Merge pull request #170799 from msfjarvis/hs/2022-04-28/ncdu-2.1.2

ncdu_2: 2.0 -> 2.1.2

authored by Sandro and committed by GitHub 1bff69d3 af366332

+3 -24
-17
pkgs/tools/misc/ncdu_2/c-import-order.patch
··· 1 - diff --git a/src/ui.zig b/src/ui.zig 2 - index 8401910..50171a7 100644 3 - --- a/src/ui.zig 4 - +++ b/src/ui.zig 5 - @@ -8,11 +8,11 @@ const main = @import("main.zig"); 6 - const util = @import("util.zig"); 7 - 8 - pub const c = @cImport({ 9 - + @cDefine("_XOPEN_SOURCE", "1"); 10 - @cInclude("stdio.h"); 11 - @cInclude("string.h"); 12 - @cInclude("curses.h"); 13 - @cInclude("time.h"); 14 - - @cDefine("_X_OPEN_SOURCE", "1"); 15 - @cInclude("wchar.h"); 16 - @cInclude("locale.h"); 17 - });
···
+3 -7
pkgs/tools/misc/ncdu_2/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch, zig, ncurses }: 2 3 stdenv.mkDerivation rec { 4 pname = "ncdu"; 5 - version = "2.0"; 6 7 src = fetchurl { 8 url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; 9 - sha256 = "sha256-Zs2mgEdnsukbeM/cqCX5/a9qCkxuQAYloBrVWVQYR8w="; 10 }; 11 - 12 - patches = [ 13 - ./c-import-order.patch # https://code.blicky.net/yorhel/ncdu/issues/183 14 - ]; 15 16 XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv 17
··· 1 + { lib, stdenv, fetchurl, zig, ncurses }: 2 3 stdenv.mkDerivation rec { 4 pname = "ncdu"; 5 + version = "2.1.2"; 6 7 src = fetchurl { 8 url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; 9 + sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw="; 10 }; 11 12 XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv 13