various: move to pkgs/by-name

pkgs/tools/typesetting/asciidoc/default.nix → pkgs/by-name/as/asciidoc/package.nix

@@ -9,12 +9,11 @@
   enableStandardFeatures ? false,
   sourceHighlight,
   highlight,
-  pygments,
   graphviz,
   texliveMinimal,
   dblatexFull,
   libxslt,
-  w3m,
+  w3m-batch,
   lynx,
   imagemagick,
   lilypond,
@@ -45,11 +44,7 @@
   enableQrcodeFilter ? false,
   qrencode,
   enableMatplotlibFilter ? false,
-  matplotlib,
-  numpy,
   enableAafigureFilter ? false,
-  aafigure,
-  recursive-pth-loader,
   # backends
   enableDeckjsBackend ? false,
   enableOdfBackend ? false,
@@ -61,6 +56,13 @@
 }:
 
 let
+  inherit (python3.pkgs)
+    pygments
+    matplotlib
+    numpy
+    aafigure
+    recursive-pth-loader
+    ;
 
   _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter;
   _enableMscgenFilter = enableExtraPlugins || enableMscgenFilter;
@@ -268,7 +270,7 @@ python3.pkgs.buildPythonApplication rec {
             -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
             -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
             ${lib.optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \
-            -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
+            -e "s|^W3M =.*|W3M = '${w3m-batch}/bin/w3m'|" \
             -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
             -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
             -e "s|^EPUBCHECK =.*|EPUBCHECK = '${epubcheck}/bin/epubcheck'|" \

pkgs/tools/admin/cdist/default.nix → pkgs/by-name/cd/cdist/package.nix

@@ -1,13 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitea,
-  six,
-  sphinxHook,
-  sphinx-rtd-theme,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cdist";
   version = "7.0.0";
   format = "setuptools";
@@ -25,7 +22,7 @@ buildPythonApplication rec {
     hash = "sha256-lIx0RtGQJdY2e00azI9yS6TV+5pCegpKOOD0dQmgMqA=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3Packages; [
     six
     sphinxHook
     sphinx-rtd-theme

pkgs/tools/filesystems/disorderfs/default.nix → pkgs/by-name/di/disorderfs/package.nix

@@ -5,7 +5,7 @@
   pkg-config,
   fuse,
   attr,
-  asciidoc,
+  asciidoc-full,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    asciidoc
+    asciidoc-full
   ];
 
   buildInputs = [

pkgs/tools/games/gamemode/default.nix → pkgs/by-name/ga/gamemode/package.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libgamemode32,
+  pkgsi686Linux,
   makeWrapper,
   meson,
   ninja,
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
           ]
           ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
             # Support wrapping 32bit applications on a 64bit linux system
-            libgamemode32
+            pkgsi686Linux.gamemode.lib
           ]
         )
       }

pkgs/tools/admin/ibmcloud-cli/default.nix → pkgs/by-name/ib/ibmcloud-cli/package.nix

@@ -1,11 +1,12 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchurl,
   installShellFiles,
   writableTmpDirAsHomeHook,
 }:
 let
+  stdenv = stdenvNoCC;
   arch =
     with stdenv.hostPlatform;
     if isx86_64 then

pkgs/tools/filesystems/kio-fuse/default.nix → pkgs/by-name/ki/kio-fuse/package.nix

@@ -4,8 +4,7 @@
   fetchgit,
   cmake,
   extra-cmake-modules,
-  wrapQtAppsHook,
-  kio,
+  libsForQt5,
   fuse3,
 }:
 
@@ -22,11 +21,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    kio
+    libsForQt5.kio
     fuse3
   ];
 

pkgs/tools/X11/libstrangle/default.nix → pkgs/by-name/li/libstrangle/package.nix

@@ -1,13 +1,13 @@
 {
   lib,
-  stdenv,
+  stdenv_32bit,
   fetchFromGitLab,
   fetchpatch,
   libGL,
   libX11,
 }:
 
-stdenv.mkDerivation rec {
+stdenv_32bit.mkDerivation rec {
   pname = "libstrangle";
   version = "unstable-202202022";
 

pkgs/tools/audio/liquidsoap/full.nix → pkgs/by-name/li/liquidsoap/package.nix

@@ -6,21 +6,24 @@
   which,
   pkg-config,
   libjpeg,
-  ocamlPackages,
+  ocaml-ng,
   awscli2,
   bubblewrap,
   curl,
   dune,
-  ffmpeg,
+  ffmpeg_6-full,
   yt-dlp,
   runtimePackages ? [
     awscli2
     bubblewrap
     curl
-    ffmpeg
+    ffmpeg_6-full
     yt-dlp
   ],
 }:
+let
+  ocamlPackages = ocaml-ng.ocamlPackages_4_14;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "liquidsoap";
   version = "2.4.2";

pkgs/tools/admin/meraki-cli/default.nix → pkgs/by-name/me/meraki-cli/package.nix

@@ -1,17 +1,10 @@
 {
   lib,
-  argcomplete,
-  jinja2,
-  meraki,
-  rich,
+  python3Packages,
   fetchPypi,
-  buildPythonApplication,
-  pytestCheckHook,
-  requests-mock,
-  setuptools,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "meraki-cli";
   version = "1.5.1";
   pyproject = true;
@@ -30,18 +23,18 @@ buildPythonApplication rec {
     "TestUpgrade"
   ];
 
-  build-system = [
+  build-system = with python3Packages; [
     setuptools
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     argcomplete
     jinja2
     meraki
     rich
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     pytestCheckHook
     requests-mock
   ];

pkgs/tools/games/pokefinder/default.nix → pkgs/by-name/po/pokefinder/package.nix

@@ -4,14 +4,10 @@
   copyDesktopItems,
   makeDesktopItem,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   python3,
-  qtbase,
-  qttools,
-  qtwayland,
+  qt6,
   imagemagick,
-  wrapQtAppsHook,
   gitUpdater,
 }:
 
@@ -53,7 +49,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
     python3
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
@@ -73,10 +69,10 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
-    qttools
+    qt6.qtbase
+    qt6.qttools
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";

pkgs/tools/admin/pulumi-bin/update.sh → pkgs/by-name/pu/pulumi-bin/update.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell update-pulumi-shell.nix -i bash
+#!nix-shell -i bash -p gh
 # shellcheck shell=bash
 # Bash 3 compatible for Darwin
 

pkgs/tools/backup/pyznap/default.nix → pkgs/by-name/py/pyznap/package.nix

@@ -1,11 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  setuptools,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pyznap";
   version = "1.6.0";
   format = "setuptools";
@@ -15,7 +14,7 @@ buildPythonApplication rec {
     sha256 = "88bf1d6de2c11f14acbdfa01b61eb95c94f95d829ddebdaee3786b64ccb93ae3";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     setuptools
   ];
 

pkgs/tools/virtualization/supermin/default.nix → pkgs/by-name/su/supermin/package.nix

@@ -6,7 +6,7 @@
   e2fsprogs,
   perl,
   pkg-config,
-  ocamlPackages,
+  ocaml-ng,
   glibc,
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     pkg-config
   ]
-  ++ (with ocamlPackages; [
+  ++ (with ocaml-ng.ocamlPackages_4_14; [
     findlib
     ocaml
   ]);

pkgs/tools/video/swftools/default.nix → pkgs/by-name/sw/swftools/package.nix

@@ -1,13 +1,13 @@
 {
   lib,
-  stdenv,
+  gccStdenv,
   fetchurl,
   freetype,
   libjpeg,
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation rec {
   pname = "swftools";
   version = "0.9.2";
 

pkgs/tools/audio/tidal-dl/default.nix → pkgs/by-name/ti/tidal-dl/package.nix

@@ -1,11 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  aigpy,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "tidal-dl";
   version = "2022.10.31.1";
   format = "setuptools";
@@ -15,7 +14,7 @@ buildPythonApplication rec {
     hash = "sha256-b2AAsiI3n2/v6HC37fMI/d8UcxZxsWM+fnWvdajHrOg=";
   };
 
-  propagatedBuildInputs = [ aigpy ];
+  propagatedBuildInputs = with python3Packages; [ aigpy ];
 
   meta = {
     homepage = "https://github.com/yaronzz/Tidal-Media-Downloader";

pkgs/tools/typesetting/tikzit/default.nix → pkgs/by-name/ti/tikzit/package.nix

@@ -2,13 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qttools,
-  qtbase,
-  poppler,
+  qt5,
   flex,
   bison,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -23,15 +20,15 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    qt5.qmake
+    qt5.qttools
     flex
     bison
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    poppler
+    qt5.qtbase
+    libsForQt5.poppler
   ];
 
   # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory