various: move to pkgs/by-name (#483842)

2026-02-01 23:43:14 +00:00
parent 6a94faead0 7df68118d1
commit 688a7c54cd
66 changed files with 95 additions and 234 deletions
@@ -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'|" \
@@ -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
@@ -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 = [
@@ -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
          ]
        )
      }
@@ -1,11 +1,12 @@
 {
  lib,
-  stdenv,
+  stdenvNoCC,
  fetchurl,
  installShellFiles,
  writableTmpDirAsHomeHook,
 }:
 let
+  stdenv = stdenvNoCC;
  arch =
    with stdenv.hostPlatform;
    if isx86_64 then
@@ -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
  ];

@@ -1,13 +1,13 @@
 {
  lib,
-  stdenv,
+  stdenv_32bit,
  fetchFromGitLab,
  fetchpatch,
  libGL,
  libX11,
 }:

-stdenv.mkDerivation rec {
+stdenv_32bit.mkDerivation rec {
  pname = "libstrangle";
  version = "unstable-202202022";

@@ -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";
@@ -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
  ];
@@ -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";
@@ -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

@@ -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
  ];

@@ -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
  ]);
@@ -1,13 +1,13 @@
 {
  lib,
-  stdenv,
+  gccStdenv,
  fetchurl,
  freetype,
  libjpeg,
  zlib,
 }:

-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation rec {
  pname = "swftools";
  version = "0.9.2";

@@ -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";
@@ -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
@@ -12,6 +12,7 @@
  libGL,
  libgbm,
  libjpeg_turbo,
+  libjpeg_turbo' ? libjpeg_turbo.override { enableJava = true; },
  makeWrapper,
  mesa-gl-headers, # for built-in 3D software rendering using swrast
  openjdk, # for the client with Java GUI
@@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
    freetype
    libGL # for -DTVNC_SYSTEMX11=1
    libgbm
-    libjpeg_turbo
+    libjpeg_turbo'
    openssl
    pam
    perl
@@ -1,20 +1,18 @@
 {
-  pkgs,
  lib,
-  eggDerivation,
-  fetchegg,
+  chickenPackages_4,
 }:

 let
-  eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
+  eggs = import ./eggs.nix { inherit (chickenPackages_4) eggDerivation fetchegg; };
 in

-eggDerivation rec {
+chickenPackages_4.eggDerivation rec {
  pname = "ugarit-manifest-maker";
  version = "0.1";
  name = "${pname}-${version}";

-  src = fetchegg {
+  src = chickenPackages_4.fetchegg {
    inherit version;
    name = pname;
    sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q";
@@ -1,20 +1,19 @@
 {
  lib,
-  eggDerivation,
-  fetchegg,
+  chickenPackages_4,
  z3,
 }:

 let
-  eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
+  eggs = import ./eggs.nix { inherit (chickenPackages_4) eggDerivation fetchegg; };
 in

-eggDerivation rec {
+chickenPackages_4.eggDerivation rec {
  pname = "ugarit";
  version = "2.0";
  name = "${pname}-${version}";

-  src = fetchegg {
+  src = chickenPackages_4.fetchegg {
    inherit version;
    name = pname;
    sha256 = "1l5zkr6b8l5dw9p5mimbva0ncqw1sbvp3d4cywm1hqx2m03a0f1n";
@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  clangStdenv,
  fetchFromGitHub,
  installShellFiles,
  gnustep-base,
@@ -11,7 +11,9 @@
  wavpack,
  xcbuildHook,
 }:
-
+let
+  stdenv = clangStdenv;
+in
 stdenv.mkDerivation rec {
  pname = "unar";
  version = "1.10.8";
@@ -5,10 +5,7 @@
  fetchFromGitHub,
  mtools,
  p7zip,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
-  qmake,
+  qt5,
  syslinux,
  util-linux,
  which,
@@ -30,12 +27,12 @@ stdenv.mkDerivation rec {
  '';

  buildInputs = [
-    qtbase
-    qttools
-    qmake
+    qt5.qtbase
+    qt5.qttools
+    qt5.qmake
  ];

-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];

  # Lots of nice hard-coded paths...
  postPatch = ''
@@ -1,11 +1,11 @@
 {
  lib,
-  buildPythonApplication,
+  python3Packages,
  fetchFromGitHub,
  unar,
 }:

-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "unrar-wrapper";
  version = "1.0.0";
  format = "setuptools";
@@ -2,10 +2,11 @@
  stdenv,
  lib,
  virtualglLib,
-  virtualglLib_i686 ? null,
+  pkgsi686Linux,
  makeWrapper,
  vulkan-loader,
  addDriverRunpath,
+  usei686VirtualglLib ? stdenv.hostPlatform.system == "x86_64-linux",
 }:

 stdenv.mkDerivation {
@@ -25,7 +26,7 @@ stdenv.mkDerivation {
      --prefix LD_LIBRARY_PATH : "${
        lib.makeLibraryPath [
          virtualglLib
-          virtualglLib_i686
+          (if usei686VirtualglLib then pkgsi686Linux.virtualglLib else null) # TODO use lib.optional(s) for this

          addDriverRunpath.driverLink

@@ -34,8 +35,8 @@ stdenv.mkDerivation {
        ]
      }"
  ''
-  + lib.optionalString (virtualglLib_i686 != null) ''
-    ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
+  + lib.optionalString usei686VirtualglLib ''
+    ln -sf ${pkgsi686Linux.virtualglLib}/bin/.vglrun.vars32 $out/bin
  '';

  meta = {
@@ -9,7 +9,7 @@
  libXtst,
  libXi,
  libjpeg_turbo,
-  fltk,
+  fltk_1_3,
  libxcb-keysyms,
  opencl-headers,
  opencl-clhpp,
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
    libjpeg_turbo
    libGL
    libGLU
-    fltk
+    fltk_1_3
    libXv
    libXtst
    libXi
@@ -5,10 +5,11 @@
  copyDesktopItems,
  makeDesktopItem,
  makeBinaryWrapper,
-  wine,
+  wineWowPackages,
 }:

 let
+  wine = wineWowPackages.stable;
  # The icon is also from the winbox AUR package (see above).
  icon = fetchurl {
    name = "winbox.png";
@@ -6,7 +6,6 @@
  pkg-config,
  procps,
  makeWrapper,
-  ...
 }:

 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@
  makeWrapper,
  stdenv,
  testers,
-  w3m,
+  w3m-batch,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
           libxslt
           libxml2
           getopt
-           w3m
+           w3m-batch
         ]
       }"
  '';
@@ -8,12 +8,14 @@
  meson,
  ninja,
  pkg-config,
-  wine,
+  wineWowPackages,
  libxcb,
  nix-update-script,
 }:

 let
+  wine = wineWowPackages.yabridge;
+
  # Derived from subprojects/asio.wrap
  asio = fetchFromGitHub {
    owner = "chriskohlhoff";
@@ -3,7 +3,7 @@
  rustPlatform,
  yabridge,
  makeWrapper,
-  wine,
+  wineWowPackages,
 }:

 rustPlatform.buildRustPackage {
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage {
    wrapProgram "$out/bin/yabridgectl" \
      --prefix PATH : ${
        lib.makeBinPath [
-          wine # winedump
+          wineWowPackages.yabridge # winedump
        ]
      }
  '';
@@ -1,9 +0,0 @@
-{
-  nixpkgs ? import ../../../.. { },
-}:
-with nixpkgs;
-mkShell {
-  packages = [
-    pkgs.gh
-  ];
-}
@@ -991,10 +991,6 @@ with pkgs;

  dehinter = with python3Packages; toPythonApplication dehinter;

-  gamemode = callPackage ../tools/games/gamemode {
-    libgamemode32 = pkgsi686Linux.gamemode.lib;
-  };
-
  gamescope-wsi = callPackage ../by-name/ga/gamescope/package.nix {
    enableExecutable = false;
    enableWsi = true;
@@ -1040,10 +1036,6 @@ with pkgs;

  shaperglot = with python3Packages; toPythonApplication shaperglot;

-  supermin = callPackage ../tools/virtualization/supermin {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-
  ufolint = with python3Packages; toPythonApplication ufolint;

  ventoy-full = ventoy.override {
@@ -1066,17 +1058,6 @@ with pkgs;
  waydroid-nftables = waydroid.override { withNftables = true; };

  winbox = winbox3;
-  winbox3 = callPackage ../tools/admin/winbox {
-    wine = wineWowPackages.stable;
-  };
-
-  yabridge = callPackage ../tools/audio/yabridge {
-    wine = wineWowPackages.yabridge;
-  };
-
-  yabridgectl = callPackage ../tools/audio/yabridgectl {
-    wine = wineWowPackages.yabridge;
-  };

  ### APPLICATIONS/VERSION-MANAGEMENT

@@ -1662,8 +1643,6 @@ with pkgs;

  clickgen = with python3Packages; toPythonApplication clickgen;

-  cloud-init = callPackage ../tools/virtualization/cloud-init { inherit systemd; };
-
  coloredlogs = with python3Packages; toPythonApplication coloredlogs;

  czkawka-full = czkawka.wrapper.override {
@@ -1729,10 +1708,6 @@ with pkgs;
    plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins);
  };

-  disorderfs = callPackage ../tools/filesystems/disorderfs {
-    asciidoc = asciidoc-full;
-  };
-
  dino = callPackage ../applications/networking/instant-messengers/dino { };

  dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
@@ -1907,9 +1882,7 @@ with pkgs;
          throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression."
      );

-  mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
-
-  mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });
+  mkspiffs-presets = recurseIntoAttrs (callPackages ../by-name/mk/mkspiffs/presets.nix { });

  mobilizon = callPackage ../servers/mobilizon {
    beamPackages = beam.packages.erlang_27.extend (self: super: { elixir = self.elixir_1_18; });
@@ -1946,8 +1919,6 @@ with pkgs;

  pixcat = with python3Packages; toPythonApplication pixcat;

-  pyznap = python3Packages.callPackage ../tools/backup/pyznap { };
-
  psrecord = python3Packages.callPackage ../tools/misc/psrecord { };

  remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
@@ -2007,18 +1978,6 @@ with pkgs;

  apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { };

-  asciidoc = callPackage ../tools/typesetting/asciidoc {
-    inherit (python3.pkgs)
-      pygments
-      matplotlib
-      numpy
-      aafigure
-      recursive-pth-loader
-      ;
-    w3m = w3m-batch;
-    enableStandardFeatures = false;
-  };
-
  asciidoc-full = asciidoc.override {
    enableStandardFeatures = true;
  };
@@ -2059,8 +2018,6 @@ with pkgs;

  davix-copy = davix.override { enableThirdPartyCopy = true; };

-  cdist = python3Packages.callPackage ../tools/admin/cdist { };
-
  cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };

  libceph = ceph.lib;
@@ -2329,8 +2286,6 @@ with pkgs;

  engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { };

-  kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
-
  rocmPackages = recurseIntoAttrs (callPackage ../development/rocm-modules { });

  tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
@@ -2834,8 +2789,6 @@ with pkgs;

  keybase-gui = callPackage ../tools/security/keybase/gui.nix { };

-  kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };
-
  krunvm = callPackage ../applications/virtualization/krunvm {
    inherit (darwin) sigtool;
  };
@@ -2848,11 +2801,6 @@ with pkgs;

  limine-full = limine.override { enableAll = true; };

-  liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
-    ffmpeg = ffmpeg_6-full;
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-
  loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { };

  logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
@@ -3338,8 +3286,6 @@ with pkgs;

  pulumiPackages = recurseIntoAttrs pulumi.pkgs;

-  pulumi-bin = callPackage ../tools/admin/pulumi-bin { };
-
  patch = gnupatch;

  pcscliteWithPolkit = pcsclite.override {
@@ -3637,8 +3583,6 @@ with pkgs;

  tinc = callPackage ../tools/networking/tinc { };

-  tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
-
  tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };

  tldr-hs = haskellPackages.tldr;
@@ -3682,8 +3626,6 @@ with pkgs;
    withPython = true;
  };

-  unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { };
-
  unrpa = with python3Packages; toPythonApplication unrpa;

  usort = with python3Packages; toPythonApplication usort;
@@ -3743,11 +3685,6 @@ with pkgs;

  truecrack-cuda = truecrack.override { cudaSupport = true; };

-  turbovnc = callPackage ../tools/admin/turbovnc {
-    # fontDirectories = [ font-adobe-75dpi font-misc-misc font-cursor-misc font-bh-lucidatypewriter-75dpi ];
-    libjpeg_turbo = libjpeg_turbo.override { enableJava = true; };
-  };
-
  unbound-with-systemd = unbound.override {
    withSystemd = true;
  };
@@ -3765,20 +3702,6 @@ with pkgs;
    withRedis = true;
  };

-  unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { };
-
-  ugarit = callPackage ../tools/backup/ugarit {
-    inherit (chickenPackages_4) eggDerivation fetchegg;
-  };
-
-  ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker {
-    inherit (chickenPackages_4) eggDerivation fetchegg;
-  };
-
-  unar = callPackage ../tools/archivers/unar {
-    stdenv = clangStdenv;
-  };
-
  unzipNLS = lowPrio (unzip.override { enableNLS = true; });

  inherit (callPackages ../servers/varnish { })
@@ -3817,10 +3740,6 @@ with pkgs;

  libxfs = xfsprogs.dev;

-  xmlto = callPackage ../tools/typesetting/xmlto {
-    w3m = w3m-batch;
-  };
-
  xorriso = libisoburn;

  xvfb-run = callPackage ../tools/misc/xvfb-run {
@@ -6064,8 +5983,6 @@ with pkgs;

  mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { };

-  meraki-cli = python3Packages.callPackage ../tools/admin/meraki-cli { };
-
  python-matter-server =
    with python3Packages;
    toPythonApplication (
@@ -6275,10 +6192,6 @@ with pkgs;
    stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
  };

-  swftools = callPackage ../tools/video/swftools {
-    stdenv = gccStdenv;
-  };
-
  teensyduino = arduino-core.override {
    withGui = true;
    withTeensyduino = true;
@@ -7256,10 +7169,6 @@ with pkgs;
  mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { };
  mbedtls = callPackage ../development/libraries/mbedtls/3.nix { };

-  mergerfs = callPackage ../tools/filesystems/mergerfs { };
-
-  mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };
-
  simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3 { };

  tblite = callPackage ../development/libraries/science/chemistry/tblite { };
@@ -10727,8 +10636,6 @@ with pkgs;

  mercurialFull = mercurial.override { fullBuild = true; };

-  meshcentral = callPackage ../tools/admin/meshcentral { };
-
  michabo = libsForQt5.callPackage ../applications/misc/michabo { };

  minitube = libsForQt5.callPackage ../applications/video/minitube { };
@@ -11010,8 +10917,6 @@ with pkgs;

  plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });

-  pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { };
-
  pothos = libsForQt5.callPackage ../applications/radio/pothos { };

  # perhaps there are better apps for this task? It's how I had configured my previous system.
@@ -11229,10 +11134,6 @@ with pkgs;

  myfitnesspal = with python3Packages; toPythonApplication myfitnesspal;

-  libstrangle = callPackage ../tools/X11/libstrangle {
-    stdenv = stdenv_32bit;
-  };
-
  lightdm_qt = lightdm.override { withQt5 = true; };

  curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
@@ -11578,15 +11479,6 @@ with pkgs;
    }
  );

-  virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix {
-    fltk = fltk_1_3;
-  };
-
-  virtualgl = callPackage ../tools/X11/virtualgl {
-    virtualglLib_i686 =
-      if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.virtualglLib else null;
-  };
-
  vlc-bin-universal = vlc-bin.override { variant = "universal"; };

  libvlc = vlc.override {
@@ -11707,10 +11599,6 @@ with pkgs;

  x32edit = callPackage ../applications/audio/midas/x32edit.nix { };

-  xbindkeys-config = callPackage ../tools/X11/xbindkeys-config {
-    gtk = gtk2;
-  };
-
  kodiPackages = recurseIntoAttrs (kodi.packages);

  kodi = callPackage ../applications/video/kodi {
@@ -12024,8 +11912,6 @@ with pkgs;

  freeciv_gtk = freeciv;

-  ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
-
  # used as base package for iortcw forks
  iortcw_sp = callPackage ../by-name/io/iortcw/sp.nix { };

@@ -13304,8 +13190,6 @@ with pkgs;

  swift-corelibs-libdispatch = swiftPackages.Dispatch;

-  tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { };
-
  duden = python3Packages.toPythonApplication python3Packages.duden;

  yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { });