From 8daea9d60e160ed20afce545c60b0961b627a065 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 15:35:16 -0700
Subject: [PATCH] ding: migrate to by-name

---
 .../misc => by-name/di}/ding/dict.patch           |  0
 .../default.nix => by-name/di/ding/package.nix}   | 15 +++++++--------
 pkgs/top-level/all-packages.nix                   |  5 -----
 3 files changed, 7 insertions(+), 13 deletions(-)
 rename pkgs/{applications/misc => by-name/di}/ding/dict.patch (100%)
 rename pkgs/{applications/misc/ding/default.nix => by-name/di/ding/package.nix} (89%)

diff --git a/pkgs/applications/misc/ding/dict.patch b/pkgs/by-name/di/ding/dict.patch
similarity index 100%
rename from pkgs/applications/misc/ding/dict.patch
rename to pkgs/by-name/di/ding/dict.patch
diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/by-name/di/ding/package.nix
similarity index 89%
rename from pkgs/applications/misc/ding/default.nix
rename to pkgs/by-name/di/ding/package.nix
index 5be85e033846..fb870dce115a 100644
--- a/pkgs/applications/misc/ding/default.nix
+++ b/pkgs/by-name/di/ding/package.nix
@@ -1,7 +1,6 @@
 {
   aspell,
-  aspellDicts_de,
-  aspellDicts_en,
+  aspellDicts,
   buildEnv,
   fetchurl,
   fortune,
@@ -17,18 +16,18 @@ let
     name = "env-ding-aspell";
     paths = [
       aspell
-      aspellDicts_de
-      aspellDicts_en
+      aspellDicts.de
+      aspellDicts.en
     ];
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ding";
   version = "1.9";
 
   src = fetchurl {
-    url = "https://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${version}.tar.gz";
-    sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";
+    url = "https://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${finalAttrs.version}.tar.gz";
+    hash = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -81,4 +80,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux; # homepage says: unix-like except darwin
     maintainers = [ lib.maintainers.exi ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5b183bf0ad0..4757e55b295c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1630,11 +1630,6 @@ with pkgs;
     inherit (haskellPackages) ghcWithPackages diagrams-builder;
   };
 
-  ding = callPackage ../applications/misc/ding {
-    aspellDicts_de = aspellDicts.de;
-    aspellDicts_en = aspellDicts.en;
-  };
-
   discourse = callPackage ../servers/web-apps/discourse { };
 
   discourseAllPlugins = discourse.override {