various: migrate to by-name (#537310)

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

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 = [ ];
   };
-}
+})

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
@@ -6366,10 +6364,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;