diff --git a/pkgs/applications/misc/acpic/default.nix b/pkgs/by-name/ac/acpic/package.nix similarity index 100% rename from pkgs/applications/misc/acpic/default.nix rename to pkgs/by-name/ac/acpic/package.nix diff --git a/pkgs/tools/audio/botamusique/catch-invalid-versions.patch b/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch similarity index 100% rename from pkgs/tools/audio/botamusique/catch-invalid-versions.patch rename to pkgs/by-name/bo/botamusique/catch-invalid-versions.patch diff --git a/pkgs/tools/audio/botamusique/no-runtime-update.patch b/pkgs/by-name/bo/botamusique/no-runtime-update.patch similarity index 100% rename from pkgs/tools/audio/botamusique/no-runtime-update.patch rename to pkgs/by-name/bo/botamusique/no-runtime-update.patch diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/by-name/bo/botamusique/package.nix similarity index 100% rename from pkgs/tools/audio/botamusique/default.nix rename to pkgs/by-name/bo/botamusique/package.nix diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/by-name/bo/botamusique/src.json similarity index 100% rename from pkgs/tools/audio/botamusique/src.json rename to pkgs/by-name/bo/botamusique/src.json diff --git a/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch b/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch similarity index 100% rename from pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch rename to pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch diff --git a/pkgs/applications/audio/castopod/default.nix b/pkgs/by-name/ca/castopod/package.nix similarity index 100% rename from pkgs/applications/audio/castopod/default.nix rename to pkgs/by-name/ca/castopod/package.nix diff --git a/pkgs/applications/audio/castopod/update.sh b/pkgs/by-name/ca/castopod/update.sh similarity index 100% rename from pkgs/applications/audio/castopod/update.sh rename to pkgs/by-name/ca/castopod/update.sh diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/by-name/cl/cloak/package.nix similarity index 100% rename from pkgs/applications/misc/cloak/default.nix rename to pkgs/by-name/cl/cloak/package.nix diff --git a/pkgs/applications/misc/coltrane/Gemfile b/pkgs/by-name/co/coltrane/Gemfile similarity index 100% rename from pkgs/applications/misc/coltrane/Gemfile rename to pkgs/by-name/co/coltrane/Gemfile diff --git a/pkgs/applications/misc/coltrane/Gemfile.lock b/pkgs/by-name/co/coltrane/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/coltrane/Gemfile.lock rename to pkgs/by-name/co/coltrane/Gemfile.lock diff --git a/pkgs/applications/misc/coltrane/gemset.nix b/pkgs/by-name/co/coltrane/gemset.nix similarity index 100% rename from pkgs/applications/misc/coltrane/gemset.nix rename to pkgs/by-name/co/coltrane/gemset.nix diff --git a/pkgs/applications/misc/coltrane/default.nix b/pkgs/by-name/co/coltrane/package.nix similarity index 100% rename from pkgs/applications/misc/coltrane/default.nix rename to pkgs/by-name/co/coltrane/package.nix diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/by-name/co/cotp/package.nix similarity index 100% rename from pkgs/applications/misc/cotp/default.nix rename to pkgs/by-name/co/cotp/package.nix diff --git a/pkgs/applications/finance/denaro/deps.nix b/pkgs/by-name/de/denaro/deps.nix similarity index 100% rename from pkgs/applications/finance/denaro/deps.nix rename to pkgs/by-name/de/denaro/deps.nix diff --git a/pkgs/applications/finance/denaro/default.nix b/pkgs/by-name/de/denaro/package.nix similarity index 100% rename from pkgs/applications/finance/denaro/default.nix rename to pkgs/by-name/de/denaro/package.nix diff --git a/pkgs/applications/finance/denaro/update.sh b/pkgs/by-name/de/denaro/update.sh similarity index 100% rename from pkgs/applications/finance/denaro/update.sh rename to pkgs/by-name/de/denaro/update.sh diff --git a/pkgs/applications/misc/doing/Gemfile b/pkgs/by-name/do/doing/Gemfile similarity index 100% rename from pkgs/applications/misc/doing/Gemfile rename to pkgs/by-name/do/doing/Gemfile diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/pkgs/by-name/do/doing/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/doing/Gemfile.lock rename to pkgs/by-name/do/doing/Gemfile.lock diff --git a/pkgs/applications/misc/doing/gemset.nix b/pkgs/by-name/do/doing/gemset.nix similarity index 100% rename from pkgs/applications/misc/doing/gemset.nix rename to pkgs/by-name/do/doing/gemset.nix diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/by-name/do/doing/package.nix similarity index 100% rename from pkgs/applications/misc/doing/default.nix rename to pkgs/by-name/do/doing/package.nix diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/by-name/go/gollum/Gemfile similarity index 100% rename from pkgs/applications/misc/gollum/Gemfile rename to pkgs/by-name/go/gollum/Gemfile diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/by-name/go/gollum/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/gollum/Gemfile.lock rename to pkgs/by-name/go/gollum/Gemfile.lock diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/by-name/go/gollum/gemset.nix similarity index 100% rename from pkgs/applications/misc/gollum/gemset.nix rename to pkgs/by-name/go/gollum/gemset.nix diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/by-name/go/gollum/package.nix similarity index 100% rename from pkgs/applications/misc/gollum/default.nix rename to pkgs/by-name/go/gollum/package.nix diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/pkgs/by-name/je/jekyll/basic/Gemfile similarity index 100% rename from pkgs/applications/misc/jekyll/basic/Gemfile rename to pkgs/by-name/je/jekyll/basic/Gemfile diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/by-name/je/jekyll/basic/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/jekyll/basic/Gemfile.lock rename to pkgs/by-name/je/jekyll/basic/Gemfile.lock diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/by-name/je/jekyll/basic/gemset.nix similarity index 100% rename from pkgs/applications/misc/jekyll/basic/gemset.nix rename to pkgs/by-name/je/jekyll/basic/gemset.nix diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/by-name/je/jekyll/full/Gemfile similarity index 100% rename from pkgs/applications/misc/jekyll/full/Gemfile rename to pkgs/by-name/je/jekyll/full/Gemfile diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/by-name/je/jekyll/full/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/jekyll/full/Gemfile.lock rename to pkgs/by-name/je/jekyll/full/Gemfile.lock diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/by-name/je/jekyll/full/gemset.nix similarity index 100% rename from pkgs/applications/misc/jekyll/full/gemset.nix rename to pkgs/by-name/je/jekyll/full/gemset.nix diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/by-name/je/jekyll/package.nix similarity index 100% rename from pkgs/applications/misc/jekyll/default.nix rename to pkgs/by-name/je/jekyll/package.nix diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/by-name/je/jekyll/update.sh similarity index 100% rename from pkgs/applications/misc/jekyll/update.sh rename to pkgs/by-name/je/jekyll/update.sh diff --git a/pkgs/tools/audio/loudgain/fix-gcc-14.patch b/pkgs/by-name/lo/loudgain/fix-gcc-14.patch similarity index 100% rename from pkgs/tools/audio/loudgain/fix-gcc-14.patch rename to pkgs/by-name/lo/loudgain/fix-gcc-14.patch diff --git a/pkgs/tools/audio/loudgain/default.nix b/pkgs/by-name/lo/loudgain/package.nix similarity index 100% rename from pkgs/tools/audio/loudgain/default.nix rename to pkgs/by-name/lo/loudgain/package.nix diff --git a/pkgs/tools/audio/loudgain/support-ffmpeg-5.patch b/pkgs/by-name/lo/loudgain/support-ffmpeg-5.patch similarity index 100% rename from pkgs/tools/audio/loudgain/support-ffmpeg-5.patch rename to pkgs/by-name/lo/loudgain/support-ffmpeg-5.patch diff --git a/pkgs/tools/audio/loudgain/support-ffmpeg-7.patch b/pkgs/by-name/lo/loudgain/support-ffmpeg-7.patch similarity index 100% rename from pkgs/tools/audio/loudgain/support-ffmpeg-7.patch rename to pkgs/by-name/lo/loudgain/support-ffmpeg-7.patch diff --git a/pkgs/tools/audio/mpdcron/Gemfile b/pkgs/by-name/mp/mpdcron/Gemfile similarity index 100% rename from pkgs/tools/audio/mpdcron/Gemfile rename to pkgs/by-name/mp/mpdcron/Gemfile diff --git a/pkgs/tools/audio/mpdcron/Gemfile.lock b/pkgs/by-name/mp/mpdcron/Gemfile.lock similarity index 100% rename from pkgs/tools/audio/mpdcron/Gemfile.lock rename to pkgs/by-name/mp/mpdcron/Gemfile.lock diff --git a/pkgs/tools/audio/mpdcron/fix-canonicalize-conflict-with-glibc.patch b/pkgs/by-name/mp/mpdcron/fix-canonicalize-conflict-with-glibc.patch similarity index 100% rename from pkgs/tools/audio/mpdcron/fix-canonicalize-conflict-with-glibc.patch rename to pkgs/by-name/mp/mpdcron/fix-canonicalize-conflict-with-glibc.patch diff --git a/pkgs/tools/audio/mpdcron/gemset.nix b/pkgs/by-name/mp/mpdcron/gemset.nix similarity index 100% rename from pkgs/tools/audio/mpdcron/gemset.nix rename to pkgs/by-name/mp/mpdcron/gemset.nix diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/by-name/mp/mpdcron/package.nix similarity index 100% rename from pkgs/tools/audio/mpdcron/default.nix rename to pkgs/by-name/mp/mpdcron/package.nix diff --git a/pkgs/applications/misc/pdfposter/default.nix b/pkgs/by-name/pd/pdfposter/package.nix similarity index 100% rename from pkgs/applications/misc/pdfposter/default.nix rename to pkgs/by-name/pd/pdfposter/package.nix diff --git a/pkgs/applications/audio/psst/Cargo.lock b/pkgs/by-name/ps/psst/Cargo.lock similarity index 100% rename from pkgs/applications/audio/psst/Cargo.lock rename to pkgs/by-name/ps/psst/Cargo.lock diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/by-name/ps/psst/make-build-reproducible.patch similarity index 100% rename from pkgs/applications/audio/psst/make-build-reproducible.patch rename to pkgs/by-name/ps/psst/make-build-reproducible.patch diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/by-name/ps/psst/package.nix similarity index 100% rename from pkgs/applications/audio/psst/default.nix rename to pkgs/by-name/ps/psst/package.nix diff --git a/pkgs/applications/audio/psst/update.sh b/pkgs/by-name/ps/psst/update.sh similarity index 100% rename from pkgs/applications/audio/psst/update.sh rename to pkgs/by-name/ps/psst/update.sh diff --git a/pkgs/applications/misc/pt/.bundle/config b/pkgs/by-name/pt/pt/.bundle/config similarity index 100% rename from pkgs/applications/misc/pt/.bundle/config rename to pkgs/by-name/pt/pt/.bundle/config diff --git a/pkgs/applications/misc/pt/Gemfile b/pkgs/by-name/pt/pt/Gemfile similarity index 100% rename from pkgs/applications/misc/pt/Gemfile rename to pkgs/by-name/pt/pt/Gemfile diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/by-name/pt/pt/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/pt/Gemfile.lock rename to pkgs/by-name/pt/pt/Gemfile.lock diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/by-name/pt/pt/gemset.nix similarity index 100% rename from pkgs/applications/misc/pt/gemset.nix rename to pkgs/by-name/pt/pt/gemset.nix diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/by-name/pt/pt/package.nix similarity index 100% rename from pkgs/applications/misc/pt/default.nix rename to pkgs/by-name/pt/pt/package.nix diff --git a/pkgs/applications/misc/taskjuggler/Gemfile b/pkgs/by-name/ta/taskjuggler/Gemfile similarity index 100% rename from pkgs/applications/misc/taskjuggler/Gemfile rename to pkgs/by-name/ta/taskjuggler/Gemfile diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/by-name/ta/taskjuggler/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/taskjuggler/Gemfile.lock rename to pkgs/by-name/ta/taskjuggler/Gemfile.lock diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/by-name/ta/taskjuggler/gemset.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/gemset.nix rename to pkgs/by-name/ta/taskjuggler/gemset.nix diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/by-name/ta/taskjuggler/package.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/default.nix rename to pkgs/by-name/ta/taskjuggler/package.nix diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/by-name/xx/xxe-pe/package.nix similarity index 100% rename from pkgs/applications/editors/xxe-pe/default.nix rename to pkgs/by-name/xx/xxe-pe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f21ca2c8c21..63180c24f1f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -290,10 +290,6 @@ with pkgs; stdenv = clangStdenv; }; - cloak = callPackage ../applications/misc/cloak { }; - - cotp = callPackage ../applications/misc/cotp { }; - cope = callPackage ../by-name/co/cope/package.nix { perl = perl538; perlPackages = perl538Packages; @@ -750,7 +746,6 @@ with pkgs; singularity-tools = callPackage ../build-support/singularity-tools { }; - srcOnly = callPackage ../build-support/src-only { }; substitute = callPackage ../build-support/substitute/substitute.nix { }; @@ -1356,8 +1351,6 @@ with pkgs; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - coltrane = callPackage ../applications/misc/coltrane { }; - dosbox = callPackage ../applications/emulators/dosbox { inherit (darwin.apple_sdk.frameworks ) OpenGL; SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat; @@ -1772,8 +1765,6 @@ with pkgs; blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; - botamusique = callPackage ../tools/audio/botamusique { }; - bucklespring = bucklespring-x11; bucklespring-libinput = callPackage ../applications/audio/bucklespring { }; bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; }; @@ -1781,8 +1772,6 @@ with pkgs; buildbotPackages = recurseIntoAttrs (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot { }); inherit (buildbotPackages) buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker; - castopod = callPackage ../applications/audio/castopod { }; - certipy = with python3Packages; toPythonApplication certipy-ad; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; @@ -2614,8 +2603,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base; }; - mpdcron = callPackage ../tools/audio/mpdcron { }; - mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { }; nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; @@ -3969,8 +3956,6 @@ with pkgs; jc = with python3Packages; toPythonApplication jc; - jekyll = callPackage ../applications/misc/jekyll { }; - jello = with python3Packages; toPythonApplication jello; jing = res.jing-trang; @@ -4148,8 +4133,6 @@ with pkgs; lolcat = callPackage ../tools/misc/lolcat { }; - loudgain = callPackage ../tools/audio/loudgain/default.nix { }; - lsyncd = callPackage ../applications/networking/sync/lsyncd { lua = lua5_2_compat; }; @@ -4576,7 +4559,6 @@ with pkgs; apps = lib.importJSON ../servers/nextcloud/packages/30.json; }; - nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -4604,7 +4586,6 @@ with pkgs; nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; - mkgmap = callPackage ../applications/misc/mkgmap { }; mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; @@ -4902,8 +4883,6 @@ with pkgs; pdd = python3Packages.callPackage ../tools/misc/pdd { }; - pdfposter = callPackage ../applications/misc/pdfposter { }; - pdfminer = with python3Packages; toPythonApplication pdfminer-six; pgsync = callPackage ../development/tools/database/pgsync { }; @@ -8656,7 +8635,6 @@ with pkgs; inherit (__splicedPackages.haskellPackages) ShellCheck; }; - # Minimal shellcheck executable for package checks. # Use shellcheck which does not include docs, as # pandoc takes long to build and documentation isn't needed for just running the cli @@ -8806,8 +8784,6 @@ with pkgs; xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; - xxe-pe = callPackage ../applications/editors/xxe-pe { }; - xxdiff-tip = xxdiff; ycmd = callPackage ../by-name/yc/ycmd/package.nix { @@ -9588,7 +9564,6 @@ with pkgs; gtk4 = callPackage ../development/libraries/gtk/4.x.nix { }; - # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { cairo = cairo.override { x11Support = true; }; @@ -11401,7 +11376,6 @@ with pkgs; jdk = jdk8; }; - ### DEVELOPMENT / LIBRARIES / JAVASCRIPT ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) @@ -13395,8 +13369,6 @@ with pkgs; pdfstudioviewer ; - acpic = callPackage ../applications/misc/acpic/default.nix { }; - aeolus = callPackage ../applications/audio/aeolus { }; aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { }; @@ -13711,8 +13683,6 @@ with pkgs; plugins = []; }; - denaro = callPackage ../applications/finance/denaro { }; - inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; @@ -13753,7 +13723,6 @@ with pkgs; docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { }; - drawio = callPackage ../applications/graphics/drawio { inherit (darwin) autoSignDarwinBinariesHook; }; @@ -14333,8 +14302,6 @@ with pkgs; inherit (darwin) libobjc; }; - gollum = callPackage ../applications/misc/gollum { }; - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; @@ -15290,7 +15257,6 @@ with pkgs; pythonPackages = python3Packages; }; - notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; @@ -15867,8 +15833,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - psst = callPackage ../applications/audio/psst { }; - squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix { audioBackend = "pulse"; }; @@ -15969,8 +15933,6 @@ with pkgs; teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { }; - telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv @@ -17467,7 +17429,6 @@ with pkgs; xonotic-glx-unwrapped = xonotic-glx.xonotic-unwrapped; xonotic-dedicated-unwrapped = xonotic-dedicated.xonotic-unwrapped; - xpilot-ng = callPackage ../games/xpilot { }; bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { }; bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { }; @@ -18005,7 +17966,6 @@ with pkgs; gmp-static = gmp.override { withStatic = true; }; }; - inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_12 z3_4_11 @@ -18694,8 +18654,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreFoundation Security; }; - pt = callPackage ../applications/misc/pt { }; - pyupgrade = with python3Packages; toPythonApplication pyupgrade; pwntools = with python3Packages; toPythonApplication pwntools; @@ -19016,7 +18974,6 @@ with pkgs; branch = "development"; }; - discord-screenaudio = qt6Packages.callPackage ../applications/networking/instant-messengers/discord-screenaudio { }; discordo = callPackage ../applications/networking/discordo/default.nix { }; @@ -19098,8 +19055,6 @@ with pkgs; openbsd = callPackage ../os-specific/bsd/openbsd { }; - doing = callPackage ../applications/misc/doing { }; - alibuild = callPackage ../development/tools/build-managers/alibuild { python = python3; };