diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-07-21 14:45:49 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-07-22 08:08:57 +1000 |
| commit | 98367d2c61d1b3c144ae818c07125104d3867dd7 (patch) | |
| tree | 59be23262b17a5fb3157a493a99e2057609fdcb5 /pkgs | |
| parent | af7d2aaa0d7fae44cdef463538833d536e3def1f (diff) | |
| download | nixpkgs-98367d2c61d1b3c144ae818c07125104d3867dd7.tar nixpkgs-98367d2c61d1b3c144ae818c07125104d3867dd7.tar.gz nixpkgs-98367d2c61d1b3c144ae818c07125104d3867dd7.tar.bz2 nixpkgs-98367d2c61d1b3c144ae818c07125104d3867dd7.tar.lz nixpkgs-98367d2c61d1b3c144ae818c07125104d3867dd7.tar.xz nixpkgs-98367d2c61d1b3c144ae818c07125104d3867dd7.tar.zst nixpkgs-98367d2c61d1b3c144ae818c07125104d3867dd7.zip | |
ncdu: default to v2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/ncdu/1.nix (renamed from pkgs/tools/misc/ncdu_2/default.nix) | 14 | ||||
| -rw-r--r-- | pkgs/tools/misc/ncdu/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 16 insertions, 15 deletions
diff --git a/pkgs/tools/misc/ncdu_2/default.nix b/pkgs/tools/misc/ncdu/1.nix index 0cfb78bcf0b..d1c185c0f23 100644 --- a/pkgs/tools/misc/ncdu_2/default.nix +++ b/pkgs/tools/misc/ncdu/1.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchurl, zig, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "ncdu"; - version = "2.1.2"; + version = "1.17"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw="; + sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E="; }; - XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv - - nativeBuildInputs = [ - zig - ]; - buildInputs = [ ncurses ]; - PREFIX = placeholder "out"; - meta = with lib; { description = "Disk usage analyzer with an ncurses interface"; homepage = "https://dev.yorhel.nl/ncdu"; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index d1c185c0f23..0cfb78bcf0b 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, zig, ncurses }: stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.17"; + version = "2.1.2"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E="; + sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw="; }; + XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv + + nativeBuildInputs = [ + zig + ]; + buildInputs = [ ncurses ]; + PREFIX = placeholder "out"; + meta = with lib; { description = "Disk usage analyzer with an ncurses interface"; homepage = "https://dev.yorhel.nl/ncdu"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c8f4cdde0da..90cd965a4b1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -919,6 +919,7 @@ mapAliases ({ ### N ### + ncdu_2 = ncdu; # Added 2022-07-22 nccl = throw "nccl has been renamed to cudaPackages.nccl"; # Added 2022-04-04 nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04 nccl_cudatoolkit_11 = throw "nccl_cudatoolkit_11 has been renamed to cudaPackages_11.nccl"; # Added 2022-04-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49772490ff0..0d8b4e7a82a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29260,7 +29260,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; ncdu = callPackage ../tools/misc/ncdu { }; - ncdu_2 = callPackage ../tools/misc/ncdu_2 { }; + ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; ncdc = callPackage ../applications/networking/p2p/ncdc { }; |