From 00985e97dd6f3d00cfaefe6be2322ae700f22888 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 9 Jan 2024 12:52:08 +0200
Subject: [PATCH] ncdc: 1.23.1 -> 1.24

---
 .../networking/p2p/ncdc/default.nix           | 25 -------------
 pkgs/by-name/nc/ncdc/package.nix              | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 37 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/ncdc/default.nix
 create mode 100644 pkgs/by-name/nc/ncdc/package.nix

diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
deleted file mode 100644
index 558fe7e385f0..000000000000
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config
-, glib, gnutls, perl, libmaxminddb }:
-
-stdenv.mkDerivation rec {
-  pname = "ncdc";
-  version = "1.23.1";
-
-  src = fetchurl {
-    url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
-    hash = "sha256-lYgSFAd6Wzwk+7rwIK2g0ITuO1lqfDzB4OaKqsTJteY=";
-  };
-
-  nativeBuildInputs = [ perl pkg-config ];
-  buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls libmaxminddb ];
-
-  configureFlags = [ "--with-geoip" ];
-
-  meta = with lib; {
-    description = "Modern and lightweight direct connect client with a friendly ncurses interface";
-    homepage = "https://dev.yorhel.nl/ncdc";
-    license = licenses.mit;
-    platforms = platforms.linux; # arbitrary
-    maintainers = with maintainers; [ ehmry ];
-  };
-}
diff --git a/pkgs/by-name/nc/ncdc/package.nix b/pkgs/by-name/nc/ncdc/package.nix
new file mode 100644
index 000000000000..0a6be6f40a12
--- /dev/null
+++ b/pkgs/by-name/nc/ncdc/package.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchurl
+, ncurses
+, zlib
+, bzip2
+, sqlite
+, pkg-config
+, glib
+, gnutls
+, perl
+, libmaxminddb
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ncdc";
+  version = "1.24";
+
+  src = fetchurl {
+    url = "https://dev.yorhel.nl/download/ncdc-${finalAttrs.version}.tar.gz";
+    hash = "sha256-IzUQ1TVfxy/a01eOvIqzXR2pWyHSd0mQ86E1a3ES2h4=";
+  };
+
+  nativeBuildInputs = [ perl pkg-config ];
+  buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls libmaxminddb ];
+
+  configureFlags = [ "--with-geoip" ];
+
+  meta = {
+    changelog = "https://dev.yorhel.nl/ncdc/changes";
+    description = "Modern and lightweight direct connect client with a friendly ncurses interface";
+    homepage = "https://dev.yorhel.nl/ncdc";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
+    mainProgram = "ncdc";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccb3f513c19c..780de4a95d78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34265,8 +34265,6 @@ with pkgs;
 
   ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
 
-  ncdc = callPackage ../applications/networking/p2p/ncdc { };
-
   ncspot = callPackage ../applications/audio/ncspot {
     inherit (darwin.apple_sdk.frameworks) Cocoa;