From c1c08336a2639ec2d3adf84bd3f6779df9b07953 Mon Sep 17 00:00:00 2001 From: Grayson Tinker Date: Mon, 15 Jun 2026 21:17:21 -0700 Subject: [PATCH 1/2] 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; From 1992c9070d65d8cfd8a2a79ef38785953aa11943 Mon Sep 17 00:00:00 2001 From: Grayson Tinker Date: Wed, 1 Jul 2026 00:34:27 -0700 Subject: [PATCH 2/2] tetex: migrate to by-name --- .../typesetting/tex => by-name/te}/tetex/clang.patch | 0 .../tex => by-name/te}/tetex/environment.patch | 0 .../tex => by-name/te}/tetex/extramembot.patch | 0 .../tex => by-name/te}/tetex/getline.patch | 0 .../default.nix => by-name/te/tetex/package.nix} | 12 ++++++------ .../tex => by-name/te}/tetex/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 7 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/clang.patch (100%) rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/environment.patch (100%) rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/extramembot.patch (100%) rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/getline.patch (100%) rename pkgs/{tools/typesetting/tex/tetex/default.nix => by-name/te/tetex/package.nix} (90%) rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/setup-hook.sh (100%) diff --git a/pkgs/tools/typesetting/tex/tetex/clang.patch b/pkgs/by-name/te/tetex/clang.patch similarity index 100% rename from pkgs/tools/typesetting/tex/tetex/clang.patch rename to pkgs/by-name/te/tetex/clang.patch diff --git a/pkgs/tools/typesetting/tex/tetex/environment.patch b/pkgs/by-name/te/tetex/environment.patch similarity index 100% rename from pkgs/tools/typesetting/tex/tetex/environment.patch rename to pkgs/by-name/te/tetex/environment.patch diff --git a/pkgs/tools/typesetting/tex/tetex/extramembot.patch b/pkgs/by-name/te/tetex/extramembot.patch similarity index 100% rename from pkgs/tools/typesetting/tex/tetex/extramembot.patch rename to pkgs/by-name/te/tetex/extramembot.patch diff --git a/pkgs/tools/typesetting/tex/tetex/getline.patch b/pkgs/by-name/te/tetex/getline.patch similarity index 100% rename from pkgs/tools/typesetting/tex/tetex/getline.patch rename to pkgs/by-name/te/tetex/getline.patch diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/by-name/te/tetex/package.nix similarity index 90% rename from pkgs/tools/typesetting/tex/tetex/default.nix rename to pkgs/by-name/te/tetex/package.nix index b5c09d0a2ccb..f42138f5fdfa 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/by-name/te/tetex/package.nix @@ -5,23 +5,23 @@ flex, bison, zlib, - libpng, + libpng12, ncurses, ed, automake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tetex"; version = "3.0"; src = fetchurl { - url = "https://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-src-${version}.tar.gz"; + url = "https://mirrors.ctan.org/obsolete/systems/unix/teTeX/${finalAttrs.version}/distrib/tetex-src-${finalAttrs.version}.tar.gz"; sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = "https://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-texmf-${version}.tar.gz"; + url = "https://mirrors.ctan.org/obsolete/systems/unix/teTeX/${finalAttrs.version}/distrib/tetex-texmf-${finalAttrs.version}.tar.gz"; sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { flex bison zlib - libpng + libpng12 ncurses ed ]; @@ -92,4 +92,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; hydraPlatforms = [ ]; }; -} +}) diff --git a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh b/pkgs/by-name/te/tetex/setup-hook.sh similarity index 100% rename from pkgs/tools/typesetting/tex/tetex/setup-hook.sh rename to pkgs/by-name/te/tetex/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c7efee4fdaa..7d3cdd136f86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1581,8 +1581,6 @@ with pkgs; pgf = pgf2; - tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; - texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive