From b865a68d53a427d013a5eb61b28642d13c079dd1 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 15:08:26 -0700
Subject: [PATCH 01/11] svn2git: migrate to by-name

---
 .../default.nix => by-name/sv/svn2git/package.nix}   | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{applications/version-management/svn2git/default.nix => by-name/sv/svn2git/package.nix} (81%)

diff --git a/pkgs/applications/version-management/svn2git/default.nix b/pkgs/by-name/sv/svn2git/package.nix
similarity index 81%
rename from pkgs/applications/version-management/svn2git/default.nix
rename to pkgs/by-name/sv/svn2git/package.nix
index c839b01239c0..e5aadb8e949a 100644
--- a/pkgs/applications/version-management/svn2git/default.nix
+++ b/pkgs/by-name/sv/svn2git/package.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
   ruby,
   makeWrapper,
-  git,
+  gitSVN,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "svn2git";
   version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "nirvdrum";
     repo = "svn2git";
-    rev = "v${version}";
-    sha256 = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w=";
   };
 
   nativeBuildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/svn2git \
       --set RUBYLIB $out/lib \
-      --prefix PATH : ${git}/bin
+      --prefix PATH : ${gitSVN}/bin
   '';
 
   meta = {
@@ -46,4 +46,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     mainProgram = "svn2git";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30674f248999..c5ccebe79d5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1209,10 +1209,6 @@ with pkgs;
     libsForQt5.callPackage ../applications/version-management/svn-all-fast-export
       { };
 
-  svn2git = callPackage ../applications/version-management/svn2git {
-    git = gitSVN;
-  };
-
   inherit (haskellPackages) git-annex;
 
   inherit (haskellPackages) git-brunch;

From 773eba567b92ca6611135fcf7d6858e74fe91562 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 15:17:44 -0700
Subject: [PATCH 02/11] rednotebook: migrate to by-name

---
 .../default.nix => by-name/re/rednotebook/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/editors/rednotebook/default.nix => by-name/re/rednotebook/package.nix} (100%)

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/by-name/re/rednotebook/package.nix
similarity index 100%
rename from pkgs/applications/editors/rednotebook/default.nix
rename to pkgs/by-name/re/rednotebook/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5ccebe79d5e..dd8f9f157605 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9656,8 +9656,6 @@ with pkgs;
     withXineBackend = true;
   };
 
-  rednotebook = callPackage ../applications/editors/rednotebook { };
-
   ringboard-wayland = callPackage ../by-name/ri/ringboard/package.nix { displayServer = "wayland"; };
 
   ripcord =

From ca029e48567c2a9f3357c6e595908ba0b4e27e88 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 16:13:04 -0700
Subject: [PATCH 03/11] ci/OWNERS: Drop entry for pkgs/applications/blockchains

The subsequent two commits will remove the final packages from this directory.
---
 ci/OWNERS | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 0b7d71bc4293..b4308633e403 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -402,9 +402,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /nixos/tests/docker-tools*                       @roberth @jhol
 /doc/build-helpers/images/dockertools.section.md @roberth @jhol
 
-# Blockchains
-/pkgs/applications/blockchains  @mmahut @RaghavSood
-
 # Go
 /doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92
 /pkgs/build-support/go @kalbasit @katexochen @Mic92

From c36f8391520ca4550e2da54d89e8f4a883497512 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 15:25:47 -0700
Subject: [PATCH 04/11] teos-watchtower-plugin: migrate to by-name

---
 .../applications/blockchains/teos/default.nix | 28 ---------------
 .../te/teos-watchtower-plugin/package.nix     | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/by-name/te/teos-watchtower-plugin/package.nix

diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix
index 4d687602ab13..fefef995a6ce 100644
--- a/pkgs/applications/blockchains/teos/default.nix
+++ b/pkgs/applications/blockchains/teos/default.nix
@@ -47,32 +47,4 @@ in
       description = "Lightning watchtower compliant with BOLT13, written in Rust";
     };
   };
-
-  teos-watchtower-plugin = rustPlatform.buildRustPackage {
-    pname = "teos-watchtower-plugin";
-    inherit version src;
-
-    cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M=";
-
-    buildAndTestSubdir = "watchtower-plugin";
-
-    nativeBuildInputs = [
-      pkg-config
-      protobuf
-      rustfmt
-    ];
-
-    buildInputs = [
-      openssl
-    ];
-
-    passthru.updateScript = updateScript;
-
-    __darwinAllowLocalNetworking = true;
-
-    meta = meta // {
-      description = "Lightning watchtower plugin for clightning";
-      mainProgram = "watchtower-client";
-    };
-  };
 }
diff --git a/pkgs/by-name/te/teos-watchtower-plugin/package.nix b/pkgs/by-name/te/teos-watchtower-plugin/package.nix
new file mode 100644
index 000000000000..3da03f5357b4
--- /dev/null
+++ b/pkgs/by-name/te/teos-watchtower-plugin/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  rustPlatform,
+  teos,
+  pkg-config,
+  protobuf,
+  rustfmt,
+  openssl,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "teos-watchtower-plugin";
+  inherit (teos) version src;
+
+  cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M=";
+
+  buildAndTestSubdir = "watchtower-plugin";
+
+  nativeBuildInputs = [
+    pkg-config
+    protobuf
+    rustfmt
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = teos.meta // {
+    description = "Lightning watchtower plugin for clightning";
+    mainProgram = "watchtower-client";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd8f9f157605..fdc3d31f9367 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10236,7 +10236,6 @@ with pkgs;
 
   inherit (callPackages ../applications/blockchains/teos { })
     teos
-    teos-watchtower-plugin
     ;
 
   vertcoind = vertcoin.override {

From 4bcb6f45494eab4ea049652eb6b6c7bf9bcffcae Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 15:30:37 -0700
Subject: [PATCH 05/11] teos: migrate to by-name

---
 .../applications/blockchains/teos/default.nix | 50 -------------------
 pkgs/by-name/te/teos/package.nix              | 41 +++++++++++++++
 .../blockchains => by-name/te}/teos/update.sh |  0
 pkgs/top-level/all-packages.nix               |  4 --
 4 files changed, 41 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/teos/default.nix
 create mode 100644 pkgs/by-name/te/teos/package.nix
 rename pkgs/{applications/blockchains => by-name/te}/teos/update.sh (100%)

diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix
deleted file mode 100644
index fefef995a6ce..000000000000
--- a/pkgs/applications/blockchains/teos/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  protobuf,
-  rustfmt,
-  pkg-config,
-  openssl,
-}:
-
-let
-  version = "0.2.0";
-
-  src = fetchFromGitHub {
-    owner = "talaia-labs";
-    repo = "rust-teos";
-    rev = "v${version}";
-    hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY=";
-  };
-
-  meta = {
-    homepage = "https://github.com/talaia-labs/rust-teos";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ seberm ];
-  };
-  updateScript = ./update.sh;
-in
-{
-  teos = rustPlatform.buildRustPackage {
-    pname = "teos";
-    inherit version src;
-
-    cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M=";
-
-    buildAndTestSubdir = "teos";
-
-    nativeBuildInputs = [
-      protobuf
-      rustfmt
-    ];
-
-    passthru.updateScript = updateScript;
-
-    __darwinAllowLocalNetworking = true;
-
-    meta = meta // {
-      description = "Lightning watchtower compliant with BOLT13, written in Rust";
-    };
-  };
-}
diff --git a/pkgs/by-name/te/teos/package.nix b/pkgs/by-name/te/teos/package.nix
new file mode 100644
index 000000000000..707d9adc2949
--- /dev/null
+++ b/pkgs/by-name/te/teos/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  protobuf,
+  rustfmt,
+  pkg-config,
+  openssl,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "teos";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "talaia-labs";
+    repo = "rust-teos";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY=";
+  };
+
+  cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M=";
+
+  buildAndTestSubdir = "teos";
+
+  nativeBuildInputs = [
+    protobuf
+    rustfmt
+  ];
+
+  passthru.updateScript = ./update.sh;
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    homepage = "https://github.com/talaia-labs/rust-teos";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ seberm ];
+    description = "Lightning watchtower compliant with BOLT13, written in Rust";
+  };
+})
diff --git a/pkgs/applications/blockchains/teos/update.sh b/pkgs/by-name/te/teos/update.sh
similarity index 100%
rename from pkgs/applications/blockchains/teos/update.sh
rename to pkgs/by-name/te/teos/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdc3d31f9367..e5b183bf0ad0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10234,10 +10234,6 @@ with pkgs;
 
   pycoin = with python3Packages; toPythonApplication pycoin;
 
-  inherit (callPackages ../applications/blockchains/teos { })
-    teos
-    ;
-
   vertcoind = vertcoin.override {
     withGui = false;
   };

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 06/11] 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 {

From 1200bc87a63f8738f1efbcb150164b230db2acc2 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 15:45:13 -0700
Subject: [PATCH 07/11] mwic: migrate to by-name

---
 .../mwic/default.nix => by-name/mw/mwic/package.nix} | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{applications/misc/mwic/default.nix => by-name/mw/mwic/package.nix} (70%)

diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/by-name/mw/mwic/package.nix
similarity index 70%
rename from pkgs/applications/misc/mwic/default.nix
rename to pkgs/by-name/mw/mwic/package.nix
index 9aa8902f416d..46a1cfe0efeb 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/by-name/mw/mwic/package.nix
@@ -2,25 +2,25 @@
   lib,
   stdenv,
   fetchurl,
-  pythonPackages,
+  python3Packages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "0.7.10";
   pname = "mwic";
 
   src = fetchurl {
-    url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/jwilk/mwic/releases/download/${finalAttrs.version}/mwic-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-dmIHPehkxpSb78ymVpcPCu4L41coskrHQOg067dprOo=";
   };
 
   makeFlags = [ "PREFIX=\${out}" ];
 
   nativeBuildInputs = [
-    pythonPackages.wrapPython
+    python3Packages.wrapPython
   ];
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     pyenchant
     regex
   ];
@@ -36,4 +36,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4757e55b295c..7a470a17d01d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9441,10 +9441,6 @@ with pkgs;
 
   mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay;
 
-  mwic = callPackage ../applications/misc/mwic {
-    pythonPackages = python3Packages;
-  };
-
   netmaker = callPackage ../applications/networking/netmaker { subPackages = [ "." ]; };
   netmaker-full = callPackage ../applications/networking/netmaker { };
 

From 84f3d12f5bcfa17f14822a4b6111da6400c02533 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 15:49:35 -0700
Subject: [PATCH 08/11] mu-repo: migrate to by-name

---
 .../mu-repo/default.nix => by-name/mu/mu-repo/package.nix}  | 6 +++---
 pkgs/top-level/all-packages.nix                             | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{applications/misc/mu-repo/default.nix => by-name/mu/mu-repo/package.nix} (85%)

diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/by-name/mu/mu-repo/package.nix
similarity index 85%
rename from pkgs/applications/misc/mu-repo/default.nix
rename to pkgs/by-name/mu/mu-repo/package.nix
index 99f52a5901b3..9dc5e67e2e07 100644
--- a/pkgs/applications/misc/mu-repo/default.nix
+++ b/pkgs/by-name/mu/mu-repo/package.nix
@@ -7,7 +7,7 @@
   mu-repo,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mu-repo";
   version = "1.9.0";
   format = "setuptools";
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "fabioz";
     repo = "mu-repo";
-    tag = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
     hash = "sha256-aSRf0B/skoZLsn4dykWOFKVNtHYCsD9RtZ1frHDrcJU=";
   };
 
@@ -40,4 +40,4 @@ python3Packages.buildPythonApplication rec {
     maintainers = with lib.maintainers; [ sikmir ];
     mainProgram = "mu";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a470a17d01d..6f4e9af917c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9423,8 +9423,6 @@ with pkgs;
 
   mpvScripts = callPackage ../by-name/mp/mpv/scripts.nix { };
 
-  mu-repo = callPackage ../applications/misc/mu-repo { };
-
   murmur =
     (callPackages ../applications/networking/mumble {
       avahi = avahi-compat;

From bfdab41d8376d4bb9ee5f0a90d929505b2b78556 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 15:54:03 -0700
Subject: [PATCH 09/11] parsec-bin: migrate to by-name

---
 .../misc/parsec/bin.nix => by-name/pa/parsec-bin/package.nix}   | 2 +-
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{applications/misc/parsec/bin.nix => by-name/pa/parsec-bin/package.nix} (97%)

diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/by-name/pa/parsec-bin/package.nix
similarity index 97%
rename from pkgs/applications/misc/parsec/bin.nix
rename to pkgs/by-name/pa/parsec-bin/package.nix
index c483c5bb6488..05663920b9a2 100644
--- a/pkgs/applications/misc/parsec/bin.nix
+++ b/pkgs/by-name/pa/parsec-bin/package.nix
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchurl {
     url = "https://web.archive.org/web/20250226223019/https://builds.parsec.app/package/parsec-linux.deb";
-    sha256 = "sha256-8Wkbo6l1NGBPX2QMJszq+u9nLM96tu7WYRTQq6/CzM8=";
+    hash = "sha256-8Wkbo6l1NGBPX2QMJszq+u9nLM96tu7WYRTQq6/CzM8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4e9af917c7..cc4510c6f1be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9538,8 +9538,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
-
   pdfpc = callPackage ../applications/misc/pdfpc {
     inherit (gst_all_1)
       gstreamer

From df17e07ade611342f8df0efb61983c5ab0e6a278 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 16:02:36 -0700
Subject: [PATCH 10/11] blucontrol: migrate to by-name

---
 .../wrapper.nix => by-name/bl/blucontrol/package.nix}         | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/blucontrol/wrapper.nix => by-name/bl/blucontrol/package.nix} (90%)

diff --git a/pkgs/applications/misc/blucontrol/wrapper.nix b/pkgs/by-name/bl/blucontrol/package.nix
similarity index 90%
rename from pkgs/applications/misc/blucontrol/wrapper.nix
rename to pkgs/by-name/bl/blucontrol/package.nix
index eb004835ae20..dfa595a6a1cb 100644
--- a/pkgs/applications/misc/blucontrol/wrapper.nix
+++ b/pkgs/by-name/bl/blucontrol/package.nix
@@ -2,11 +2,11 @@
   stdenv,
   lib,
   makeWrapper,
-  ghcWithPackages,
+  haskellPackages,
   packages ? (_: [ ]),
 }:
 let
-  blucontrolEnv = ghcWithPackages (self: [ self.blucontrol ] ++ packages self);
+  blucontrolEnv = haskellPackages.ghcWithPackages (self: [ self.blucontrol ] ++ packages self);
 in
 stdenv.mkDerivation {
   pname = "blucontrol-with-packages";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc4510c6f1be..82fc3ac9432e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8760,10 +8760,6 @@ with pkgs;
 
   bitwig-studio = bitwig-studio6;
 
-  blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {
-    inherit (haskellPackages) ghcWithPackages;
-  };
-
   breezy = with python3Packages; toPythonApplication breezy;
 
   # calico-felix and calico-node have not been packaged due to libbpf, linking issues

From da61b3ddf3f2be83b674d52d3e18e1354cef8ed9 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Sun, 7 Jun 2026 16:05:56 -0700
Subject: [PATCH 11/11] stag: migrate to by-name

---
 .../misc/stag/default.nix => by-name/st/stag/package.nix}     | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/stag/default.nix => by-name/st/stag/package.nix} (97%)

diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/by-name/st/stag/package.nix
similarity index 97%
rename from pkgs/applications/misc/stag/default.nix
rename to pkgs/by-name/st/stag/package.nix
index f5507ba47824..51f6f6a05ba1 100644
--- a/pkgs/applications/misc/stag/default.nix
+++ b/pkgs/by-name/st/stag/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  curses,
+  ncurses,
   fetchpatch,
 }:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
       ' -Werror ' ' '
   '';
 
-  buildInputs = [ curses ];
+  buildInputs = [ ncurses ];
 
   installPhase = ''
     make install PREFIX=$out
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82fc3ac9432e..3af475c45471 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9677,10 +9677,6 @@ with pkgs;
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };
 
-  stag = callPackage ../applications/misc/stag {
-    curses = ncurses;
-  };
-
   sweethome3d = recurseIntoAttrs (
     (callPackage ../applications/misc/sweethome3d { })
     // (callPackage ../applications/misc/sweethome3d/editors.nix {