From 0055175761885d116b7805c3e4845ab52038484b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 13:39:17 +0200
Subject: [PATCH 1/5] ncdu: move to by-name

---
 pkgs/{tools/misc => by-name/nc}/ncdu/1.nix                    | 0
 .../misc/ncdu/default.nix => by-name/nc/ncdu/package.nix}     | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 3 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{tools/misc => by-name/nc}/ncdu/1.nix (100%)
 rename pkgs/{tools/misc/ncdu/default.nix => by-name/nc/ncdu/package.nix} (100%)

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 100%
rename from pkgs/tools/misc/ncdu/default.nix
rename to pkgs/by-name/nc/ncdu/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68f275e9a295..16175bdfa430 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13539,9 +13539,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 { };
 

From ab6e46604d6627c3f54791ce32a136c792719390 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 14:03:10 +0200
Subject: [PATCH 2/5] ncdu: specify versionCheckProgramArg explicitly

---
 pkgs/by-name/nc/ncdu/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 1bcecae210ba..533536a468bc 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -38,9 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     installManPage ncdu.1
   '';
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
   passthru.tests.version = testers.testVersion {

From eb6138d3584a1b75671f6a8c65306298f331733f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 14:03:55 +0200
Subject: [PATCH 3/5] ncdu: remove `tests.version`

---
 pkgs/by-name/nc/ncdu/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 533536a468bc..fd13387c8f12 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -8,7 +8,6 @@
   zstd,
   installShellFiles,
   versionCheckHook,
-  testers,
   pie ? stdenv.hostPlatform.isDarwin,
 }:
 
@@ -42,10 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-  };
-
   meta = {
     homepage = "https://dev.yorhel.nl/ncdu";
     description = "Disk usage analyzer with an ncurses interface";

From e9350edebf89cea7145a67cbed3b25faf8c49b59 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 14:08:00 +0200
Subject: [PATCH 4/5] ncdu: add updateScript

---
 pkgs/by-name/nc/ncdu/package.nix | 2 ++
 pkgs/by-name/nc/ncdu/update.sh   | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100755 pkgs/by-name/nc/ncdu/update.sh

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index fd13387c8f12..cce5d30e5cc1 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     homepage = "https://dev.yorhel.nl/ncdu";
     description = "Disk usage analyzer with an ncurses interface";
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

From 5436ceef5397d9c7600953c442a84bf0db57bce0 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 27 May 2025 14:10:45 +0200
Subject: [PATCH 5/5] ncdu: add defelo as maintainer

---
 pkgs/by-name/nc/ncdu/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index cce5d30e5cc1..1db1c17fb6b2 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       pSub
       rodrgz
+      defelo
     ];
     inherit (zig_0_14.meta) platforms;
     mainProgram = "ncdu";