diff --git a/pkgs/tools/misc/ncdu/1.nix b/pkgs/by-name/nc/ncdu/1.nix similarity index 100% rename from pkgs/tools/misc/ncdu/1.nix rename to pkgs/by-name/nc/ncdu/1.nix diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/by-name/nc/ncdu/package.nix similarity index 86% rename from pkgs/tools/misc/ncdu/default.nix rename to pkgs/by-name/nc/ncdu/package.nix index 1bcecae210ba..1db1c17fb6b2 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/by-name/nc/ncdu/package.nix @@ -8,7 +8,6 @@ zstd, installShellFiles, versionCheckHook, - testers, pie ? stdenv.hostPlatform.isDarwin, }: @@ -38,14 +37,11 @@ stdenv.mkDerivation (finalAttrs: { installManPage ncdu.1 ''; - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; doInstallCheck = true; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; + passthru.updateScript = ./update.sh; meta = { homepage = "https://dev.yorhel.nl/ncdu"; @@ -55,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ pSub rodrgz + defelo ]; inherit (zig_0_14.meta) platforms; mainProgram = "ncdu"; diff --git a/pkgs/by-name/nc/ncdu/update.sh b/pkgs/by-name/nc/ncdu/update.sh new file mode 100755 index 000000000000..430c83649ac3 --- /dev/null +++ b/pkgs/by-name/nc/ncdu/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts coreutils gnused nix-update + +version=$(list-git-tags --url=https://g.blicky.net/ncdu.git | tail -1 | sed 's/^v//') +nix-update --version="$version" ncdu diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b4db4c33be0..4ebdcccdb165 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13546,9 +13546,7 @@ with pkgs; mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; - ncdu = callPackage ../tools/misc/ncdu { }; - - ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; + ncdu_1 = callPackage ../by-name/nc/ncdu/1.nix { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };