From ba84716b51766ddd15446ddb904ffec7fc99f75c Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 19 Sep 2026 01:30:45 -0400
Subject: [PATCH] wyrd: move to by-name

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../misc/wyrd/default.nix => by-name/wy/wyrd/package.nix}   | 6 +++++-
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/{tools/misc/wyrd/default.nix => by-name/wy/wyrd/package.nix} (93%)

diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/by-name/wy/wyrd/package.nix
similarity index 93%
rename from pkgs/tools/misc/wyrd/default.nix
rename to pkgs/by-name/wy/wyrd/package.nix
index 47b47c339eb6..74a18994e075 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/by-name/wy/wyrd/package.nix
@@ -3,10 +3,13 @@
   stdenv,
   fetchFromGitLab,
   makeWrapper,
-  ocamlPackages,
+  ocaml-ng,
   remind,
 }:
 
+let
+  ocamlPackages = ocaml-ng.ocamlPackages_4_14;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wyrd";
   version = "1.7.4";
@@ -19,6 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7822c324636a..30859f6dcad2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3002,10 +3002,6 @@ with pkgs;
   # https://github.com/NixOS/nixpkgs/issues/227327
   wafHook = waf.hook;
 
-  wyrd = callPackage ../tools/misc/wyrd {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-
   # A minimal xar is needed to break an infinite recursion between macfuse-stubs and xar.
   # It is also needed to reduce the amount of unnecessary stuff in the Darwin bootstrap.
   xarMinimal = callPackage ../by-name/xa/xar/package.nix { e2fsprogs = null; };