From c1c08336a2639ec2d3adf84bd3f6779df9b07953 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Mon, 15 Jun 2026 21:17:21 -0700
Subject: [PATCH] non: migrate to by-name

---
 .../audio/non/default.nix => by-name/no/non/package.nix} | 9 +++++++--
 pkgs/top-level/all-packages.nix                          | 4 ----
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename pkgs/{applications/audio/non/default.nix => by-name/no/non/package.nix} (88%)

diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/by-name/no/non/package.nix
similarity index 88%
rename from pkgs/applications/audio/non/default.nix
rename to pkgs/by-name/no/non/package.nix
index 8bc2b9e633d8..aad1eee48a15 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/by-name/no/non/package.nix
@@ -13,23 +13,28 @@
   liblo,
   libsigcxx,
   lrdf,
-  wafHook,
+  waf,
 }:
 
+let
+  wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook;
+in
 stdenv.mkDerivation {
   pname = "non";
   version = "unstable-2021-01-28";
+
   src = fetchFromGitHub {
     owner = "linuxaudio";
     repo = "non";
     rev = "cdad26211b301d2fad55a26812169ab905b85bbb";
-    sha256 = "sha256-iMJNMDytNXpEkUhL0RILSd25ixkm8HL/edtOZta0Pf4=";
+    hash = "sha256-iMJNMDytNXpEkUhL0RILSd25ixkm8HL/edtOZta0Pf4=";
   };
 
   nativeBuildInputs = [
     pkg-config
     wafHook
   ];
+
   buildInputs = [
     python3
     cairo
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5388f98c2637..5c7efee4fdaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6366,10 +6366,6 @@ with pkgs;
   ngtcp2 = callPackage ../development/libraries/ngtcp2 { };
   ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { };
 
-  non = callPackage ../applications/audio/non {
-    wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook;
-  };
-
   nss_latest = callPackage ../development/libraries/nss/latest.nix { };
   nss_esr = callPackage ../development/libraries/nss/esr.nix { };
   nss = nss_esr;