From 890d03374fedcd5f7f3e8156fcfd89c07d78ee45 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 19 Aug 2025 09:32:45 +0200 Subject: [PATCH] treewide: move to by-name part 3 --- .../al/alerta-server/package.nix} | 0 .../al/alerta/package.nix} | 0 .../apr/cross-assume-dev-zero-mmappable.patch | 0 .../ap/apr/package.nix} | 0 .../bo/bore-cli/package.nix} | 0 .../ch/charybdis/package.nix} | 0 .../tools => by-name/co}/corundum/Gemfile | 0 .../co}/corundum/Gemfile.lock | 0 .../tools => by-name/co}/corundum/gemset.nix | 0 .../co/corundum/package.nix} | 0 .../da}/danger-gitlab/Gemfile | 0 .../da}/danger-gitlab/Gemfile.lock | 0 .../da}/danger-gitlab/gemset.nix | 0 .../da/danger-gitlab/package.nix} | 0 .../du/duff/package.nix} | 0 .../ei}/eid-mw/eid-nssdb.in | 0 .../ei/eid-mw/package.nix} | 0 .../nosql => by-name/ev}/eventstore/deps.json | 0 .../ev/eventstore/package.nix} | 0 .../ev}/eventstore/updater.sh | 0 .../ha/hasura-cli/package.nix} | 0 .../hc/hci/package.nix} | 2 +- .../he/hercules-ci-agent/package.nix} | 2 +- .../hi}/hivex/hivex-syms.patch | 0 .../hi/hivex/package.nix} | 0 .../jm/jmol/package.nix} | 4 +- .../la/laurel/package.nix} | 0 .../li/librepo/package.nix} | 0 .../ma}/maphosts/Gemfile | 0 .../ma}/maphosts/Gemfile.lock | 0 .../ma}/maphosts/gemset.nix | 0 .../ma/maphosts/package.nix} | 0 .../ma}/marvin/LicenseManager.desktop | 0 .../ma}/marvin/MarvinSketch.desktop | 0 .../ma}/marvin/MarvinView.desktop | 0 .../ma/marvin/package.nix} | 0 .../oi/oilrush/package.nix} | 0 .../pi/pinnwand/package.nix} | 0 pkgs/{tools/misc => by-name/po}/polar/Gemfile | 0 .../misc => by-name/po}/polar/Gemfile.lock | 0 .../misc => by-name/po}/polar/gemset.nix | 0 .../po/polar/package.nix} | 0 .../{tools/text => by-name/re}/reckon/Gemfile | 0 .../text => by-name/re}/reckon/Gemfile.lock | 0 .../text => by-name/re}/reckon/gemset.nix | 0 .../re/reckon/package.nix} | 0 .../re}/redis-dump/.bundle/config | 0 .../tools => by-name/re}/redis-dump/Gemfile | 0 .../re}/redis-dump/Gemfile.lock | 0 .../re}/redis-dump/gemset.nix | 0 .../re/redis-dump/package.nix} | 0 .../ri}/riemann-dash/Gemfile | 0 .../ri}/riemann-dash/Gemfile.lock | 0 .../ri}/riemann-dash/gemset.nix | 0 .../ri/riemann-dash/package.nix} | 0 .../misc => by-name/ri}/riemann-tools/Gemfile | 0 .../ri}/riemann-tools/Gemfile.lock | 0 .../ri}/riemann-tools/gemset.nix | 0 .../ri/riemann-tools/package.nix} | 0 .../ro/rosenpass-tools/package.nix} | 0 .../ro/rosenpass/package.nix} | 0 .../cli => by-name/sc/schleuder-cli}/Gemfile | 0 .../sc/schleuder-cli}/Gemfile.lock | 0 .../sc/schleuder-cli}/gemset.nix | 0 .../sc/schleuder-cli/package.nix} | 0 .../security => by-name/sc}/schleuder/Gemfile | 0 .../sc}/schleuder/Gemfile.lock | 0 .../sc}/schleuder/gemset.nix | 0 .../sc/schleuder/package.nix} | 0 .../misc => by-name/se}/serverspec/Gemfile | 0 .../se}/serverspec/Gemfile.lock | 0 .../misc => by-name/se}/serverspec/gemset.nix | 0 .../se/serverspec/package.nix} | 0 .../so/sommelier/package.nix} | 0 .../so}/sommelier/update.py | 0 .../so/sonobuoy/package.nix} | 0 .../cluster => by-name/so}/sonobuoy/update.sh | 0 .../st/steck/package.nix} | 0 .../misc => by-name/te}/teamocil/Gemfile | 0 .../misc => by-name/te}/teamocil/Gemfile.lock | 0 .../misc => by-name/te}/teamocil/gemset.nix | 0 .../te/teamocil/package.nix} | 0 .../tr/truvari/package.nix} | 0 .../ve/veusz/package.nix} | 0 .../vo/vorbis-tools/package.nix} | 0 .../xd/xdelta/package.nix} | 0 .../zp/zpaq/package.nix} | 0 .../zp/zpaqd/package.nix} | 0 pkgs/top-level/all-packages.nix | 82 ------------------- 89 files changed, 4 insertions(+), 86 deletions(-) rename pkgs/{servers/monitoring/alerta/default.nix => by-name/al/alerta-server/package.nix} (100%) rename pkgs/{servers/monitoring/alerta/client.nix => by-name/al/alerta/package.nix} (100%) rename pkgs/{development/libraries => by-name/ap}/apr/cross-assume-dev-zero-mmappable.patch (100%) rename pkgs/{development/libraries/apr/default.nix => by-name/ap/apr/package.nix} (100%) rename pkgs/{tools/networking/bore-cli/default.nix => by-name/bo/bore-cli/package.nix} (100%) rename pkgs/{servers/irc/charybdis/default.nix => by-name/ch/charybdis/package.nix} (100%) rename pkgs/{development/tools => by-name/co}/corundum/Gemfile (100%) rename pkgs/{development/tools => by-name/co}/corundum/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/co}/corundum/gemset.nix (100%) rename pkgs/{development/tools/corundum/default.nix => by-name/co/corundum/package.nix} (100%) rename pkgs/{applications/version-management => by-name/da}/danger-gitlab/Gemfile (100%) rename pkgs/{applications/version-management => by-name/da}/danger-gitlab/Gemfile.lock (100%) rename pkgs/{applications/version-management => by-name/da}/danger-gitlab/gemset.nix (100%) rename pkgs/{applications/version-management/danger-gitlab/default.nix => by-name/da/danger-gitlab/package.nix} (100%) rename pkgs/{tools/filesystems/duff/default.nix => by-name/du/duff/package.nix} (100%) rename pkgs/{tools/security => by-name/ei}/eid-mw/eid-nssdb.in (100%) rename pkgs/{tools/security/eid-mw/default.nix => by-name/ei/eid-mw/package.nix} (100%) rename pkgs/{servers/nosql => by-name/ev}/eventstore/deps.json (100%) rename pkgs/{servers/nosql/eventstore/default.nix => by-name/ev/eventstore/package.nix} (100%) rename pkgs/{servers/nosql => by-name/ev}/eventstore/updater.sh (100%) rename pkgs/{servers/hasura/cli.nix => by-name/ha/hasura-cli/package.nix} (100%) rename pkgs/{development/tools/continuous-integration/hci/default.nix => by-name/hc/hci/package.nix} (97%) rename pkgs/{development/tools/continuous-integration/hercules-ci-agent/default.nix => by-name/he/hercules-ci-agent/package.nix} (98%) rename pkgs/{development/libraries => by-name/hi}/hivex/hivex-syms.patch (100%) rename pkgs/{development/libraries/hivex/default.nix => by-name/hi/hivex/package.nix} (100%) rename pkgs/{applications/science/chemistry/jmol/default.nix => by-name/jm/jmol/package.nix} (92%) rename pkgs/{servers/monitoring/laurel/default.nix => by-name/la/laurel/package.nix} (100%) rename pkgs/{tools/package-management/librepo/default.nix => by-name/li/librepo/package.nix} (100%) rename pkgs/{tools/networking => by-name/ma}/maphosts/Gemfile (100%) rename pkgs/{tools/networking => by-name/ma}/maphosts/Gemfile.lock (100%) rename pkgs/{tools/networking => by-name/ma}/maphosts/gemset.nix (100%) rename pkgs/{tools/networking/maphosts/default.nix => by-name/ma/maphosts/package.nix} (100%) rename pkgs/{applications/science/chemistry => by-name/ma}/marvin/LicenseManager.desktop (100%) rename pkgs/{applications/science/chemistry => by-name/ma}/marvin/MarvinSketch.desktop (100%) rename pkgs/{applications/science/chemistry => by-name/ma}/marvin/MarvinView.desktop (100%) rename pkgs/{applications/science/chemistry/marvin/default.nix => by-name/ma/marvin/package.nix} (100%) rename pkgs/{games/oilrush/default.nix => by-name/oi/oilrush/package.nix} (100%) rename pkgs/{servers/pinnwand/default.nix => by-name/pi/pinnwand/package.nix} (100%) rename pkgs/{tools/misc => by-name/po}/polar/Gemfile (100%) rename pkgs/{tools/misc => by-name/po}/polar/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/po}/polar/gemset.nix (100%) rename pkgs/{tools/misc/polar/default.nix => by-name/po/polar/package.nix} (100%) rename pkgs/{tools/text => by-name/re}/reckon/Gemfile (100%) rename pkgs/{tools/text => by-name/re}/reckon/Gemfile.lock (100%) rename pkgs/{tools/text => by-name/re}/reckon/gemset.nix (100%) rename pkgs/{tools/text/reckon/default.nix => by-name/re/reckon/package.nix} (100%) rename pkgs/{development/tools => by-name/re}/redis-dump/.bundle/config (100%) rename pkgs/{development/tools => by-name/re}/redis-dump/Gemfile (100%) rename pkgs/{development/tools => by-name/re}/redis-dump/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/re}/redis-dump/gemset.nix (100%) rename pkgs/{development/tools/redis-dump/default.nix => by-name/re/redis-dump/package.nix} (100%) rename pkgs/{servers/monitoring => by-name/ri}/riemann-dash/Gemfile (100%) rename pkgs/{servers/monitoring => by-name/ri}/riemann-dash/Gemfile.lock (100%) rename pkgs/{servers/monitoring => by-name/ri}/riemann-dash/gemset.nix (100%) rename pkgs/{servers/monitoring/riemann-dash/default.nix => by-name/ri/riemann-dash/package.nix} (100%) rename pkgs/{tools/misc => by-name/ri}/riemann-tools/Gemfile (100%) rename pkgs/{tools/misc => by-name/ri}/riemann-tools/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/ri}/riemann-tools/gemset.nix (100%) rename pkgs/{tools/misc/riemann-tools/default.nix => by-name/ri/riemann-tools/package.nix} (100%) rename pkgs/{tools/networking/rosenpass/tools.nix => by-name/ro/rosenpass-tools/package.nix} (100%) rename pkgs/{tools/networking/rosenpass/default.nix => by-name/ro/rosenpass/package.nix} (100%) rename pkgs/{tools/security/schleuder/cli => by-name/sc/schleuder-cli}/Gemfile (100%) rename pkgs/{tools/security/schleuder/cli => by-name/sc/schleuder-cli}/Gemfile.lock (100%) rename pkgs/{tools/security/schleuder/cli => by-name/sc/schleuder-cli}/gemset.nix (100%) rename pkgs/{tools/security/schleuder/cli/default.nix => by-name/sc/schleuder-cli/package.nix} (100%) rename pkgs/{tools/security => by-name/sc}/schleuder/Gemfile (100%) rename pkgs/{tools/security => by-name/sc}/schleuder/Gemfile.lock (100%) rename pkgs/{tools/security => by-name/sc}/schleuder/gemset.nix (100%) rename pkgs/{tools/security/schleuder/default.nix => by-name/sc/schleuder/package.nix} (100%) rename pkgs/{tools/misc => by-name/se}/serverspec/Gemfile (100%) rename pkgs/{tools/misc => by-name/se}/serverspec/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/se}/serverspec/gemset.nix (100%) rename pkgs/{tools/misc/serverspec/default.nix => by-name/se/serverspec/package.nix} (100%) rename pkgs/{applications/window-managers/sommelier/default.nix => by-name/so/sommelier/package.nix} (100%) rename pkgs/{applications/window-managers => by-name/so}/sommelier/update.py (100%) rename pkgs/{applications/networking/cluster/sonobuoy/default.nix => by-name/so/sonobuoy/package.nix} (100%) rename pkgs/{applications/networking/cluster => by-name/so}/sonobuoy/update.sh (100%) rename pkgs/{servers/pinnwand/steck.nix => by-name/st/steck/package.nix} (100%) rename pkgs/{tools/misc => by-name/te}/teamocil/Gemfile (100%) rename pkgs/{tools/misc => by-name/te}/teamocil/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/te}/teamocil/gemset.nix (100%) rename pkgs/{tools/misc/teamocil/default.nix => by-name/te/teamocil/package.nix} (100%) rename pkgs/{applications/science/biology/truvari/default.nix => by-name/tr/truvari/package.nix} (100%) rename pkgs/{applications/graphics/veusz/default.nix => by-name/ve/veusz/package.nix} (100%) rename pkgs/{applications/audio/vorbis-tools/default.nix => by-name/vo/vorbis-tools/package.nix} (100%) rename pkgs/{tools/compression/xdelta/default.nix => by-name/xd/xdelta/package.nix} (100%) rename pkgs/{tools/archivers/zpaq/default.nix => by-name/zp/zpaq/package.nix} (100%) rename pkgs/{tools/archivers/zpaq/zpaqd.nix => by-name/zp/zpaqd/package.nix} (100%) diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/by-name/al/alerta-server/package.nix similarity index 100% rename from pkgs/servers/monitoring/alerta/default.nix rename to pkgs/by-name/al/alerta-server/package.nix diff --git a/pkgs/servers/monitoring/alerta/client.nix b/pkgs/by-name/al/alerta/package.nix similarity index 100% rename from pkgs/servers/monitoring/alerta/client.nix rename to pkgs/by-name/al/alerta/package.nix diff --git a/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch b/pkgs/by-name/ap/apr/cross-assume-dev-zero-mmappable.patch similarity index 100% rename from pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch rename to pkgs/by-name/ap/apr/cross-assume-dev-zero-mmappable.patch diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/by-name/ap/apr/package.nix similarity index 100% rename from pkgs/development/libraries/apr/default.nix rename to pkgs/by-name/ap/apr/package.nix diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/by-name/bo/bore-cli/package.nix similarity index 100% rename from pkgs/tools/networking/bore-cli/default.nix rename to pkgs/by-name/bo/bore-cli/package.nix diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/by-name/ch/charybdis/package.nix similarity index 100% rename from pkgs/servers/irc/charybdis/default.nix rename to pkgs/by-name/ch/charybdis/package.nix diff --git a/pkgs/development/tools/corundum/Gemfile b/pkgs/by-name/co/corundum/Gemfile similarity index 100% rename from pkgs/development/tools/corundum/Gemfile rename to pkgs/by-name/co/corundum/Gemfile diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/pkgs/by-name/co/corundum/Gemfile.lock similarity index 100% rename from pkgs/development/tools/corundum/Gemfile.lock rename to pkgs/by-name/co/corundum/Gemfile.lock diff --git a/pkgs/development/tools/corundum/gemset.nix b/pkgs/by-name/co/corundum/gemset.nix similarity index 100% rename from pkgs/development/tools/corundum/gemset.nix rename to pkgs/by-name/co/corundum/gemset.nix diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/by-name/co/corundum/package.nix similarity index 100% rename from pkgs/development/tools/corundum/default.nix rename to pkgs/by-name/co/corundum/package.nix diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile b/pkgs/by-name/da/danger-gitlab/Gemfile similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/Gemfile rename to pkgs/by-name/da/danger-gitlab/Gemfile diff --git a/pkgs/applications/version-management/danger-gitlab/Gemfile.lock b/pkgs/by-name/da/danger-gitlab/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/Gemfile.lock rename to pkgs/by-name/da/danger-gitlab/Gemfile.lock diff --git a/pkgs/applications/version-management/danger-gitlab/gemset.nix b/pkgs/by-name/da/danger-gitlab/gemset.nix similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/gemset.nix rename to pkgs/by-name/da/danger-gitlab/gemset.nix diff --git a/pkgs/applications/version-management/danger-gitlab/default.nix b/pkgs/by-name/da/danger-gitlab/package.nix similarity index 100% rename from pkgs/applications/version-management/danger-gitlab/default.nix rename to pkgs/by-name/da/danger-gitlab/package.nix diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/by-name/du/duff/package.nix similarity index 100% rename from pkgs/tools/filesystems/duff/default.nix rename to pkgs/by-name/du/duff/package.nix diff --git a/pkgs/tools/security/eid-mw/eid-nssdb.in b/pkgs/by-name/ei/eid-mw/eid-nssdb.in similarity index 100% rename from pkgs/tools/security/eid-mw/eid-nssdb.in rename to pkgs/by-name/ei/eid-mw/eid-nssdb.in diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/by-name/ei/eid-mw/package.nix similarity index 100% rename from pkgs/tools/security/eid-mw/default.nix rename to pkgs/by-name/ei/eid-mw/package.nix diff --git a/pkgs/servers/nosql/eventstore/deps.json b/pkgs/by-name/ev/eventstore/deps.json similarity index 100% rename from pkgs/servers/nosql/eventstore/deps.json rename to pkgs/by-name/ev/eventstore/deps.json diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/by-name/ev/eventstore/package.nix similarity index 100% rename from pkgs/servers/nosql/eventstore/default.nix rename to pkgs/by-name/ev/eventstore/package.nix diff --git a/pkgs/servers/nosql/eventstore/updater.sh b/pkgs/by-name/ev/eventstore/updater.sh similarity index 100% rename from pkgs/servers/nosql/eventstore/updater.sh rename to pkgs/by-name/ev/eventstore/updater.sh diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/by-name/ha/hasura-cli/package.nix similarity index 100% rename from pkgs/servers/hasura/cli.nix rename to pkgs/by-name/ha/hasura-cli/package.nix diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/by-name/hc/hci/package.nix similarity index 97% rename from pkgs/development/tools/continuous-integration/hci/default.nix rename to pkgs/by-name/hc/hci/package.nix index a1ce297d14f3..2429e32d1d76 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/by-name/hc/hci/package.nix @@ -58,6 +58,6 @@ in pkg // { meta = pkg.meta // { - position = toString ./default.nix + ":1"; + position = toString ./package.nix + ":1"; }; } diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/by-name/he/hercules-ci-agent/package.nix similarity index 98% rename from pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix rename to pkgs/by-name/he/hercules-ci-agent/package.nix index 84b63e689f9f..00a0fc7cfad3 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/by-name/he/hercules-ci-agent/package.nix @@ -41,7 +41,7 @@ in pkg.overrideAttrs ( finalAttrs: o: { meta = o.meta // { - position = toString ./default.nix + ":1"; + position = toString ./package.nix + ":1"; }; passthru = o.passthru // { tests = { diff --git a/pkgs/development/libraries/hivex/hivex-syms.patch b/pkgs/by-name/hi/hivex/hivex-syms.patch similarity index 100% rename from pkgs/development/libraries/hivex/hivex-syms.patch rename to pkgs/by-name/hi/hivex/hivex-syms.patch diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/by-name/hi/hivex/package.nix similarity index 100% rename from pkgs/development/libraries/hivex/default.nix rename to pkgs/by-name/hi/hivex/package.nix diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/by-name/jm/jmol/package.nix similarity index 92% rename from pkgs/applications/science/chemistry/jmol/default.nix rename to pkgs/by-name/jm/jmol/package.nix index 423d4f1c676a..c1c9d5aefbf9 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/by-name/jm/jmol/package.nix @@ -4,7 +4,7 @@ fetchurl, unzip, makeDesktopItem, - jre, + jre8, }: let @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; patchPhase = '' - sed -i -e "4s:.*:command=${jre}/bin/java:" -e "10s:.*:jarpath=$out/share/jmol/Jmol.jar:" -e "11,21d" jmol + sed -i -e "4s:.*:command=${jre8}/bin/java:" -e "10s:.*:jarpath=$out/share/jmol/Jmol.jar:" -e "11,21d" jmol ''; installPhase = '' diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/by-name/la/laurel/package.nix similarity index 100% rename from pkgs/servers/monitoring/laurel/default.nix rename to pkgs/by-name/la/laurel/package.nix diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/by-name/li/librepo/package.nix similarity index 100% rename from pkgs/tools/package-management/librepo/default.nix rename to pkgs/by-name/li/librepo/package.nix diff --git a/pkgs/tools/networking/maphosts/Gemfile b/pkgs/by-name/ma/maphosts/Gemfile similarity index 100% rename from pkgs/tools/networking/maphosts/Gemfile rename to pkgs/by-name/ma/maphosts/Gemfile diff --git a/pkgs/tools/networking/maphosts/Gemfile.lock b/pkgs/by-name/ma/maphosts/Gemfile.lock similarity index 100% rename from pkgs/tools/networking/maphosts/Gemfile.lock rename to pkgs/by-name/ma/maphosts/Gemfile.lock diff --git a/pkgs/tools/networking/maphosts/gemset.nix b/pkgs/by-name/ma/maphosts/gemset.nix similarity index 100% rename from pkgs/tools/networking/maphosts/gemset.nix rename to pkgs/by-name/ma/maphosts/gemset.nix diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/by-name/ma/maphosts/package.nix similarity index 100% rename from pkgs/tools/networking/maphosts/default.nix rename to pkgs/by-name/ma/maphosts/package.nix diff --git a/pkgs/applications/science/chemistry/marvin/LicenseManager.desktop b/pkgs/by-name/ma/marvin/LicenseManager.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/LicenseManager.desktop rename to pkgs/by-name/ma/marvin/LicenseManager.desktop diff --git a/pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop b/pkgs/by-name/ma/marvin/MarvinSketch.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop rename to pkgs/by-name/ma/marvin/MarvinSketch.desktop diff --git a/pkgs/applications/science/chemistry/marvin/MarvinView.desktop b/pkgs/by-name/ma/marvin/MarvinView.desktop similarity index 100% rename from pkgs/applications/science/chemistry/marvin/MarvinView.desktop rename to pkgs/by-name/ma/marvin/MarvinView.desktop diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/by-name/ma/marvin/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/marvin/default.nix rename to pkgs/by-name/ma/marvin/package.nix diff --git a/pkgs/games/oilrush/default.nix b/pkgs/by-name/oi/oilrush/package.nix similarity index 100% rename from pkgs/games/oilrush/default.nix rename to pkgs/by-name/oi/oilrush/package.nix diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/by-name/pi/pinnwand/package.nix similarity index 100% rename from pkgs/servers/pinnwand/default.nix rename to pkgs/by-name/pi/pinnwand/package.nix diff --git a/pkgs/tools/misc/polar/Gemfile b/pkgs/by-name/po/polar/Gemfile similarity index 100% rename from pkgs/tools/misc/polar/Gemfile rename to pkgs/by-name/po/polar/Gemfile diff --git a/pkgs/tools/misc/polar/Gemfile.lock b/pkgs/by-name/po/polar/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/polar/Gemfile.lock rename to pkgs/by-name/po/polar/Gemfile.lock diff --git a/pkgs/tools/misc/polar/gemset.nix b/pkgs/by-name/po/polar/gemset.nix similarity index 100% rename from pkgs/tools/misc/polar/gemset.nix rename to pkgs/by-name/po/polar/gemset.nix diff --git a/pkgs/tools/misc/polar/default.nix b/pkgs/by-name/po/polar/package.nix similarity index 100% rename from pkgs/tools/misc/polar/default.nix rename to pkgs/by-name/po/polar/package.nix diff --git a/pkgs/tools/text/reckon/Gemfile b/pkgs/by-name/re/reckon/Gemfile similarity index 100% rename from pkgs/tools/text/reckon/Gemfile rename to pkgs/by-name/re/reckon/Gemfile diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/by-name/re/reckon/Gemfile.lock similarity index 100% rename from pkgs/tools/text/reckon/Gemfile.lock rename to pkgs/by-name/re/reckon/Gemfile.lock diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/by-name/re/reckon/gemset.nix similarity index 100% rename from pkgs/tools/text/reckon/gemset.nix rename to pkgs/by-name/re/reckon/gemset.nix diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/by-name/re/reckon/package.nix similarity index 100% rename from pkgs/tools/text/reckon/default.nix rename to pkgs/by-name/re/reckon/package.nix diff --git a/pkgs/development/tools/redis-dump/.bundle/config b/pkgs/by-name/re/redis-dump/.bundle/config similarity index 100% rename from pkgs/development/tools/redis-dump/.bundle/config rename to pkgs/by-name/re/redis-dump/.bundle/config diff --git a/pkgs/development/tools/redis-dump/Gemfile b/pkgs/by-name/re/redis-dump/Gemfile similarity index 100% rename from pkgs/development/tools/redis-dump/Gemfile rename to pkgs/by-name/re/redis-dump/Gemfile diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/by-name/re/redis-dump/Gemfile.lock similarity index 100% rename from pkgs/development/tools/redis-dump/Gemfile.lock rename to pkgs/by-name/re/redis-dump/Gemfile.lock diff --git a/pkgs/development/tools/redis-dump/gemset.nix b/pkgs/by-name/re/redis-dump/gemset.nix similarity index 100% rename from pkgs/development/tools/redis-dump/gemset.nix rename to pkgs/by-name/re/redis-dump/gemset.nix diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/by-name/re/redis-dump/package.nix similarity index 100% rename from pkgs/development/tools/redis-dump/default.nix rename to pkgs/by-name/re/redis-dump/package.nix diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/by-name/ri/riemann-dash/Gemfile similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/Gemfile rename to pkgs/by-name/ri/riemann-dash/Gemfile diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/by-name/ri/riemann-dash/Gemfile.lock similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/Gemfile.lock rename to pkgs/by-name/ri/riemann-dash/Gemfile.lock diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/by-name/ri/riemann-dash/gemset.nix similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/gemset.nix rename to pkgs/by-name/ri/riemann-dash/gemset.nix diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/by-name/ri/riemann-dash/package.nix similarity index 100% rename from pkgs/servers/monitoring/riemann-dash/default.nix rename to pkgs/by-name/ri/riemann-dash/package.nix diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/by-name/ri/riemann-tools/Gemfile similarity index 100% rename from pkgs/tools/misc/riemann-tools/Gemfile rename to pkgs/by-name/ri/riemann-tools/Gemfile diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/by-name/ri/riemann-tools/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/riemann-tools/Gemfile.lock rename to pkgs/by-name/ri/riemann-tools/Gemfile.lock diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/by-name/ri/riemann-tools/gemset.nix similarity index 100% rename from pkgs/tools/misc/riemann-tools/gemset.nix rename to pkgs/by-name/ri/riemann-tools/gemset.nix diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/by-name/ri/riemann-tools/package.nix similarity index 100% rename from pkgs/tools/misc/riemann-tools/default.nix rename to pkgs/by-name/ri/riemann-tools/package.nix diff --git a/pkgs/tools/networking/rosenpass/tools.nix b/pkgs/by-name/ro/rosenpass-tools/package.nix similarity index 100% rename from pkgs/tools/networking/rosenpass/tools.nix rename to pkgs/by-name/ro/rosenpass-tools/package.nix diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/by-name/ro/rosenpass/package.nix similarity index 100% rename from pkgs/tools/networking/rosenpass/default.nix rename to pkgs/by-name/ro/rosenpass/package.nix diff --git a/pkgs/tools/security/schleuder/cli/Gemfile b/pkgs/by-name/sc/schleuder-cli/Gemfile similarity index 100% rename from pkgs/tools/security/schleuder/cli/Gemfile rename to pkgs/by-name/sc/schleuder-cli/Gemfile diff --git a/pkgs/tools/security/schleuder/cli/Gemfile.lock b/pkgs/by-name/sc/schleuder-cli/Gemfile.lock similarity index 100% rename from pkgs/tools/security/schleuder/cli/Gemfile.lock rename to pkgs/by-name/sc/schleuder-cli/Gemfile.lock diff --git a/pkgs/tools/security/schleuder/cli/gemset.nix b/pkgs/by-name/sc/schleuder-cli/gemset.nix similarity index 100% rename from pkgs/tools/security/schleuder/cli/gemset.nix rename to pkgs/by-name/sc/schleuder-cli/gemset.nix diff --git a/pkgs/tools/security/schleuder/cli/default.nix b/pkgs/by-name/sc/schleuder-cli/package.nix similarity index 100% rename from pkgs/tools/security/schleuder/cli/default.nix rename to pkgs/by-name/sc/schleuder-cli/package.nix diff --git a/pkgs/tools/security/schleuder/Gemfile b/pkgs/by-name/sc/schleuder/Gemfile similarity index 100% rename from pkgs/tools/security/schleuder/Gemfile rename to pkgs/by-name/sc/schleuder/Gemfile diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/by-name/sc/schleuder/Gemfile.lock similarity index 100% rename from pkgs/tools/security/schleuder/Gemfile.lock rename to pkgs/by-name/sc/schleuder/Gemfile.lock diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/by-name/sc/schleuder/gemset.nix similarity index 100% rename from pkgs/tools/security/schleuder/gemset.nix rename to pkgs/by-name/sc/schleuder/gemset.nix diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/by-name/sc/schleuder/package.nix similarity index 100% rename from pkgs/tools/security/schleuder/default.nix rename to pkgs/by-name/sc/schleuder/package.nix diff --git a/pkgs/tools/misc/serverspec/Gemfile b/pkgs/by-name/se/serverspec/Gemfile similarity index 100% rename from pkgs/tools/misc/serverspec/Gemfile rename to pkgs/by-name/se/serverspec/Gemfile diff --git a/pkgs/tools/misc/serverspec/Gemfile.lock b/pkgs/by-name/se/serverspec/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/serverspec/Gemfile.lock rename to pkgs/by-name/se/serverspec/Gemfile.lock diff --git a/pkgs/tools/misc/serverspec/gemset.nix b/pkgs/by-name/se/serverspec/gemset.nix similarity index 100% rename from pkgs/tools/misc/serverspec/gemset.nix rename to pkgs/by-name/se/serverspec/gemset.nix diff --git a/pkgs/tools/misc/serverspec/default.nix b/pkgs/by-name/se/serverspec/package.nix similarity index 100% rename from pkgs/tools/misc/serverspec/default.nix rename to pkgs/by-name/se/serverspec/package.nix diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/by-name/so/sommelier/package.nix similarity index 100% rename from pkgs/applications/window-managers/sommelier/default.nix rename to pkgs/by-name/so/sommelier/package.nix diff --git a/pkgs/applications/window-managers/sommelier/update.py b/pkgs/by-name/so/sommelier/update.py similarity index 100% rename from pkgs/applications/window-managers/sommelier/update.py rename to pkgs/by-name/so/sommelier/update.py diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/by-name/so/sonobuoy/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/sonobuoy/default.nix rename to pkgs/by-name/so/sonobuoy/package.nix diff --git a/pkgs/applications/networking/cluster/sonobuoy/update.sh b/pkgs/by-name/so/sonobuoy/update.sh similarity index 100% rename from pkgs/applications/networking/cluster/sonobuoy/update.sh rename to pkgs/by-name/so/sonobuoy/update.sh diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/by-name/st/steck/package.nix similarity index 100% rename from pkgs/servers/pinnwand/steck.nix rename to pkgs/by-name/st/steck/package.nix diff --git a/pkgs/tools/misc/teamocil/Gemfile b/pkgs/by-name/te/teamocil/Gemfile similarity index 100% rename from pkgs/tools/misc/teamocil/Gemfile rename to pkgs/by-name/te/teamocil/Gemfile diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/by-name/te/teamocil/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/teamocil/Gemfile.lock rename to pkgs/by-name/te/teamocil/Gemfile.lock diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/by-name/te/teamocil/gemset.nix similarity index 100% rename from pkgs/tools/misc/teamocil/gemset.nix rename to pkgs/by-name/te/teamocil/gemset.nix diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/by-name/te/teamocil/package.nix similarity index 100% rename from pkgs/tools/misc/teamocil/default.nix rename to pkgs/by-name/te/teamocil/package.nix diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/by-name/tr/truvari/package.nix similarity index 100% rename from pkgs/applications/science/biology/truvari/default.nix rename to pkgs/by-name/tr/truvari/package.nix diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/by-name/ve/veusz/package.nix similarity index 100% rename from pkgs/applications/graphics/veusz/default.nix rename to pkgs/by-name/ve/veusz/package.nix diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/by-name/vo/vorbis-tools/package.nix similarity index 100% rename from pkgs/applications/audio/vorbis-tools/default.nix rename to pkgs/by-name/vo/vorbis-tools/package.nix diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/by-name/xd/xdelta/package.nix similarity index 100% rename from pkgs/tools/compression/xdelta/default.nix rename to pkgs/by-name/xd/xdelta/package.nix diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/by-name/zp/zpaq/package.nix similarity index 100% rename from pkgs/tools/archivers/zpaq/default.nix rename to pkgs/by-name/zp/zpaq/package.nix diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/by-name/zp/zpaqd/package.nix similarity index 100% rename from pkgs/tools/archivers/zpaq/zpaqd.nix rename to pkgs/by-name/zp/zpaqd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eba0aae5c634..631ced3eb066 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -806,8 +806,6 @@ with pkgs; closureInfo = callPackage ../build-support/closure-info.nix { }; - serverspec = callPackage ../tools/misc/serverspec { }; - setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; shortenPerlShebang = makeSetupHook { @@ -2710,8 +2708,6 @@ with pkgs; cve-bin-tool = python3Packages.callPackage ../tools/security/cve-bin-tool { }; - danger-gitlab = callPackage ../applications/version-management/danger-gitlab { }; - dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; ddcui = libsForQt5.callPackage ../applications/misc/ddcui { }; @@ -2746,8 +2742,6 @@ with pkgs; dub-to-nix ; - duff = callPackage ../tools/filesystems/duff { }; - dvtm = callPackage ../tools/misc/dvtm { # if you prefer a custom config, write the config.h in dvtm.config.h # and enable @@ -2756,8 +2750,6 @@ with pkgs; dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { }; - eid-mw = callPackage ../tools/security/eid-mw { }; - engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { }; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; @@ -2765,14 +2757,6 @@ with pkgs; rocmPackages = rocmPackages_6; rocmPackages_6 = recurseIntoAttrs (callPackage ../development/rocm-modules/6 { }); - sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - - schleuder = callPackage ../tools/security/schleuder { }; - - schleuder-cli = callPackage ../tools/security/schleuder/cli { }; - - teamocil = callPackage ../tools/misc/teamocil { }; - tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; tracy = callPackage ../by-name/tr/tracy/package.nix { withWayland = stdenv.hostPlatform.isLinux; }; @@ -4000,8 +3984,6 @@ with pkgs; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { }; - pinnwand = callPackage ../servers/pinnwand { }; - plan9port = callPackage ../tools/system/plan9port { inherit (darwin) DarwinTools; }; @@ -4152,8 +4134,6 @@ with pkgs; recoll-nox = recoll.override { withGui = false; }; - reckon = callPackage ../tools/text/reckon { }; - remote-exec = python3Packages.callPackage ../tools/misc/remote-exec { }; reptor = with python3.pkgs; toPythonApplication reptor; @@ -4166,16 +4146,10 @@ with pkgs; reuse = with python3.pkgs; toPythonApplication reuse; - riemann-tools = callPackage ../tools/misc/riemann-tools { }; - rmlint = callPackage ../tools/misc/rmlint { inherit (python3Packages) sphinx; }; - rosenpass = callPackage ../tools/networking/rosenpass { }; - - rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { }; - rpm = callPackage ../tools/package-management/rpm { lua = lua5_4; }; @@ -4260,8 +4234,6 @@ with pkgs; soundkonverter = libsForQt5.soundkonverter; - steck = callPackage ../servers/pinnwand/steck.nix { }; - stm32loader = with python3Packages; toPythonApplication stm32loader; solc-select = with python3Packages; toPythonApplication solc-select; @@ -4574,7 +4546,6 @@ with pkgs; # It is also needed to reduce the amount of unnecessary stuff in the Darwin bootstrap. xarMinimal = callPackage ../by-name/xa/xar/package.nix { e2fsprogs = null; }; - xdelta = callPackage ../tools/compression/xdelta { }; xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { }; xdot = with python3Packages; toPythonApplication xdot; @@ -4629,9 +4600,6 @@ with pkgs; nvidiaSupport = true; }; - zpaq = callPackage ../tools/archivers/zpaq { }; - zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; - zstd = callPackage ../tools/compression/zstd { cmake = buildPackages.cmakeMinimal; }; @@ -6893,8 +6861,6 @@ with pkgs; bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { }; - bore-cli = callPackage ../tools/networking/bore-cli/default.nix { }; - bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; buildkite-test-collector-rust = @@ -6969,8 +6935,6 @@ with pkgs; cookiecutter = with python3Packages; toPythonApplication cookiecutter; - corundum = callPackage ../development/tools/corundum { }; - ctags = callPackage ../development/tools/misc/ctags { }; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix { }; @@ -7322,8 +7286,6 @@ with pkgs; portableService = callPackage ../build-support/portable-service { }; - polar = callPackage ../tools/misc/polar { }; - pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; premake4 = callPackage ../development/tools/misc/premake { }; @@ -7361,8 +7323,6 @@ with pkgs; inherit (callPackages ../development/tools/parsing/ragel { }) ragelStable ragelDev; - redis-dump = callPackage ../development/tools/redis-dump { }; - inherit (regclient) regbot regctl regsync; reno = with python312Packages; toPythonApplication reno; @@ -7562,8 +7522,6 @@ with pkgs; appstream = callPackage ../development/libraries/appstream { }; - apr = callPackage ../development/libraries/apr { }; - argparse-manpage = with python3Packages; toPythonApplication argparse-manpage; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; @@ -7640,10 +7598,6 @@ with pkgs; }; }); - hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; - - hci = callPackage ../development/tools/continuous-integration/hci { }; - niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv); ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu); @@ -8201,8 +8155,6 @@ with pkgs; highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; - hivex = callPackage ../development/libraries/hivex { }; - hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; @@ -8334,8 +8286,6 @@ with pkgs; } ); - laurel = callPackage ../servers/monitoring/laurel/default.nix { }; - lcms = lcms2; libagar = callPackage ../development/libraries/libagar { }; @@ -8468,8 +8418,6 @@ with pkgs; inherit (lomiri) cmake-extras; }; - librepo = callPackage ../tools/package-management/librepo { }; - libretranslate = with python3.pkgs; toPythonApplication libretranslate; librsb = callPackage ../development/libraries/librsb { @@ -9867,10 +9815,6 @@ with pkgs; ### SERVERS - alerta = callPackage ../servers/monitoring/alerta/client.nix { }; - - alerta-server = callPackage ../servers/monitoring/alerta { }; - apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -9951,8 +9895,6 @@ with pkgs; dnsutils = bind.dnsutils; dig = lib.addMetaAttrs { mainProgram = "dig"; } bind.dnsutils; - charybdis = callPackage ../servers/irc/charybdis { }; - clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; couchdb3 = callPackage ../servers/http/couchdb/3.nix { @@ -9998,8 +9940,6 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - eventstore = callPackage ../servers/nosql/eventstore { }; - felix = callPackage ../servers/felix { }; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; @@ -10016,8 +9956,6 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/grafana/plugins { }); - hasura-cli = callPackage ../servers/hasura/cli.nix { }; - inherit (callPackage ../servers/hbase { }) hbase_2_4 hbase_2_5 @@ -10320,8 +10258,6 @@ with pkgs; nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { }); - riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; - qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { }; @@ -13322,8 +13258,6 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - sommelier = callPackage ../applications/window-managers/sommelier { }; - spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { }; sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; @@ -13655,8 +13589,6 @@ with pkgs; vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - veusz = callPackage ../applications/graphics/veusz { }; - vim = vimUtils.makeCustomizable ( callPackage ../applications/editors/vim { } @@ -13777,8 +13709,6 @@ with pkgs; onlyLibVLC = true; }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; - vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; @@ -14465,8 +14395,6 @@ with pkgs; npush = callPackage ../games/npush { }; run-npush = callPackage ../games/npush/run.nix { }; - oilrush = callPackage ../games/oilrush { }; - openloco = pkgsi686Linux.callPackage ../games/openloco { }; openmw = libsForQt5.callPackage ../games/openmw { }; @@ -14825,12 +14753,6 @@ with pkgs; avogadro2 = libsForQt5.callPackage ../applications/science/chemistry/avogadro2 { }; - jmol = callPackage ../applications/science/chemistry/jmol { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - - marvin = callPackage ../applications/science/chemistry/marvin { }; - molbar = with python3Packages; toPythonApplication molbar; nwchem = callPackage ../applications/science/chemistry/nwchem { @@ -14906,8 +14828,6 @@ with pkgs; }; }; - truvari = callPackage ../applications/science/biology/truvari { }; - ### SCIENCE/MACHINE LEARNING sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; @@ -16019,8 +15939,6 @@ with pkgs; pinentry = pinentry-curses; }; - maphosts = callPackage ../tools/networking/maphosts { }; - tora = libsForQt5.callPackage ../development/tools/tora { }; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };